diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 225bdc85..1a21d9da 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -89,7 +89,12 @@ "omada": { "activeUser": "Active devices", "alerts": "Alerts", - "connectedAp": "Connected APs" + "connectedAp": "Connected APs", + "isolatedAp": "Isolated APs", + "powerConsumption": "Power consumption", + "availablePorts" : "Available ports", + "connectedGateway": "Connected gateways", + "connectedSwitches": "Connected switches" }, "nzbget": { "rate": "Rate", diff --git a/src/widgets/omada/component.jsx b/src/widgets/omada/component.jsx index a21ae94d..c41708c1 100644 --- a/src/widgets/omada/component.jsx +++ b/src/widgets/omada/component.jsx @@ -23,6 +23,12 @@ export default function Component({ service }) { + + + + + + ); } @@ -32,6 +38,12 @@ export default function Component({ service }) { + + + + + + ); } diff --git a/src/widgets/omada/proxy.js b/src/widgets/omada/proxy.js index 7b535059..82f5dfcb 100644 --- a/src/widgets/omada/proxy.js +++ b/src/widgets/omada/proxy.js @@ -59,7 +59,13 @@ export default async function omadaProxyHandler(req, res) { let cid; let cversion; let connectedAp; + let isolatedAp; let activeuser; + let connectedSwitches; + let connectedGateways; + let availablePorts; + let powerConsumption; + let alerts; let loginUrl; let siteName; @@ -191,18 +197,20 @@ export default async function omadaProxyHandler(req, res) { }); const data = JSON.parse(statResponse[2]); + if (data.errorCode !== 0) { return res.status(500).send(statResponse[2]); } connectedAp = data.result.connectedAp; activeuser = data.result.activeUser; + isolatedAp = data.result.isolatedAp; alerts = data.result.alerts; } else { let siteStatsUrl; let response; sitetoswitch = listresult.result.data.filter(site => site.name === widget.site); - // On 5.0.0, the key we need is id, on 4.x.x, it's key ... + // On 5.0.0, the field we need is id, on 4.x.x, it's key ... siteName = sitetoswitch[0].id ?? sitetoswitch[0].key; if (cversion < "5.0.0") { siteStatsUrl = `${url}/api/v2/sites/${siteName}/dashboard/overviewDiagram?token=${token}¤tPage=1¤tPageSize=1000`; @@ -224,6 +232,11 @@ 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") { @@ -244,7 +257,13 @@ export default async function omadaProxyHandler(req, res) { return res.send(JSON.stringify({ "connectedAp": connectedAp, "activeUser": activeuser, - "alerts": alerts + "alerts": alerts, + "isolatedAp": isolatedAp, + "connectedGateways": connectedGateways, + "connectedSwitches": connectedSwitches, + "availablePorts": availablePorts, + "powerConsumption": powerConsumption, + })); } }