From f2a59dad2f90d5aa5e89762e39f680a725ab6f3f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 6 Dec 2024 17:31:26 +0100 Subject: [PATCH] sysutils/nut: scrub --- .../nut/src/opnsense/www/js/widgets/Metadata/Nut.xml | 4 +--- sysutils/nut/src/opnsense/www/js/widgets/Nut.js | 9 +++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/sysutils/nut/src/opnsense/www/js/widgets/Metadata/Nut.xml b/sysutils/nut/src/opnsense/www/js/widgets/Metadata/Nut.xml index a3ebebf19..5d7487898 100644 --- a/sysutils/nut/src/opnsense/www/js/widgets/Metadata/Nut.xml +++ b/sysutils/nut/src/opnsense/www/js/widgets/Metadata/Nut.xml @@ -2,9 +2,7 @@ Nut.js - /api/nut/service/status - /api/nut/settings/get - /api/nut/diagnostics/upsstatus + /api/nut/* NUT diff --git a/sysutils/nut/src/opnsense/www/js/widgets/Nut.js b/sysutils/nut/src/opnsense/www/js/widgets/Nut.js index 53de7a14b..6ede278ce 100644 --- a/sysutils/nut/src/opnsense/www/js/widgets/Nut.js +++ b/sysutils/nut/src/opnsense/www/js/widgets/Nut.js @@ -25,9 +25,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ - -import BaseTableWidget from 'widget-base-table'; - export default class NutNetclient extends BaseTableWidget { constructor() { super(); @@ -54,7 +51,7 @@ export default class NutNetclient extends BaseTableWidget { // Periodically called to update the widget's data and UI. async onWidgetTick() { // Fetch the NUT service status from the server. - const nut_service_status = await this.ajaxCall('/api/nut/service/status'); + const nut_service_status = await this.ajaxCall(`/api/nut/${'service/status'}`); // If the service is not running, display a message and stop further processing. if (!nut_service_status || nut_service_status.status !== 'running') { @@ -63,7 +60,7 @@ export default class NutNetclient extends BaseTableWidget { } // Fetch the NUT settings from the server. - const nut_settings = await this.ajaxCall('/api/nut/settings/get'); + const nut_settings = await this.ajaxCall(`/api/nut/${'settings/get'}`); // // If netclient is not enabled, display a message and stop further processing. // if (nut_settings.nut?.netclient?.enable !== "1") { @@ -72,7 +69,7 @@ export default class NutNetclient extends BaseTableWidget { // } // Fetch the UPS status data from the server. - const { response: nut_ups_status_response } = await this.ajaxCall('/api/nut/diagnostics/upsstatus'); + const { response: nut_ups_status_response } = await this.ajaxCall(`/api/nut/${'diagnostics/upsstatus'}`); // Parse the UPS status data into a key-value object. const nut_ups_status = nut_ups_status_response.split('\n').reduce((acc, line) => {