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

add support for "fields" from services.yaml

Browse Source
This commit is contained in:
Stephen Donchez 2023-07-29 16:57:17 -04:00
parent 67c1c9ec42
commit a4f9667329
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,19 @@ 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();
@ -13,6 +26,8 @@ export default function Component({ service }) {
const { data: urbackupData, error: urbackupError } = useWidgetAPI(widget, "status"); const { data: urbackupData, error: urbackupError } = useWidgetAPI(widget, "status");
const [showOk, showErrored, showNoRecent, showDiskUsage] = determineFields(widget);
if (urbackupError) { if (urbackupError) {
return <Container service={service} error={urbackupError} />; return <Container service={service} error={urbackupError} />;
} }
@ -31,10 +46,10 @@ export default function Component({ service }) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="urbackup.ok" value={t("common.number", { value: parseInt(statusData.ok, 10) })} /> {showOk && <Block label="urbackup.ok" value={t("common.number", { value: parseInt(statusData.ok, 10) })} />}
<Block label="urbackup.errored" value={t("common.number", { value: parseInt(statusData.errored, 10) })} /> {showErrored && <Block label="urbackup.errored" value={t("common.number", { value: parseInt(statusData.errored, 10) })} />}
<Block label="urbackup.noRecent" value={t("common.number", { value: parseInt(statusData.noRecent, 10) })} /> {showNoRecent && <Block label="urbackup.noRecent" value={t("common.number", { value: parseInt(statusData.noRecent, 10) })} />}
{urbackupData.diskUsage && <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>
); );
} }

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

@ -1,5 +1,3 @@
// suppress a false positive - this is in package.json
// eslint-disable-next-line import/no-extraneous-dependencies
import {UrbackupServer} from "urbackup-server-api"; import {UrbackupServer} from "urbackup-server-api";
import getServiceWidget from "utils/config/service-helpers"; import getServiceWidget from "utils/config/service-helpers";
@ -18,7 +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.diskUsage) if(serviceWidget.fields?.includes("totalUsed"))
{ {
diskUsage = await server.getUsage(); diskUsage = await server.getUsage();
} }