From b6036cadd3db479c8a8d67ab435552ba198e2739 Mon Sep 17 00:00:00 2001 From: Xinos Date: Thu, 17 Aug 2023 15:17:02 +0700 Subject: [PATCH] Revert "Info widget OMV updates" This reverts commit fc2a9336dc828ac7742773f24f3508e6547b4211. --- public/locales/en/common.json | 4 +-- .../widgets/openmediavault/openmediavault.jsx | 21 -------------- .../widgets/openmediavault/updates.jsx | 29 ------------------- src/components/widgets/widget.jsx | 1 - src/pages/api/widgets/openmediavault.js | 16 ---------- src/widgets/openmediavault/proxy.js | 16 ++++------ 6 files changed, 7 insertions(+), 80 deletions(-) delete mode 100644 src/components/widgets/openmediavault/openmediavault.jsx delete mode 100644 src/components/widgets/openmediavault/updates.jsx delete mode 100644 src/pages/api/widgets/openmediavault.js diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 461551ee..6d9b76a7 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -710,8 +710,6 @@ "passed": "Passed", "failed": "Failed", "zfsHits": "Hits", - "zfsMisses": "Misses", - "updatesAvailable": "Updates available", - "packageCount": "Package count: {{ value, number }}" + "zfsMisses": "Misses" } } diff --git a/src/components/widgets/openmediavault/openmediavault.jsx b/src/components/widgets/openmediavault/openmediavault.jsx deleted file mode 100644 index 9d8be5c2..00000000 --- a/src/components/widgets/openmediavault/openmediavault.jsx +++ /dev/null @@ -1,21 +0,0 @@ -import Container from "../widget/container"; -import Raw from "../widget/raw"; - -import Updates from "./updates"; - -export default function Resources({ options }) { - const { expanded } = options; - - return ( - - -
- {("updates" in options ? options.updates : true) && } -
- {options.label && ( -
{options.label}
- )} -
-
- ); -} diff --git a/src/components/widgets/openmediavault/updates.jsx b/src/components/widgets/openmediavault/updates.jsx deleted file mode 100644 index c50751ea..00000000 --- a/src/components/widgets/openmediavault/updates.jsx +++ /dev/null @@ -1,29 +0,0 @@ -import useSWR from "swr"; -import { FaCheck } from "react-icons/fa"; -import { useTranslation } from "next-i18next"; - -import Resource from "../widget/resource"; -import Error from "../widget/error"; - -export default function Uptime({ expanded }) { - 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 ; - } - - if (!data || data?.response?.length === 0) { - return null; - } - - return ( - - ); -} diff --git a/src/components/widgets/widget.jsx b/src/components/widgets/widget.jsx index f1e18c9d..b4fdb143 100644 --- a/src/components/widgets/widget.jsx +++ b/src/components/widgets/widget.jsx @@ -15,7 +15,6 @@ const widgetMappings = { openmeteo: dynamic(() => import("components/widgets/openmeteo/openmeteo")), longhorn: dynamic(() => import("components/widgets/longhorn/longhorn")), kubernetes: dynamic(() => import("components/widgets/kubernetes/kubernetes")), - openmediavault: dynamic(() => import("components/widgets/openmediavault/openmediavault")), }; export default function Widget({ widget, style }) { diff --git a/src/pages/api/widgets/openmediavault.js b/src/pages/api/widgets/openmediavault.js deleted file mode 100644 index dcf49f2b..00000000 --- a/src/pages/api/widgets/openmediavault.js +++ /dev/null @@ -1,16 +0,0 @@ -import { processReq } from "../../../widgets/openmediavault/proxy"; - -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", - method, - ...options, - }; - - return processReq(widget, res); -} diff --git a/src/widgets/openmediavault/proxy.js b/src/widgets/openmediavault/proxy.js index 0b0fd35e..06380b13 100644 --- a/src/widgets/openmediavault/proxy.js +++ b/src/widgets/openmediavault/proxy.js @@ -104,7 +104,12 @@ async function processBg(url, filename) { return resp; } -export async function processReq(widget, res) { +export default async function proxyHandler(req, res) { + const widget = await getWidget(req); + if (!widget) { + return res.status(400).json({ error: "Invalid proxy service type" }); + } + const api = widgets?.[widget.type]?.api; if (!api) { return res.status(403).json({ error: "Service does not support RPC calls" }); @@ -147,12 +152,3 @@ export async function processReq(widget, res) { return res.status(resp.status).send(resp.data); } - -export default async function proxyHandler(req, res) { - const widget = await getWidget(req); - if (!widget) { - return res.status(400).json({ error: "Invalid proxy service type" }); - } - - return processReq(widget, res); -}