diff --git a/src/widgets/components.js b/src/widgets/components.js
index 7f3477e2..681b877c 100644
--- a/src/widgets/components.js
+++ b/src/widgets/components.js
@@ -25,7 +25,6 @@ const components = {
npm: dynamic(() => import("./npm/component")),
nzbget: dynamic(() => import("./nzbget/component")),
omada: dynamic(() => import("./omada/component")),
- omadalan: dynamic(() => import("./omadalan/component")),
ombi: dynamic(() => import("./ombi/component")),
overseerr: dynamic(() => import("./overseerr/component")),
paperlessngx: dynamic(() => import("./paperlessngx/component")),
diff --git a/src/widgets/omada/component.jsx b/src/widgets/omada/component.jsx
index c2bce933..d499da36 100644
--- a/src/widgets/omada/component.jsx
+++ b/src/widgets/omada/component.jsx
@@ -23,7 +23,8 @@ export default function Component({ service }) {
-
+
+
);
}
@@ -33,7 +34,8 @@ export default function Component({ service }) {
-
+ { omadaData.connectedGateways > 0 && }
+ { omadaData.connectedSwitches > 0 && }
);
}
diff --git a/src/widgets/omada/proxy.js b/src/widgets/omada/proxy.js
index ed1fd30f..58263052 100644
--- a/src/widgets/omada/proxy.js
+++ b/src/widgets/omada/proxy.js
@@ -60,13 +60,9 @@ export default async function omadaProxyHandler(req, res) {
let cid;
let cversion;
let connectedAp;
- let isolatedAp;
- let disconnectedAp;
let activeuser;
let connectedSwitches;
let connectedGateways;
- let availablePorts;
- let powerConsumption;
let alerts;
let loginUrl;
@@ -210,8 +206,6 @@ export default async function omadaProxyHandler(req, res) {
}
connectedAp = data.result.connectedAp;
activeuser = data.result.activeUser;
- isolatedAp = data.result.isolatedAp;
- disconnectedAp = data.result.disconnectedAp;
alerts = data.result.alerts;
} else {
@@ -245,11 +239,9 @@ export default async function omadaProxyHandler(req, res) {
activeuser = clientresult.result.totalClientNum;
connectedAp = clientresult.result.connectedApNum;
- isolatedAp = clientresult.result.isolatedApNum;
connectedGateways = clientresult.result.connectedGatewayNum;
connectedSwitches = clientresult.result.connectedSwitchNum;
- availablePorts = clientresult.result.availablePorts;
- powerConsumption = clientresult.result.powerConsumption;
+
let alertUrl;
if (cversion >= "5.0.0") {
@@ -271,12 +263,8 @@ export default async function omadaProxyHandler(req, res) {
"connectedAp": connectedAp,
"activeUser": activeuser,
"alerts": alerts,
- "isolatedAp": isolatedAp,
"connectedGateways": connectedGateways,
"connectedSwitches": connectedSwitches,
- "availablePorts": availablePorts,
- "powerConsumption": powerConsumption,
- "disconnectedAp": disconnectedAp,
}));
}
}
diff --git a/src/widgets/omadalan/component.jsx b/src/widgets/omadalan/component.jsx
deleted file mode 100644
index 953ab036..00000000
--- a/src/widgets/omadalan/component.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useTranslation } from "next-i18next";
-
-import useWidgetAPI from "../../utils/proxy/use-widget-api";
-import Container from "../../components/services/widget/container";
-import Block from "../../components/services/widget/block";
-
-export default function Component({ service }) {
- const { t } = useTranslation();
-
- const { widget } = service;
-
- const { data: omadaData, error: omadaAPIError } = useWidgetAPI(widget, "stats", {
- refreshInterval: 5000,
- });
-
- if (omadaAPIError) {
- return ;
- }
-
- if (!omadaData) {
- return (
-
-
-
-
-
-
-
- );
- }
-
- return (
-
-
-
-
-
-
-
- );
-}
diff --git a/src/widgets/omadalan/widget.js b/src/widgets/omadalan/widget.js
deleted file mode 100644
index e7775bdd..00000000
--- a/src/widgets/omadalan/widget.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import omadaProxyHandler from "../omada/proxy";
-// import genericProxyHandler from "../../utils/proxy/handlers/generic";
-
-const widget = {
- api: "{url}/web/v1/{endpoint}",
- proxyHandler: omadaProxyHandler,
-
- mappings: {
- stats: {
- endpoint: "controller",
- }
- }
-};
-
-export default widget;
diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js
index f458eaed..c87ba4ad 100644
--- a/src/widgets/widgets.js
+++ b/src/widgets/widgets.js
@@ -20,7 +20,6 @@ import navidrome from "./navidrome/widget";
import npm from "./npm/widget";
import nzbget from "./nzbget/widget";
import omada from "./omada/widget";
-import omadalan from './omadalan/widget';
import ombi from "./ombi/widget";
import overseerr from "./overseerr/widget";
import paperlessngx from "./paperlessngx/widget";
@@ -71,7 +70,6 @@ const widgets = {
npm,
nzbget,
omada,
- omadalan,
ombi,
overseerr,
paperlessngx,