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

Move to explicit checks

Browse Source
This commit is contained in:
Georges-Antoine Assi 2023-05-03 19:11:59 -04:00
parent 38221d763f
commit d680a8656d
No known key found for this signature in database
GPG Key ID: E01F01B06E816D51
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,19 +14,21 @@ 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 // cpuload & memoryusage are deprecated, so limit to 4 fields
let deprecatedFieldsCount = widget.fields ? widget.fields.includes('cpuload') + widget.fields.includes('memoryusage') : 0; const showCpuLoad = widget.fields?.includes('cpuload');
if (widget.fields && widget.fields.length - deprecatedFieldsCount < 4) deprecatedFieldsCount -= 4 - (widget.fields.length - deprecatedFieldsCount); const showMemoryUsage = widget.fields?.includes('memoryusage');
const showNumFiles = !showCpuLoad || !showMemoryUsage; // at least 1 deprecated field is hidden
const showNumShares = !showCpuLoad && !showMemoryUsage; // both deprecated fields are hidden
if (!nextcloudData) { if (!nextcloudData) {
return ( return (
<Container service={service}> <Container service={service}>
{widget.fields?.includes('cpuload') && <Block label="nextcloud.cpuload" />} {showCpuLoad && <Block label="nextcloud.cpuload" />}
{widget.fields?.includes('memoryusage') && <Block label="nextcloud.memoryusage" />} {showMemoryUsage && <Block label="nextcloud.memoryusage" />}
<Block label="nextcloud.freespace" /> <Block label="nextcloud.freespace" />
<Block label="nextcloud.activeusers" /> <Block label="nextcloud.activeusers" />
{deprecatedFieldsCount < 2 && <Block label="nextcloud.numfiles" />} {showNumFiles && <Block label="nextcloud.numfiles" />}
{deprecatedFieldsCount < 1 && <Block label="nextcloud.numshares" />} {showNumShares && <Block label="nextcloud.numshares" />}
</Container> </Container>
); );
} }
@ -36,12 +38,12 @@ export default function Component({ service }) {
return ( return (
<Container service={service}> <Container service={service}>
{widget.fields?.includes('cpuload') && <Block label="nextcloud.cpuload" value={t("common.percent", { value: nextcloudInfo.system.cpuload[0] })} />} {showCpuLoad && <Block label="nextcloud.cpuload" value={t("common.percent", { value: nextcloudInfo.system.cpuload[0] })} />}
{widget.fields?.includes('memoryusage') && <Block label="nextcloud.memoryusage" value={t("common.percent", { value:memoryUsage })} />} {showMemoryUsage && <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 })} />
{deprecatedFieldsCount < 2 && <Block label="nextcloud.numfiles" value={t("common.number", { value: nextcloudInfo.storage.num_files })} />} {showNumFiles && <Block label="nextcloud.numfiles" value={t("common.number", { value: nextcloudInfo.storage.num_files })} />}
{deprecatedFieldsCount < 1 && <Block label="nextcloud.numshares" value={t("common.number", { value: nextcloudInfo.shares.num_shares })} />} {showNumShares && <Block label="nextcloud.numshares" value={t("common.number", { value: nextcloudInfo.shares.num_shares })} />}
</Container> </Container>
); );
} }