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

fix field filtering, syntax

Browse Source
This commit is contained in:
shamoon 2023-07-29 21:59:16 -07:00
parent a4f9667329
commit 1eb4939cf1
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,27 +6,14 @@ import Container from "components/services/widget/container";
import Block from "components/services/widget/block"; import Block from "components/services/widget/block";
import useWidgetAPI from "utils/proxy/use-widget-api"; import useWidgetAPI from "utils/proxy/use-widget-api";
function determineFields(widget){
// don't include diskUsage by default, since it requires a second API call
if (!widget.fields) return [true, true, true, false]
return [
widget.fields?.includes('ok'),
widget.fields?.includes('errored'),
widget.fields?.includes('noRecent'),
widget.fields?.includes('totalUsed')
];
}
export default function Component({ service }) { export default function Component({ service }) {
const { t } = useTranslation(); const { t } = useTranslation();
const { widget } = service; const { widget } = service;
const { data: urbackupData, error: urbackupError } = useWidgetAPI(widget, "status"); const showDiskUsage = widget.fields?.includes('totalUsed')
const [showOk, showErrored, showNoRecent, showDiskUsage] = determineFields(widget); const { data: urbackupData, error: urbackupError } = useWidgetAPI(widget, "status");
if (urbackupError) { if (urbackupError) {
return <Container service={service} error={urbackupError} />; return <Container service={service} error={urbackupError} />;
@ -38,6 +25,7 @@ export default function Component({ service }) {
<Block label="urbackup.ok" /> <Block label="urbackup.ok" />
<Block label="urbackup.errored" /> <Block label="urbackup.errored" />
<Block label="urbackup.noRecent" /> <Block label="urbackup.noRecent" />
{showDiskUsage && <Block label="urbackup.totalUsed" />}
</Container> </Container>
); );
} }
@ -46,9 +34,9 @@ export default function Component({ service }) {
return ( return (
<Container service={service}> <Container service={service}>
{showOk && <Block label="urbackup.ok" value={t("common.number", { value: parseInt(statusData.ok, 10) })} />} <Block label="urbackup.ok" value={t("common.number", { value: parseInt(statusData.ok, 10) })} />
{showErrored && <Block label="urbackup.errored" value={t("common.number", { value: parseInt(statusData.errored, 10) })} />} <Block label="urbackup.errored" value={t("common.number", { value: parseInt(statusData.errored, 10) })} />
{showNoRecent && <Block label="urbackup.noRecent" value={t("common.number", { value: parseInt(statusData.noRecent, 10) })} />} <Block label="urbackup.noRecent" value={t("common.number", { value: parseInt(statusData.noRecent, 10) })} />
{showDiskUsage && <Block label="urbackup.totalUsed" value={t("common.bbytes", {value: parseFloat(statusData.totalUsage, 10)})} />} {showDiskUsage && <Block label="urbackup.totalUsed" value={t("common.bbytes", {value: parseFloat(statusData.totalUsage, 10)})} />}
</Container> </Container>
); );

3
src/widgets/urbackup/proxy.js
View File

@ -16,8 +16,7 @@ await (async () => {
try { try {
const allClients = await server.getStatus({includeRemoved: false}); const allClients = await server.getStatus({includeRemoved: false});
let diskUsage = false let diskUsage = false
if(serviceWidget.fields?.includes("totalUsed")) if (serviceWidget.fields?.includes("totalUsed")) {
{
diskUsage = await server.getUsage(); diskUsage = await server.getUsage();
} }
res.status(200).send({ res.status(200).send({