Revert "Refactoring"

This reverts commit b0bc29227e.
This commit is contained in:
Xinos 2023-08-17 15:17:02 +07:00
parent b0bc29227e
commit 5ba980d33a
6 changed files with 17 additions and 18 deletions

View File

@ -1,16 +1,14 @@
import useSWR from "swr";
import { FaDownload } from "react-icons/fa";
import { FaCheck } from "react-icons/fa";
import { useTranslation } from "next-i18next";
import Resource from "../widget/resource";
import Error from "../widget/error";
const params = new URLSearchParams({ method: "apt.enumerateUpgraded" }).toString();
const useApi = () => useSWR(`/api/widgets/openmediavault?${params}`);
export default function Uptime({ expanded }) {
const { t } = useTranslation();
const { data, error } = useApi();
const { t, i18n } = useTranslation();
const params = { lang: i18n.language, method: "apt.enumerateUpgraded" };
const { data, error } = useSWR(`/api/widgets/openmediavault?${new URLSearchParams(params).toString()}`);
if (error || data?.error) {
return <Error />;
@ -22,7 +20,7 @@ export default function Uptime({ expanded }) {
return (
<Resource
icon={FaDownload}
icon={FaCheck}
value={t("openmediavault.updatesAvailable")}
expandedValue={t("openmediavault.packageCount", { value: data.response.length })}
expanded={expanded}

View File

@ -4,6 +4,7 @@ import { getPrivateWidgetOptions } from "utils/config/widget-helpers";
export default async function handler(req, res) {
const { index, method } = req.query;
const [{ options }] = await getPrivateWidgetOptions("openmediavault", index);
const widget = {
type: "openmediavault",

View File

@ -20,13 +20,13 @@ const items = [
export default function Component({ service }) {
const { data, error } = useWidgetAPI(service.widget);
if (error || data?.error) {
return <Container service={service} error={error || data?.error} />;
if (error) {
return <Container service={service} error={error} />;
}
const itemsWithData = items.map((item) => ({
...item,
number: data?.response?.data ? item.getNumber(data.response.data) : null,
number: data?.response?.data ? item.getNumber(data?.response?.data) : null,
}));
return (

View File

@ -25,13 +25,13 @@ const items = [
export default function Component({ service }) {
const { data, error } = useWidgetAPI(service.widget);
if (error || data?.error) {
return <Container service={service} error={error || data?.error} />;
if (error) {
return <Container service={service} error={error} />;
}
const itemsWithData = items.map((item) => ({
...item,
number: data?.response?.data ? item.getNumber(data.response.data) : null,
number: data?.response?.data ? item.getNumber(data?.response?.data) : null,
}));
return (

View File

@ -25,13 +25,13 @@ const items = [
export default function Component({ service }) {
const { data, error } = useWidgetAPI(service.widget);
if (error || data?.error) {
return <Container service={service} error={error || data?.error} />;
if (error) {
return <Container service={service} error={error} />;
}
const itemsWithData = items.map((item) => ({
...item,
number: data?.response?.output ? item.getNumber(JSON.parse(data.response.output).data) : null,
number: data?.response?.output ? item.getNumber(JSON.parse(data?.response?.output || "{}")?.data) : null,
}));
return (

View File

@ -38,10 +38,10 @@ export default function Component({ service }) {
}
}, [data]);
if (error || data?.error) {
if (error) {
return (
<Container>
<Error error={error || data?.error} />
<Error error={error} />
</Container>
);
}