mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-23 00:13:13 +09:00
Fix rendered more hooks error when refreshing hosts page (#789)
* Fix rendered more hooks error when refreshing hosts page * Fix conditional render on controllerPage Doesn't cause any issues that I know off right now, but changes to antd internal code could change that so it feels better to be sure.
This commit is contained in:
1 parent
3ddbe2ddb3
commit
4221b96431
2 files changed
+6
-5
No files matched your search
@@ -81,6 +81,7 @@ export default function ControllerPage() {
|
|||||||
const [systems] = useSystems();
|
const [systems] = useSystems();
|
||||||
const system = systems.get("controller");
|
const system = systems.get("controller");
|
||||||
const [maxLevel, setMaxLevel] = useState<keyof typeof lib.levels>("info");
|
const [maxLevel, setMaxLevel] = useState<keyof typeof lib.levels>("info");
|
||||||
|
const canShowNpm = hasNpmButtonPermission(true);
|
||||||
|
|
||||||
return <PageLayout nav={[{ name: "Controller" }]}>
|
return <PageLayout nav={[{ name: "Controller" }]}>
|
||||||
<PageHeader
|
<PageHeader
|
||||||
@@ -88,7 +89,7 @@ export default function ControllerPage() {
|
|||||||
extra={<Space>
|
extra={<Space>
|
||||||
<ControllerControlButton canRestart={system?.canRestart} restartRequired={system?.restartRequired}/>
|
<ControllerControlButton canRestart={system?.canRestart} restartRequired={system?.restartRequired}/>
|
||||||
{
|
{
|
||||||
hasNpmButtonPermission(true)
|
canShowNpm
|
||||||
&& <NpmButton target="controller" canRestart={system?.canRestart}/>
|
&& <NpmButton target="controller" canRestart={system?.canRestart}/>
|
||||||
}
|
}
|
||||||
</Space>}
|
</Space>}
|
||||||
|
|||||||
@@ -90,6 +90,7 @@ export default function HostViewPage() {
|
|||||||
const system = systems.get(hostId);
|
const system = systems.get(hostId);
|
||||||
const [host, synced] = useHost(hostId);
|
const [host, synced] = useHost(hostId);
|
||||||
const [maxLevel, setMaxLevel] = useState<keyof typeof lib.levels>("info");
|
const [maxLevel, setMaxLevel] = useState<keyof typeof lib.levels>("info");
|
||||||
|
const canShowNpm = hasNpmButtonPermission(false);
|
||||||
const hostInstances = new Map([...instances].filter(([_id, instance]) => instance.assignedHost === hostId));
|
const hostInstances = new Map([...instances].filter(([_id, instance]) => instance.assignedHost === hostId));
|
||||||
|
|
||||||
let nav = [{ name: "Hosts", path: "/hosts" }, { name: host?.name ?? String(hostId) }];
|
let nav = [{ name: "Hosts", path: "/hosts" }, { name: host?.name ?? String(hostId) }];
|
||||||
@@ -124,10 +125,9 @@ export default function HostViewPage() {
|
|||||||
</Button>
|
</Button>
|
||||||
</Popconfirm>
|
</Popconfirm>
|
||||||
}
|
}
|
||||||
{
|
{canShowNpm && (
|
||||||
hasNpmButtonPermission(false)
|
<NpmButton target={{ hostId }} canRestart={system?.canRestart} disabled={!host["connected"]}/>
|
||||||
&& <NpmButton target={{ hostId }} canRestart={system?.canRestart} disabled={!host["connected"]}/>
|
)}
|
||||||
}
|
|
||||||
</Space>;
|
</Space>;
|
||||||
|
|
||||||
return <PageLayout nav={nav}>
|
return <PageLayout nav={nav}>
|
||||||
|
|||||||
Reference in new issue
Block a user