OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support "deprecated fields" for nextcloud widget

Browse Source
This commit is contained in:
shamoon 2023-05-03 14:29:12 -07:00
parent 648ea5943f
commit 38221d763f
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/services/widget/container.jsx
View File

@ -33,5 +33,5 @@ export default function Container({ error = false, children, service }) {
})); }));
} }
return <div className="relative flex flex-row w-full">{visibleChildren.slice(0, 4)}</div>; return <div className="relative flex flex-row w-full">{visibleChildren}</div>;
} }

20
src/widgets/nextcloud/component.jsx
View File

@ -14,15 +14,19 @@ export default function Component({ service }) {
return <Container service={service} error={nextcloudError} />; return <Container service={service} error={nextcloudError} />;
} }
// cpuload & memoryusage were deprecated, dont break existing installs & dont have > 4 blocks total
let deprecatedFieldsCount = widget.fields ? widget.fields.includes('cpuload') + widget.fields.includes('memoryusage') : 0;
if (widget.fields && widget.fields.length - deprecatedFieldsCount < 4) deprecatedFieldsCount -= 4 - (widget.fields.length - deprecatedFieldsCount);
if (!nextcloudData) { if (!nextcloudData) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="nextcloud.cpuload" /> {widget.fields?.includes('cpuload') && <Block label="nextcloud.cpuload" />}
<Block label="nextcloud.memoryusage" /> {widget.fields?.includes('memoryusage') && <Block label="nextcloud.memoryusage" />}
<Block label="nextcloud.freespace" /> <Block label="nextcloud.freespace" />
<Block label="nextcloud.activeusers" /> <Block label="nextcloud.activeusers" />
<Block label="nextcloud.numfiles" /> {deprecatedFieldsCount < 2 && <Block label="nextcloud.numfiles" />}
<Block label="nextcloud.numshares" /> {deprecatedFieldsCount < 1 && <Block label="nextcloud.numshares" />}
</Container> </Container>
); );
} }
@ -32,12 +36,12 @@ export default function Component({ service }) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="nextcloud.cpuload" value={t("common.percent", { value: nextcloudInfo.system.cpuload[0] })} /> {widget.fields?.includes('cpuload') && <Block label="nextcloud.cpuload" value={t("common.percent", { value: nextcloudInfo.system.cpuload[0] })} />}
<Block label="nextcloud.memoryusage" value={t("common.percent", { value:memoryUsage })} /> {widget.fields?.includes('memoryusage') && <Block label="nextcloud.memoryusage" value={t("common.percent", { value:memoryUsage })} />}
<Block label="nextcloud.freespace" value={t("common.bbytes", { value: nextcloudInfo.system.freespace, maximumFractionDigits: 1 })} /> <Block label="nextcloud.freespace" value={t("common.bbytes", { value: nextcloudInfo.system.freespace, maximumFractionDigits: 1 })} />
<Block label="nextcloud.activeusers" value={t("common.number", { value: nextcloudData.ocs.data.activeUsers.last24hours })} /> <Block label="nextcloud.activeusers" value={t("common.number", { value: nextcloudData.ocs.data.activeUsers.last24hours })} />
<Block label="nextcloud.numfiles" value={t("common.number", { value: nextcloudInfo.storage.num_files })} /> {deprecatedFieldsCount < 2 && <Block label="nextcloud.numfiles" value={t("common.number", { value: nextcloudInfo.storage.num_files })} />}
<Block label="nextcloud.numshares" value={t("common.number", { value: nextcloudInfo.shares.num_shares })} /> {deprecatedFieldsCount < 1 && <Block label="nextcloud.numshares" value={t("common.number", { value: nextcloudInfo.shares.num_shares })} />}
</Container> </Container>
); );
} }