From 45929ea0045d3f31d9a2360fe6a768062786e237 Mon Sep 17 00:00:00 2001 From: Tim Panajott Date: Sat, 14 Nov 2026 14:37:37 +0100 Subject: [PATCH 1/8] Reworked initial setup to use new REST v2 --- .../react-components/dist/.vite/manifest.json | 206 ++--- ...qu00Wbg.js => AnimatePresence-CuLSycWM.js} | 4 +- ...QbHCc.js => EntitiesPagesView-DH3jKYSy.js} | 8 +- ...re-BkKCiqU6.js => EntityStore-ZzZ1Mv2G.js} | 6 +- ...p-qFecaEyr.js => InitialSetup-DfGb8gZw.js} | 714 +++++++++--------- .../{Logs-fyKfGB-i.js => Logs-1o_raoql.js} | 6 +- ...js => MultiStep_AddEditEntity-DY7Yn9gy.js} | 16 +- ...1.js => NSPanelToastContainer-CdQdRrsL.js} | 2 +- ...w-CVnckJ-l.js => NSPanelsView-BkBUvxvB.js} | 16 +- ...mPage-DatvtqhE.js => RoomPage-BEbmnNs8.js} | 18 +- ...View-CmYCbfLH.js => RoomsView-Bp_5KHLS.js} | 19 +- ...e-DP7xWhAz.js => SettingsPage-DNoGED8P.js} | 9 +- ...-B_b5mu_f.js => SettingsStore-DF3_BTZd.js} | 2 +- ...idebar-Ck5FumSR.js => Sidebar-FLF6GWUw.js} | 10 +- ...ore-YH4Dqjwd.js => StompStore-DbalEryK.js} | 6 +- ...nings-B4Wyiqy9.js => Warnings-2nOlGrxR.js} | 6 +- .../react-components/dist/fields-p6wav3mx.js | 183 +++++ ....esm-OPyB-aE8.js => index.esm-CyxbWRtN.js} | 2 +- ...{layout-MHz_8kDh.js => layout-SvH9qeCO.js} | 184 +---- .../{main-GTPFHy3s.js => main-2GKhVwa3.js} | 24 +- .../dist/{mdi-gqrDBoHO.js => mdi-CeE3u6rn.js} | 2 +- .../{proxy-DUfbqFkY.js => proxy-BJsAbzcZ.js} | 2 +- .../{react-Dmrhcfpd.js => react-DZ04j01Q.js} | 2 +- ...B_MQU9.js => react-select.esm-DHSXefzL.js} | 2 +- ...table-DCj6uSpL.js => sortable-C9pxUcQH.js} | 2 +- ...ing-BVI2O33U.js => use-spring-DFNxrtSb.js} | 4 +- .../components/InitialSetup/InitialSetup.tsx | 153 ++-- .../components/InitialSetup/Step2_Theme.tsx | 23 +- .../InitialSetup/Step3_ManagerSettings.tsx | 47 +- .../InitialSetup/Step4_MqttSettings.tsx | 57 +- .../Step5_HomeAssistantSettings.tsx | 35 +- .../InitialSetup/Step6_OpenhabSettings.tsx | 21 +- .../InitialSetup/Step7_Finished.tsx | 94 ++- .../src/components/InitialSetup/form.ts | 68 ++ .../react-components/templates/scripts.html | 2 +- .../nspanelmanager/web/static/css/main.css | 262 +------ .../nspanelmanager/web/templates/index.html | 2 +- 37 files changed, 1060 insertions(+), 1159 deletions(-) rename docker/web/nspanelmanager/web/react-components/dist/{AnimatePresence-Dqu00Wbg.js => AnimatePresence-CuLSycWM.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{EntitiesPagesView-s7wQbHCc.js => EntitiesPagesView-DH3jKYSy.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{EntityStore-BkKCiqU6.js => EntityStore-ZzZ1Mv2G.js} (92%) rename docker/web/nspanelmanager/web/react-components/dist/{InitialSetup-qFecaEyr.js => InitialSetup-DfGb8gZw.js} (68%) rename docker/web/nspanelmanager/web/react-components/dist/{Logs-fyKfGB-i.js => Logs-1o_raoql.js} (97%) rename docker/web/nspanelmanager/web/react-components/dist/{MultiStep_AddEditEntity-KDtbEBBY.js => MultiStep_AddEditEntity-DY7Yn9gy.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{NSPanelToastContainer-DX4VftN1.js => NSPanelToastContainer-CdQdRrsL.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{NSPanelsView-CVnckJ-l.js => NSPanelsView-BkBUvxvB.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{RoomPage-DatvtqhE.js => RoomPage-BEbmnNs8.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{RoomsView-CmYCbfLH.js => RoomsView-Bp_5KHLS.js} (98%) rename docker/web/nspanelmanager/web/react-components/dist/{SettingsPage-DP7xWhAz.js => SettingsPage-DNoGED8P.js} (98%) rename docker/web/nspanelmanager/web/react-components/dist/{SettingsStore-B_b5mu_f.js => SettingsStore-DF3_BTZd.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{Sidebar-Ck5FumSR.js => Sidebar-FLF6GWUw.js} (98%) rename docker/web/nspanelmanager/web/react-components/dist/{StompStore-YH4Dqjwd.js => StompStore-DbalEryK.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{Warnings-B4Wyiqy9.js => Warnings-2nOlGrxR.js} (95%) create mode 100644 docker/web/nspanelmanager/web/react-components/dist/fields-p6wav3mx.js rename docker/web/nspanelmanager/web/react-components/dist/{index.esm-OPyB-aE8.js => index.esm-CyxbWRtN.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{layout-MHz_8kDh.js => layout-SvH9qeCO.js} (70%) rename docker/web/nspanelmanager/web/react-components/dist/{main-GTPFHy3s.js => main-2GKhVwa3.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{mdi-gqrDBoHO.js => mdi-CeE3u6rn.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{proxy-DUfbqFkY.js => proxy-BJsAbzcZ.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{react-Dmrhcfpd.js => react-DZ04j01Q.js} (96%) rename docker/web/nspanelmanager/web/react-components/dist/{react-select.esm-DIB_MQU9.js => react-select.esm-DHSXefzL.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{sortable-DCj6uSpL.js => sortable-C9pxUcQH.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{use-spring-BVI2O33U.js => use-spring-DFNxrtSb.js} (98%) create mode 100644 docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts diff --git a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json index 8db2bd578..46e429da0 100755 --- a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json +++ b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json @@ -1,249 +1,259 @@ { - "_AnimatePresence-Dqu00Wbg.js": { - "file": "AnimatePresence-Dqu00Wbg.js", + "_AnimatePresence-CuLSycWM.js": { + "file": "AnimatePresence-CuLSycWM.js", "name": "AnimatePresence", "imports": [ "src/main.tsx", - "_proxy-DUfbqFkY.js" + "_proxy-BJsAbzcZ.js" ] }, - "_EntityStore-BkKCiqU6.js": { - "file": "EntityStore-BkKCiqU6.js", + "_EntityStore-ZzZ1Mv2G.js": { + "file": "EntityStore-ZzZ1Mv2G.js", "name": "EntityStore", "imports": [ - "_react-Dmrhcfpd.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_StompStore-YH4Dqjwd.js" + "_react-DZ04j01Q.js", + "_NSPanelToastContainer-CdQdRrsL.js", + "_StompStore-DbalEryK.js" ] }, - "_MultiStep_AddEditEntity-KDtbEBBY.js": { - "file": "MultiStep_AddEditEntity-KDtbEBBY.js", + "_MultiStep_AddEditEntity-DY7Yn9gy.js": { + "file": "MultiStep_AddEditEntity-DY7Yn9gy.js", "name": "MultiStep_AddEditEntity", "imports": [ "src/main.tsx", - "_react-Dmrhcfpd.js", - "_SettingsStore-B_b5mu_f.js", - "_react-select.esm-DIB_MQU9.js", - "_index.esm-OPyB-aE8.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_proxy-DUfbqFkY.js", - "_AnimatePresence-Dqu00Wbg.js" + "_react-DZ04j01Q.js", + "_SettingsStore-DF3_BTZd.js", + "_react-select.esm-DHSXefzL.js", + "_index.esm-CyxbWRtN.js", + "_NSPanelToastContainer-CdQdRrsL.js", + "_proxy-BJsAbzcZ.js", + "_AnimatePresence-CuLSycWM.js" ] }, - "_NSPanelToastContainer-DX4VftN1.js": { - "file": "NSPanelToastContainer-DX4VftN1.js", + "_NSPanelToastContainer-CdQdRrsL.js": { + "file": "NSPanelToastContainer-CdQdRrsL.js", "name": "NSPanelToastContainer", "imports": [ "src/main.tsx" ] }, - "_SettingsStore-B_b5mu_f.js": { - "file": "SettingsStore-B_b5mu_f.js", + "_SettingsStore-DF3_BTZd.js": { + "file": "SettingsStore-DF3_BTZd.js", "name": "SettingsStore", "imports": [ - "_react-Dmrhcfpd.js" + "_react-DZ04j01Q.js" ] }, - "_StompStore-YH4Dqjwd.js": { - "file": "StompStore-YH4Dqjwd.js", + "_StompStore-DbalEryK.js": { + "file": "StompStore-DbalEryK.js", "name": "StompStore", "imports": [ "src/main.tsx", - "_react-Dmrhcfpd.js", - "_NSPanelToastContainer-DX4VftN1.js" + "_react-DZ04j01Q.js", + "_NSPanelToastContainer-CdQdRrsL.js" ] }, - "_index.esm-OPyB-aE8.js": { - "file": "index.esm-OPyB-aE8.js", + "_fields-p6wav3mx.js": { + "file": "fields-p6wav3mx.js", + "name": "fields", + "imports": [ + "src/main.tsx", + "_index.esm-CyxbWRtN.js" + ] + }, + "_index.esm-CyxbWRtN.js": { + "file": "index.esm-CyxbWRtN.js", "name": "index.esm", "imports": [ "src/main.tsx" ] }, - "_layout-MHz_8kDh.js": { - "file": "layout-MHz_8kDh.js", + "_layout-SvH9qeCO.js": { + "file": "layout-SvH9qeCO.js", "name": "layout", "imports": [ - "src/main.tsx", - "_index.esm-OPyB-aE8.js" + "src/main.tsx" ] }, - "_mdi-gqrDBoHO.js": { - "file": "mdi-gqrDBoHO.js", + "_mdi-CeE3u6rn.js": { + "file": "mdi-CeE3u6rn.js", "name": "mdi", "imports": [ "src/main.tsx" ] }, - "_proxy-DUfbqFkY.js": { - "file": "proxy-DUfbqFkY.js", + "_proxy-BJsAbzcZ.js": { + "file": "proxy-BJsAbzcZ.js", "name": "proxy", "imports": [ "src/main.tsx" ] }, - "_react-Dmrhcfpd.js": { - "file": "react-Dmrhcfpd.js", + "_react-DZ04j01Q.js": { + "file": "react-DZ04j01Q.js", "name": "react", "imports": [ "src/main.tsx" ] }, - "_react-select.esm-DIB_MQU9.js": { - "file": "react-select.esm-DIB_MQU9.js", + "_react-select.esm-DHSXefzL.js": { + "file": "react-select.esm-DHSXefzL.js", "name": "react-select.esm", "imports": [ "src/main.tsx" ] }, - "_sortable-DCj6uSpL.js": { - "file": "sortable-DCj6uSpL.js", + "_sortable-C9pxUcQH.js": { + "file": "sortable-C9pxUcQH.js", "name": "sortable", "imports": [ "src/main.tsx" ] }, - "_use-spring-BVI2O33U.js": { - "file": "use-spring-BVI2O33U.js", + "_use-spring-DFNxrtSb.js": { + "file": "use-spring-DFNxrtSb.js", "name": "use-spring", "imports": [ "src/main.tsx", - "_proxy-DUfbqFkY.js" + "_proxy-BJsAbzcZ.js" ] }, "src/components/EntitiesPage/EntitiesPagesView.tsx": { - "file": "EntitiesPagesView-s7wQbHCc.js", + "file": "EntitiesPagesView-DH3jKYSy.js", "name": "EntitiesPagesView", "src": "src/components/EntitiesPage/EntitiesPagesView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-DCj6uSpL.js", - "_react-Dmrhcfpd.js", - "_MultiStep_AddEditEntity-KDtbEBBY.js" + "_sortable-C9pxUcQH.js", + "_react-DZ04j01Q.js", + "_MultiStep_AddEditEntity-DY7Yn9gy.js" ] }, "src/components/IndexPage/NSPanelsView.tsx": { - "file": "NSPanelsView-CVnckJ-l.js", + "file": "NSPanelsView-BkBUvxvB.js", "name": "NSPanelsView", "src": "src/components/IndexPage/NSPanelsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_react-select.esm-DIB_MQU9.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_proxy-DUfbqFkY.js", - "_use-spring-BVI2O33U.js", - "_StompStore-YH4Dqjwd.js", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js" + "_react-select.esm-DHSXefzL.js", + "_NSPanelToastContainer-CdQdRrsL.js", + "_proxy-BJsAbzcZ.js", + "_use-spring-DFNxrtSb.js", + "_StompStore-DbalEryK.js", + "_EntityStore-ZzZ1Mv2G.js", + "_mdi-CeE3u6rn.js" ] }, "src/components/InitialSetup/InitialSetup.tsx": { - "file": "InitialSetup-qFecaEyr.js", + "file": "InitialSetup-DfGb8gZw.js", "name": "InitialSetup", "src": "src/components/InitialSetup/InitialSetup.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_SettingsStore-B_b5mu_f.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_proxy-DUfbqFkY.js", - "_AnimatePresence-Dqu00Wbg.js", - "_mdi-gqrDBoHO.js" + "_index.esm-CyxbWRtN.js", + "_NSPanelToastContainer-CdQdRrsL.js", + "_proxy-BJsAbzcZ.js", + "_AnimatePresence-CuLSycWM.js", + "_mdi-CeE3u6rn.js", + "_layout-SvH9qeCO.js" ] }, "src/components/NSPanelPage/Logs.tsx": { - "file": "Logs-fyKfGB-i.js", + "file": "Logs-1o_raoql.js", "name": "Logs", "src": "src/components/NSPanelPage/Logs.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_SettingsStore-B_b5mu_f.js", - "_StompStore-YH4Dqjwd.js" + "_SettingsStore-DF3_BTZd.js", + "_StompStore-DbalEryK.js" ] }, "src/components/NSPanelPage/Sidebar.tsx": { - "file": "Sidebar-Ck5FumSR.js", + "file": "Sidebar-FLF6GWUw.js", "name": "Sidebar", "src": "src/components/NSPanelPage/Sidebar.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_NSPanelToastContainer-DX4VftN1.js", - "_StompStore-YH4Dqjwd.js", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js" + "_NSPanelToastContainer-CdQdRrsL.js", + "_StompStore-DbalEryK.js", + "_EntityStore-ZzZ1Mv2G.js", + "_mdi-CeE3u6rn.js" ] }, "src/components/NSPanelPage/Warnings.tsx": { - "file": "Warnings-B4Wyiqy9.js", + "file": "Warnings-2nOlGrxR.js", "name": "Warnings", "src": "src/components/NSPanelPage/Warnings.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js" + "_EntityStore-ZzZ1Mv2G.js", + "_mdi-CeE3u6rn.js" ] }, "src/components/RoomPage/RoomPage.tsx": { - "file": "RoomPage-DatvtqhE.js", + "file": "RoomPage-BEbmnNs8.js", "name": "RoomPage", "src": "src/components/RoomPage/RoomPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_MultiStep_AddEditEntity-KDtbEBBY.js", - "_react-select.esm-DIB_MQU9.js", - "_index.esm-OPyB-aE8.js", - "_NSPanelToastContainer-DX4VftN1.js", + "_MultiStep_AddEditEntity-DY7Yn9gy.js", + "_react-select.esm-DHSXefzL.js", + "_index.esm-CyxbWRtN.js", + "_NSPanelToastContainer-CdQdRrsL.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", - "_StompStore-YH4Dqjwd.js", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js" + "_StompStore-DbalEryK.js", + "_EntityStore-ZzZ1Mv2G.js", + "_mdi-CeE3u6rn.js" ] }, "src/components/RoomsPage/RoomsView.tsx": { - "file": "RoomsView-CmYCbfLH.js", + "file": "RoomsView-Bp_5KHLS.js", "name": "RoomsView", "src": "src/components/RoomsPage/RoomsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-DCj6uSpL.js", - "_index.esm-OPyB-aE8.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_proxy-DUfbqFkY.js", - "_use-spring-BVI2O33U.js", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js", - "_layout-MHz_8kDh.js" + "_sortable-C9pxUcQH.js", + "_index.esm-CyxbWRtN.js", + "_NSPanelToastContainer-CdQdRrsL.js", + "_proxy-BJsAbzcZ.js", + "_use-spring-DFNxrtSb.js", + "_EntityStore-ZzZ1Mv2G.js", + "_mdi-CeE3u6rn.js", + "_layout-SvH9qeCO.js", + "_fields-p6wav3mx.js" ] }, "src/components/SettingsPage/SettingsPage.tsx": { - "file": "SettingsPage-DP7xWhAz.js", + "file": "SettingsPage-DNoGED8P.js", "name": "SettingsPage", "src": "src/components/SettingsPage/SettingsPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_index.esm-OPyB-aE8.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_layout-MHz_8kDh.js" + "_index.esm-CyxbWRtN.js", + "_NSPanelToastContainer-CdQdRrsL.js", + "_layout-SvH9qeCO.js", + "_fields-p6wav3mx.js" ] }, "src/main.tsx": { - "file": "main-GTPFHy3s.js", + "file": "main-2GKhVwa3.js", "name": "main", "src": "src/main.tsx", "isEntry": true, "dynamicImports": [ - "_MultiStep_AddEditEntity-KDtbEBBY.js", + "_MultiStep_AddEditEntity-DY7Yn9gy.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", "src/components/IndexPage/NSPanelsView.tsx", - "_NSPanelToastContainer-DX4VftN1.js", + "_NSPanelToastContainer-CdQdRrsL.js", "src/components/InitialSetup/InitialSetup.tsx", "src/components/NSPanelPage/Sidebar.tsx", "src/components/NSPanelPage/Warnings.tsx", diff --git a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-Dqu00Wbg.js b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CuLSycWM.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-Dqu00Wbg.js rename to docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CuLSycWM.js index 34f97a47c..514df1f19 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-Dqu00Wbg.js +++ b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CuLSycWM.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-DUfbqFkY.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-BJsAbzcZ.js"; //#region node_modules/framer-motion/dist/es/utils/use-composed-ref.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-s7wQbHCc.js b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DH3jKYSy.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-s7wQbHCc.js rename to docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DH3jKYSy.js index 8c2fef7b7..33297f127 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-s7wQbHCc.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DH3jKYSy.js @@ -1,7 +1,7 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-DCj6uSpL.js"; -import { t as create } from "./react-Dmrhcfpd.js"; -import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-KDtbEBBY.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-C9pxUcQH.js"; +import { t as create } from "./react-DZ04j01Q.js"; +import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-DY7Yn9gy.js"; //#region src/components/EntitiesPage/GenericEntityBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-BkKCiqU6.js b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-ZzZ1Mv2G.js similarity index 92% rename from docker/web/nspanelmanager/web/react-components/dist/EntityStore-BkKCiqU6.js rename to docker/web/nspanelmanager/web/react-components/dist/EntityStore-ZzZ1Mv2G.js index 2d46bb5cd..72146c335 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-BkKCiqU6.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-ZzZ1Mv2G.js @@ -1,6 +1,6 @@ -import { t as create } from "./react-Dmrhcfpd.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; +import { t as create } from "./react-DZ04j01Q.js"; +import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; +import { t as useStompStore } from "./StompStore-DbalEryK.js"; //#region src/stores/EntityStore.ts var nspanel_stomp_status_update_callback = (message) => { const json_data = JSON.parse(message.body); diff --git a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-qFecaEyr.js b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DfGb8gZw.js similarity index 68% rename from docker/web/nspanelmanager/web/react-components/dist/InitialSetup-qFecaEyr.js rename to docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DfGb8gZw.js index 160288210..cd9e69a98 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-qFecaEyr.js +++ b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DfGb8gZw.js @@ -1,9 +1,10 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as useSettingsStore } from "./SettingsStore-B_b5mu_f.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as motion } from "./proxy-DUfbqFkY.js"; -import { t as AnimatePresence } from "./AnimatePresence-Dqu00Wbg.js"; -import { i as mdiInformationOutline, x as require_Icon } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { s as useForm } from "./index.esm-CyxbWRtN.js"; +import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; +import { t as motion } from "./proxy-BJsAbzcZ.js"; +import { t as AnimatePresence } from "./AnimatePresence-CuLSycWM.js"; +import { i as mdiInformationOutline, x as require_Icon } from "./mdi-CeE3u6rn.js"; +import { i as api, t as Alert } from "./layout-SvH9qeCO.js"; //#region src/components/InitialSetup/Step1_Welcome.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); @@ -45,55 +46,94 @@ var Step1_Welcome = ({ nextStep }) => { })] }); }; //#endregion +//#region src/components/InitialSetup/form.ts +var INITIAL_SETUP_FIELDS = [ + "manager_address", + "manager_port", + "mqtt_server", + "mqtt_port", + "mqtt_username", + "home_assistant_address", + "openhab_address", + "theme" +]; +var SECRETS = [ + "mqtt_password", + "home_assistant_token", + "openhab_token" +]; +var ADDON_MANAGED = ["home_assistant_address", "home_assistant_token"]; +function toFormValues(settings) { + const values = {}; + for (const name of INITIAL_SETUP_FIELDS) values[name] = settings[name]; + for (const secret of SECRETS) { + values[secret] = ""; + values[`clear_${secret}`] = false; + } + return values; +} +/** +* The PATCH body for a submitted form: only the settings that changed. Secrets are sent when a new +* value is typed, or as "" when "clear" is ticked. Add-on managed settings are never sent in the add-on. +*/ +function buildPatch(values, dirty, isHomeAssistantAddon) { + const body = {}; + const allowed = (name) => !(isHomeAssistantAddon && ADDON_MANAGED.includes(name)); + for (const name of INITIAL_SETUP_FIELDS) if (dirty[name] && allowed(name)) body[name] = values[name]; + for (const secret of SECRETS) { + if (!allowed(secret)) continue; + if (values[`clear_${secret}`]) body[secret] = ""; + else if (values[secret]) body[secret] = values[secret]; + } + return body; +} +//#endregion //#region src/components/InitialSetup/Step2_Theme.tsx -var Step2_Theme = ({ setFormData, formData, nextStep, prevStep }) => { - const [selectedTheme, setSelectedTheme] = (0, import_react.useState)("default"); +var Step2_Theme = ({ setValue, nextStep, prevStep, watch }) => { + const themes = { + default: "Default", + light: "Light", + dark: "Dark", + nspmwip: "NSPanel Manager", + cupcake: "Cupcake", + bumblebee: "Bumblebee", + emerald: "Emerald", + corporate: "Corporate", + synthwave: "Synthwave", + retro: "Retro", + cyberpunk: "Cyberpunk", + valentine: "Valentine", + halloween: "Halloween", + garden: "Garden", + forest: "Forest", + aqua: "Aqua", + lofi: "Lo-Fi", + pastel: "Pastel", + fantasy: "Fantasy", + wireframe: "Wireframe", + black: "Black", + luxury: "Luxury", + dracula: "Dracula", + cmyk: "CMYK", + autumn: "Autumn", + business: "Business", + acid: "Acid", + lemonade: "Lemonade", + night: "Night", + coffee: "Coffee", + winter: "Winter", + dim: "Dim", + nord: "Nord", + sunset: "Sunset" + }; + const selectedTheme = watch("theme"); return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "grid gap-4 grid-cols-3 mt-4 justify-end items-center", - children: Object.entries({ - default: "Default", - light: "Light", - dark: "Dark", - nspmwip: "NSPanel Manager", - cupcake: "Cupcake", - bumblebee: "Bumblebee", - emerald: "Emerald", - corporate: "Corporate", - synthwave: "Synthwave", - retro: "Retro", - cyberpunk: "Cyberpunk", - valentine: "Valentine", - halloween: "Halloween", - garden: "Garden", - forest: "Forest", - aqua: "Aqua", - lofi: "Lo-Fi", - pastel: "Pastel", - fantasy: "Fantasy", - wireframe: "Wireframe", - black: "Black", - luxury: "Luxury", - dracula: "Dracula", - cmyk: "CMYK", - autumn: "Autumn", - business: "Business", - acid: "Acid", - lemonade: "Lemonade", - night: "Night", - coffee: "Coffee", - winter: "Winter", - dim: "Dim", - nord: "Nord", - sunset: "Sunset" - }).map(([theme_option, display_name]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + children: Object.entries(themes).map(([theme_option, display_name]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "bg-neutral text-neutral-content grid grid-cols-3 w-full h-20 rounded-box overflow-hidden cursor-pointer", "data-theme": theme_option, onClick: () => { - setSelectedTheme(theme_option); - setFormData({ - ...formData, - theme: theme_option - }); + setValue("theme", theme_option); }, children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "", @@ -111,7 +151,7 @@ var Step2_Theme = ({ setFormData, formData, nextStep, prevStep }) => { name: "theme-dropdown", className: "theme-controller radio radio-xs radio-accent p-0 m-0 absolute top-1 right-1", value: theme_option, - checked: theme_option === selectedTheme + checked: theme_option == selectedTheme }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "label-text justify-start w-full ml-2 text-wrap", children: display_name @@ -146,12 +186,12 @@ var Step2_Theme = ({ setFormData, formData, nextStep, prevStep }) => { }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex gap-2 justify-end mt-8", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-neutral", onClick: prevStep, children: "Back" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-primary", onClick: nextStep, children: "Next" @@ -160,24 +200,15 @@ var Step2_Theme = ({ setFormData, formData, nextStep, prevStep }) => { }; //#endregion //#region src/components/InitialSetup/Step3_ManagerSettings.tsx -var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { - const managerAddressRef = (0, import_react.useRef)(null); - const managerPortRef = (0, import_react.useRef)(null); +var Step3_ManagerSettings = ({ setValue, getValues, register, nextStep, prevStep }) => { const getIPFromURL = () => { fetch("/rest/get_ip_by_hostname", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ hostname: window.location.hostname }) }).then((response) => response.json()).then((data) => { - if (data.ip) { - if (managerAddressRef.current) { - managerAddressRef.current.value = data.ip; - setFormData({ - ...formData, - manager_address: data.ip - }); - } - } else Notify({ + if (data.ip) setValue("manager_address", data.ip); + else Notify({ message: "Failed to get IP from URL. No \"ip\" field in response.", level: "error" }); @@ -190,11 +221,14 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { }; const testManagerAddressAndPort = () => { const params = { - address: formData.manager_address, - port: formData.manager_port.toString() + address: getValues("manager_address"), + port: getValues("manager_port").toString() }; const queryString = new URLSearchParams(params).toString(); - fetch("/rest/mqttmanager/test?" + queryString, { method: "GET" }).then((response) => { + fetch("/rest/mqttmanager/test?" + queryString, { + method: "GET", + signal: AbortSignal.timeout(2e3) + }).then((response) => { if (response.ok) Notify({ message: "Manager address and port are valid.", level: "success", @@ -231,13 +265,8 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md rounded-r-none border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "text", - onChange: (e) => setFormData({ - ...formData, - manager_address: e.target.value - }), - value: formData.manager_address, - required: true, - ref: managerAddressRef + ...register("manager_address"), + required: true }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "btn btn-info rounded-l-none h-auto", @@ -260,20 +289,14 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md rounded-r-none border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "number", - onChange: (e) => setFormData({ - ...formData, - manager_port: parseInt(e.target.value) - }), - value: formData.manager_port, - required: true, - ref: managerPortRef + ...register("manager_port", { valueAsNumber: true }), + required: true }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "btn btn-info rounded-l-none h-auto", - onClick: () => managerPortRef.current && (managerPortRef.current.value = window.location.port) && setFormData({ - ...formData, - manager_port: parseInt(window.location.port) - }), + onClick: () => { + setValue("manager_port", parseInt(window.location.port)); + }, children: "Load from URL" })] })] @@ -288,15 +311,14 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex gap-2 justify-end mt-8", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-neutral", onClick: prevStep, children: "Back" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-primary", onClick: nextStep, - disabled: !formData.manager_address || !formData.manager_port, children: "Next" })] })] }); @@ -304,8 +326,8 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { //#endregion //#region src/components/InitialSetup/Step4_MqttSettings.tsx var import_Icon = require_Icon(); -var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { - const [anonymousLogin, setAnonymousLogin] = (0, import_react.useState)(formData.mqtt_username === ""); +var Step4_MqttSettings = ({ setValue, getValues, register, nextStep, prevStep }) => { + const [noLogin, setNoLogin] = (0, import_react.useState)(getValues("mqtt_username") == "" && getValues("mqtt_password") == ""); return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [ /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "alert alert-info my-4", @@ -330,11 +352,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "text", - onChange: (e) => setFormData({ - ...formData, - mqtt_server: e.target.value - }), - value: formData.mqtt_server, + ...register("mqtt_server"), required: true }) })] @@ -353,11 +371,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "number", - onChange: (e) => setFormData({ - ...formData, - mqtt_port: parseInt(e.target.value) - }), - value: formData.mqtt_port, + ...register("mqtt_port", { valueAsNumber: true }), required: true }) })] @@ -375,20 +389,20 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", className: "checkbox checkbox-sm checkbox-primary", - checked: anonymousLogin, - onChange: () => { - setAnonymousLogin(!anonymousLogin); - setFormData({ - ...formData, - mqtt_username: "", - mqtt_password: "" - }); + checked: noLogin, + onChange: (e) => { + if (e.currentTarget.checked) { + setValue("mqtt_username", ""); + setValue("mqtt_password", ""); + setValue("clear_mqtt_password", true); + setNoLogin(true); + } else setNoLogin(false); } }), "Anonymous login"] }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex justify-center my-4 duration-500 transition-transform ease-linear", - hidden: anonymousLogin, + hidden: noLogin, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { @@ -401,12 +415,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "text", id: "mqtt_username", - onChange: (e) => setFormData({ - ...formData, - mqtt_username: e.target.value - }), - value: formData.mqtt_username, - disabled: anonymousLogin, + ...register("mqtt_username"), required: true }) })] @@ -414,7 +423,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex justify-center mb-4 duration-500 transition-transform ease-linear", - hidden: anonymousLogin, + hidden: noLogin == true, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { @@ -427,12 +436,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "password", id: "mqtt_password", - onChange: (e) => setFormData({ - ...formData, - mqtt_password: e.target.value - }), - value: formData.mqtt_password, - disabled: anonymousLogin, + ...register("mqtt_password"), required: true }) })] @@ -445,15 +449,15 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex gap-2 justify-end mt-8", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-neutral", onClick: prevStep, children: "Back" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-primary", onClick: nextStep, - disabled: !formData.mqtt_server || !formData.mqtt_port, + disabled: getValues("mqtt_server") == "" || getValues("mqtt_port") < 1 || getValues("mqtt_port") > 65535, children: "Next" })] }) @@ -461,11 +465,11 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { }; //#endregion //#region src/components/InitialSetup/Step5_HomeAssistantSettings.tsx -var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, isHomeAssistantAddon }) => { +var Step5_HomeAssistantSettings = ({ getValues, register, isHomeAssistantAddon, nextStep, prevStep }) => { const testHomeAssistant = () => { const params = { - address: formData.home_assistant_address, - token: formData.home_assistant_token + address: getValues("home_assistant_address"), + token: getValues("home_assistant_token") }; const queryString = new URLSearchParams(params).toString(); fetch("/rest/home_assistant/test?" + queryString, { method: "GET" }).then((response) => { @@ -504,7 +508,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Icon.Icon, { path: mdiInformationOutline, className: "w-6" - }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: "You are running NSPanel Manager as a Home Assistant add on. These settings are managed for you by Home Assistant. Simply press next to continue." })] + }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: "You are running NSPanel Manager as a Home Assistant add on. These settings are managed for you by Home Assistant." })] }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "alert alert-info my-4", @@ -519,6 +523,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", + hidden: isHomeAssistantAddon, children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex justify-center mb-4 duration-500 transition-transform ease-linear", children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { @@ -532,11 +537,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5", type: "text", - onChange: (e) => setFormData({ - ...formData, - home_assistant_address: e.target.value - }), - value: formData.home_assistant_address, + ...register("home_assistant_address"), disabled: isHomeAssistantAddon, required: true }) @@ -544,6 +545,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, }) }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex justify-center mb-4 duration-500 transition-transform ease-linear", + hidden: isHomeAssistantAddon, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { @@ -555,11 +557,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5", type: "password", - onChange: (e) => setFormData({ - ...formData, - home_assistant_token: e.target.value - }), - value: formData.home_assistant_token, + ...register("home_assistant_token"), disabled: isHomeAssistantAddon, required: true }) @@ -570,6 +568,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { className: "btn btn-accent w-full", onClick: testHomeAssistant, + hidden: isHomeAssistantAddon, children: "Test settings" }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { @@ -590,11 +589,11 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, }; //#endregion //#region src/components/InitialSetup/Step6_OpenhabSettings.tsx -var Step6_OpenhabSettings = ({ formData, setFormData, nextStep, prevStep }) => { +var Step6_OpenhabSettings = ({ getValues, register, nextStep, prevStep }) => { const testOpenhab = () => { const params = { - address: formData.openhab_address, - token: formData.openhab_token + address: getValues("openhab_address"), + token: getValues("openhab_token") }; const queryString = new URLSearchParams(params).toString(); fetch("/rest/openhab/test?" + queryString, { method: "GET" }).then((response) => { @@ -651,11 +650,7 @@ var Step6_OpenhabSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5", type: "text", - onChange: (e) => setFormData({ - ...formData, - openhab_address: e.target.value - }), - value: formData.openhab_address, + ...register("openhab_address"), required: true }) })] @@ -673,11 +668,7 @@ var Step6_OpenhabSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5", type: "password", - onChange: (e) => setFormData({ - ...formData, - openhab_token: e.target.value - }), - value: formData.openhab_token, + ...register("openhab_token"), required: true }) })] @@ -707,51 +698,48 @@ var Step6_OpenhabSettings = ({ formData, setFormData, nextStep, prevStep }) => { }; //#endregion //#region src/components/InitialSetup/Step7_Finished.tsx -var Step7_Finished = ({ formData, prevStep }) => { - function getCookie(name) { - let cookieValue = ""; - if (document.cookie && document.cookie !== "") { - const cookies = document.cookie.split(";"); - for (let i = 0; i < cookies.length; i++) { - const cookie = cookies[i].trim(); - if (cookie.substring(0, name.length + 1) === name + "=") { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } - } - } - return cookieValue; - } - const saveSettings = () => { - fetch("/rest/settings", { - method: "POST", - headers: { - "Content-Type": "application/json", - "X-CSRFToken": getCookie("csrftoken") - }, - body: JSON.stringify({ settings: formData }) - }).then((response) => { - if (response.ok) { +var Step7_Finished = ({ form, prevStep, isHomeAssistantAddon, dialogRef }) => { + const saveSettings = async () => { + const { getValues, reset, formState: { dirtyFields } } = form; + const body = buildPatch(getValues(), dirtyFields, isHomeAssistantAddon); + try { + const { data, error, response } = await api.PATCH("/rest/v2/settings", { body }); + if (data) { + reset(toFormValues(data)); Notify({ - message: "Settings saved successfully.", + message: "Settings saved.", level: "success", duration: 5e3 }); - window.location.reload(); - } else response.json().then((data) => { - Notify({ - message: "Failed to save settings. Error: " + data.message, + dialogRef.current?.close(); + return; + } + if (response.status === 400 && error && !("detail" in error && error.detail)) { + console.error("Got error ", error); + const fieldErrors = Object.entries(error); + if (fieldErrors.length === 0) Notify({ + message: "Nothing was saved.", level: "error", - duration: 5e3 + duration: 8e3 }); - }); - }).catch((error) => { + for (const [field, messages] of fieldErrors) for (const message of Array.isArray(messages) ? messages : [messages]) Notify({ + message: `${field}: ${message}`, + level: "error", + duration: 8e3 + }); + } else { + const detail = error && "detail" in error ? error.detail : `HTTP ${response.status}`; + Notify({ + message: `Couldn't save the settings: ${detail}`, + level: "error" + }); + } + } catch (failure) { Notify({ - message: "Failed to save settings. Error: " + error.message, - level: "error", - duration: 5e3 + message: `Couldn't save the settings: ${failure instanceof Error ? failure.message : String(failure)}`, + level: "error" }); - }); + } }; return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", @@ -776,11 +764,11 @@ var Step7_Finished = ({ formData, prevStep }) => { }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "mt-2 text-center", - children: "Initial setup is now finished. If you have any NSPanels already flashed and connected to the same MQTT broker they should show up automatically. In case they do not, there is the documentation and also a discord where you can get help. There is also the Github page where you can report issues and contribute." + children: "Initial setup is now finished. If you have any NSPanels already flashed and connected to the same MQTT broker they should show up automatically. In case they do not, there is the documentation and also a discord where you can get help. There is also the Github page where you can report issues and" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "my-2 text-center font-bold", - children: "Thank you for your support and trust and have fun!" + children: "Thank you for your support and trust. Have fun and enjoy!" }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { id: "about_links", @@ -824,12 +812,12 @@ var Step7_Finished = ({ formData, prevStep }) => { /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex gap-2 justify-end mt-8", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-neutral", onClick: prevStep, children: "Back" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-primary", onClick: saveSettings, children: "Save" @@ -841,39 +829,24 @@ var Step7_Finished = ({ formData, prevStep }) => { //#endregion //#region src/components/InitialSetup/InitialSetup.tsx var InitialSetup = ({ opened, isHomeAssistantAddon }) => { - const [step, setStep] = (0, import_react.useState)(1); - const [hasPopulatedFromExistingSettings, setHasPopulatedFromExistingSettings] = (0, import_react.useState)(false); - const [formData, setFormData] = (0, import_react.useState)({ - theme: "default", - manager_address: "", - manager_port: 8e3, - mqtt_server: "", - mqtt_port: 1883, - mqtt_username: "", - mqtt_password: "", - home_assistant_address: "", - home_assistant_token: "", - openhab_address: "", - openhab_token: "" - }); - const settingsStoreStatus = useSettingsStore((state) => state.status); - if (settingsStoreStatus == "none") useSettingsStore.getState().fetchData(); - else if (settingsStoreStatus == "loaded" && !hasPopulatedFromExistingSettings) { - console.log("Settings loaded, updating formData for initial setup."); - setFormData((prev) => ({ - ...prev, - theme: useSettingsStore.getState().settings?.theme ?? "default", - manager_address: useSettingsStore.getState().settings?.manager_address ?? "", - manager_port: useSettingsStore.getState().settings?.manager_port ?? 8e3, - mqtt_server: useSettingsStore.getState().settings?.mqtt_server ?? "", - mqtt_port: useSettingsStore.getState().settings?.mqtt_port ?? 1883, - home_assistant_address: useSettingsStore.getState().settings?.home_assistant_address ?? "", - openhab_address: useSettingsStore.getState().settings?.openhab_address ?? "" + const [state, setState] = (0, import_react.useState)({ status: "loading" }); + const fetchSettings = (0, import_react.useCallback)(() => { + api.GET("/rest/v2/settings").then(({ data, response }) => setState(data ? { + status: "loaded", + settings: data + } : { + status: "error", + message: `HTTP ${response.status}` + })).catch((error) => setState({ + status: "error", + message: error instanceof Error ? error.message : String(error) })); - setHasPopulatedFromExistingSettings(true); - } - const nextStep = () => setStep((prev) => prev + 1); - const prevStep = () => setStep((prev) => prev - 1); + }, []); + (0, import_react.useEffect)(fetchSettings, [fetchSettings]); + const retry = () => { + setState({ status: "loading" }); + fetchSettings(); + }; const dialogRef = (0, import_react.useRef)(null); const contentRef = (0, import_react.useRef)(null); const checkOverflow = () => { @@ -897,126 +870,179 @@ var InitialSetup = ({ opened, isHomeAssistantAddon }) => { ref: dialogRef, open: opened ?? false, className: "modal duration-200", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - ref: contentRef, - className: `modal-box max-h-11/12 min-w-180 bg-base-100 text-base-content`, - children: [(() => { - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { - className: "flex justify-center mb-4 w-full", - children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("ul", { - className: "steps w-full", - children: [ - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 1 ? "step-primary cursor-pointer" : ""}`, - onClick: () => { - setStep(1); - }, - children: "Welcome" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 2 ? "step-primary" : ""}`, - onClick: () => { - setStep(2); - }, - children: "Theme" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 3 ? "step-primary" : ""}`, - onClick: () => { - setStep(3); - }, - children: "Manager settings" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 4 ? "step-primary" : ""}`, - onClick: () => { - setStep(4); - }, - children: "MQTT settings" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 5 ? "step-primary" : ""}`, - onClick: () => { - setStep(5); - }, - children: "Home Assistant settings" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 6 ? "step-primary" : ""}`, - onClick: () => { - setStep(6); - }, - children: "OpenHAB settings" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 7 ? "step-primary" : ""}`, - onClick: () => { - setStep(7); - }, - children: "Finished" - }) - ] - }) - }); - })(), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AnimatePresence, { - mode: "wait", - children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(motion.div, { - layout: true, - initial: { - opacity: 0, - x: 30 - }, - animate: { - opacity: 1, - x: 0 - }, - exit: { - opacity: 0, - x: -30 - }, - transition: { duration: .1 }, - children: (() => { - if (step == 1) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step1_Welcome, { nextStep }); - else if (step == 2) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step2_Theme, { - formData, - setFormData, - nextStep, - prevStep - }); - else if (step == 3) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step3_ManagerSettings, { - formData, - setFormData, - nextStep, - prevStep - }); - else if (step == 4) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step4_MqttSettings, { - formData, - setFormData, - nextStep, - prevStep - }); - else if (step == 5) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step5_HomeAssistantSettings, { - formData, - setFormData, - nextStep, - prevStep, - isHomeAssistantAddon - }); - else if (step == 6) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step6_OpenhabSettings, { - formData, - setFormData, - nextStep, - prevStep - }); - else if (step == 7) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step7_Finished, { - formData, - prevStep - }); - })() - }, `step.${step}`) - })] - }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "modal-backdrop" })] + children: [ + state.status === "loading" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "flex items-center justify-center modal-box max-h-11/12 min-w-180 min-h-60 bg-base-100 text-base-content", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "loading loading-spinner loading" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { + className: "ml-2 text-xl", + children: "Initializing first setup" + })] + }), + state.status === "error" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Alert, { + level: "error", + children: ["Couldn't load settings: ", state.message] + }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { + type: "button", + className: "btn", + onClick: retry, + children: "Retry" + })] }), + state.status === "loaded" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(InitialSetupForm, { + settings: state.settings, + dialogRef, + isHomeAssistantAddon + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "modal-backdrop" }) + ] }); }; +var InitialSetupForm = ({ dialogRef, isHomeAssistantAddon, settings }) => { + const [step, setStep] = (0, import_react.useState)(1); + const form = useForm({ defaultValues: toFormValues(settings) }); + const { register, setValue, getValues, watch } = form; + const nextStep = () => setStep((prev) => prev + 1); + const prevStep = () => setStep((prev) => prev - 1); + const contentRef = (0, import_react.useRef)(null); + const checkOverflow = () => { + if (contentRef.current) { + const maxHeightString = window.getComputedStyle(contentRef.current).maxHeight; + let maxHeight = parseFloat(maxHeightString); + if (maxHeightString.endsWith("%")) maxHeight = Math.trunc(window.innerHeight * maxHeight / 100); + contentRef.current.classList.toggle("overflow-y-auto", contentRef.current.scrollHeight > maxHeight); + contentRef.current.classList.toggle("overflow-y-visible", contentRef.current.scrollHeight <= maxHeight); + } + }; + (0, import_react.useEffect)(() => { + const observer = new ResizeObserver((entries) => { + entries.forEach(() => { + checkOverflow(); + }); + }); + if (contentRef.current) observer.observe(contentRef.current); + }, [contentRef]); + return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + ref: contentRef, + className: `modal-box max-h-11/12 min-w-180 bg-base-100 text-base-content`, + children: [(() => { + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { + className: "flex justify-center mb-4 w-full", + children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("ul", { + className: "steps w-full", + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 1 ? "step-primary cursor-pointer" : ""}`, + onClick: () => { + setStep(1); + }, + children: "Welcome" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 2 ? "step-primary" : ""}`, + onClick: () => { + setStep(2); + }, + children: "Theme" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 3 ? "step-primary" : ""}`, + onClick: () => { + setStep(3); + }, + children: "Manager settings" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 4 ? "step-primary" : ""}`, + onClick: () => { + setStep(4); + }, + children: "MQTT settings" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 5 ? "step-primary" : ""}`, + onClick: () => { + setStep(5); + }, + children: "Home Assistant settings" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 6 ? "step-primary" : ""}`, + onClick: () => { + setStep(6); + }, + children: "OpenHAB settings" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 7 ? "step-primary" : ""}`, + onClick: () => { + setStep(7); + }, + children: "Finished" + }) + ] + }) + }); + })(), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AnimatePresence, { + mode: "wait", + children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(motion.div, { + layout: true, + initial: { + opacity: 0, + x: 30 + }, + animate: { + opacity: 1, + x: 0 + }, + exit: { + opacity: 0, + x: -30 + }, + transition: { duration: .1 }, + children: (() => { + if (step == 1) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step1_Welcome, { nextStep }); + else if (step == 2) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step2_Theme, { + setValue, + nextStep, + prevStep, + watch + }); + else if (step == 3) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step3_ManagerSettings, { + setValue, + getValues, + register, + nextStep, + prevStep + }); + else if (step == 4) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step4_MqttSettings, { + setValue, + getValues, + register, + nextStep, + prevStep + }); + else if (step == 5) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step5_HomeAssistantSettings, { + getValues, + register, + nextStep, + prevStep, + isHomeAssistantAddon + }); + else if (step == 6) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step6_OpenhabSettings, { + getValues, + register, + nextStep, + prevStep + }); + else if (step == 7) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step7_Finished, { + form, + isHomeAssistantAddon, + prevStep, + dialogRef + }); + })() + }, `step.${step}`) + })] + }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "modal-backdrop" })] }); +}; //#endregion export { InitialSetup as default }; diff --git a/docker/web/nspanelmanager/web/react-components/dist/Logs-fyKfGB-i.js b/docker/web/nspanelmanager/web/react-components/dist/Logs-1o_raoql.js similarity index 97% rename from docker/web/nspanelmanager/web/react-components/dist/Logs-fyKfGB-i.js rename to docker/web/nspanelmanager/web/react-components/dist/Logs-1o_raoql.js index 7d2193e26..ab1580228 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Logs-fyKfGB-i.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Logs-1o_raoql.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as useSettingsStore } from "./SettingsStore-B_b5mu_f.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { t as useSettingsStore } from "./SettingsStore-DF3_BTZd.js"; +import { t as useStompStore } from "./StompStore-DbalEryK.js"; //#region src/components/NSPanelPage/Logs.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-KDtbEBBY.js b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DY7Yn9gy.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-KDtbEBBY.js rename to docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DY7Yn9gy.js index 201cf8fc4..94e258704 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-KDtbEBBY.js +++ b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DY7Yn9gy.js @@ -1,11 +1,11 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as create } from "./react-Dmrhcfpd.js"; -import { t as useSettingsStore } from "./SettingsStore-B_b5mu_f.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-DIB_MQU9.js"; -import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-OPyB-aE8.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as motion } from "./proxy-DUfbqFkY.js"; -import { t as AnimatePresence } from "./AnimatePresence-Dqu00Wbg.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { t as create } from "./react-DZ04j01Q.js"; +import { t as useSettingsStore } from "./SettingsStore-DF3_BTZd.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-DHSXefzL.js"; +import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-CyxbWRtN.js"; +import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; +import { t as motion } from "./proxy-BJsAbzcZ.js"; +import { t as AnimatePresence } from "./AnimatePresence-CuLSycWM.js"; //#region src/stores/EntitiesPagesStore.ts function getCookie$1(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DX4VftN1.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-CdQdRrsL.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DX4VftN1.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-CdQdRrsL.js index 67d05c87a..2371ac3f0 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DX4VftN1.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-CdQdRrsL.js @@ -1,4 +1,4 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; //#region node_modules/clsx/dist/clsx.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); function r(e) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-CVnckJ-l.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-BkBUvxvB.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-CVnckJ-l.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-BkBUvxvB.js index 44bd1f39b..e129cb66e 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-CVnckJ-l.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-BkBUvxvB.js @@ -1,11 +1,11 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-DIB_MQU9.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as motion } from "./proxy-DUfbqFkY.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BVI2O33U.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-DHSXefzL.js"; +import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; +import { t as motion } from "./proxy-BJsAbzcZ.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-DFNxrtSb.js"; +import { t as useStompStore } from "./StompStore-DbalEryK.js"; +import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-CeE3u6rn.js"; //#region src/components/IndexPage/NSPanelBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DatvtqhE.js b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-BEbmnNs8.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/RoomPage-DatvtqhE.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomPage-BEbmnNs8.js index c2842f605..dd4d04173 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DatvtqhE.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-BEbmnNs8.js @@ -1,12 +1,12 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-KDtbEBBY.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-DIB_MQU9.js"; -import { l as useWatch, s as useForm } from "./index.esm-OPyB-aE8.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import EntitiesPagesView from "./EntitiesPagesView-s7wQbHCc.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { d as mdiTextShort, x as require_Icon } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-DY7Yn9gy.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-DHSXefzL.js"; +import { l as useWatch, s as useForm } from "./index.esm-CyxbWRtN.js"; +import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; +import EntitiesPagesView from "./EntitiesPagesView-DH3jKYSy.js"; +import { t as useStompStore } from "./StompStore-DbalEryK.js"; +import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; +import { d as mdiTextShort, x as require_Icon } from "./mdi-CeE3u6rn.js"; //#region src/components/RoomPage/RoomPage.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-CmYCbfLH.js b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-Bp_5KHLS.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/RoomsView-CmYCbfLH.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomsView-Bp_5KHLS.js index 0cb8eff8b..2334a22f3 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-CmYCbfLH.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-Bp_5KHLS.js @@ -1,12 +1,13 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { r as DragDropProvider, t as useSortable } from "./sortable-DCj6uSpL.js"; -import { n as FormProvider, s as useForm } from "./index.esm-OPyB-aE8.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as motion } from "./proxy-DUfbqFkY.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BVI2O33U.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { o as mdiMenu, x as require_Icon } from "./mdi-gqrDBoHO.js"; -import { c as TextInput, l as api, t as Alert } from "./layout-MHz_8kDh.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { r as DragDropProvider, t as useSortable } from "./sortable-C9pxUcQH.js"; +import { n as FormProvider, s as useForm } from "./index.esm-CyxbWRtN.js"; +import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; +import { t as motion } from "./proxy-BJsAbzcZ.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-DFNxrtSb.js"; +import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; +import { o as mdiMenu, x as require_Icon } from "./mdi-CeE3u6rn.js"; +import { i as api, t as Alert } from "./layout-SvH9qeCO.js"; +import { a as TextInput } from "./fields-p6wav3mx.js"; //#region src/components/RoomsPage/RoomBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DP7xWhAz.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DNoGED8P.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DP7xWhAz.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DNoGED8P.js index f217e89db..9d780810f 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DP7xWhAz.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DNoGED8P.js @@ -1,7 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-OPyB-aE8.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { a as RadioGroup$1, c as TextInput$1, i as NumberInput$1, l as api, n as Card, o as SecretInput$1, r as Row, s as Select$1, t as Alert, u as getCookie } from "./layout-MHz_8kDh.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-CyxbWRtN.js"; +import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; +import { a as getCookie, i as api, n as Card, r as Row, t as Alert } from "./layout-SvH9qeCO.js"; +import { a as TextInput$1, i as Select$1, n as RadioGroup$1, r as SecretInput$1, t as NumberInput$1 } from "./fields-p6wav3mx.js"; //#region src/api/connectionTests.ts var import_react = /* @__PURE__ */ __toESM(require_react(), 1); async function errorMessage(response) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-B_b5mu_f.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DF3_BTZd.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsStore-B_b5mu_f.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DF3_BTZd.js index 4ac5ef3c6..7ceefcb48 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-B_b5mu_f.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DF3_BTZd.js @@ -1,4 +1,4 @@ -import { t as create } from "./react-Dmrhcfpd.js"; +import { t as create } from "./react-DZ04j01Q.js"; //#region src/stores/SettingsStore.ts function getCookie(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-Ck5FumSR.js b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-FLF6GWUw.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/Sidebar-Ck5FumSR.js rename to docker/web/nspanelmanager/web/react-components/dist/Sidebar-FLF6GWUw.js index 0f38fcf78..194e8018d 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-Ck5FumSR.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-FLF6GWUw.js @@ -1,8 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; +import { t as useStompStore } from "./StompStore-DbalEryK.js"; +import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-CeE3u6rn.js"; //#region src/components/NSPanelPage/Sidebar.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/StompStore-YH4Dqjwd.js b/docker/web/nspanelmanager/web/react-components/dist/StompStore-DbalEryK.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/StompStore-YH4Dqjwd.js rename to docker/web/nspanelmanager/web/react-components/dist/StompStore-DbalEryK.js index 4160bf5ff..6efd92589 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/StompStore-YH4Dqjwd.js +++ b/docker/web/nspanelmanager/web/react-components/dist/StompStore-DbalEryK.js @@ -1,6 +1,6 @@ -import { i as __commonJSMin } from "./main-GTPFHy3s.js"; -import { t as create } from "./react-Dmrhcfpd.js"; -import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-DX4VftN1.js"; +import { i as __commonJSMin } from "./main-2GKhVwa3.js"; +import { t as create } from "./react-DZ04j01Q.js"; +import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-CdQdRrsL.js"; //#region node_modules/tslib/tslib.es6.mjs /****************************************************************************** Copyright (c) Microsoft Corporation. diff --git a/docker/web/nspanelmanager/web/react-components/dist/Warnings-B4Wyiqy9.js b/docker/web/nspanelmanager/web/react-components/dist/Warnings-2nOlGrxR.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/Warnings-B4Wyiqy9.js rename to docker/web/nspanelmanager/web/react-components/dist/Warnings-2nOlGrxR.js index 8dfe173bd..64afe54cc 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Warnings-B4Wyiqy9.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Warnings-2nOlGrxR.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { x as require_Icon } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; +import { x as require_Icon } from "./mdi-CeE3u6rn.js"; //#region src/components/NSPanelPage/Warnings.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/fields-p6wav3mx.js b/docker/web/nspanelmanager/web/react-components/dist/fields-p6wav3mx.js new file mode 100644 index 000000000..97439052c --- /dev/null +++ b/docker/web/nspanelmanager/web/react-components/dist/fields-p6wav3mx.js @@ -0,0 +1,183 @@ +import { r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-CyxbWRtN.js"; +require_react(); +var import_jsx_runtime = require_jsx_runtime(); +function Field({ name, label, hint, children }) { + const { formState: { errors, defaultValues } } = useFormContext(); + const error = get(errors, name)?.message; + const unreadable = get(defaultValues, name) === null; + return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "mb-2 w-full", + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { + htmlFor: name, + className: "block mb-1 text-sm font-medium", + children: label + }), + children, + error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm text-error", + id: `${name}-error`, + children: error + }) : unreadable ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm text-warning", + children: "No valid value is stored. Enter one." + }) : hint ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm opacity-60", + children: hint + }) : null + ] + }); +} +var inputClass = "input w-full"; +function useInvalid(name) { + const { formState: { errors } } = useFormContext(); + const invalid = get(errors, name) !== void 0; + return { + "aria-invalid": invalid, + "aria-describedby": invalid ? `${name}-error` : void 0 + }; +} +function TextInput({ name, label, hint, disabled, button }) { + const { register } = useFormContext(); + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { + name, + label, + hint, + children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "join w-full", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + id: name, + type: "text", + className: `${inputClass} join-item`, + disabled, + ...useInvalid(name), + ...register(name) + }), button] + }) + }); +} +var toNumber = (value) => value === "" || value === null || value === void 0 ? null : Number(value); +function NumberInput({ name, label, hint, button }) { + const { register } = useFormContext(); + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { + name, + label, + hint, + children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "join w-full", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + id: name, + type: "number", + step: 1, + className: `${inputClass} join-item`, + ...useInvalid(name), + ...register(name, { setValueAs: toNumber }) + }), button] + }) + }); +} +function Select({ name, label, options }) { + const { register } = useFormContext(); + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { + name, + label, + children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", { + id: name, + className: "select w-full", + ...useInvalid(name), + ...register(name), + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { + value: "", + disabled: true, + children: "Choose…" + }), options.map(([value, text]) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { + value, + children: text + }, value))] + }) + }); +} +function RadioGroup({ name, label, options }) { + const { control } = useFormContext(); + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Controller, { + control, + name, + render: ({ field }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("fieldset", { + className: "mb-2 w-full", + "aria-label": label, + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("legend", { + className: "block mb-1 text-sm font-medium", + children: label + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { + className: "flex flex-wrap border border-neutral rounded-lg", + children: options.map(([value, text]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { + className: "flex items-center gap-2 flex-1 px-3 py-3 text-sm font-medium cursor-pointer", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "radio", + className: "radio radio-accent radio-sm", + name, + checked: field.value === value, + onChange: () => field.onChange(value), + onBlur: field.onBlur + }), text] + }, String(value))) + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FieldMessage, { name }) + ] + }) + }); +} +function FieldMessage({ name }) { + const { formState: { errors, defaultValues } } = useFormContext(); + const error = get(errors, name)?.message; + if (error) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm text-error", + children: error + }); + if (get(defaultValues, name) === null) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm text-warning", + children: "No valid value is stored. Choose one." + }); + return null; +} +function SecretInput({ name, clearName, label, isSet, disabled, button }) { + const { register, control } = useFormContext(); + const clear = useWatch({ + control, + name: clearName + }); + return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Field, { + name, + label, + hint: isSet && !disabled ? "Stored, and not shown. Leave blank to keep it." : void 0, + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "join w-full", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + id: name, + type: "password", + autoComplete: "new-password", + className: `${inputClass} join-item`, + placeholder: isSet ? "••••••••" : "", + disabled: disabled || clear, + ...useInvalid(name), + ...register(name) + }), button] + }), isSet && !disabled && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { + className: "label mt-1 text-sm", + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "checkbox", + className: "checkbox checkbox-accent checkbox-sm", + ...register(clearName) + }), + "Clear the stored ", + label.toLowerCase() + ] + })] + }); +} +//#endregion +export { TextInput as a, Select as i, RadioGroup as n, SecretInput as r, NumberInput as t }; diff --git a/docker/web/nspanelmanager/web/react-components/dist/index.esm-OPyB-aE8.js b/docker/web/nspanelmanager/web/react-components/dist/index.esm-CyxbWRtN.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/index.esm-OPyB-aE8.js rename to docker/web/nspanelmanager/web/react-components/dist/index.esm-CyxbWRtN.js index 30d67dcbd..730fcce80 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/index.esm-OPyB-aE8.js +++ b/docker/web/nspanelmanager/web/react-components/dist/index.esm-CyxbWRtN.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-GTPFHy3s.js"; +import { c as __toESM, r as require_react } from "./main-2GKhVwa3.js"; //#region node_modules/react-hook-form/dist/index.esm.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var isCheckBoxInput = (element) => element.type === "checkbox"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/layout-MHz_8kDh.js b/docker/web/nspanelmanager/web/react-components/dist/layout-SvH9qeCO.js similarity index 70% rename from docker/web/nspanelmanager/web/react-components/dist/layout-MHz_8kDh.js rename to docker/web/nspanelmanager/web/react-components/dist/layout-SvH9qeCO.js index eb5dfc0c2..ce8340d12 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/layout-MHz_8kDh.js +++ b/docker/web/nspanelmanager/web/react-components/dist/layout-SvH9qeCO.js @@ -1,5 +1,4 @@ -import { r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-OPyB-aE8.js"; +import { r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; //#region node_modules/openapi-fetch/dist/index.mjs var PATH_PARAM_RE = /\{[^{}]+\}/g; var supportsRequestInitExt = () => { @@ -414,185 +413,6 @@ var api = createClient({ api.use(csrf); require_react(); var import_jsx_runtime = require_jsx_runtime(); -function Field({ name, label, hint, children }) { - const { formState: { errors, defaultValues } } = useFormContext(); - const error = get(errors, name)?.message; - const unreadable = get(defaultValues, name) === null; - return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - className: "mb-2 w-full", - children: [ - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { - htmlFor: name, - className: "block mb-1 text-sm font-medium", - children: label - }), - children, - error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm text-error", - id: `${name}-error`, - children: error - }) : unreadable ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm text-warning", - children: "No valid value is stored. Enter one." - }) : hint ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm opacity-60", - children: hint - }) : null - ] - }); -} -var inputClass = "input w-full"; -function useInvalid(name) { - const { formState: { errors } } = useFormContext(); - const invalid = get(errors, name) !== void 0; - return { - "aria-invalid": invalid, - "aria-describedby": invalid ? `${name}-error` : void 0 - }; -} -function TextInput({ name, label, hint, disabled, button }) { - const { register } = useFormContext(); - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { - name, - label, - hint, - children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - className: "join w-full", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - id: name, - type: "text", - className: `${inputClass} join-item`, - disabled, - ...useInvalid(name), - ...register(name) - }), button] - }) - }); -} -var toNumber = (value) => value === "" || value === null || value === void 0 ? null : Number(value); -function NumberInput({ name, label, hint, button }) { - const { register } = useFormContext(); - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { - name, - label, - hint, - children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - className: "join w-full", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - id: name, - type: "number", - step: 1, - className: `${inputClass} join-item`, - ...useInvalid(name), - ...register(name, { setValueAs: toNumber }) - }), button] - }) - }); -} -function Select({ name, label, options }) { - const { register } = useFormContext(); - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { - name, - label, - children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", { - id: name, - className: "select w-full", - ...useInvalid(name), - ...register(name), - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { - value: "", - disabled: true, - children: "Choose…" - }), options.map(([value, text]) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { - value, - children: text - }, value))] - }) - }); -} -function RadioGroup({ name, label, options }) { - const { control } = useFormContext(); - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Controller, { - control, - name, - render: ({ field }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("fieldset", { - className: "mb-2 w-full", - "aria-label": label, - children: [ - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("legend", { - className: "block mb-1 text-sm font-medium", - children: label - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { - className: "flex flex-wrap border border-neutral rounded-lg", - children: options.map(([value, text]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { - className: "flex items-center gap-2 flex-1 px-3 py-3 text-sm font-medium cursor-pointer", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - type: "radio", - className: "radio radio-accent radio-sm", - name, - checked: field.value === value, - onChange: () => field.onChange(value), - onBlur: field.onBlur - }), text] - }, String(value))) - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FieldMessage, { name }) - ] - }) - }); -} -function FieldMessage({ name }) { - const { formState: { errors, defaultValues } } = useFormContext(); - const error = get(errors, name)?.message; - if (error) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm text-error", - children: error - }); - if (get(defaultValues, name) === null) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm text-warning", - children: "No valid value is stored. Choose one." - }); - return null; -} -function SecretInput({ name, clearName, label, isSet, disabled, button }) { - const { register, control } = useFormContext(); - const clear = useWatch({ - control, - name: clearName - }); - return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Field, { - name, - label, - hint: isSet && !disabled ? "Stored, and not shown. Leave blank to keep it." : void 0, - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - className: "join w-full", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - id: name, - type: "password", - autoComplete: "new-password", - className: `${inputClass} join-item`, - placeholder: isSet ? "••••••••" : "", - disabled: disabled || clear, - ...useInvalid(name), - ...register(name) - }), button] - }), isSet && !disabled && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { - className: "label mt-1 text-sm", - children: [ - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - type: "checkbox", - className: "checkbox checkbox-accent checkbox-sm", - ...register(clearName) - }), - "Clear the stored ", - label.toLowerCase() - ] - })] - }); -} -//#endregion -//#region src/components/common/layout.tsx function Card({ title, actions, children }) { return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { className: "p-4 mt-2 bg-base-100 rounded-box shadow-lg w-full", @@ -625,4 +445,4 @@ function Alert({ level, children }) { }); } //#endregion -export { RadioGroup as a, TextInput as c, NumberInput as i, api as l, Card as n, SecretInput as o, Row as r, Select as s, Alert as t, getCookie as u }; +export { getCookie as a, api as i, Card as n, Row as r, Alert as t }; diff --git a/docker/web/nspanelmanager/web/react-components/dist/main-GTPFHy3s.js b/docker/web/nspanelmanager/web/react-components/dist/main-2GKhVwa3.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/main-GTPFHy3s.js rename to docker/web/nspanelmanager/web/react-components/dist/main-2GKhVwa3.js index d15159593..90a6a0218 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/main-GTPFHy3s.js +++ b/docker/web/nspanelmanager/web/react-components/dist/main-2GKhVwa3.js @@ -1,4 +1,4 @@ -const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-KDtbEBBY.js","react-Dmrhcfpd.js","SettingsStore-B_b5mu_f.js","react-select.esm-DIB_MQU9.js","index.esm-OPyB-aE8.js","NSPanelToastContainer-DX4VftN1.js","proxy-DUfbqFkY.js","AnimatePresence-Dqu00Wbg.js","EntitiesPagesView-s7wQbHCc.js","sortable-DCj6uSpL.js","NSPanelsView-CVnckJ-l.js","use-spring-BVI2O33U.js","StompStore-YH4Dqjwd.js","EntityStore-BkKCiqU6.js","mdi-gqrDBoHO.js","InitialSetup-qFecaEyr.js","Sidebar-Ck5FumSR.js","Warnings-B4Wyiqy9.js","Logs-fyKfGB-i.js","RoomPage-DatvtqhE.js","SettingsPage-DP7xWhAz.js","layout-MHz_8kDh.js","RoomsView-CmYCbfLH.js"])))=>i.map(i=>d[i]); +const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-DY7Yn9gy.js","react-DZ04j01Q.js","SettingsStore-DF3_BTZd.js","react-select.esm-DHSXefzL.js","index.esm-CyxbWRtN.js","NSPanelToastContainer-CdQdRrsL.js","proxy-BJsAbzcZ.js","AnimatePresence-CuLSycWM.js","EntitiesPagesView-DH3jKYSy.js","sortable-C9pxUcQH.js","NSPanelsView-BkBUvxvB.js","use-spring-DFNxrtSb.js","StompStore-DbalEryK.js","EntityStore-ZzZ1Mv2G.js","mdi-CeE3u6rn.js","InitialSetup-DfGb8gZw.js","layout-SvH9qeCO.js","Sidebar-FLF6GWUw.js","Warnings-2nOlGrxR.js","Logs-1o_raoql.js","RoomPage-BEbmnNs8.js","SettingsPage-DNoGED8P.js","fields-p6wav3mx.js","RoomsView-Bp_5KHLS.js"])))=>i.map(i=>d[i]); //#region \0rolldown/runtime.js var __create = Object.create; var __defProp = Object.defineProperty; @@ -10204,16 +10204,16 @@ var __vitePreload = function preload(baseModule, deps, importerUrl) { }; //#endregion //#region src/componentMap.tsx -var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-KDtbEBBY.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); -var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-s7wQbHCc.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); -var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-CVnckJ-l.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); -var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-DX4VftN1.js").then((n) => n.t), [])); -var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-qFecaEyr.js"), __vite__mapDeps([15,2,1,5,6,7,14]))); -var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-Ck5FumSR.js"), __vite__mapDeps([16,5,12,1,13,14]))); -var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-B4Wyiqy9.js"), __vite__mapDeps([17,13,1,5,12,14]))); -var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-fyKfGB-i.js"), __vite__mapDeps([18,2,1,12,5]))); -var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-DatvtqhE.js"), __vite__mapDeps([19,0,1,2,3,4,5,6,7,8,9,12,13,14]))); -var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-DP7xWhAz.js"), __vite__mapDeps([20,4,5,21]))); +var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-DY7Yn9gy.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); +var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-DH3jKYSy.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); +var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-BkBUvxvB.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); +var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-CdQdRrsL.js").then((n) => n.t), [])); +var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-DfGb8gZw.js"), __vite__mapDeps([15,4,5,6,7,14,16]))); +var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-FLF6GWUw.js"), __vite__mapDeps([17,5,12,1,13,14]))); +var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-2nOlGrxR.js"), __vite__mapDeps([18,13,1,5,12,14]))); +var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-1o_raoql.js"), __vite__mapDeps([19,2,1,12,5]))); +var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-BEbmnNs8.js"), __vite__mapDeps([20,0,1,2,3,4,5,6,7,8,9,12,13,14]))); +var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-DNoGED8P.js"), __vite__mapDeps([21,4,5,16,22]))); var componentMap = { MultiStep_AddEditEntity, EntitiesPagesView, @@ -10224,7 +10224,7 @@ var componentMap = { NSPanelWarnings, NSPanelLogs, RoomPage, - RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-CmYCbfLH.js"), __vite__mapDeps([22,9,4,5,6,11,13,1,12,14,21]))), + RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-Bp_5KHLS.js"), __vite__mapDeps([23,9,4,5,6,11,13,1,12,14,16,22]))), SettingsPage }; //#endregion diff --git a/docker/web/nspanelmanager/web/react-components/dist/mdi-gqrDBoHO.js b/docker/web/nspanelmanager/web/react-components/dist/mdi-CeE3u6rn.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/mdi-gqrDBoHO.js rename to docker/web/nspanelmanager/web/react-components/dist/mdi-CeE3u6rn.js index 7d622ae8f..971045702 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/mdi-gqrDBoHO.js +++ b/docker/web/nspanelmanager/web/react-components/dist/mdi-CeE3u6rn.js @@ -1,4 +1,4 @@ -import { i as __commonJSMin, r as require_react } from "./main-GTPFHy3s.js"; +import { i as __commonJSMin, r as require_react } from "./main-2GKhVwa3.js"; //#region node_modules/prop-types/lib/ReactPropTypesSecret.js /** * Copyright (c) 2013-present, Facebook, Inc. diff --git a/docker/web/nspanelmanager/web/react-components/dist/proxy-DUfbqFkY.js b/docker/web/nspanelmanager/web/react-components/dist/proxy-BJsAbzcZ.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/proxy-DUfbqFkY.js rename to docker/web/nspanelmanager/web/react-components/dist/proxy-BJsAbzcZ.js index 27cfca5fa..31c3be849 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/proxy-DUfbqFkY.js +++ b/docker/web/nspanelmanager/web/react-components/dist/proxy-BJsAbzcZ.js @@ -1,4 +1,4 @@ -import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; //#region node_modules/framer-motion/dist/es/context/LayoutGroupContext.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-Dmrhcfpd.js b/docker/web/nspanelmanager/web/react-components/dist/react-DZ04j01Q.js similarity index 96% rename from docker/web/nspanelmanager/web/react-components/dist/react-Dmrhcfpd.js rename to docker/web/nspanelmanager/web/react-components/dist/react-DZ04j01Q.js index c6d493b27..823d3a968 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-Dmrhcfpd.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-DZ04j01Q.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-GTPFHy3s.js"; +import { c as __toESM, r as require_react } from "./main-2GKhVwa3.js"; //#region node_modules/zustand/esm/vanilla.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var createStoreImpl = (createState) => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DIB_MQU9.js b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DHSXefzL.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DIB_MQU9.js rename to docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DHSXefzL.js index 5c300d182..359fae484 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DIB_MQU9.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DHSXefzL.js @@ -1,4 +1,4 @@ -import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-GTPFHy3s.js"; +import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-2GKhVwa3.js"; //#region node_modules/@babel/runtime/helpers/esm/typeof.js function _typeof(o) { "@babel/helpers - typeof"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/sortable-DCj6uSpL.js b/docker/web/nspanelmanager/web/react-components/dist/sortable-C9pxUcQH.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/sortable-DCj6uSpL.js rename to docker/web/nspanelmanager/web/react-components/dist/sortable-C9pxUcQH.js index 1d3b32775..39e1b683d 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/sortable-DCj6uSpL.js +++ b/docker/web/nspanelmanager/web/react-components/dist/sortable-C9pxUcQH.js @@ -1,4 +1,4 @@ -import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; //#region node_modules/@preact/signals-core/dist/signals-core.module.js var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var i = Symbol.for("preact-signals"); diff --git a/docker/web/nspanelmanager/web/react-components/dist/use-spring-BVI2O33U.js b/docker/web/nspanelmanager/web/react-components/dist/use-spring-DFNxrtSb.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/use-spring-BVI2O33U.js rename to docker/web/nspanelmanager/web/react-components/dist/use-spring-DFNxrtSb.js index e587e8f21..abe368b00 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/use-spring-BVI2O33U.js +++ b/docker/web/nspanelmanager/web/react-components/dist/use-spring-DFNxrtSb.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react } from "./main-GTPFHy3s.js"; -import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-DUfbqFkY.js"; +import { c as __toESM, r as require_react } from "./main-2GKhVwa3.js"; +import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-BJsAbzcZ.js"; //#region node_modules/motion-dom/dist/es/utils/transform.mjs function transform(...args) { const useImmediate = !Array.isArray(args[0]); diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx index 52344e52b..d0e7ea56f 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx @@ -1,4 +1,5 @@ -import { useState, useRef, useEffect } from "react"; +import { useState, useRef, useEffect, useCallback } from "react"; +import { useForm } from "react-hook-form"; import Step1_Welcome from "./Step1_Welcome"; import Step2_Theme from "./Step2_Theme"; import Step3_ManagerSettings from "./Step3_ManagerSettings"; @@ -7,25 +8,16 @@ import Step5_HomeAssistantSettings from "./Step5_HomeAssistantSettings"; import Step6_OpenhabSettings from "./Step6_OpenhabSettings"; import { AnimatePresence } from "framer-motion"; import { motion } from "framer-motion"; -import { useSettingsStore } from "../../stores/SettingsStore"; import Step7_Finished from "./Step7_Finished"; +import { api, type Settings } from "../../api/client"; +import { type InitialSetupFormValues, toFormValues } from "./form"; +import { Alert } from "../common/layout"; export type nextStepType = () => void; export type handleChangeType = (input: string) => (e: React.ChangeEvent) => void; export type handleButtonSelectEvent = (input: string, value: string) => () => void; -export interface formDataType { - theme: string; - manager_address: string; - manager_port: number; - mqtt_server: string; - mqtt_port: number; - mqtt_username: string; - mqtt_password: string; - home_assistant_address: string; - home_assistant_token: string; - openhab_address: string; - openhab_token: string; -} + +type LoadState = { status: "loading" } | { status: "error"; message: string } | { status: "loaded"; settings: Settings }; const InitialSetup = ({ opened, @@ -39,44 +31,91 @@ const InitialSetup = ({ onComplete?: () => void; opened: boolean; isHomeAssistantAddon: boolean; +}) => { + const [state, setState] = useState({ status: "loading" }); + + // Sets the state only once the request finishes. + const fetchSettings = useCallback(() => { + api + .GET("/rest/v2/settings") + .then(({ data, response }) => setState(data ? { status: "loaded", settings: data } : { status: "error", message: `HTTP ${response.status}` })) + .catch((error) => setState({ status: "error", message: error instanceof Error ? error.message : String(error) })); + }, []); + + useEffect(fetchSettings, [fetchSettings]); + + const retry = () => { + setState({ status: "loading" }); + fetchSettings(); + }; + + const dialogRef = useRef(null); + const contentRef = useRef(null); + + // Automatically switch between overflow-y-visible and overflow-y-auto depending on content height and max height + const checkOverflow = () => { + if (contentRef.current) { + const maxHeightString = window.getComputedStyle(contentRef.current).maxHeight; + let maxHeight = parseFloat(maxHeightString); + if (maxHeightString.endsWith("%")) { + // Convert percentage to pixels based on window height + maxHeight = Math.trunc((window.innerHeight * maxHeight) / 100); + } + contentRef.current.classList.toggle("overflow-y-auto", contentRef.current.scrollHeight > maxHeight); + contentRef.current.classList.toggle("overflow-y-visible", contentRef.current.scrollHeight <= maxHeight); + } + }; + + useEffect(() => { + const observer = new ResizeObserver((entries) => { + entries.forEach(() => { + checkOverflow(); + }); + }); + + if (contentRef.current) { + observer.observe(contentRef.current); + } + }, [contentRef]); + + return ( + + {state.status === "loading" && ( +
+ + Initializing first setup +
+ )} + {state.status === "error" && ( + <> + Couldn't load settings: {state.message} + + + )} + {state.status === "loaded" && } + +
+
+ ); +}; + +const InitialSetupForm = ({ + dialogRef, + isHomeAssistantAddon, + settings, +}: { + dialogRef: React.RefObject; + isHomeAssistantAddon: boolean; + settings: Settings; }) => { const [step, setStep] = useState(1); - const [hasPopulatedFromExistingSettings, setHasPopulatedFromExistingSettings] = useState(false); - const [formData, setFormData] = useState({ - theme: "default", - manager_address: "", - manager_port: 8000, - mqtt_server: "", - mqtt_port: 1883, - mqtt_username: "", - mqtt_password: "", - home_assistant_address: "", - home_assistant_token: "", - openhab_address: "", - openhab_token: "", - }); - - const settingsStoreStatus = useSettingsStore((state) => state.status); - if (settingsStoreStatus == "none") { - useSettingsStore.getState().fetchData(); - } else if (settingsStoreStatus == "loaded" && !hasPopulatedFromExistingSettings) { - console.log("Settings loaded, updating formData for initial setup."); - setFormData((prev) => ({ - ...prev, - theme: useSettingsStore.getState().settings?.theme ?? "default", - manager_address: useSettingsStore.getState().settings?.manager_address ?? "", - manager_port: useSettingsStore.getState().settings?.manager_port ?? 8000, - mqtt_server: useSettingsStore.getState().settings?.mqtt_server ?? "", - mqtt_port: useSettingsStore.getState().settings?.mqtt_port ?? 1883, - home_assistant_address: useSettingsStore.getState().settings?.home_assistant_address ?? "", - openhab_address: useSettingsStore.getState().settings?.openhab_address ?? "", - })); - setHasPopulatedFromExistingSettings(true); - } + const form = useForm({ defaultValues: toFormValues(settings) }); + const { register, setValue, getValues, watch } = form; const nextStep = () => setStep((prev) => prev + 1); const prevStep = () => setStep((prev) => prev - 1); - const dialogRef = useRef(null); const contentRef = useRef(null); // const prevStep = () => setStep((prev) => prev - 1); @@ -107,7 +146,7 @@ const InitialSetup = ({ }, [contentRef]); return ( - + <>
{(() => { return ( @@ -187,32 +226,32 @@ const InitialSetup = ({ if (step == 1) { return ; } else if (step == 2) { - return ; + return ; } else if (step == 3) { - return ; + return ; } else if (step == 4) { - return ; + return ; } else if (step == 5) { return ( ); } else if (step == 6) { - return ; + return ; } else if (step == 7) { - return ; + return ; } })()}
-
+ ); }; diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx index f4243454b..7cbe4e587 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx @@ -1,18 +1,17 @@ -import { useState } from "react"; -import { type formDataType } from "./InitialSetup"; +import { type UseFormSetValue, type UseFormWatch } from "react-hook-form"; +import { type InitialSetupFormValues } from "./form"; const Step2_Theme = ({ - setFormData, - formData, + setValue, nextStep, prevStep, + watch, }: { - setFormData: (data: formDataType) => void; - formData: formDataType; + setValue: UseFormSetValue; nextStep: () => void; prevStep: () => void; + watch: UseFormWatch; }) => { - const [selectedTheme, setSelectedTheme] = useState("default"); const themes = { default: "Default", light: "Light", @@ -49,6 +48,7 @@ const Step2_Theme = ({ nord: "Nord", sunset: "Sunset", }; + const selectedTheme = watch("theme"); return (
@@ -58,8 +58,7 @@ const Step2_Theme = ({ className="bg-neutral text-neutral-content grid grid-cols-3 w-full h-20 rounded-box overflow-hidden cursor-pointer" data-theme={theme_option} onClick={() => { - setSelectedTheme(theme_option); - setFormData({ ...formData, theme: theme_option }); + setValue("theme", theme_option); }} >
@@ -74,7 +73,7 @@ const Step2_Theme = ({ name="theme-dropdown" className="theme-controller radio radio-xs radio-accent p-0 m-0 absolute top-1 right-1" value={theme_option} - checked={theme_option === selectedTheme} + checked={theme_option == selectedTheme} /> {display_name} @@ -90,10 +89,10 @@ const Step2_Theme = ({ ))}
- -
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx index d034cda73..3a3a94bd6 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx @@ -1,21 +1,20 @@ -import { useRef } from "react"; -import { type formDataType } from "./InitialSetup"; import { Notify } from "../NSPanelToastContainer"; +import { type UseFormSetValue, type UseFormGetValues, type UseFormRegister } from "react-hook-form"; +import { type InitialSetupFormValues } from "./form"; const Step3_ManagerSettings = ({ - formData, - setFormData, + setValue, + getValues, + register, nextStep, prevStep, }: { - formData: formDataType; - setFormData: (data: formDataType) => void; + setValue: UseFormSetValue; + getValues: UseFormGetValues; + register: UseFormRegister; nextStep: () => void; prevStep: () => void; }) => { - const managerAddressRef = useRef(null); - const managerPortRef = useRef(null); - const getIPFromURL = () => { fetch("/rest/get_ip_by_hostname", { method: "POST", @@ -27,10 +26,7 @@ const Step3_ManagerSettings = ({ .then((response) => response.json()) .then((data) => { if (data.ip) { - if (managerAddressRef.current) { - managerAddressRef.current.value = data.ip; - setFormData({ ...formData, manager_address: data.ip }); - } + setValue("manager_address", data.ip); } else { Notify({ message: 'Failed to get IP from URL. No "ip" field in response.', level: "error" }); } @@ -42,13 +38,14 @@ const Step3_ManagerSettings = ({ const testManagerAddressAndPort = () => { const params = { - address: formData.manager_address, - port: formData.manager_port.toString(), + address: getValues("manager_address"), + port: getValues("manager_port").toString(), }; const queryString = new URLSearchParams(params).toString(); fetch("/rest/mqttmanager/test?" + queryString, { method: "GET", + signal: AbortSignal.timeout(2000), }) .then((response) => { if (response.ok) { @@ -77,10 +74,8 @@ const Step3_ManagerSettings = ({ setFormData({ ...formData, manager_address: e.target.value })} - value={formData.manager_address} + {...register("manager_address")} required - ref={managerAddressRef} /> @@ -122,10 +113,10 @@ const Step3_ManagerSettings = ({
- -
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx index 9a80579d7..e2bef7ff3 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx @@ -1,20 +1,24 @@ -import { type formDataType } from "./InitialSetup"; import { Icon } from "@mdi/react"; import { mdiInformationOutline } from "@mdi/js"; import { useState } from "react"; +import { type UseFormSetValue, type UseFormGetValues, type UseFormRegister } from "react-hook-form"; +import { type InitialSetupFormValues } from "./form"; + const Step4_MqttSettings = ({ - formData, - setFormData, + setValue, + getValues, + register, nextStep, prevStep, }: { - formData: formDataType; - setFormData: (data: formDataType) => void; + setValue: UseFormSetValue; + getValues: UseFormGetValues; + register: UseFormRegister; nextStep: () => void; prevStep: () => void; }) => { - const [anonymousLogin, setAnonymousLogin] = useState(formData.mqtt_username === ""); + const [noLogin, setNoLogin] = useState(getValues("mqtt_username") == "" && getValues("mqtt_password") == ""); return (
@@ -36,8 +40,7 @@ const Step4_MqttSettings = ({ setFormData({ ...formData, mqtt_server: e.target.value })} - value={formData.mqtt_server} + {...register("mqtt_server")} required />
@@ -53,8 +56,7 @@ const Step4_MqttSettings = ({ setFormData({ ...formData, mqtt_port: parseInt(e.target.value) })} - value={formData.mqtt_port} + {...register("mqtt_port", { valueAsNumber: true })} required /> @@ -66,16 +68,22 @@ const Step4_MqttSettings = ({ { - setAnonymousLogin(!anonymousLogin); - setFormData({ ...formData, mqtt_username: "", mqtt_password: "" }); + checked={noLogin} + onChange={(e) => { + if (e.currentTarget.checked) { + setValue("mqtt_username", ""); + setValue("mqtt_password", ""); + setValue("clear_mqtt_password", true); + setNoLogin(true); + } else { + setNoLogin(false); + } }} /> Anonymous login - - -
+ -
+
-
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx index f9795f2b9..83d6a14ac 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx @@ -1,23 +1,24 @@ -import { type formDataType } from "./InitialSetup"; import { Icon } from "@mdi/react"; import { mdiInformationOutline } from "@mdi/js"; import { Notify } from "../NSPanelToastContainer"; +import { type UseFormGetValues, type UseFormRegister } from "react-hook-form"; +import { type InitialSetupFormValues } from "./form"; const Step6_OpenhabSettings = ({ - formData, - setFormData, + getValues, + register, nextStep, prevStep, }: { - formData: formDataType; - setFormData: (data: formDataType) => void; + getValues: UseFormGetValues; + register: UseFormRegister; nextStep: () => void; prevStep: () => void; }) => { const testOpenhab = () => { const params = { - address: formData.openhab_address, - token: formData.openhab_token, + address: getValues("openhab_address"), + token: getValues("openhab_token"), }; const queryString = new URLSearchParams(params).toString(); @@ -62,8 +63,7 @@ const Step6_OpenhabSettings = ({ setFormData({ ...formData, openhab_address: e.target.value })} - value={formData.openhab_address} + {...register("openhab_address")} required />
@@ -79,8 +79,7 @@ const Step6_OpenhabSettings = ({ setFormData({ ...formData, openhab_token: e.target.value })} - value={formData.openhab_token} + {...register("openhab_token")} required />
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx index 0dd4d69bd..f452087d1 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx @@ -1,44 +1,59 @@ -import { type formDataType } from "./InitialSetup"; import { Notify } from "../NSPanelToastContainer"; +import { type UseFormReturn } from "react-hook-form"; +import { type InitialSetupFormValues, buildPatch, toFormValues } from "./form"; +import { api } from "../../api/client"; -const Step7_Finished = ({ formData, prevStep }: { formData: formDataType; prevStep: () => void }) => { - function getCookie(name: string) { - let cookieValue = ""; - if (document.cookie && document.cookie !== "") { - const cookies = document.cookie.split(";"); - for (let i = 0; i < cookies.length; i++) { - const cookie = cookies[i].trim(); - if (cookie.substring(0, name.length + 1) === name + "=") { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } +const Step7_Finished = ({ + form, + prevStep, + isHomeAssistantAddon, + dialogRef, +}: { + form: UseFormReturn; + prevStep: () => void; + isHomeAssistantAddon: boolean; + dialogRef: React.RefObject; +}) => { + const saveSettings = async () => { + const { + getValues, + reset, + formState: { dirtyFields }, + } = form; + + const body = buildPatch(getValues(), dirtyFields, isHomeAssistantAddon); + try { + const { data, error, response } = await api.PATCH("/rest/v2/settings", { body }); + if (data) { + reset(toFormValues(data)); + Notify({ message: "Settings saved.", level: "success", duration: 5000 }); + dialogRef.current?.close(); + return; } - } - return cookieValue; - } + if (response.status === 400 && error && !("detail" in error && error.detail)) { + console.error("Got error ", error); - const saveSettings = () => { - fetch("/rest/settings", { - method: "POST", - headers: { - "Content-Type": "application/json", - "X-CSRFToken": getCookie("csrftoken"), - }, - body: JSON.stringify({ settings: formData }), - }) - .then((response) => { - if (response.ok) { - Notify({ message: "Settings saved successfully.", level: "success", duration: 5000 }); - window.location.reload(); - } else { - response.json().then((data) => { - Notify({ message: "Failed to save settings. Error: " + data.message, level: "error", duration: 5000 }); - }); + const fieldErrors = Object.entries(error as Record); + if (fieldErrors.length === 0) { + Notify({ message: "Nothing was saved.", level: "error", duration: 8000 }); } - }) - .catch((error) => { - Notify({ message: "Failed to save settings. Error: " + error.message, level: "error", duration: 5000 }); - }); + + for (const [field, messages] of fieldErrors) { + for (const message of Array.isArray(messages) ? messages : [messages]) { + Notify({ + message: `${field}: ${message}`, + level: "error", + duration: 8000, + }); + } + } + } else { + const detail = error && "detail" in error ? error.detail : `HTTP ${response.status}`; + Notify({ message: `Couldn't save the settings: ${detail}`, level: "error" }); + } + } catch (failure) { + Notify({ message: `Couldn't save the settings: ${failure instanceof Error ? failure.message : String(failure)}`, level: "error" }); + } }; return ( @@ -57,9 +72,8 @@ const Step7_Finished = ({ formData, prevStep }: { formData: formDataType; prevSt

Initial setup is now finished. If you have any NSPanels already flashed and connected to the same MQTT broker they should show up automatically. In case they do not, there is the documentation and also a discord where you can get help. There is also the Github page where you can report issues and - contribute.

-

Thank you for your support and trust and have fun!

+

Thank you for your support and trust. Have fun and enjoy!

- -
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts new file mode 100644 index 000000000..1d2d06ea5 --- /dev/null +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts @@ -0,0 +1,68 @@ +import type { Settings, SettingsUpdateRequest } from "../../api/client"; + +// The settings this page edits. Weather and time, and the theme, are edited elsewhere. +export const INITIAL_SETUP_FIELDS = [ + "manager_address", + "manager_port", + "mqtt_server", + "mqtt_port", + "mqtt_username", + "home_assistant_address", + "openhab_address", + "theme", +] as const satisfies readonly (keyof Settings & keyof SettingsUpdateRequest)[]; + +export const SECRETS = ["mqtt_password", "home_assistant_token", "openhab_token"] as const; + +export type PageField = (typeof INITIAL_SETUP_FIELDS)[number]; +export type Secret = (typeof SECRETS)[number]; + +// Values are null when nothing valid is stored; such a field is left blank and sent only if filled in. +export type InitialSetupFormValues = { [K in PageField]: Settings[K] } & { [K in Secret]: string } & { [K in Secret as `clear_${K}`]: boolean }; + +// Set by the Home Assistant add-on, so read-only there. +export const ADDON_MANAGED: readonly string[] = ["home_assistant_address", "home_assistant_token"]; + +// The screensaver shows the outside temperature only in the modes without weather. +export const MODES_WITH_OUTSIDE_TEMPERATURE: readonly string[] = ["datetime_with_background", "datetime_without_background"]; + +export function toFormValues(settings: Settings): InitialSetupFormValues { + const values = {} as Record; + for (const name of INITIAL_SETUP_FIELDS) { + values[name] = settings[name]; + } + for (const secret of SECRETS) { + values[secret] = ""; + values[`clear_${secret}`] = false; + } + return values as InitialSetupFormValues; +} + +/** + * The PATCH body for a submitted form: only the settings that changed. Secrets are sent when a new + * value is typed, or as "" when "clear" is ticked. Add-on managed settings are never sent in the add-on. + */ +export function buildPatch( + values: InitialSetupFormValues, + dirty: Partial>, + isHomeAssistantAddon: boolean, +): SettingsUpdateRequest { + const body: Record = {}; + const allowed = (name: string) => !(isHomeAssistantAddon && ADDON_MANAGED.includes(name)); + for (const name of INITIAL_SETUP_FIELDS) { + if (dirty[name] && allowed(name)) { + body[name] = values[name]; + } + } + for (const secret of SECRETS) { + if (!allowed(secret)) { + continue; + } + if (values[`clear_${secret}`]) { + body[secret] = ""; + } else if (values[secret]) { + body[secret] = values[secret]; + } + } + return body as SettingsUpdateRequest; +} diff --git a/docker/web/nspanelmanager/web/react-components/templates/scripts.html b/docker/web/nspanelmanager/web/react-components/templates/scripts.html index 254bccac9..7f5a4027b 100644 --- a/docker/web/nspanelmanager/web/react-components/templates/scripts.html +++ b/docker/web/nspanelmanager/web/react-components/templates/scripts.html @@ -1,2 +1,2 @@ {% load static %} - + diff --git a/docker/web/nspanelmanager/web/static/css/main.css b/docker/web/nspanelmanager/web/static/css/main.css index ef4ee45a8..c68034c8c 100644 --- a/docker/web/nspanelmanager/web/static/css/main.css +++ b/docker/web/nspanelmanager/web/static/css/main.css @@ -7,24 +7,15 @@ --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --color-red-50: oklch(97.1% 0.013 17.38); - --color-red-100: oklch(93.6% 0.032 17.717); - --color-red-300: oklch(80.8% 0.114 19.571); --color-red-500: oklch(63.7% 0.237 25.331); - --color-red-600: oklch(57.7% 0.245 27.325); --color-red-700: oklch(50.5% 0.213 27.518); --color-red-800: oklch(44.4% 0.177 26.899); --color-yellow-50: oklch(98.7% 0.026 102.212); --color-yellow-300: oklch(90.5% 0.182 98.111); --color-yellow-500: oklch(79.5% 0.184 86.047); - --color-yellow-600: oklch(68.1% 0.162 75.834); --color-yellow-800: oklch(47.6% 0.114 61.907); - --color-green-100: oklch(96.2% 0.044 156.743); - --color-green-300: oklch(87.1% 0.15 154.449); --color-green-500: oklch(72.3% 0.219 149.579); - --color-green-700: oklch(52.7% 0.154 150.069); - --color-green-800: oklch(44.8% 0.119 151.328); --color-blue-50: oklch(97% 0.014 254.604); - --color-blue-100: oklch(93.2% 0.032 255.585); --color-blue-300: oklch(80.9% 0.105 251.813); --color-blue-500: oklch(62.3% 0.214 259.815); --color-blue-600: oklch(54.6% 0.245 262.881); @@ -35,9 +26,7 @@ --color-indigo-600: oklch(51.1% 0.262 276.966); --color-pink-500: oklch(65.6% 0.241 354.308); --color-pink-800: oklch(45.9% 0.187 3.815); - --color-slate-100: oklch(96.8% 0.007 247.896); --color-slate-500: oklch(55.4% 0.046 257.417); - --color-slate-950: oklch(12.9% 0.042 264.695); --color-gray-50: oklch(98.5% 0.002 247.839); --color-gray-100: oklch(96.7% 0.003 264.542); --color-gray-200: oklch(92.8% 0.006 264.531); @@ -86,7 +75,6 @@ --ease-in: cubic-bezier(0.4, 0, 1, 1); --ease-out: cubic-bezier(0, 0, 0.2, 1); --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1); - --animate-spin: spin 1s linear infinite; --animate-ping: ping 1s cubic-bezier(0, 0, 0.2, 1) infinite; --animate-pulse: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; --blur-sm: 8px; @@ -4066,83 +4054,6 @@ } } } - .stack\! { - display: inline-grid !important; - grid-template-columns: 3px 4px 1fr 4px 3px !important; - grid-template-rows: 3px 4px 1fr 4px 3px !important; - & > * { - height: 100% !important; - width: 100% !important; - &:nth-child(n + 2) { - width: 100% !important; - opacity: 70% !important; - } - &:nth-child(2) { - z-index: 2 !important; - opacity: 90% !important; - } - &:nth-child(1) { - z-index: 3 !important; - width: 100% !important; - } - } - &, &.stack-bottom { - > * { - grid-column: 3 / 4 !important; - grid-row: 3 / 6 !important; - &:nth-child(2) { - grid-column: 2 / 5 !important; - grid-row: 2 / 5 !important; - } - &:nth-child(1) { - grid-column: 1 / 6 !important; - grid-row: 1 / 4 !important; - } - } - } - &.stack-top { - > * { - grid-column: 3 / 4 !important; - grid-row: 1 / 4 !important; - &:nth-child(2) { - grid-column: 2 / 5 !important; - grid-row: 2 / 5 !important; - } - &:nth-child(1) { - grid-column: 1 / 6 !important; - grid-row: 3 / 6 !important; - } - } - } - &.stack-start { - > * { - grid-column: 1 / 4 !important; - grid-row: 3 / 4 !important; - &:nth-child(2) { - grid-column: 2 / 5 !important; - grid-row: 2 / 5 !important; - } - &:nth-child(1) { - grid-column: 3 / 6 !important; - grid-row: 1 / 6 !important; - } - } - } - &.stack-end { - > * { - grid-column: 3 / 6 !important; - grid-row: 3 / 4 !important; - &:nth-child(2) { - grid-column: 2 / 5 !important; - grid-row: 2 / 5 !important; - } - &:nth-child(1) { - grid-column: 1 / 4 !important; - grid-row: 1 / 6 !important; - } - } - } - } .modal-backdrop { grid-column-start: 1; grid-row-start: 1; @@ -5084,9 +4995,6 @@ .me-2 { margin-inline-end: calc(var(--spacing) * 2); } - .me-3 { - margin-inline-end: calc(var(--spacing) * 3); - } .me-6 { margin-inline-end: calc(var(--spacing) * 6); } @@ -5111,15 +5019,9 @@ .mt-2 { margin-top: calc(var(--spacing) * 2); } - .mt-3 { - margin-top: calc(var(--spacing) * 3); - } .mt-4 { margin-top: calc(var(--spacing) * 4); } - .mt-5 { - margin-top: calc(var(--spacing) * 5); - } .mt-8 { margin-top: calc(var(--spacing) * 8); } @@ -5874,9 +5776,6 @@ .h-10 { height: calc(var(--spacing) * 10); } - .h-11 { - height: calc(var(--spacing) * 11); - } .h-12 { height: calc(var(--spacing) * 12); } @@ -5916,9 +5815,6 @@ .h-\[500px\] { height: 500px; } - .h-\[calc\(100\%-1rem\)\] { - height: calc(100% - 1rem); - } .h-auto { height: auto; } @@ -5961,6 +5857,9 @@ .min-h-10 { min-height: calc(var(--spacing) * 10); } + .min-h-60 { + min-height: calc(var(--spacing) * 60); + } .min-h-auto { min-height: auto; } @@ -6109,9 +6008,6 @@ .w-10 { width: calc(var(--spacing) * 10); } - .w-11 { - width: calc(var(--spacing) * 11); - } .w-12 { width: calc(var(--spacing) * 12); } @@ -6372,9 +6268,6 @@ .animate-rotate-border { animation: var(--animate-rotate-border); } - .animate-spin { - animation: var(--animate-spin); - } .link { cursor: pointer; text-decoration-line: underline; @@ -6780,22 +6673,12 @@ .gap-2 { gap: calc(var(--spacing) * 2); } - .gap-3 { - gap: calc(var(--spacing) * 3); - } .gap-4 { gap: calc(var(--spacing) * 4); } .gap-6 { gap: calc(var(--spacing) * 6); } - .space-y-1 { - :where(& > :not(:last-child)) { - --tw-space-y-reverse: 0; - margin-block-start: calc(calc(var(--spacing) * 1) * var(--tw-space-y-reverse)); - margin-block-end: calc(calc(var(--spacing) * 1) * calc(1 - var(--tw-space-y-reverse))); - } - } .space-y-4 { :where(& > :not(:last-child)) { --tw-space-y-reverse: 0; @@ -7285,10 +7168,6 @@ border-bottom-right-radius: var(--radius-field); border-bottom-left-radius: var(--radius-field); } - .rounded-b-md { - border-bottom-right-radius: var(--radius-md); - border-bottom-left-radius: var(--radius-md); - } .rounded-b-selector { border-bottom-left-radius: var(--radius-selector); border-bottom-right-radius: var(--radius-selector); @@ -7363,10 +7242,6 @@ border-inline-style: var(--tw-border-style); border-inline-width: 0px; } - .border-x-2 { - border-inline-style: var(--tw-border-style); - border-inline-width: 2px; - } .border-y { border-block-style: var(--tw-border-style); border-block-width: 1px; @@ -7546,12 +7421,6 @@ .border-black { border-color: var(--color-black); } - .border-blue-500 { - border-color: var(--color-blue-500); - } - .border-blue-800 { - border-color: var(--color-blue-800); - } .border-gray-200 { border-color: var(--color-gray-200); } @@ -7714,15 +7583,6 @@ .bg-blue-50 { background-color: var(--color-blue-50); } - .bg-blue-100 { - background-color: var(--color-blue-100); - } - .bg-blue-300 { - background-color: var(--color-blue-300); - } - .bg-blue-500 { - background-color: var(--color-blue-500); - } .bg-blue-700 { background-color: var(--color-blue-700); } @@ -7741,15 +7601,6 @@ .bg-gray-200 { background-color: var(--color-gray-200); } - .bg-gray-800 { - background-color: var(--color-gray-800); - } - .bg-green-100 { - background-color: var(--color-green-100); - } - .bg-green-700 { - background-color: var(--color-green-700); - } .bg-info { background-color: var(--color-info); } @@ -7768,9 +7619,6 @@ .bg-red-50 { background-color: var(--color-red-50); } - .bg-red-100 { - background-color: var(--color-red-100); - } .bg-red-500 { background-color: var(--color-red-500); } @@ -7780,18 +7628,9 @@ .bg-red-500\/\[50\%\] { background-color: color-mix(in oklab, var(--color-red-500) 50%, transparent); } - .bg-red-600 { - background-color: var(--color-red-600); - } - .bg-red-700 { - background-color: var(--color-red-700); - } .bg-slate-500 { background-color: var(--color-slate-500); } - .bg-slate-950 { - background-color: var(--color-slate-950); - } .bg-success { background-color: var(--color-success); } @@ -7807,12 +7646,6 @@ .bg-yellow-50 { background-color: var(--color-yellow-50); } - .bg-yellow-300 { - background-color: var(--color-yellow-300); - } - .bg-yellow-600 { - background-color: var(--color-yellow-600); - } .divider-accent { &:before, &:after { background-color: var(--color-accent); @@ -8267,9 +8100,6 @@ .pt-2 { padding-top: calc(var(--spacing) * 2); } - .pt-4 { - padding-top: calc(var(--spacing) * 4); - } .pt-5 { padding-top: calc(var(--spacing) * 5); } @@ -8881,9 +8711,6 @@ .text-black { color: var(--color-black); } - .text-blue-600 { - color: var(--color-blue-600); - } .text-blue-800 { color: var(--color-blue-800); } @@ -8893,12 +8720,6 @@ .text-error-content { color: var(--color-error-content); } - .text-gray-50 { - color: var(--color-gray-50); - } - .text-gray-200 { - color: var(--color-gray-200); - } .text-gray-400 { color: var(--color-gray-400); } @@ -8911,18 +8732,12 @@ .text-gray-700 { color: var(--color-gray-700); } - .text-gray-800 { - color: var(--color-gray-800); - } .text-gray-900 { color: var(--color-gray-900); } .text-green-500 { color: var(--color-green-500); } - .text-green-800 { - color: var(--color-green-800); - } .text-indigo-600 { color: var(--color-indigo-600); } @@ -8959,9 +8774,6 @@ .text-red-800 { color: var(--color-red-800); } - .text-slate-100 { - color: var(--color-slate-100); - } .text-success { color: var(--color-success); } @@ -9172,9 +8984,6 @@ .opacity-80 { opacity: 80%; } - .opacity-90 { - opacity: 90%; - } .mix-blend-plus-darker { mix-blend-mode: plus-darker; } @@ -9910,9 +9719,6 @@ .\[animation-name\:tile-background\] { animation-name: tile-background; } - .\[idx\:\%d\] { - idx: %d; - } .backface-hidden { backface-visibility: hidden; } @@ -10420,11 +10226,6 @@ border-bottom-left-radius: var(--radius-md); } } - .last\:rounded-md { - &:last-child { - border-radius: var(--radius-md); - } - } .last\:rounded-r-md { &:last-child { border-top-right-radius: var(--radius-md); @@ -10502,13 +10303,6 @@ } } } - .hover\:bg-green-800 { - &:hover { - @media (hover: hover) { - background-color: var(--color-green-800); - } - } - } .hover\:bg-home-assistant\/10 { &:hover { @media (hover: hover) { @@ -10523,13 +10317,6 @@ } } } - .hover\:bg-red-800 { - &:hover { - @media (hover: hover) { - background-color: var(--color-red-800); - } - } - } .hover\:bg-yellow-500\/10 { &:hover { @media (hover: hover) { @@ -10764,21 +10551,11 @@ --tw-ring-color: var(--color-gray-500); } } - .focus\:ring-green-300 { - &:focus { - --tw-ring-color: var(--color-green-300); - } - } .focus\:ring-indigo-200 { &:focus { --tw-ring-color: var(--color-indigo-200); } } - .focus\:ring-red-300 { - &:focus { - --tw-ring-color: var(--color-red-300); - } - } .focus\:ring-offset-0 { &:focus { --tw-ring-offset-width: 0px; @@ -10914,11 +10691,6 @@ position: sticky; } } - .md\:inset-0 { - @media (width >= 48rem) { - inset: calc(var(--spacing) * 0); - } - } .md\:top-4 { @media (width >= 48rem) { top: calc(var(--spacing) * 4); @@ -11039,15 +10811,6 @@ justify-content: space-between; } } - .md\:space-y-0 { - @media (width >= 48rem) { - :where(& > :not(:last-child)) { - --tw-space-y-reverse: 0; - margin-block-start: calc(calc(var(--spacing) * 0) * var(--tw-space-y-reverse)); - margin-block-end: calc(calc(var(--spacing) * 0) * calc(1 - var(--tw-space-y-reverse))); - } - } - } .md\:space-x-0 { @media (width >= 48rem) { :where(& > :not(:last-child)) { @@ -11057,15 +10820,6 @@ } } } - .md\:space-x-2 { - @media (width >= 48rem) { - :where(& > :not(:last-child)) { - --tw-space-x-reverse: 0; - margin-inline-start: calc(calc(var(--spacing) * 2) * var(--tw-space-x-reverse)); - margin-inline-end: calc(calc(var(--spacing) * 2) * calc(1 - var(--tw-space-x-reverse))); - } - } - } .md\:space-x-8 { @media (width >= 48rem) { :where(& > :not(:last-child)) { @@ -11136,11 +10890,6 @@ } } } - .rtl\:text-right { - &:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) { - text-align: right; - } - } .dark\:border-gray-600 { @media (prefers-color-scheme: dark) { border-color: var(--color-gray-600); @@ -13009,11 +12758,6 @@ initial-value: ""; inherits: false; } -@keyframes spin { - to { - transform: rotate(360deg); - } -} @keyframes ping { 75%, 100% { transform: scale(2); diff --git a/docker/web/nspanelmanager/web/templates/index.html b/docker/web/nspanelmanager/web/templates/index.html index 9951689f8..12a3cd54d 100644 --- a/docker/web/nspanelmanager/web/templates/index.html +++ b/docker/web/nspanelmanager/web/templates/index.html @@ -9,7 +9,7 @@ {% block content %} -{% if manager_address == "" %} +{% if manager_address != "" %} {% RC 'InitialSetup' opened=True isHomeAssistantAddon=is_home_assistant_addon %} {% endif %} From dedfb5b79d4a4dd8d340b21b80ed70f9c9a84628 Mon Sep 17 00:00:00 2001 From: Tim Panajott Date: Sat, 14 Nov 2026 14:53:53 +0100 Subject: [PATCH 2/8] Fixed react build issues --- .../components/InitialSetup/InitialSetup.tsx | 10 +++++++--- .../InitialSetup/Step3_ManagerSettings.tsx | 17 +++++++++++++++-- .../InitialSetup/Step4_MqttSettings.tsx | 13 ++++++------- .../Step5_HomeAssistantSettings.tsx | 17 +++++++++++++++-- .../InitialSetup/Step6_OpenhabSettings.tsx | 17 +++++++++++++++-- .../components/InitialSetup/Step7_Finished.tsx | 2 +- 6 files changed, 59 insertions(+), 17 deletions(-) diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx index d0e7ea56f..268e0add2 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx @@ -94,7 +94,9 @@ const InitialSetup = ({ )} - {state.status === "loaded" && } + {state.status === "loaded" && dialogRef != null && ( + + )}
@@ -106,7 +108,7 @@ const InitialSetupForm = ({ isHomeAssistantAddon, settings, }: { - dialogRef: React.RefObject; + dialogRef: React.RefObject; isHomeAssistantAddon: boolean; settings: Settings; }) => { @@ -230,7 +232,9 @@ const InitialSetupForm = ({ } else if (step == 3) { return ; } else if (step == 4) { - return ; + return ( + + ); } else if (step == 5) { return ( { + const address = getValues("manager_address"); + const port = getValues("manager_port"); + + if (address == null) { + Notify({ message: "Manager address is required to test the connection", level: "error", duration: 5000 }); + return; + } + + if (port == null) { + Notify({ message: "Manager port is required to test the connection", level: "error", duration: 5000 }); + return; + } + const params = { - address: getValues("manager_address"), - port: getValues("manager_port").toString(), + address: address, + port: port.toString(), }; const queryString = new URLSearchParams(params).toString(); diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx index e2bef7ff3..7637abaec 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx @@ -2,23 +2,27 @@ import { Icon } from "@mdi/react"; import { mdiInformationOutline } from "@mdi/js"; import { useState } from "react"; -import { type UseFormSetValue, type UseFormGetValues, type UseFormRegister } from "react-hook-form"; +import { type UseFormSetValue, type UseFormGetValues, type UseFormRegister, type UseFormWatch } from "react-hook-form"; import { type InitialSetupFormValues } from "./form"; const Step4_MqttSettings = ({ setValue, getValues, register, + watch, nextStep, prevStep, }: { setValue: UseFormSetValue; getValues: UseFormGetValues; register: UseFormRegister; + watch: UseFormWatch; nextStep: () => void; prevStep: () => void; }) => { const [noLogin, setNoLogin] = useState(getValues("mqtt_username") == "" && getValues("mqtt_password") == ""); + const address = watch("mqtt_server"); + const port = watch("mqtt_port"); return (
@@ -124,12 +128,7 @@ const Step4_MqttSettings = ({ -
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step5_HomeAssistantSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step5_HomeAssistantSettings.tsx index 9167822a5..b973b408c 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step5_HomeAssistantSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step5_HomeAssistantSettings.tsx @@ -18,9 +18,22 @@ const Step5_HomeAssistantSettings = ({ prevStep: () => void; }) => { const testHomeAssistant = () => { + const address = getValues("home_assistant_address"); + const token = getValues("home_assistant_token"); + + if (address == null) { + Notify({ message: "Home Assistant address is required to test the connection", level: "error", duration: 5000 }); + return; + } + + if (token == null) { + Notify({ message: "Home Assistant token is required to test the connection", level: "error", duration: 5000 }); + return; + } + const params = { - address: getValues("home_assistant_address"), - token: getValues("home_assistant_token"), + address: address, + token: token, }; const queryString = new URLSearchParams(params).toString(); diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx index 83d6a14ac..cb5914766 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx @@ -16,9 +16,22 @@ const Step6_OpenhabSettings = ({ prevStep: () => void; }) => { const testOpenhab = () => { + const address = getValues("openhab_address"); + const token = getValues("openhab_token"); + + if (address == null) { + Notify({ message: "OpenHAB address is required to test the connection", level: "error", duration: 5000 }); + return; + } + + if (token == null) { + Notify({ message: "OpenHAB token is required to test the connection", level: "error", duration: 5000 }); + return; + } + const params = { - address: getValues("openhab_address"), - token: getValues("openhab_token"), + address: address, + token: token, }; const queryString = new URLSearchParams(params).toString(); diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx index f452087d1..99e1cef2a 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx @@ -12,7 +12,7 @@ const Step7_Finished = ({ form: UseFormReturn; prevStep: () => void; isHomeAssistantAddon: boolean; - dialogRef: React.RefObject; + dialogRef: React.RefObject; }) => { const saveSettings = async () => { const { From 2e5a07b4f99acfd46a2713a9b1de42862c3cb3fe Mon Sep 17 00:00:00 2001 From: Tim Panajott Date: Sat, 14 Nov 2026 14:55:13 +0100 Subject: [PATCH 3/8] Rebuild with fixed issues --- .../react-components/dist/.vite/manifest.json | 204 +++++++++--------- ...uLSycWM.js => AnimatePresence-C5DU0GhE.js} | 4 +- ...jKYSy.js => EntitiesPagesView-DTK_W_3m.js} | 8 +- ...re-ZzZ1Mv2G.js => EntityStore-vSp3-_ve.js} | 6 +- ...p-DfGb8gZw.js => InitialSetup-DzNxC3hH.js} | 99 +++++++-- .../{Logs-1o_raoql.js => Logs-D7TbuEX-.js} | 6 +- ...js => MultiStep_AddEditEntity-DXyHos_N.js} | 16 +- ...L.js => NSPanelToastContainer-BeaDvrjv.js} | 2 +- ...w-BkBUvxvB.js => NSPanelsView-DFPbiBh0.js} | 16 +- ...mPage-BEbmnNs8.js => RoomPage-DrYlucCR.js} | 18 +- ...View-Bp_5KHLS.js => RoomsView-C8QdDbZO.js} | 20 +- ...e-DNoGED8P.js => SettingsPage-C-tBeVml.js} | 10 +- ...-DF3_BTZd.js => SettingsStore-DqOcuBO4.js} | 2 +- ...idebar-FLF6GWUw.js => Sidebar-FfmNugko.js} | 10 +- ...ore-DbalEryK.js => StompStore-DHVAwnBW.js} | 6 +- ...nings-2nOlGrxR.js => Warnings-CQHhdLov.js} | 6 +- ...{fields-p6wav3mx.js => fields-CY_sLYf3.js} | 4 +- ....esm-CyxbWRtN.js => index.esm-D2iT7jTM.js} | 2 +- ...{layout-SvH9qeCO.js => layout-CEwTn_qs.js} | 2 +- .../{main-2GKhVwa3.js => main-DsrUEgTV.js} | 24 +-- .../dist/{mdi-CeE3u6rn.js => mdi-Bo7fQ2tR.js} | 2 +- .../{proxy-BJsAbzcZ.js => proxy-7sw4PveN.js} | 2 +- .../{react-DZ04j01Q.js => react-at0u27-d.js} | 2 +- ...SXefzL.js => react-select.esm-oykjlSBu.js} | 2 +- ...table-C9pxUcQH.js => sortable-DJ3Lryh9.js} | 2 +- ...ing-DFNxrtSb.js => use-spring-DVh6ql00.js} | 4 +- .../react-components/templates/scripts.html | 2 +- 27 files changed, 268 insertions(+), 213 deletions(-) rename docker/web/nspanelmanager/web/react-components/dist/{AnimatePresence-CuLSycWM.js => AnimatePresence-C5DU0GhE.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{EntitiesPagesView-DH3jKYSy.js => EntitiesPagesView-DTK_W_3m.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{EntityStore-ZzZ1Mv2G.js => EntityStore-vSp3-_ve.js} (92%) rename docker/web/nspanelmanager/web/react-components/dist/{InitialSetup-DfGb8gZw.js => InitialSetup-DzNxC3hH.js} (94%) rename docker/web/nspanelmanager/web/react-components/dist/{Logs-1o_raoql.js => Logs-D7TbuEX-.js} (97%) rename docker/web/nspanelmanager/web/react-components/dist/{MultiStep_AddEditEntity-DY7Yn9gy.js => MultiStep_AddEditEntity-DXyHos_N.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{NSPanelToastContainer-CdQdRrsL.js => NSPanelToastContainer-BeaDvrjv.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{NSPanelsView-BkBUvxvB.js => NSPanelsView-DFPbiBh0.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{RoomPage-BEbmnNs8.js => RoomPage-DrYlucCR.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{RoomsView-Bp_5KHLS.js => RoomsView-C8QdDbZO.js} (98%) rename docker/web/nspanelmanager/web/react-components/dist/{SettingsPage-DNoGED8P.js => SettingsPage-C-tBeVml.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{SettingsStore-DF3_BTZd.js => SettingsStore-DqOcuBO4.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{Sidebar-FLF6GWUw.js => Sidebar-FfmNugko.js} (98%) rename docker/web/nspanelmanager/web/react-components/dist/{StompStore-DbalEryK.js => StompStore-DHVAwnBW.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{Warnings-2nOlGrxR.js => Warnings-CQHhdLov.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{fields-p6wav3mx.js => fields-CY_sLYf3.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{index.esm-CyxbWRtN.js => index.esm-D2iT7jTM.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{layout-SvH9qeCO.js => layout-CEwTn_qs.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{main-2GKhVwa3.js => main-DsrUEgTV.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{mdi-CeE3u6rn.js => mdi-Bo7fQ2tR.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{proxy-BJsAbzcZ.js => proxy-7sw4PveN.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{react-DZ04j01Q.js => react-at0u27-d.js} (96%) rename docker/web/nspanelmanager/web/react-components/dist/{react-select.esm-DHSXefzL.js => react-select.esm-oykjlSBu.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{sortable-C9pxUcQH.js => sortable-DJ3Lryh9.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{use-spring-DFNxrtSb.js => use-spring-DVh6ql00.js} (98%) diff --git a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json index 46e429da0..c0cee3b67 100755 --- a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json +++ b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json @@ -1,259 +1,259 @@ { - "_AnimatePresence-CuLSycWM.js": { - "file": "AnimatePresence-CuLSycWM.js", + "_AnimatePresence-C5DU0GhE.js": { + "file": "AnimatePresence-C5DU0GhE.js", "name": "AnimatePresence", "imports": [ "src/main.tsx", - "_proxy-BJsAbzcZ.js" + "_proxy-7sw4PveN.js" ] }, - "_EntityStore-ZzZ1Mv2G.js": { - "file": "EntityStore-ZzZ1Mv2G.js", + "_EntityStore-vSp3-_ve.js": { + "file": "EntityStore-vSp3-_ve.js", "name": "EntityStore", "imports": [ - "_react-DZ04j01Q.js", - "_NSPanelToastContainer-CdQdRrsL.js", - "_StompStore-DbalEryK.js" + "_react-at0u27-d.js", + "_NSPanelToastContainer-BeaDvrjv.js", + "_StompStore-DHVAwnBW.js" ] }, - "_MultiStep_AddEditEntity-DY7Yn9gy.js": { - "file": "MultiStep_AddEditEntity-DY7Yn9gy.js", + "_MultiStep_AddEditEntity-DXyHos_N.js": { + "file": "MultiStep_AddEditEntity-DXyHos_N.js", "name": "MultiStep_AddEditEntity", "imports": [ "src/main.tsx", - "_react-DZ04j01Q.js", - "_SettingsStore-DF3_BTZd.js", - "_react-select.esm-DHSXefzL.js", - "_index.esm-CyxbWRtN.js", - "_NSPanelToastContainer-CdQdRrsL.js", - "_proxy-BJsAbzcZ.js", - "_AnimatePresence-CuLSycWM.js" + "_react-at0u27-d.js", + "_SettingsStore-DqOcuBO4.js", + "_react-select.esm-oykjlSBu.js", + "_index.esm-D2iT7jTM.js", + "_NSPanelToastContainer-BeaDvrjv.js", + "_proxy-7sw4PveN.js", + "_AnimatePresence-C5DU0GhE.js" ] }, - "_NSPanelToastContainer-CdQdRrsL.js": { - "file": "NSPanelToastContainer-CdQdRrsL.js", + "_NSPanelToastContainer-BeaDvrjv.js": { + "file": "NSPanelToastContainer-BeaDvrjv.js", "name": "NSPanelToastContainer", "imports": [ "src/main.tsx" ] }, - "_SettingsStore-DF3_BTZd.js": { - "file": "SettingsStore-DF3_BTZd.js", + "_SettingsStore-DqOcuBO4.js": { + "file": "SettingsStore-DqOcuBO4.js", "name": "SettingsStore", "imports": [ - "_react-DZ04j01Q.js" + "_react-at0u27-d.js" ] }, - "_StompStore-DbalEryK.js": { - "file": "StompStore-DbalEryK.js", + "_StompStore-DHVAwnBW.js": { + "file": "StompStore-DHVAwnBW.js", "name": "StompStore", "imports": [ "src/main.tsx", - "_react-DZ04j01Q.js", - "_NSPanelToastContainer-CdQdRrsL.js" + "_react-at0u27-d.js", + "_NSPanelToastContainer-BeaDvrjv.js" ] }, - "_fields-p6wav3mx.js": { - "file": "fields-p6wav3mx.js", + "_fields-CY_sLYf3.js": { + "file": "fields-CY_sLYf3.js", "name": "fields", "imports": [ "src/main.tsx", - "_index.esm-CyxbWRtN.js" + "_index.esm-D2iT7jTM.js" ] }, - "_index.esm-CyxbWRtN.js": { - "file": "index.esm-CyxbWRtN.js", + "_index.esm-D2iT7jTM.js": { + "file": "index.esm-D2iT7jTM.js", "name": "index.esm", "imports": [ "src/main.tsx" ] }, - "_layout-SvH9qeCO.js": { - "file": "layout-SvH9qeCO.js", + "_layout-CEwTn_qs.js": { + "file": "layout-CEwTn_qs.js", "name": "layout", "imports": [ "src/main.tsx" ] }, - "_mdi-CeE3u6rn.js": { - "file": "mdi-CeE3u6rn.js", + "_mdi-Bo7fQ2tR.js": { + "file": "mdi-Bo7fQ2tR.js", "name": "mdi", "imports": [ "src/main.tsx" ] }, - "_proxy-BJsAbzcZ.js": { - "file": "proxy-BJsAbzcZ.js", + "_proxy-7sw4PveN.js": { + "file": "proxy-7sw4PveN.js", "name": "proxy", "imports": [ "src/main.tsx" ] }, - "_react-DZ04j01Q.js": { - "file": "react-DZ04j01Q.js", + "_react-at0u27-d.js": { + "file": "react-at0u27-d.js", "name": "react", "imports": [ "src/main.tsx" ] }, - "_react-select.esm-DHSXefzL.js": { - "file": "react-select.esm-DHSXefzL.js", + "_react-select.esm-oykjlSBu.js": { + "file": "react-select.esm-oykjlSBu.js", "name": "react-select.esm", "imports": [ "src/main.tsx" ] }, - "_sortable-C9pxUcQH.js": { - "file": "sortable-C9pxUcQH.js", + "_sortable-DJ3Lryh9.js": { + "file": "sortable-DJ3Lryh9.js", "name": "sortable", "imports": [ "src/main.tsx" ] }, - "_use-spring-DFNxrtSb.js": { - "file": "use-spring-DFNxrtSb.js", + "_use-spring-DVh6ql00.js": { + "file": "use-spring-DVh6ql00.js", "name": "use-spring", "imports": [ "src/main.tsx", - "_proxy-BJsAbzcZ.js" + "_proxy-7sw4PveN.js" ] }, "src/components/EntitiesPage/EntitiesPagesView.tsx": { - "file": "EntitiesPagesView-DH3jKYSy.js", + "file": "EntitiesPagesView-DTK_W_3m.js", "name": "EntitiesPagesView", "src": "src/components/EntitiesPage/EntitiesPagesView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-C9pxUcQH.js", - "_react-DZ04j01Q.js", - "_MultiStep_AddEditEntity-DY7Yn9gy.js" + "_sortable-DJ3Lryh9.js", + "_react-at0u27-d.js", + "_MultiStep_AddEditEntity-DXyHos_N.js" ] }, "src/components/IndexPage/NSPanelsView.tsx": { - "file": "NSPanelsView-BkBUvxvB.js", + "file": "NSPanelsView-DFPbiBh0.js", "name": "NSPanelsView", "src": "src/components/IndexPage/NSPanelsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_react-select.esm-DHSXefzL.js", - "_NSPanelToastContainer-CdQdRrsL.js", - "_proxy-BJsAbzcZ.js", - "_use-spring-DFNxrtSb.js", - "_StompStore-DbalEryK.js", - "_EntityStore-ZzZ1Mv2G.js", - "_mdi-CeE3u6rn.js" + "_react-select.esm-oykjlSBu.js", + "_NSPanelToastContainer-BeaDvrjv.js", + "_proxy-7sw4PveN.js", + "_use-spring-DVh6ql00.js", + "_StompStore-DHVAwnBW.js", + "_EntityStore-vSp3-_ve.js", + "_mdi-Bo7fQ2tR.js" ] }, "src/components/InitialSetup/InitialSetup.tsx": { - "file": "InitialSetup-DfGb8gZw.js", + "file": "InitialSetup-DzNxC3hH.js", "name": "InitialSetup", "src": "src/components/InitialSetup/InitialSetup.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_index.esm-CyxbWRtN.js", - "_NSPanelToastContainer-CdQdRrsL.js", - "_proxy-BJsAbzcZ.js", - "_AnimatePresence-CuLSycWM.js", - "_mdi-CeE3u6rn.js", - "_layout-SvH9qeCO.js" + "_index.esm-D2iT7jTM.js", + "_NSPanelToastContainer-BeaDvrjv.js", + "_proxy-7sw4PveN.js", + "_AnimatePresence-C5DU0GhE.js", + "_mdi-Bo7fQ2tR.js", + "_layout-CEwTn_qs.js" ] }, "src/components/NSPanelPage/Logs.tsx": { - "file": "Logs-1o_raoql.js", + "file": "Logs-D7TbuEX-.js", "name": "Logs", "src": "src/components/NSPanelPage/Logs.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_SettingsStore-DF3_BTZd.js", - "_StompStore-DbalEryK.js" + "_SettingsStore-DqOcuBO4.js", + "_StompStore-DHVAwnBW.js" ] }, "src/components/NSPanelPage/Sidebar.tsx": { - "file": "Sidebar-FLF6GWUw.js", + "file": "Sidebar-FfmNugko.js", "name": "Sidebar", "src": "src/components/NSPanelPage/Sidebar.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_NSPanelToastContainer-CdQdRrsL.js", - "_StompStore-DbalEryK.js", - "_EntityStore-ZzZ1Mv2G.js", - "_mdi-CeE3u6rn.js" + "_NSPanelToastContainer-BeaDvrjv.js", + "_StompStore-DHVAwnBW.js", + "_EntityStore-vSp3-_ve.js", + "_mdi-Bo7fQ2tR.js" ] }, "src/components/NSPanelPage/Warnings.tsx": { - "file": "Warnings-2nOlGrxR.js", + "file": "Warnings-CQHhdLov.js", "name": "Warnings", "src": "src/components/NSPanelPage/Warnings.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_EntityStore-ZzZ1Mv2G.js", - "_mdi-CeE3u6rn.js" + "_EntityStore-vSp3-_ve.js", + "_mdi-Bo7fQ2tR.js" ] }, "src/components/RoomPage/RoomPage.tsx": { - "file": "RoomPage-BEbmnNs8.js", + "file": "RoomPage-DrYlucCR.js", "name": "RoomPage", "src": "src/components/RoomPage/RoomPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_MultiStep_AddEditEntity-DY7Yn9gy.js", - "_react-select.esm-DHSXefzL.js", - "_index.esm-CyxbWRtN.js", - "_NSPanelToastContainer-CdQdRrsL.js", + "_MultiStep_AddEditEntity-DXyHos_N.js", + "_react-select.esm-oykjlSBu.js", + "_index.esm-D2iT7jTM.js", + "_NSPanelToastContainer-BeaDvrjv.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", - "_StompStore-DbalEryK.js", - "_EntityStore-ZzZ1Mv2G.js", - "_mdi-CeE3u6rn.js" + "_StompStore-DHVAwnBW.js", + "_EntityStore-vSp3-_ve.js", + "_mdi-Bo7fQ2tR.js" ] }, "src/components/RoomsPage/RoomsView.tsx": { - "file": "RoomsView-Bp_5KHLS.js", + "file": "RoomsView-C8QdDbZO.js", "name": "RoomsView", "src": "src/components/RoomsPage/RoomsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-C9pxUcQH.js", - "_index.esm-CyxbWRtN.js", - "_NSPanelToastContainer-CdQdRrsL.js", - "_proxy-BJsAbzcZ.js", - "_use-spring-DFNxrtSb.js", - "_EntityStore-ZzZ1Mv2G.js", - "_mdi-CeE3u6rn.js", - "_layout-SvH9qeCO.js", - "_fields-p6wav3mx.js" + "_sortable-DJ3Lryh9.js", + "_index.esm-D2iT7jTM.js", + "_NSPanelToastContainer-BeaDvrjv.js", + "_proxy-7sw4PveN.js", + "_use-spring-DVh6ql00.js", + "_EntityStore-vSp3-_ve.js", + "_mdi-Bo7fQ2tR.js", + "_layout-CEwTn_qs.js", + "_fields-CY_sLYf3.js" ] }, "src/components/SettingsPage/SettingsPage.tsx": { - "file": "SettingsPage-DNoGED8P.js", + "file": "SettingsPage-C-tBeVml.js", "name": "SettingsPage", "src": "src/components/SettingsPage/SettingsPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_index.esm-CyxbWRtN.js", - "_NSPanelToastContainer-CdQdRrsL.js", - "_layout-SvH9qeCO.js", - "_fields-p6wav3mx.js" + "_index.esm-D2iT7jTM.js", + "_NSPanelToastContainer-BeaDvrjv.js", + "_layout-CEwTn_qs.js", + "_fields-CY_sLYf3.js" ] }, "src/main.tsx": { - "file": "main-2GKhVwa3.js", + "file": "main-DsrUEgTV.js", "name": "main", "src": "src/main.tsx", "isEntry": true, "dynamicImports": [ - "_MultiStep_AddEditEntity-DY7Yn9gy.js", + "_MultiStep_AddEditEntity-DXyHos_N.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", "src/components/IndexPage/NSPanelsView.tsx", - "_NSPanelToastContainer-CdQdRrsL.js", + "_NSPanelToastContainer-BeaDvrjv.js", "src/components/InitialSetup/InitialSetup.tsx", "src/components/NSPanelPage/Sidebar.tsx", "src/components/NSPanelPage/Warnings.tsx", diff --git a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CuLSycWM.js b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-C5DU0GhE.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CuLSycWM.js rename to docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-C5DU0GhE.js index 514df1f19..988099f11 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CuLSycWM.js +++ b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-C5DU0GhE.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-BJsAbzcZ.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-7sw4PveN.js"; //#region node_modules/framer-motion/dist/es/utils/use-composed-ref.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DH3jKYSy.js b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DTK_W_3m.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DH3jKYSy.js rename to docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DTK_W_3m.js index 33297f127..47db5f985 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DH3jKYSy.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DTK_W_3m.js @@ -1,7 +1,7 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-C9pxUcQH.js"; -import { t as create } from "./react-DZ04j01Q.js"; -import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-DY7Yn9gy.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-DJ3Lryh9.js"; +import { t as create } from "./react-at0u27-d.js"; +import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-DXyHos_N.js"; //#region src/components/EntitiesPage/GenericEntityBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-ZzZ1Mv2G.js b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-vSp3-_ve.js similarity index 92% rename from docker/web/nspanelmanager/web/react-components/dist/EntityStore-ZzZ1Mv2G.js rename to docker/web/nspanelmanager/web/react-components/dist/EntityStore-vSp3-_ve.js index 72146c335..cb41557b3 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-ZzZ1Mv2G.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-vSp3-_ve.js @@ -1,6 +1,6 @@ -import { t as create } from "./react-DZ04j01Q.js"; -import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; -import { t as useStompStore } from "./StompStore-DbalEryK.js"; +import { t as create } from "./react-at0u27-d.js"; +import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; +import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; //#region src/stores/EntityStore.ts var nspanel_stomp_status_update_callback = (message) => { const json_data = JSON.parse(message.body); diff --git a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DfGb8gZw.js b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DzNxC3hH.js similarity index 94% rename from docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DfGb8gZw.js rename to docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DzNxC3hH.js index cd9e69a98..771696b5e 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DfGb8gZw.js +++ b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DzNxC3hH.js @@ -1,10 +1,10 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { s as useForm } from "./index.esm-CyxbWRtN.js"; -import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; -import { t as motion } from "./proxy-BJsAbzcZ.js"; -import { t as AnimatePresence } from "./AnimatePresence-CuLSycWM.js"; -import { i as mdiInformationOutline, x as require_Icon } from "./mdi-CeE3u6rn.js"; -import { i as api, t as Alert } from "./layout-SvH9qeCO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { s as useForm } from "./index.esm-D2iT7jTM.js"; +import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; +import { t as motion } from "./proxy-7sw4PveN.js"; +import { t as AnimatePresence } from "./AnimatePresence-C5DU0GhE.js"; +import { i as mdiInformationOutline, x as require_Icon } from "./mdi-Bo7fQ2tR.js"; +import { i as api, t as Alert } from "./layout-CEwTn_qs.js"; //#region src/components/InitialSetup/Step1_Welcome.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); @@ -220,9 +220,27 @@ var Step3_ManagerSettings = ({ setValue, getValues, register, nextStep, prevStep }); }; const testManagerAddressAndPort = () => { + const address = getValues("manager_address"); + const port = getValues("manager_port"); + if (address == null) { + Notify({ + message: "Manager address is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + if (port == null) { + Notify({ + message: "Manager port is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } const params = { - address: getValues("manager_address"), - port: getValues("manager_port").toString() + address, + port: port.toString() }; const queryString = new URLSearchParams(params).toString(); fetch("/rest/mqttmanager/test?" + queryString, { @@ -326,8 +344,10 @@ var Step3_ManagerSettings = ({ setValue, getValues, register, nextStep, prevStep //#endregion //#region src/components/InitialSetup/Step4_MqttSettings.tsx var import_Icon = require_Icon(); -var Step4_MqttSettings = ({ setValue, getValues, register, nextStep, prevStep }) => { +var Step4_MqttSettings = ({ setValue, getValues, register, watch, nextStep, prevStep }) => { const [noLogin, setNoLogin] = (0, import_react.useState)(getValues("mqtt_username") == "" && getValues("mqtt_password") == ""); + const address = watch("mqtt_server"); + const port = watch("mqtt_port"); return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [ /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "alert alert-info my-4", @@ -457,7 +477,7 @@ var Step4_MqttSettings = ({ setValue, getValues, register, nextStep, prevStep }) type: "button", className: "btn btn-primary", onClick: nextStep, - disabled: getValues("mqtt_server") == "" || getValues("mqtt_port") < 1 || getValues("mqtt_port") > 65535, + disabled: address == "" || port == null || port < 1 || port > 65535, children: "Next" })] }) @@ -467,11 +487,28 @@ var Step4_MqttSettings = ({ setValue, getValues, register, nextStep, prevStep }) //#region src/components/InitialSetup/Step5_HomeAssistantSettings.tsx var Step5_HomeAssistantSettings = ({ getValues, register, isHomeAssistantAddon, nextStep, prevStep }) => { const testHomeAssistant = () => { - const params = { - address: getValues("home_assistant_address"), - token: getValues("home_assistant_token") - }; - const queryString = new URLSearchParams(params).toString(); + const address = getValues("home_assistant_address"); + const token = getValues("home_assistant_token"); + if (address == null) { + Notify({ + message: "Home Assistant address is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + if (token == null) { + Notify({ + message: "Home Assistant token is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + const queryString = new URLSearchParams({ + address, + token + }).toString(); fetch("/rest/home_assistant/test?" + queryString, { method: "GET" }).then((response) => { if (response.ok) Notify({ message: "Home Assistant address and token are valid.", @@ -591,11 +628,28 @@ var Step5_HomeAssistantSettings = ({ getValues, register, isHomeAssistantAddon, //#region src/components/InitialSetup/Step6_OpenhabSettings.tsx var Step6_OpenhabSettings = ({ getValues, register, nextStep, prevStep }) => { const testOpenhab = () => { - const params = { - address: getValues("openhab_address"), - token: getValues("openhab_token") - }; - const queryString = new URLSearchParams(params).toString(); + const address = getValues("openhab_address"); + const token = getValues("openhab_token"); + if (address == null) { + Notify({ + message: "OpenHAB address is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + if (token == null) { + Notify({ + message: "OpenHAB token is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + const queryString = new URLSearchParams({ + address, + token + }).toString(); fetch("/rest/openhab/test?" + queryString, { method: "GET" }).then((response) => { if (response.ok) Notify({ message: "OpenHAB address and token are valid.", @@ -887,7 +941,7 @@ var InitialSetup = ({ opened, isHomeAssistantAddon }) => { onClick: retry, children: "Retry" })] }), - state.status === "loaded" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(InitialSetupForm, { + state.status === "loaded" && dialogRef != null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(InitialSetupForm, { settings: state.settings, dialogRef, isHomeAssistantAddon @@ -1017,6 +1071,7 @@ var InitialSetupForm = ({ dialogRef, isHomeAssistantAddon, settings }) => { setValue, getValues, register, + watch, nextStep, prevStep }); diff --git a/docker/web/nspanelmanager/web/react-components/dist/Logs-1o_raoql.js b/docker/web/nspanelmanager/web/react-components/dist/Logs-D7TbuEX-.js similarity index 97% rename from docker/web/nspanelmanager/web/react-components/dist/Logs-1o_raoql.js rename to docker/web/nspanelmanager/web/react-components/dist/Logs-D7TbuEX-.js index ab1580228..ce76b1c00 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Logs-1o_raoql.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Logs-D7TbuEX-.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { t as useSettingsStore } from "./SettingsStore-DF3_BTZd.js"; -import { t as useStompStore } from "./StompStore-DbalEryK.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { t as useSettingsStore } from "./SettingsStore-DqOcuBO4.js"; +import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; //#region src/components/NSPanelPage/Logs.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DY7Yn9gy.js b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DXyHos_N.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DY7Yn9gy.js rename to docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DXyHos_N.js index 94e258704..a2ed43fd2 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DY7Yn9gy.js +++ b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DXyHos_N.js @@ -1,11 +1,11 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { t as create } from "./react-DZ04j01Q.js"; -import { t as useSettingsStore } from "./SettingsStore-DF3_BTZd.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-DHSXefzL.js"; -import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-CyxbWRtN.js"; -import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; -import { t as motion } from "./proxy-BJsAbzcZ.js"; -import { t as AnimatePresence } from "./AnimatePresence-CuLSycWM.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { t as create } from "./react-at0u27-d.js"; +import { t as useSettingsStore } from "./SettingsStore-DqOcuBO4.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-oykjlSBu.js"; +import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-D2iT7jTM.js"; +import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; +import { t as motion } from "./proxy-7sw4PveN.js"; +import { t as AnimatePresence } from "./AnimatePresence-C5DU0GhE.js"; //#region src/stores/EntitiesPagesStore.ts function getCookie$1(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-CdQdRrsL.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-BeaDvrjv.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-CdQdRrsL.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-BeaDvrjv.js index 2371ac3f0..aa92c7817 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-CdQdRrsL.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-BeaDvrjv.js @@ -1,4 +1,4 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; //#region node_modules/clsx/dist/clsx.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); function r(e) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-BkBUvxvB.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-DFPbiBh0.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-BkBUvxvB.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-DFPbiBh0.js index e129cb66e..389162a7a 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-BkBUvxvB.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-DFPbiBh0.js @@ -1,11 +1,11 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-DHSXefzL.js"; -import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; -import { t as motion } from "./proxy-BJsAbzcZ.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-DFNxrtSb.js"; -import { t as useStompStore } from "./StompStore-DbalEryK.js"; -import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-CeE3u6rn.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-oykjlSBu.js"; +import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; +import { t as motion } from "./proxy-7sw4PveN.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-DVh6ql00.js"; +import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; +import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-Bo7fQ2tR.js"; //#region src/components/IndexPage/NSPanelBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-BEbmnNs8.js b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DrYlucCR.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/RoomPage-BEbmnNs8.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomPage-DrYlucCR.js index dd4d04173..c537fe46d 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-BEbmnNs8.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DrYlucCR.js @@ -1,12 +1,12 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-DY7Yn9gy.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-DHSXefzL.js"; -import { l as useWatch, s as useForm } from "./index.esm-CyxbWRtN.js"; -import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; -import EntitiesPagesView from "./EntitiesPagesView-DH3jKYSy.js"; -import { t as useStompStore } from "./StompStore-DbalEryK.js"; -import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; -import { d as mdiTextShort, x as require_Icon } from "./mdi-CeE3u6rn.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-DXyHos_N.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-oykjlSBu.js"; +import { l as useWatch, s as useForm } from "./index.esm-D2iT7jTM.js"; +import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; +import EntitiesPagesView from "./EntitiesPagesView-DTK_W_3m.js"; +import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; +import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; +import { d as mdiTextShort, x as require_Icon } from "./mdi-Bo7fQ2tR.js"; //#region src/components/RoomPage/RoomPage.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-Bp_5KHLS.js b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-C8QdDbZO.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/RoomsView-Bp_5KHLS.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomsView-C8QdDbZO.js index 2334a22f3..256203fdf 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-Bp_5KHLS.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-C8QdDbZO.js @@ -1,13 +1,13 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { r as DragDropProvider, t as useSortable } from "./sortable-C9pxUcQH.js"; -import { n as FormProvider, s as useForm } from "./index.esm-CyxbWRtN.js"; -import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; -import { t as motion } from "./proxy-BJsAbzcZ.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-DFNxrtSb.js"; -import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; -import { o as mdiMenu, x as require_Icon } from "./mdi-CeE3u6rn.js"; -import { i as api, t as Alert } from "./layout-SvH9qeCO.js"; -import { a as TextInput } from "./fields-p6wav3mx.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { r as DragDropProvider, t as useSortable } from "./sortable-DJ3Lryh9.js"; +import { n as FormProvider, s as useForm } from "./index.esm-D2iT7jTM.js"; +import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; +import { t as motion } from "./proxy-7sw4PveN.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-DVh6ql00.js"; +import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; +import { o as mdiMenu, x as require_Icon } from "./mdi-Bo7fQ2tR.js"; +import { i as api, t as Alert } from "./layout-CEwTn_qs.js"; +import { a as TextInput } from "./fields-CY_sLYf3.js"; //#region src/components/RoomsPage/RoomBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DNoGED8P.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-C-tBeVml.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DNoGED8P.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsPage-C-tBeVml.js index 9d780810f..788afafa5 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DNoGED8P.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-C-tBeVml.js @@ -1,8 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-CyxbWRtN.js"; -import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; -import { a as getCookie, i as api, n as Card, r as Row, t as Alert } from "./layout-SvH9qeCO.js"; -import { a as TextInput$1, i as Select$1, n as RadioGroup$1, r as SecretInput$1, t as NumberInput$1 } from "./fields-p6wav3mx.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-D2iT7jTM.js"; +import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; +import { a as getCookie, i as api, n as Card, r as Row, t as Alert } from "./layout-CEwTn_qs.js"; +import { a as TextInput$1, i as Select$1, n as RadioGroup$1, r as SecretInput$1, t as NumberInput$1 } from "./fields-CY_sLYf3.js"; //#region src/api/connectionTests.ts var import_react = /* @__PURE__ */ __toESM(require_react(), 1); async function errorMessage(response) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DF3_BTZd.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DqOcuBO4.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DF3_BTZd.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DqOcuBO4.js index 7ceefcb48..e831d27a2 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DF3_BTZd.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DqOcuBO4.js @@ -1,4 +1,4 @@ -import { t as create } from "./react-DZ04j01Q.js"; +import { t as create } from "./react-at0u27-d.js"; //#region src/stores/SettingsStore.ts function getCookie(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-FLF6GWUw.js b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-FfmNugko.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/Sidebar-FLF6GWUw.js rename to docker/web/nspanelmanager/web/react-components/dist/Sidebar-FfmNugko.js index 194e8018d..c5e3d5a3b 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-FLF6GWUw.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-FfmNugko.js @@ -1,8 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { n as Notify } from "./NSPanelToastContainer-CdQdRrsL.js"; -import { t as useStompStore } from "./StompStore-DbalEryK.js"; -import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-CeE3u6rn.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; +import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; +import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-Bo7fQ2tR.js"; //#region src/components/NSPanelPage/Sidebar.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/StompStore-DbalEryK.js b/docker/web/nspanelmanager/web/react-components/dist/StompStore-DHVAwnBW.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/StompStore-DbalEryK.js rename to docker/web/nspanelmanager/web/react-components/dist/StompStore-DHVAwnBW.js index 6efd92589..67d34fe74 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/StompStore-DbalEryK.js +++ b/docker/web/nspanelmanager/web/react-components/dist/StompStore-DHVAwnBW.js @@ -1,6 +1,6 @@ -import { i as __commonJSMin } from "./main-2GKhVwa3.js"; -import { t as create } from "./react-DZ04j01Q.js"; -import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-CdQdRrsL.js"; +import { i as __commonJSMin } from "./main-DsrUEgTV.js"; +import { t as create } from "./react-at0u27-d.js"; +import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-BeaDvrjv.js"; //#region node_modules/tslib/tslib.es6.mjs /****************************************************************************** Copyright (c) Microsoft Corporation. diff --git a/docker/web/nspanelmanager/web/react-components/dist/Warnings-2nOlGrxR.js b/docker/web/nspanelmanager/web/react-components/dist/Warnings-CQHhdLov.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/Warnings-2nOlGrxR.js rename to docker/web/nspanelmanager/web/react-components/dist/Warnings-CQHhdLov.js index 64afe54cc..efc0ae0ca 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Warnings-2nOlGrxR.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Warnings-CQHhdLov.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { t as useEntityStatesStore } from "./EntityStore-ZzZ1Mv2G.js"; -import { x as require_Icon } from "./mdi-CeE3u6rn.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; +import { x as require_Icon } from "./mdi-Bo7fQ2tR.js"; //#region src/components/NSPanelPage/Warnings.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/fields-p6wav3mx.js b/docker/web/nspanelmanager/web/react-components/dist/fields-CY_sLYf3.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/fields-p6wav3mx.js rename to docker/web/nspanelmanager/web/react-components/dist/fields-CY_sLYf3.js index 97439052c..d7aa8381c 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/fields-p6wav3mx.js +++ b/docker/web/nspanelmanager/web/react-components/dist/fields-CY_sLYf3.js @@ -1,5 +1,5 @@ -import { r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; -import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-CyxbWRtN.js"; +import { r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-D2iT7jTM.js"; require_react(); var import_jsx_runtime = require_jsx_runtime(); function Field({ name, label, hint, children }) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/index.esm-CyxbWRtN.js b/docker/web/nspanelmanager/web/react-components/dist/index.esm-D2iT7jTM.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/index.esm-CyxbWRtN.js rename to docker/web/nspanelmanager/web/react-components/dist/index.esm-D2iT7jTM.js index 730fcce80..9d9cec73f 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/index.esm-CyxbWRtN.js +++ b/docker/web/nspanelmanager/web/react-components/dist/index.esm-D2iT7jTM.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-2GKhVwa3.js"; +import { c as __toESM, r as require_react } from "./main-DsrUEgTV.js"; //#region node_modules/react-hook-form/dist/index.esm.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var isCheckBoxInput = (element) => element.type === "checkbox"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/layout-SvH9qeCO.js b/docker/web/nspanelmanager/web/react-components/dist/layout-CEwTn_qs.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/layout-SvH9qeCO.js rename to docker/web/nspanelmanager/web/react-components/dist/layout-CEwTn_qs.js index ce8340d12..b71d5ba53 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/layout-SvH9qeCO.js +++ b/docker/web/nspanelmanager/web/react-components/dist/layout-CEwTn_qs.js @@ -1,4 +1,4 @@ -import { r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; //#region node_modules/openapi-fetch/dist/index.mjs var PATH_PARAM_RE = /\{[^{}]+\}/g; var supportsRequestInitExt = () => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/main-2GKhVwa3.js b/docker/web/nspanelmanager/web/react-components/dist/main-DsrUEgTV.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/main-2GKhVwa3.js rename to docker/web/nspanelmanager/web/react-components/dist/main-DsrUEgTV.js index 90a6a0218..acf835e27 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/main-2GKhVwa3.js +++ b/docker/web/nspanelmanager/web/react-components/dist/main-DsrUEgTV.js @@ -1,4 +1,4 @@ -const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-DY7Yn9gy.js","react-DZ04j01Q.js","SettingsStore-DF3_BTZd.js","react-select.esm-DHSXefzL.js","index.esm-CyxbWRtN.js","NSPanelToastContainer-CdQdRrsL.js","proxy-BJsAbzcZ.js","AnimatePresence-CuLSycWM.js","EntitiesPagesView-DH3jKYSy.js","sortable-C9pxUcQH.js","NSPanelsView-BkBUvxvB.js","use-spring-DFNxrtSb.js","StompStore-DbalEryK.js","EntityStore-ZzZ1Mv2G.js","mdi-CeE3u6rn.js","InitialSetup-DfGb8gZw.js","layout-SvH9qeCO.js","Sidebar-FLF6GWUw.js","Warnings-2nOlGrxR.js","Logs-1o_raoql.js","RoomPage-BEbmnNs8.js","SettingsPage-DNoGED8P.js","fields-p6wav3mx.js","RoomsView-Bp_5KHLS.js"])))=>i.map(i=>d[i]); +const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-DXyHos_N.js","react-at0u27-d.js","SettingsStore-DqOcuBO4.js","react-select.esm-oykjlSBu.js","index.esm-D2iT7jTM.js","NSPanelToastContainer-BeaDvrjv.js","proxy-7sw4PveN.js","AnimatePresence-C5DU0GhE.js","EntitiesPagesView-DTK_W_3m.js","sortable-DJ3Lryh9.js","NSPanelsView-DFPbiBh0.js","use-spring-DVh6ql00.js","StompStore-DHVAwnBW.js","EntityStore-vSp3-_ve.js","mdi-Bo7fQ2tR.js","InitialSetup-DzNxC3hH.js","layout-CEwTn_qs.js","Sidebar-FfmNugko.js","Warnings-CQHhdLov.js","Logs-D7TbuEX-.js","RoomPage-DrYlucCR.js","SettingsPage-C-tBeVml.js","fields-CY_sLYf3.js","RoomsView-C8QdDbZO.js"])))=>i.map(i=>d[i]); //#region \0rolldown/runtime.js var __create = Object.create; var __defProp = Object.defineProperty; @@ -10204,16 +10204,16 @@ var __vitePreload = function preload(baseModule, deps, importerUrl) { }; //#endregion //#region src/componentMap.tsx -var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-DY7Yn9gy.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); -var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-DH3jKYSy.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); -var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-BkBUvxvB.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); -var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-CdQdRrsL.js").then((n) => n.t), [])); -var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-DfGb8gZw.js"), __vite__mapDeps([15,4,5,6,7,14,16]))); -var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-FLF6GWUw.js"), __vite__mapDeps([17,5,12,1,13,14]))); -var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-2nOlGrxR.js"), __vite__mapDeps([18,13,1,5,12,14]))); -var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-1o_raoql.js"), __vite__mapDeps([19,2,1,12,5]))); -var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-BEbmnNs8.js"), __vite__mapDeps([20,0,1,2,3,4,5,6,7,8,9,12,13,14]))); -var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-DNoGED8P.js"), __vite__mapDeps([21,4,5,16,22]))); +var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-DXyHos_N.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); +var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-DTK_W_3m.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); +var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-DFPbiBh0.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); +var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-BeaDvrjv.js").then((n) => n.t), [])); +var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-DzNxC3hH.js"), __vite__mapDeps([15,4,5,6,7,14,16]))); +var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-FfmNugko.js"), __vite__mapDeps([17,5,12,1,13,14]))); +var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-CQHhdLov.js"), __vite__mapDeps([18,13,1,5,12,14]))); +var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-D7TbuEX-.js"), __vite__mapDeps([19,2,1,12,5]))); +var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-DrYlucCR.js"), __vite__mapDeps([20,0,1,2,3,4,5,6,7,8,9,12,13,14]))); +var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-C-tBeVml.js"), __vite__mapDeps([21,4,5,16,22]))); var componentMap = { MultiStep_AddEditEntity, EntitiesPagesView, @@ -10224,7 +10224,7 @@ var componentMap = { NSPanelWarnings, NSPanelLogs, RoomPage, - RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-Bp_5KHLS.js"), __vite__mapDeps([23,9,4,5,6,11,13,1,12,14,16,22]))), + RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-C8QdDbZO.js"), __vite__mapDeps([23,9,4,5,6,11,13,1,12,14,16,22]))), SettingsPage }; //#endregion diff --git a/docker/web/nspanelmanager/web/react-components/dist/mdi-CeE3u6rn.js b/docker/web/nspanelmanager/web/react-components/dist/mdi-Bo7fQ2tR.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/mdi-CeE3u6rn.js rename to docker/web/nspanelmanager/web/react-components/dist/mdi-Bo7fQ2tR.js index 971045702..422acee01 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/mdi-CeE3u6rn.js +++ b/docker/web/nspanelmanager/web/react-components/dist/mdi-Bo7fQ2tR.js @@ -1,4 +1,4 @@ -import { i as __commonJSMin, r as require_react } from "./main-2GKhVwa3.js"; +import { i as __commonJSMin, r as require_react } from "./main-DsrUEgTV.js"; //#region node_modules/prop-types/lib/ReactPropTypesSecret.js /** * Copyright (c) 2013-present, Facebook, Inc. diff --git a/docker/web/nspanelmanager/web/react-components/dist/proxy-BJsAbzcZ.js b/docker/web/nspanelmanager/web/react-components/dist/proxy-7sw4PveN.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/proxy-BJsAbzcZ.js rename to docker/web/nspanelmanager/web/react-components/dist/proxy-7sw4PveN.js index 31c3be849..81a86b7dd 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/proxy-BJsAbzcZ.js +++ b/docker/web/nspanelmanager/web/react-components/dist/proxy-7sw4PveN.js @@ -1,4 +1,4 @@ -import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; //#region node_modules/framer-motion/dist/es/context/LayoutGroupContext.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-DZ04j01Q.js b/docker/web/nspanelmanager/web/react-components/dist/react-at0u27-d.js similarity index 96% rename from docker/web/nspanelmanager/web/react-components/dist/react-DZ04j01Q.js rename to docker/web/nspanelmanager/web/react-components/dist/react-at0u27-d.js index 823d3a968..f458c1225 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-DZ04j01Q.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-at0u27-d.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-2GKhVwa3.js"; +import { c as __toESM, r as require_react } from "./main-DsrUEgTV.js"; //#region node_modules/zustand/esm/vanilla.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var createStoreImpl = (createState) => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DHSXefzL.js b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-oykjlSBu.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DHSXefzL.js rename to docker/web/nspanelmanager/web/react-components/dist/react-select.esm-oykjlSBu.js index 359fae484..00f0c9808 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DHSXefzL.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-oykjlSBu.js @@ -1,4 +1,4 @@ -import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-2GKhVwa3.js"; +import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-DsrUEgTV.js"; //#region node_modules/@babel/runtime/helpers/esm/typeof.js function _typeof(o) { "@babel/helpers - typeof"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/sortable-C9pxUcQH.js b/docker/web/nspanelmanager/web/react-components/dist/sortable-DJ3Lryh9.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/sortable-C9pxUcQH.js rename to docker/web/nspanelmanager/web/react-components/dist/sortable-DJ3Lryh9.js index 39e1b683d..3e6b79543 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/sortable-C9pxUcQH.js +++ b/docker/web/nspanelmanager/web/react-components/dist/sortable-DJ3Lryh9.js @@ -1,4 +1,4 @@ -import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-2GKhVwa3.js"; +import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; //#region node_modules/@preact/signals-core/dist/signals-core.module.js var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var i = Symbol.for("preact-signals"); diff --git a/docker/web/nspanelmanager/web/react-components/dist/use-spring-DFNxrtSb.js b/docker/web/nspanelmanager/web/react-components/dist/use-spring-DVh6ql00.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/use-spring-DFNxrtSb.js rename to docker/web/nspanelmanager/web/react-components/dist/use-spring-DVh6ql00.js index abe368b00..c69abdcc2 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/use-spring-DFNxrtSb.js +++ b/docker/web/nspanelmanager/web/react-components/dist/use-spring-DVh6ql00.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react } from "./main-2GKhVwa3.js"; -import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-BJsAbzcZ.js"; +import { c as __toESM, r as require_react } from "./main-DsrUEgTV.js"; +import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-7sw4PveN.js"; //#region node_modules/motion-dom/dist/es/utils/transform.mjs function transform(...args) { const useImmediate = !Array.isArray(args[0]); diff --git a/docker/web/nspanelmanager/web/react-components/templates/scripts.html b/docker/web/nspanelmanager/web/react-components/templates/scripts.html index 7f5a4027b..1ebec0f13 100644 --- a/docker/web/nspanelmanager/web/react-components/templates/scripts.html +++ b/docker/web/nspanelmanager/web/react-components/templates/scripts.html @@ -1,2 +1,2 @@ {% load static %} - + From 765462fc41b8782982c1506b8c9d7cea20dc27db Mon Sep 17 00:00:00 2001 From: Tim Panajott Date: Sat, 14 Nov 2026 16:41:51 +0100 Subject: [PATCH 4/8] Fixed a bug that caused the theme to not be saved --- .../react-components/dist/.vite/manifest.json | 204 +++++++++--------- ...5DU0GhE.js => AnimatePresence-BrcXqfjQ.js} | 4 +- ..._W_3m.js => EntitiesPagesView-CRcue4RN.js} | 8 +- ...re-vSp3-_ve.js => EntityStore-B1wVZ1VC.js} | 6 +- ...p-DzNxC3hH.js => InitialSetup-DXdZ9lbH.js} | 28 +-- .../{Logs-D7TbuEX-.js => Logs-CetI0u-X.js} | 6 +- ...js => MultiStep_AddEditEntity-BmADEvMy.js} | 16 +- ...v.js => NSPanelToastContainer-DqBiCYgm.js} | 2 +- ...w-DFPbiBh0.js => NSPanelsView-NSgV8rtx.js} | 16 +- ...mPage-DrYlucCR.js => RoomPage-Bu2HHqaj.js} | 18 +- ...View-C8QdDbZO.js => RoomsView-COctz1MN.js} | 20 +- ...e-C-tBeVml.js => SettingsPage-Crubx4dI.js} | 10 +- ...-DqOcuBO4.js => SettingsStore-BRAdTFqa.js} | 2 +- ...idebar-FfmNugko.js => Sidebar-TExSla66.js} | 10 +- ...ore-DHVAwnBW.js => StompStore-BKQe4lAO.js} | 6 +- ...nings-CQHhdLov.js => Warnings-B6qeeYwB.js} | 6 +- ...{fields-CY_sLYf3.js => fields-OWlKSje3.js} | 4 +- ....esm-D2iT7jTM.js => index.esm-k48P7boK.js} | 2 +- ...{layout-CEwTn_qs.js => layout-UB6ft_05.js} | 2 +- .../{main-DsrUEgTV.js => main-DArmUgNn.js} | 24 +-- .../dist/{mdi-Bo7fQ2tR.js => mdi-C7m9AGig.js} | 2 +- .../{proxy-7sw4PveN.js => proxy-BZTzkADl.js} | 2 +- .../{react-at0u27-d.js => react-Y4ytZYw3.js} | 2 +- ...kjlSBu.js => react-select.esm-B911rKmb.js} | 2 +- ...table-DJ3Lryh9.js => sortable-9KjXuaJO.js} | 2 +- ...ing-DVh6ql00.js => use-spring-COy4hU03.js} | 4 +- .../components/InitialSetup/Step2_Theme.tsx | 6 +- .../InitialSetup/Step3_ManagerSettings.tsx | 4 +- .../InitialSetup/Step4_MqttSettings.tsx | 6 +- .../react-components/templates/scripts.html | 2 +- .../nspanelmanager/web/templates/index.html | 2 +- .../nspanelmanager/web/templates/navbar.html | 1 + docker/web/nspanelmanager/web/views.py | 2 +- 33 files changed, 219 insertions(+), 212 deletions(-) rename docker/web/nspanelmanager/web/react-components/dist/{AnimatePresence-C5DU0GhE.js => AnimatePresence-BrcXqfjQ.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{EntitiesPagesView-DTK_W_3m.js => EntitiesPagesView-CRcue4RN.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{EntityStore-vSp3-_ve.js => EntityStore-B1wVZ1VC.js} (92%) rename docker/web/nspanelmanager/web/react-components/dist/{InitialSetup-DzNxC3hH.js => InitialSetup-DXdZ9lbH.js} (97%) rename docker/web/nspanelmanager/web/react-components/dist/{Logs-D7TbuEX-.js => Logs-CetI0u-X.js} (97%) rename docker/web/nspanelmanager/web/react-components/dist/{MultiStep_AddEditEntity-DXyHos_N.js => MultiStep_AddEditEntity-BmADEvMy.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{NSPanelToastContainer-BeaDvrjv.js => NSPanelToastContainer-DqBiCYgm.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{NSPanelsView-DFPbiBh0.js => NSPanelsView-NSgV8rtx.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{RoomPage-DrYlucCR.js => RoomPage-Bu2HHqaj.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{RoomsView-C8QdDbZO.js => RoomsView-COctz1MN.js} (98%) rename docker/web/nspanelmanager/web/react-components/dist/{SettingsPage-C-tBeVml.js => SettingsPage-Crubx4dI.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{SettingsStore-DqOcuBO4.js => SettingsStore-BRAdTFqa.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{Sidebar-FfmNugko.js => Sidebar-TExSla66.js} (98%) rename docker/web/nspanelmanager/web/react-components/dist/{StompStore-DHVAwnBW.js => StompStore-BKQe4lAO.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{Warnings-CQHhdLov.js => Warnings-B6qeeYwB.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{fields-CY_sLYf3.js => fields-OWlKSje3.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{index.esm-D2iT7jTM.js => index.esm-k48P7boK.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{layout-CEwTn_qs.js => layout-UB6ft_05.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{main-DsrUEgTV.js => main-DArmUgNn.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{mdi-Bo7fQ2tR.js => mdi-C7m9AGig.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{proxy-7sw4PveN.js => proxy-BZTzkADl.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{react-at0u27-d.js => react-Y4ytZYw3.js} (96%) rename docker/web/nspanelmanager/web/react-components/dist/{react-select.esm-oykjlSBu.js => react-select.esm-B911rKmb.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{sortable-DJ3Lryh9.js => sortable-9KjXuaJO.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{use-spring-DVh6ql00.js => use-spring-COy4hU03.js} (98%) diff --git a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json index c0cee3b67..96930e791 100755 --- a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json +++ b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json @@ -1,259 +1,259 @@ { - "_AnimatePresence-C5DU0GhE.js": { - "file": "AnimatePresence-C5DU0GhE.js", + "_AnimatePresence-BrcXqfjQ.js": { + "file": "AnimatePresence-BrcXqfjQ.js", "name": "AnimatePresence", "imports": [ "src/main.tsx", - "_proxy-7sw4PveN.js" + "_proxy-BZTzkADl.js" ] }, - "_EntityStore-vSp3-_ve.js": { - "file": "EntityStore-vSp3-_ve.js", + "_EntityStore-B1wVZ1VC.js": { + "file": "EntityStore-B1wVZ1VC.js", "name": "EntityStore", "imports": [ - "_react-at0u27-d.js", - "_NSPanelToastContainer-BeaDvrjv.js", - "_StompStore-DHVAwnBW.js" + "_react-Y4ytZYw3.js", + "_NSPanelToastContainer-DqBiCYgm.js", + "_StompStore-BKQe4lAO.js" ] }, - "_MultiStep_AddEditEntity-DXyHos_N.js": { - "file": "MultiStep_AddEditEntity-DXyHos_N.js", + "_MultiStep_AddEditEntity-BmADEvMy.js": { + "file": "MultiStep_AddEditEntity-BmADEvMy.js", "name": "MultiStep_AddEditEntity", "imports": [ "src/main.tsx", - "_react-at0u27-d.js", - "_SettingsStore-DqOcuBO4.js", - "_react-select.esm-oykjlSBu.js", - "_index.esm-D2iT7jTM.js", - "_NSPanelToastContainer-BeaDvrjv.js", - "_proxy-7sw4PveN.js", - "_AnimatePresence-C5DU0GhE.js" + "_react-Y4ytZYw3.js", + "_SettingsStore-BRAdTFqa.js", + "_react-select.esm-B911rKmb.js", + "_index.esm-k48P7boK.js", + "_NSPanelToastContainer-DqBiCYgm.js", + "_proxy-BZTzkADl.js", + "_AnimatePresence-BrcXqfjQ.js" ] }, - "_NSPanelToastContainer-BeaDvrjv.js": { - "file": "NSPanelToastContainer-BeaDvrjv.js", + "_NSPanelToastContainer-DqBiCYgm.js": { + "file": "NSPanelToastContainer-DqBiCYgm.js", "name": "NSPanelToastContainer", "imports": [ "src/main.tsx" ] }, - "_SettingsStore-DqOcuBO4.js": { - "file": "SettingsStore-DqOcuBO4.js", + "_SettingsStore-BRAdTFqa.js": { + "file": "SettingsStore-BRAdTFqa.js", "name": "SettingsStore", "imports": [ - "_react-at0u27-d.js" + "_react-Y4ytZYw3.js" ] }, - "_StompStore-DHVAwnBW.js": { - "file": "StompStore-DHVAwnBW.js", + "_StompStore-BKQe4lAO.js": { + "file": "StompStore-BKQe4lAO.js", "name": "StompStore", "imports": [ "src/main.tsx", - "_react-at0u27-d.js", - "_NSPanelToastContainer-BeaDvrjv.js" + "_react-Y4ytZYw3.js", + "_NSPanelToastContainer-DqBiCYgm.js" ] }, - "_fields-CY_sLYf3.js": { - "file": "fields-CY_sLYf3.js", + "_fields-OWlKSje3.js": { + "file": "fields-OWlKSje3.js", "name": "fields", "imports": [ "src/main.tsx", - "_index.esm-D2iT7jTM.js" + "_index.esm-k48P7boK.js" ] }, - "_index.esm-D2iT7jTM.js": { - "file": "index.esm-D2iT7jTM.js", + "_index.esm-k48P7boK.js": { + "file": "index.esm-k48P7boK.js", "name": "index.esm", "imports": [ "src/main.tsx" ] }, - "_layout-CEwTn_qs.js": { - "file": "layout-CEwTn_qs.js", + "_layout-UB6ft_05.js": { + "file": "layout-UB6ft_05.js", "name": "layout", "imports": [ "src/main.tsx" ] }, - "_mdi-Bo7fQ2tR.js": { - "file": "mdi-Bo7fQ2tR.js", + "_mdi-C7m9AGig.js": { + "file": "mdi-C7m9AGig.js", "name": "mdi", "imports": [ "src/main.tsx" ] }, - "_proxy-7sw4PveN.js": { - "file": "proxy-7sw4PveN.js", + "_proxy-BZTzkADl.js": { + "file": "proxy-BZTzkADl.js", "name": "proxy", "imports": [ "src/main.tsx" ] }, - "_react-at0u27-d.js": { - "file": "react-at0u27-d.js", + "_react-Y4ytZYw3.js": { + "file": "react-Y4ytZYw3.js", "name": "react", "imports": [ "src/main.tsx" ] }, - "_react-select.esm-oykjlSBu.js": { - "file": "react-select.esm-oykjlSBu.js", + "_react-select.esm-B911rKmb.js": { + "file": "react-select.esm-B911rKmb.js", "name": "react-select.esm", "imports": [ "src/main.tsx" ] }, - "_sortable-DJ3Lryh9.js": { - "file": "sortable-DJ3Lryh9.js", + "_sortable-9KjXuaJO.js": { + "file": "sortable-9KjXuaJO.js", "name": "sortable", "imports": [ "src/main.tsx" ] }, - "_use-spring-DVh6ql00.js": { - "file": "use-spring-DVh6ql00.js", + "_use-spring-COy4hU03.js": { + "file": "use-spring-COy4hU03.js", "name": "use-spring", "imports": [ "src/main.tsx", - "_proxy-7sw4PveN.js" + "_proxy-BZTzkADl.js" ] }, "src/components/EntitiesPage/EntitiesPagesView.tsx": { - "file": "EntitiesPagesView-DTK_W_3m.js", + "file": "EntitiesPagesView-CRcue4RN.js", "name": "EntitiesPagesView", "src": "src/components/EntitiesPage/EntitiesPagesView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-DJ3Lryh9.js", - "_react-at0u27-d.js", - "_MultiStep_AddEditEntity-DXyHos_N.js" + "_sortable-9KjXuaJO.js", + "_react-Y4ytZYw3.js", + "_MultiStep_AddEditEntity-BmADEvMy.js" ] }, "src/components/IndexPage/NSPanelsView.tsx": { - "file": "NSPanelsView-DFPbiBh0.js", + "file": "NSPanelsView-NSgV8rtx.js", "name": "NSPanelsView", "src": "src/components/IndexPage/NSPanelsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_react-select.esm-oykjlSBu.js", - "_NSPanelToastContainer-BeaDvrjv.js", - "_proxy-7sw4PveN.js", - "_use-spring-DVh6ql00.js", - "_StompStore-DHVAwnBW.js", - "_EntityStore-vSp3-_ve.js", - "_mdi-Bo7fQ2tR.js" + "_react-select.esm-B911rKmb.js", + "_NSPanelToastContainer-DqBiCYgm.js", + "_proxy-BZTzkADl.js", + "_use-spring-COy4hU03.js", + "_StompStore-BKQe4lAO.js", + "_EntityStore-B1wVZ1VC.js", + "_mdi-C7m9AGig.js" ] }, "src/components/InitialSetup/InitialSetup.tsx": { - "file": "InitialSetup-DzNxC3hH.js", + "file": "InitialSetup-DXdZ9lbH.js", "name": "InitialSetup", "src": "src/components/InitialSetup/InitialSetup.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_index.esm-D2iT7jTM.js", - "_NSPanelToastContainer-BeaDvrjv.js", - "_proxy-7sw4PveN.js", - "_AnimatePresence-C5DU0GhE.js", - "_mdi-Bo7fQ2tR.js", - "_layout-CEwTn_qs.js" + "_index.esm-k48P7boK.js", + "_NSPanelToastContainer-DqBiCYgm.js", + "_proxy-BZTzkADl.js", + "_AnimatePresence-BrcXqfjQ.js", + "_mdi-C7m9AGig.js", + "_layout-UB6ft_05.js" ] }, "src/components/NSPanelPage/Logs.tsx": { - "file": "Logs-D7TbuEX-.js", + "file": "Logs-CetI0u-X.js", "name": "Logs", "src": "src/components/NSPanelPage/Logs.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_SettingsStore-DqOcuBO4.js", - "_StompStore-DHVAwnBW.js" + "_SettingsStore-BRAdTFqa.js", + "_StompStore-BKQe4lAO.js" ] }, "src/components/NSPanelPage/Sidebar.tsx": { - "file": "Sidebar-FfmNugko.js", + "file": "Sidebar-TExSla66.js", "name": "Sidebar", "src": "src/components/NSPanelPage/Sidebar.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_NSPanelToastContainer-BeaDvrjv.js", - "_StompStore-DHVAwnBW.js", - "_EntityStore-vSp3-_ve.js", - "_mdi-Bo7fQ2tR.js" + "_NSPanelToastContainer-DqBiCYgm.js", + "_StompStore-BKQe4lAO.js", + "_EntityStore-B1wVZ1VC.js", + "_mdi-C7m9AGig.js" ] }, "src/components/NSPanelPage/Warnings.tsx": { - "file": "Warnings-CQHhdLov.js", + "file": "Warnings-B6qeeYwB.js", "name": "Warnings", "src": "src/components/NSPanelPage/Warnings.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_EntityStore-vSp3-_ve.js", - "_mdi-Bo7fQ2tR.js" + "_EntityStore-B1wVZ1VC.js", + "_mdi-C7m9AGig.js" ] }, "src/components/RoomPage/RoomPage.tsx": { - "file": "RoomPage-DrYlucCR.js", + "file": "RoomPage-Bu2HHqaj.js", "name": "RoomPage", "src": "src/components/RoomPage/RoomPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_MultiStep_AddEditEntity-DXyHos_N.js", - "_react-select.esm-oykjlSBu.js", - "_index.esm-D2iT7jTM.js", - "_NSPanelToastContainer-BeaDvrjv.js", + "_MultiStep_AddEditEntity-BmADEvMy.js", + "_react-select.esm-B911rKmb.js", + "_index.esm-k48P7boK.js", + "_NSPanelToastContainer-DqBiCYgm.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", - "_StompStore-DHVAwnBW.js", - "_EntityStore-vSp3-_ve.js", - "_mdi-Bo7fQ2tR.js" + "_StompStore-BKQe4lAO.js", + "_EntityStore-B1wVZ1VC.js", + "_mdi-C7m9AGig.js" ] }, "src/components/RoomsPage/RoomsView.tsx": { - "file": "RoomsView-C8QdDbZO.js", + "file": "RoomsView-COctz1MN.js", "name": "RoomsView", "src": "src/components/RoomsPage/RoomsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-DJ3Lryh9.js", - "_index.esm-D2iT7jTM.js", - "_NSPanelToastContainer-BeaDvrjv.js", - "_proxy-7sw4PveN.js", - "_use-spring-DVh6ql00.js", - "_EntityStore-vSp3-_ve.js", - "_mdi-Bo7fQ2tR.js", - "_layout-CEwTn_qs.js", - "_fields-CY_sLYf3.js" + "_sortable-9KjXuaJO.js", + "_index.esm-k48P7boK.js", + "_NSPanelToastContainer-DqBiCYgm.js", + "_proxy-BZTzkADl.js", + "_use-spring-COy4hU03.js", + "_EntityStore-B1wVZ1VC.js", + "_mdi-C7m9AGig.js", + "_layout-UB6ft_05.js", + "_fields-OWlKSje3.js" ] }, "src/components/SettingsPage/SettingsPage.tsx": { - "file": "SettingsPage-C-tBeVml.js", + "file": "SettingsPage-Crubx4dI.js", "name": "SettingsPage", "src": "src/components/SettingsPage/SettingsPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_index.esm-D2iT7jTM.js", - "_NSPanelToastContainer-BeaDvrjv.js", - "_layout-CEwTn_qs.js", - "_fields-CY_sLYf3.js" + "_index.esm-k48P7boK.js", + "_NSPanelToastContainer-DqBiCYgm.js", + "_layout-UB6ft_05.js", + "_fields-OWlKSje3.js" ] }, "src/main.tsx": { - "file": "main-DsrUEgTV.js", + "file": "main-DArmUgNn.js", "name": "main", "src": "src/main.tsx", "isEntry": true, "dynamicImports": [ - "_MultiStep_AddEditEntity-DXyHos_N.js", + "_MultiStep_AddEditEntity-BmADEvMy.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", "src/components/IndexPage/NSPanelsView.tsx", - "_NSPanelToastContainer-BeaDvrjv.js", + "_NSPanelToastContainer-DqBiCYgm.js", "src/components/InitialSetup/InitialSetup.tsx", "src/components/NSPanelPage/Sidebar.tsx", "src/components/NSPanelPage/Warnings.tsx", diff --git a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-C5DU0GhE.js b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-BrcXqfjQ.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-C5DU0GhE.js rename to docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-BrcXqfjQ.js index 988099f11..83621a323 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-C5DU0GhE.js +++ b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-BrcXqfjQ.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-7sw4PveN.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-BZTzkADl.js"; //#region node_modules/framer-motion/dist/es/utils/use-composed-ref.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DTK_W_3m.js b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-CRcue4RN.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DTK_W_3m.js rename to docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-CRcue4RN.js index 47db5f985..450dbbcb9 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DTK_W_3m.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-CRcue4RN.js @@ -1,7 +1,7 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-DJ3Lryh9.js"; -import { t as create } from "./react-at0u27-d.js"; -import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-DXyHos_N.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-9KjXuaJO.js"; +import { t as create } from "./react-Y4ytZYw3.js"; +import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-BmADEvMy.js"; //#region src/components/EntitiesPage/GenericEntityBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-vSp3-_ve.js b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-B1wVZ1VC.js similarity index 92% rename from docker/web/nspanelmanager/web/react-components/dist/EntityStore-vSp3-_ve.js rename to docker/web/nspanelmanager/web/react-components/dist/EntityStore-B1wVZ1VC.js index cb41557b3..1afe828ee 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-vSp3-_ve.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-B1wVZ1VC.js @@ -1,6 +1,6 @@ -import { t as create } from "./react-at0u27-d.js"; -import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; -import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; +import { t as create } from "./react-Y4ytZYw3.js"; +import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; +import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; //#region src/stores/EntityStore.ts var nspanel_stomp_status_update_callback = (message) => { const json_data = JSON.parse(message.body); diff --git a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DzNxC3hH.js b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DXdZ9lbH.js similarity index 97% rename from docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DzNxC3hH.js rename to docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DXdZ9lbH.js index 771696b5e..eb24d67ff 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DzNxC3hH.js +++ b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DXdZ9lbH.js @@ -1,10 +1,10 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { s as useForm } from "./index.esm-D2iT7jTM.js"; -import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; -import { t as motion } from "./proxy-7sw4PveN.js"; -import { t as AnimatePresence } from "./AnimatePresence-C5DU0GhE.js"; -import { i as mdiInformationOutline, x as require_Icon } from "./mdi-Bo7fQ2tR.js"; -import { i as api, t as Alert } from "./layout-CEwTn_qs.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { s as useForm } from "./index.esm-k48P7boK.js"; +import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; +import { t as motion } from "./proxy-BZTzkADl.js"; +import { t as AnimatePresence } from "./AnimatePresence-BrcXqfjQ.js"; +import { i as mdiInformationOutline, x as require_Icon } from "./mdi-C7m9AGig.js"; +import { i as api, t as Alert } from "./layout-UB6ft_05.js"; //#region src/components/InitialSetup/Step1_Welcome.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); @@ -133,7 +133,9 @@ var Step2_Theme = ({ setValue, nextStep, prevStep, watch }) => { className: "bg-neutral text-neutral-content grid grid-cols-3 w-full h-20 rounded-box overflow-hidden cursor-pointer", "data-theme": theme_option, onClick: () => { - setValue("theme", theme_option); + setValue("theme", theme_option, { shouldDirty: true }); + const radio = document.querySelector(`#theme-radio-${CSS.escape(theme_option)}`); + if (radio) radio.checked = true; }, children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "", @@ -207,7 +209,7 @@ var Step3_ManagerSettings = ({ setValue, getValues, register, nextStep, prevStep headers: { "Content-Type": "application/json" }, body: JSON.stringify({ hostname: window.location.hostname }) }).then((response) => response.json()).then((data) => { - if (data.ip) setValue("manager_address", data.ip); + if (data.ip) setValue("manager_address", data.ip, { shouldDirty: true }); else Notify({ message: "Failed to get IP from URL. No \"ip\" field in response.", level: "error" @@ -313,7 +315,7 @@ var Step3_ManagerSettings = ({ setValue, getValues, register, nextStep, prevStep type: "button", className: "btn btn-info rounded-l-none h-auto", onClick: () => { - setValue("manager_port", parseInt(window.location.port)); + setValue("manager_port", parseInt(window.location.port), { shouldDirty: true }); }, children: "Load from URL" })] @@ -412,9 +414,9 @@ var Step4_MqttSettings = ({ setValue, getValues, register, watch, nextStep, prev checked: noLogin, onChange: (e) => { if (e.currentTarget.checked) { - setValue("mqtt_username", ""); - setValue("mqtt_password", ""); - setValue("clear_mqtt_password", true); + setValue("mqtt_username", "", { shouldDirty: true }); + setValue("mqtt_password", "", { shouldDirty: true }); + setValue("clear_mqtt_password", true, { shouldDirty: true }); setNoLogin(true); } else setNoLogin(false); } diff --git a/docker/web/nspanelmanager/web/react-components/dist/Logs-D7TbuEX-.js b/docker/web/nspanelmanager/web/react-components/dist/Logs-CetI0u-X.js similarity index 97% rename from docker/web/nspanelmanager/web/react-components/dist/Logs-D7TbuEX-.js rename to docker/web/nspanelmanager/web/react-components/dist/Logs-CetI0u-X.js index ce76b1c00..c27a420ee 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Logs-D7TbuEX-.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Logs-CetI0u-X.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { t as useSettingsStore } from "./SettingsStore-DqOcuBO4.js"; -import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { t as useSettingsStore } from "./SettingsStore-BRAdTFqa.js"; +import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; //#region src/components/NSPanelPage/Logs.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DXyHos_N.js b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-BmADEvMy.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DXyHos_N.js rename to docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-BmADEvMy.js index a2ed43fd2..55fe03f51 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-DXyHos_N.js +++ b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-BmADEvMy.js @@ -1,11 +1,11 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { t as create } from "./react-at0u27-d.js"; -import { t as useSettingsStore } from "./SettingsStore-DqOcuBO4.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-oykjlSBu.js"; -import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-D2iT7jTM.js"; -import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; -import { t as motion } from "./proxy-7sw4PveN.js"; -import { t as AnimatePresence } from "./AnimatePresence-C5DU0GhE.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { t as create } from "./react-Y4ytZYw3.js"; +import { t as useSettingsStore } from "./SettingsStore-BRAdTFqa.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-B911rKmb.js"; +import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-k48P7boK.js"; +import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; +import { t as motion } from "./proxy-BZTzkADl.js"; +import { t as AnimatePresence } from "./AnimatePresence-BrcXqfjQ.js"; //#region src/stores/EntitiesPagesStore.ts function getCookie$1(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-BeaDvrjv.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DqBiCYgm.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-BeaDvrjv.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DqBiCYgm.js index aa92c7817..2b319ac7f 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-BeaDvrjv.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DqBiCYgm.js @@ -1,4 +1,4 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; //#region node_modules/clsx/dist/clsx.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); function r(e) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-DFPbiBh0.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-NSgV8rtx.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-DFPbiBh0.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-NSgV8rtx.js index 389162a7a..12b33a887 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-DFPbiBh0.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-NSgV8rtx.js @@ -1,11 +1,11 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-oykjlSBu.js"; -import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; -import { t as motion } from "./proxy-7sw4PveN.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-DVh6ql00.js"; -import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; -import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-Bo7fQ2tR.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-B911rKmb.js"; +import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; +import { t as motion } from "./proxy-BZTzkADl.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-COy4hU03.js"; +import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; +import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-C7m9AGig.js"; //#region src/components/IndexPage/NSPanelBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DrYlucCR.js b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-Bu2HHqaj.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/RoomPage-DrYlucCR.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomPage-Bu2HHqaj.js index c537fe46d..eed578607 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DrYlucCR.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-Bu2HHqaj.js @@ -1,12 +1,12 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-DXyHos_N.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-oykjlSBu.js"; -import { l as useWatch, s as useForm } from "./index.esm-D2iT7jTM.js"; -import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; -import EntitiesPagesView from "./EntitiesPagesView-DTK_W_3m.js"; -import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; -import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; -import { d as mdiTextShort, x as require_Icon } from "./mdi-Bo7fQ2tR.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-BmADEvMy.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-B911rKmb.js"; +import { l as useWatch, s as useForm } from "./index.esm-k48P7boK.js"; +import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; +import EntitiesPagesView from "./EntitiesPagesView-CRcue4RN.js"; +import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; +import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; +import { d as mdiTextShort, x as require_Icon } from "./mdi-C7m9AGig.js"; //#region src/components/RoomPage/RoomPage.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-C8QdDbZO.js b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-COctz1MN.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/RoomsView-C8QdDbZO.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomsView-COctz1MN.js index 256203fdf..769d72982 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-C8QdDbZO.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-COctz1MN.js @@ -1,13 +1,13 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { r as DragDropProvider, t as useSortable } from "./sortable-DJ3Lryh9.js"; -import { n as FormProvider, s as useForm } from "./index.esm-D2iT7jTM.js"; -import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; -import { t as motion } from "./proxy-7sw4PveN.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-DVh6ql00.js"; -import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; -import { o as mdiMenu, x as require_Icon } from "./mdi-Bo7fQ2tR.js"; -import { i as api, t as Alert } from "./layout-CEwTn_qs.js"; -import { a as TextInput } from "./fields-CY_sLYf3.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { r as DragDropProvider, t as useSortable } from "./sortable-9KjXuaJO.js"; +import { n as FormProvider, s as useForm } from "./index.esm-k48P7boK.js"; +import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; +import { t as motion } from "./proxy-BZTzkADl.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-COy4hU03.js"; +import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; +import { o as mdiMenu, x as require_Icon } from "./mdi-C7m9AGig.js"; +import { i as api, t as Alert } from "./layout-UB6ft_05.js"; +import { a as TextInput } from "./fields-OWlKSje3.js"; //#region src/components/RoomsPage/RoomBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-C-tBeVml.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-Crubx4dI.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsPage-C-tBeVml.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsPage-Crubx4dI.js index 788afafa5..958309bdb 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-C-tBeVml.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-Crubx4dI.js @@ -1,8 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-D2iT7jTM.js"; -import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; -import { a as getCookie, i as api, n as Card, r as Row, t as Alert } from "./layout-CEwTn_qs.js"; -import { a as TextInput$1, i as Select$1, n as RadioGroup$1, r as SecretInput$1, t as NumberInput$1 } from "./fields-CY_sLYf3.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-k48P7boK.js"; +import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; +import { a as getCookie, i as api, n as Card, r as Row, t as Alert } from "./layout-UB6ft_05.js"; +import { a as TextInput$1, i as Select$1, n as RadioGroup$1, r as SecretInput$1, t as NumberInput$1 } from "./fields-OWlKSje3.js"; //#region src/api/connectionTests.ts var import_react = /* @__PURE__ */ __toESM(require_react(), 1); async function errorMessage(response) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DqOcuBO4.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-BRAdTFqa.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DqOcuBO4.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsStore-BRAdTFqa.js index e831d27a2..37423f201 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-DqOcuBO4.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-BRAdTFqa.js @@ -1,4 +1,4 @@ -import { t as create } from "./react-at0u27-d.js"; +import { t as create } from "./react-Y4ytZYw3.js"; //#region src/stores/SettingsStore.ts function getCookie(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-FfmNugko.js b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-TExSla66.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/Sidebar-FfmNugko.js rename to docker/web/nspanelmanager/web/react-components/dist/Sidebar-TExSla66.js index c5e3d5a3b..f804d1583 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-FfmNugko.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-TExSla66.js @@ -1,8 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { n as Notify } from "./NSPanelToastContainer-BeaDvrjv.js"; -import { t as useStompStore } from "./StompStore-DHVAwnBW.js"; -import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-Bo7fQ2tR.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; +import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; +import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-C7m9AGig.js"; //#region src/components/NSPanelPage/Sidebar.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/StompStore-DHVAwnBW.js b/docker/web/nspanelmanager/web/react-components/dist/StompStore-BKQe4lAO.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/StompStore-DHVAwnBW.js rename to docker/web/nspanelmanager/web/react-components/dist/StompStore-BKQe4lAO.js index 67d34fe74..175e869f8 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/StompStore-DHVAwnBW.js +++ b/docker/web/nspanelmanager/web/react-components/dist/StompStore-BKQe4lAO.js @@ -1,6 +1,6 @@ -import { i as __commonJSMin } from "./main-DsrUEgTV.js"; -import { t as create } from "./react-at0u27-d.js"; -import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-BeaDvrjv.js"; +import { i as __commonJSMin } from "./main-DArmUgNn.js"; +import { t as create } from "./react-Y4ytZYw3.js"; +import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-DqBiCYgm.js"; //#region node_modules/tslib/tslib.es6.mjs /****************************************************************************** Copyright (c) Microsoft Corporation. diff --git a/docker/web/nspanelmanager/web/react-components/dist/Warnings-CQHhdLov.js b/docker/web/nspanelmanager/web/react-components/dist/Warnings-B6qeeYwB.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/Warnings-CQHhdLov.js rename to docker/web/nspanelmanager/web/react-components/dist/Warnings-B6qeeYwB.js index efc0ae0ca..5f9f54a7d 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Warnings-CQHhdLov.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Warnings-B6qeeYwB.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { t as useEntityStatesStore } from "./EntityStore-vSp3-_ve.js"; -import { x as require_Icon } from "./mdi-Bo7fQ2tR.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; +import { x as require_Icon } from "./mdi-C7m9AGig.js"; //#region src/components/NSPanelPage/Warnings.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/fields-CY_sLYf3.js b/docker/web/nspanelmanager/web/react-components/dist/fields-OWlKSje3.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/fields-CY_sLYf3.js rename to docker/web/nspanelmanager/web/react-components/dist/fields-OWlKSje3.js index d7aa8381c..e8acb557a 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/fields-CY_sLYf3.js +++ b/docker/web/nspanelmanager/web/react-components/dist/fields-OWlKSje3.js @@ -1,5 +1,5 @@ -import { r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; -import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-D2iT7jTM.js"; +import { r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-k48P7boK.js"; require_react(); var import_jsx_runtime = require_jsx_runtime(); function Field({ name, label, hint, children }) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/index.esm-D2iT7jTM.js b/docker/web/nspanelmanager/web/react-components/dist/index.esm-k48P7boK.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/index.esm-D2iT7jTM.js rename to docker/web/nspanelmanager/web/react-components/dist/index.esm-k48P7boK.js index 9d9cec73f..68bf17436 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/index.esm-D2iT7jTM.js +++ b/docker/web/nspanelmanager/web/react-components/dist/index.esm-k48P7boK.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-DsrUEgTV.js"; +import { c as __toESM, r as require_react } from "./main-DArmUgNn.js"; //#region node_modules/react-hook-form/dist/index.esm.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var isCheckBoxInput = (element) => element.type === "checkbox"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/layout-CEwTn_qs.js b/docker/web/nspanelmanager/web/react-components/dist/layout-UB6ft_05.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/layout-CEwTn_qs.js rename to docker/web/nspanelmanager/web/react-components/dist/layout-UB6ft_05.js index b71d5ba53..daede4b1c 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/layout-CEwTn_qs.js +++ b/docker/web/nspanelmanager/web/react-components/dist/layout-UB6ft_05.js @@ -1,4 +1,4 @@ -import { r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; //#region node_modules/openapi-fetch/dist/index.mjs var PATH_PARAM_RE = /\{[^{}]+\}/g; var supportsRequestInitExt = () => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/main-DsrUEgTV.js b/docker/web/nspanelmanager/web/react-components/dist/main-DArmUgNn.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/main-DsrUEgTV.js rename to docker/web/nspanelmanager/web/react-components/dist/main-DArmUgNn.js index acf835e27..47d80813a 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/main-DsrUEgTV.js +++ b/docker/web/nspanelmanager/web/react-components/dist/main-DArmUgNn.js @@ -1,4 +1,4 @@ -const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-DXyHos_N.js","react-at0u27-d.js","SettingsStore-DqOcuBO4.js","react-select.esm-oykjlSBu.js","index.esm-D2iT7jTM.js","NSPanelToastContainer-BeaDvrjv.js","proxy-7sw4PveN.js","AnimatePresence-C5DU0GhE.js","EntitiesPagesView-DTK_W_3m.js","sortable-DJ3Lryh9.js","NSPanelsView-DFPbiBh0.js","use-spring-DVh6ql00.js","StompStore-DHVAwnBW.js","EntityStore-vSp3-_ve.js","mdi-Bo7fQ2tR.js","InitialSetup-DzNxC3hH.js","layout-CEwTn_qs.js","Sidebar-FfmNugko.js","Warnings-CQHhdLov.js","Logs-D7TbuEX-.js","RoomPage-DrYlucCR.js","SettingsPage-C-tBeVml.js","fields-CY_sLYf3.js","RoomsView-C8QdDbZO.js"])))=>i.map(i=>d[i]); +const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-BmADEvMy.js","react-Y4ytZYw3.js","SettingsStore-BRAdTFqa.js","react-select.esm-B911rKmb.js","index.esm-k48P7boK.js","NSPanelToastContainer-DqBiCYgm.js","proxy-BZTzkADl.js","AnimatePresence-BrcXqfjQ.js","EntitiesPagesView-CRcue4RN.js","sortable-9KjXuaJO.js","NSPanelsView-NSgV8rtx.js","use-spring-COy4hU03.js","StompStore-BKQe4lAO.js","EntityStore-B1wVZ1VC.js","mdi-C7m9AGig.js","InitialSetup-DXdZ9lbH.js","layout-UB6ft_05.js","Sidebar-TExSla66.js","Warnings-B6qeeYwB.js","Logs-CetI0u-X.js","RoomPage-Bu2HHqaj.js","SettingsPage-Crubx4dI.js","fields-OWlKSje3.js","RoomsView-COctz1MN.js"])))=>i.map(i=>d[i]); //#region \0rolldown/runtime.js var __create = Object.create; var __defProp = Object.defineProperty; @@ -10204,16 +10204,16 @@ var __vitePreload = function preload(baseModule, deps, importerUrl) { }; //#endregion //#region src/componentMap.tsx -var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-DXyHos_N.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); -var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-DTK_W_3m.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); -var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-DFPbiBh0.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); -var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-BeaDvrjv.js").then((n) => n.t), [])); -var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-DzNxC3hH.js"), __vite__mapDeps([15,4,5,6,7,14,16]))); -var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-FfmNugko.js"), __vite__mapDeps([17,5,12,1,13,14]))); -var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-CQHhdLov.js"), __vite__mapDeps([18,13,1,5,12,14]))); -var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-D7TbuEX-.js"), __vite__mapDeps([19,2,1,12,5]))); -var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-DrYlucCR.js"), __vite__mapDeps([20,0,1,2,3,4,5,6,7,8,9,12,13,14]))); -var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-C-tBeVml.js"), __vite__mapDeps([21,4,5,16,22]))); +var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-BmADEvMy.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); +var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-CRcue4RN.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); +var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-NSgV8rtx.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); +var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-DqBiCYgm.js").then((n) => n.t), [])); +var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-DXdZ9lbH.js"), __vite__mapDeps([15,4,5,6,7,14,16]))); +var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-TExSla66.js"), __vite__mapDeps([17,5,12,1,13,14]))); +var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-B6qeeYwB.js"), __vite__mapDeps([18,13,1,5,12,14]))); +var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-CetI0u-X.js"), __vite__mapDeps([19,2,1,12,5]))); +var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-Bu2HHqaj.js"), __vite__mapDeps([20,0,1,2,3,4,5,6,7,8,9,12,13,14]))); +var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-Crubx4dI.js"), __vite__mapDeps([21,4,5,16,22]))); var componentMap = { MultiStep_AddEditEntity, EntitiesPagesView, @@ -10224,7 +10224,7 @@ var componentMap = { NSPanelWarnings, NSPanelLogs, RoomPage, - RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-C8QdDbZO.js"), __vite__mapDeps([23,9,4,5,6,11,13,1,12,14,16,22]))), + RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-COctz1MN.js"), __vite__mapDeps([23,9,4,5,6,11,13,1,12,14,16,22]))), SettingsPage }; //#endregion diff --git a/docker/web/nspanelmanager/web/react-components/dist/mdi-Bo7fQ2tR.js b/docker/web/nspanelmanager/web/react-components/dist/mdi-C7m9AGig.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/mdi-Bo7fQ2tR.js rename to docker/web/nspanelmanager/web/react-components/dist/mdi-C7m9AGig.js index 422acee01..9ffcbaa74 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/mdi-Bo7fQ2tR.js +++ b/docker/web/nspanelmanager/web/react-components/dist/mdi-C7m9AGig.js @@ -1,4 +1,4 @@ -import { i as __commonJSMin, r as require_react } from "./main-DsrUEgTV.js"; +import { i as __commonJSMin, r as require_react } from "./main-DArmUgNn.js"; //#region node_modules/prop-types/lib/ReactPropTypesSecret.js /** * Copyright (c) 2013-present, Facebook, Inc. diff --git a/docker/web/nspanelmanager/web/react-components/dist/proxy-7sw4PveN.js b/docker/web/nspanelmanager/web/react-components/dist/proxy-BZTzkADl.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/proxy-7sw4PveN.js rename to docker/web/nspanelmanager/web/react-components/dist/proxy-BZTzkADl.js index 81a86b7dd..6b4a7071e 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/proxy-7sw4PveN.js +++ b/docker/web/nspanelmanager/web/react-components/dist/proxy-BZTzkADl.js @@ -1,4 +1,4 @@ -import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-DArmUgNn.js"; //#region node_modules/framer-motion/dist/es/context/LayoutGroupContext.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-at0u27-d.js b/docker/web/nspanelmanager/web/react-components/dist/react-Y4ytZYw3.js similarity index 96% rename from docker/web/nspanelmanager/web/react-components/dist/react-at0u27-d.js rename to docker/web/nspanelmanager/web/react-components/dist/react-Y4ytZYw3.js index f458c1225..3e2bfecde 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-at0u27-d.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-Y4ytZYw3.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-DsrUEgTV.js"; +import { c as __toESM, r as require_react } from "./main-DArmUgNn.js"; //#region node_modules/zustand/esm/vanilla.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var createStoreImpl = (createState) => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-oykjlSBu.js b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-B911rKmb.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/react-select.esm-oykjlSBu.js rename to docker/web/nspanelmanager/web/react-components/dist/react-select.esm-B911rKmb.js index 00f0c9808..c1e2779a3 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-oykjlSBu.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-B911rKmb.js @@ -1,4 +1,4 @@ -import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-DsrUEgTV.js"; +import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-DArmUgNn.js"; //#region node_modules/@babel/runtime/helpers/esm/typeof.js function _typeof(o) { "@babel/helpers - typeof"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/sortable-DJ3Lryh9.js b/docker/web/nspanelmanager/web/react-components/dist/sortable-9KjXuaJO.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/sortable-DJ3Lryh9.js rename to docker/web/nspanelmanager/web/react-components/dist/sortable-9KjXuaJO.js index 3e6b79543..aebadaf24 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/sortable-DJ3Lryh9.js +++ b/docker/web/nspanelmanager/web/react-components/dist/sortable-9KjXuaJO.js @@ -1,4 +1,4 @@ -import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-DsrUEgTV.js"; +import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; //#region node_modules/@preact/signals-core/dist/signals-core.module.js var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var i = Symbol.for("preact-signals"); diff --git a/docker/web/nspanelmanager/web/react-components/dist/use-spring-DVh6ql00.js b/docker/web/nspanelmanager/web/react-components/dist/use-spring-COy4hU03.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/use-spring-DVh6ql00.js rename to docker/web/nspanelmanager/web/react-components/dist/use-spring-COy4hU03.js index c69abdcc2..51813570b 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/use-spring-DVh6ql00.js +++ b/docker/web/nspanelmanager/web/react-components/dist/use-spring-COy4hU03.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react } from "./main-DsrUEgTV.js"; -import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-7sw4PveN.js"; +import { c as __toESM, r as require_react } from "./main-DArmUgNn.js"; +import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-BZTzkADl.js"; //#region node_modules/motion-dom/dist/es/utils/transform.mjs function transform(...args) { const useImmediate = !Array.isArray(args[0]); diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx index 7cbe4e587..cb5e6b9ae 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx @@ -58,7 +58,11 @@ const Step2_Theme = ({ className="bg-neutral text-neutral-content grid grid-cols-3 w-full h-20 rounded-box overflow-hidden cursor-pointer" data-theme={theme_option} onClick={() => { - setValue("theme", theme_option); + setValue("theme", theme_option, { shouldDirty: true }); + + // Update the navbar theme selector as to keep the theme when pressing the next button. + const radio = document.querySelector(`#theme-radio-${CSS.escape(theme_option)}`); + if (radio) radio.checked = true; }} >
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx index bf4114470..f94383e1d 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx @@ -26,7 +26,7 @@ const Step3_ManagerSettings = ({ .then((response) => response.json()) .then((data) => { if (data.ip) { - setValue("manager_address", data.ip); + setValue("manager_address", data.ip, { shouldDirty: true }); } else { Notify({ message: 'Failed to get IP from URL. No "ip" field in response.', level: "error" }); } @@ -113,7 +113,7 @@ const Step3_ManagerSettings = ({ type="button" className="btn btn-info rounded-l-none h-auto" onClick={() => { - setValue("manager_port", parseInt(window.location.port)); + setValue("manager_port", parseInt(window.location.port), { shouldDirty: true }); }} > Load from URL diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx index 7637abaec..c43904d3c 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx @@ -75,9 +75,9 @@ const Step4_MqttSettings = ({ checked={noLogin} onChange={(e) => { if (e.currentTarget.checked) { - setValue("mqtt_username", ""); - setValue("mqtt_password", ""); - setValue("clear_mqtt_password", true); + setValue("mqtt_username", "", { shouldDirty: true }); + setValue("mqtt_password", "", { shouldDirty: true }); + setValue("clear_mqtt_password", true, { shouldDirty: true }); setNoLogin(true); } else { setNoLogin(false); diff --git a/docker/web/nspanelmanager/web/react-components/templates/scripts.html b/docker/web/nspanelmanager/web/react-components/templates/scripts.html index 1ebec0f13..b2c50d21d 100644 --- a/docker/web/nspanelmanager/web/react-components/templates/scripts.html +++ b/docker/web/nspanelmanager/web/react-components/templates/scripts.html @@ -1,2 +1,2 @@ {% load static %} - + diff --git a/docker/web/nspanelmanager/web/templates/index.html b/docker/web/nspanelmanager/web/templates/index.html index 12a3cd54d..9951689f8 100644 --- a/docker/web/nspanelmanager/web/templates/index.html +++ b/docker/web/nspanelmanager/web/templates/index.html @@ -9,7 +9,7 @@ {% block content %} -{% if manager_address != "" %} +{% if manager_address == "" %} {% RC 'InitialSetup' opened=True isHomeAssistantAddon=is_home_assistant_addon %} {% endif %} diff --git a/docker/web/nspanelmanager/web/templates/navbar.html b/docker/web/nspanelmanager/web/templates/navbar.html index 79785b7ba..0d13a76b8 100644 --- a/docker/web/nspanelmanager/web/templates/navbar.html +++ b/docker/web/nspanelmanager/web/templates/navbar.html @@ -36,6 +36,7 @@ Date: Sat, 14 Nov 2026 16:44:24 +0100 Subject: [PATCH 5/8] Reverted some changed that were unintentional --- .../react-components/dist/.vite/manifest.json | 204 +++++++++--------- ...rcXqfjQ.js => AnimatePresence-CpnHckGS.js} | 4 +- ...ue4RN.js => EntitiesPagesView-DShidmI8.js} | 8 +- ...re-B1wVZ1VC.js => EntityStore-CHE3-bsC.js} | 6 +- ...p-DXdZ9lbH.js => InitialSetup-p38u0OlE.js} | 16 +- .../{Logs-CetI0u-X.js => Logs-B094dObe.js} | 6 +- ...js => MultiStep_AddEditEntity-xcopfTe5.js} | 16 +- ...m.js => NSPanelToastContainer-D677tDZJ.js} | 2 +- ...w-NSgV8rtx.js => NSPanelsView-1YvY26NZ.js} | 16 +- ...mPage-Bu2HHqaj.js => RoomPage-CMRDvbEM.js} | 18 +- ...View-COctz1MN.js => RoomsView-qN1A3y9X.js} | 20 +- ...e-Crubx4dI.js => SettingsPage-CzrUBqYz.js} | 10 +- ...-BRAdTFqa.js => SettingsStore-msVzBcHM.js} | 2 +- ...idebar-TExSla66.js => Sidebar-CHcoOcQs.js} | 10 +- ...ore-BKQe4lAO.js => StompStore-Bh-Guhla.js} | 6 +- ...nings-B6qeeYwB.js => Warnings-D5nCet1X.js} | 6 +- ...{fields-OWlKSje3.js => fields-Dr1KI0Cj.js} | 4 +- ....esm-k48P7boK.js => index.esm-CnTf2rLv.js} | 2 +- ...{layout-UB6ft_05.js => layout-HS0oHCMJ.js} | 2 +- .../{main-DArmUgNn.js => main-FKp56mKw.js} | 24 +-- .../dist/{mdi-C7m9AGig.js => mdi-Cr6PIsRR.js} | 2 +- .../{proxy-BZTzkADl.js => proxy-BQYsYRjY.js} | 2 +- .../{react-Y4ytZYw3.js => react-Cm4z11-B.js} | 2 +- ...11rKmb.js => react-select.esm-CbdimKhg.js} | 2 +- ...table-9KjXuaJO.js => sortable-Ke3drO00.js} | 2 +- ...ing-COy4hU03.js => use-spring-BsypnnSW.js} | 4 +- .../InitialSetup/Step7_Finished.tsx | 1 + .../src/components/InitialSetup/form.ts | 2 +- .../react-components/templates/scripts.html | 2 +- 29 files changed, 201 insertions(+), 200 deletions(-) rename docker/web/nspanelmanager/web/react-components/dist/{AnimatePresence-BrcXqfjQ.js => AnimatePresence-CpnHckGS.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{EntitiesPagesView-CRcue4RN.js => EntitiesPagesView-DShidmI8.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{EntityStore-B1wVZ1VC.js => EntityStore-CHE3-bsC.js} (92%) rename docker/web/nspanelmanager/web/react-components/dist/{InitialSetup-DXdZ9lbH.js => InitialSetup-p38u0OlE.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{Logs-CetI0u-X.js => Logs-B094dObe.js} (97%) rename docker/web/nspanelmanager/web/react-components/dist/{MultiStep_AddEditEntity-BmADEvMy.js => MultiStep_AddEditEntity-xcopfTe5.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{NSPanelToastContainer-DqBiCYgm.js => NSPanelToastContainer-D677tDZJ.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{NSPanelsView-NSgV8rtx.js => NSPanelsView-1YvY26NZ.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{RoomPage-Bu2HHqaj.js => RoomPage-CMRDvbEM.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{RoomsView-COctz1MN.js => RoomsView-qN1A3y9X.js} (98%) rename docker/web/nspanelmanager/web/react-components/dist/{SettingsPage-Crubx4dI.js => SettingsPage-CzrUBqYz.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{SettingsStore-BRAdTFqa.js => SettingsStore-msVzBcHM.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{Sidebar-TExSla66.js => Sidebar-CHcoOcQs.js} (98%) rename docker/web/nspanelmanager/web/react-components/dist/{StompStore-BKQe4lAO.js => StompStore-Bh-Guhla.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{Warnings-B6qeeYwB.js => Warnings-D5nCet1X.js} (95%) rename docker/web/nspanelmanager/web/react-components/dist/{fields-OWlKSje3.js => fields-Dr1KI0Cj.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{index.esm-k48P7boK.js => index.esm-CnTf2rLv.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{layout-UB6ft_05.js => layout-HS0oHCMJ.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{main-DArmUgNn.js => main-FKp56mKw.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{mdi-C7m9AGig.js => mdi-Cr6PIsRR.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{proxy-BZTzkADl.js => proxy-BQYsYRjY.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{react-Y4ytZYw3.js => react-Cm4z11-B.js} (96%) rename docker/web/nspanelmanager/web/react-components/dist/{react-select.esm-B911rKmb.js => react-select.esm-CbdimKhg.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{sortable-9KjXuaJO.js => sortable-Ke3drO00.js} (99%) rename docker/web/nspanelmanager/web/react-components/dist/{use-spring-COy4hU03.js => use-spring-BsypnnSW.js} (98%) diff --git a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json index 96930e791..474423a59 100755 --- a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json +++ b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json @@ -1,259 +1,259 @@ { - "_AnimatePresence-BrcXqfjQ.js": { - "file": "AnimatePresence-BrcXqfjQ.js", + "_AnimatePresence-CpnHckGS.js": { + "file": "AnimatePresence-CpnHckGS.js", "name": "AnimatePresence", "imports": [ "src/main.tsx", - "_proxy-BZTzkADl.js" + "_proxy-BQYsYRjY.js" ] }, - "_EntityStore-B1wVZ1VC.js": { - "file": "EntityStore-B1wVZ1VC.js", + "_EntityStore-CHE3-bsC.js": { + "file": "EntityStore-CHE3-bsC.js", "name": "EntityStore", "imports": [ - "_react-Y4ytZYw3.js", - "_NSPanelToastContainer-DqBiCYgm.js", - "_StompStore-BKQe4lAO.js" + "_react-Cm4z11-B.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_StompStore-Bh-Guhla.js" ] }, - "_MultiStep_AddEditEntity-BmADEvMy.js": { - "file": "MultiStep_AddEditEntity-BmADEvMy.js", + "_MultiStep_AddEditEntity-xcopfTe5.js": { + "file": "MultiStep_AddEditEntity-xcopfTe5.js", "name": "MultiStep_AddEditEntity", "imports": [ "src/main.tsx", - "_react-Y4ytZYw3.js", - "_SettingsStore-BRAdTFqa.js", - "_react-select.esm-B911rKmb.js", - "_index.esm-k48P7boK.js", - "_NSPanelToastContainer-DqBiCYgm.js", - "_proxy-BZTzkADl.js", - "_AnimatePresence-BrcXqfjQ.js" + "_react-Cm4z11-B.js", + "_SettingsStore-msVzBcHM.js", + "_react-select.esm-CbdimKhg.js", + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_proxy-BQYsYRjY.js", + "_AnimatePresence-CpnHckGS.js" ] }, - "_NSPanelToastContainer-DqBiCYgm.js": { - "file": "NSPanelToastContainer-DqBiCYgm.js", + "_NSPanelToastContainer-D677tDZJ.js": { + "file": "NSPanelToastContainer-D677tDZJ.js", "name": "NSPanelToastContainer", "imports": [ "src/main.tsx" ] }, - "_SettingsStore-BRAdTFqa.js": { - "file": "SettingsStore-BRAdTFqa.js", + "_SettingsStore-msVzBcHM.js": { + "file": "SettingsStore-msVzBcHM.js", "name": "SettingsStore", "imports": [ - "_react-Y4ytZYw3.js" + "_react-Cm4z11-B.js" ] }, - "_StompStore-BKQe4lAO.js": { - "file": "StompStore-BKQe4lAO.js", + "_StompStore-Bh-Guhla.js": { + "file": "StompStore-Bh-Guhla.js", "name": "StompStore", "imports": [ "src/main.tsx", - "_react-Y4ytZYw3.js", - "_NSPanelToastContainer-DqBiCYgm.js" + "_react-Cm4z11-B.js", + "_NSPanelToastContainer-D677tDZJ.js" ] }, - "_fields-OWlKSje3.js": { - "file": "fields-OWlKSje3.js", + "_fields-Dr1KI0Cj.js": { + "file": "fields-Dr1KI0Cj.js", "name": "fields", "imports": [ "src/main.tsx", - "_index.esm-k48P7boK.js" + "_index.esm-CnTf2rLv.js" ] }, - "_index.esm-k48P7boK.js": { - "file": "index.esm-k48P7boK.js", + "_index.esm-CnTf2rLv.js": { + "file": "index.esm-CnTf2rLv.js", "name": "index.esm", "imports": [ "src/main.tsx" ] }, - "_layout-UB6ft_05.js": { - "file": "layout-UB6ft_05.js", + "_layout-HS0oHCMJ.js": { + "file": "layout-HS0oHCMJ.js", "name": "layout", "imports": [ "src/main.tsx" ] }, - "_mdi-C7m9AGig.js": { - "file": "mdi-C7m9AGig.js", + "_mdi-Cr6PIsRR.js": { + "file": "mdi-Cr6PIsRR.js", "name": "mdi", "imports": [ "src/main.tsx" ] }, - "_proxy-BZTzkADl.js": { - "file": "proxy-BZTzkADl.js", + "_proxy-BQYsYRjY.js": { + "file": "proxy-BQYsYRjY.js", "name": "proxy", "imports": [ "src/main.tsx" ] }, - "_react-Y4ytZYw3.js": { - "file": "react-Y4ytZYw3.js", + "_react-Cm4z11-B.js": { + "file": "react-Cm4z11-B.js", "name": "react", "imports": [ "src/main.tsx" ] }, - "_react-select.esm-B911rKmb.js": { - "file": "react-select.esm-B911rKmb.js", + "_react-select.esm-CbdimKhg.js": { + "file": "react-select.esm-CbdimKhg.js", "name": "react-select.esm", "imports": [ "src/main.tsx" ] }, - "_sortable-9KjXuaJO.js": { - "file": "sortable-9KjXuaJO.js", + "_sortable-Ke3drO00.js": { + "file": "sortable-Ke3drO00.js", "name": "sortable", "imports": [ "src/main.tsx" ] }, - "_use-spring-COy4hU03.js": { - "file": "use-spring-COy4hU03.js", + "_use-spring-BsypnnSW.js": { + "file": "use-spring-BsypnnSW.js", "name": "use-spring", "imports": [ "src/main.tsx", - "_proxy-BZTzkADl.js" + "_proxy-BQYsYRjY.js" ] }, "src/components/EntitiesPage/EntitiesPagesView.tsx": { - "file": "EntitiesPagesView-CRcue4RN.js", + "file": "EntitiesPagesView-DShidmI8.js", "name": "EntitiesPagesView", "src": "src/components/EntitiesPage/EntitiesPagesView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-9KjXuaJO.js", - "_react-Y4ytZYw3.js", - "_MultiStep_AddEditEntity-BmADEvMy.js" + "_sortable-Ke3drO00.js", + "_react-Cm4z11-B.js", + "_MultiStep_AddEditEntity-xcopfTe5.js" ] }, "src/components/IndexPage/NSPanelsView.tsx": { - "file": "NSPanelsView-NSgV8rtx.js", + "file": "NSPanelsView-1YvY26NZ.js", "name": "NSPanelsView", "src": "src/components/IndexPage/NSPanelsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_react-select.esm-B911rKmb.js", - "_NSPanelToastContainer-DqBiCYgm.js", - "_proxy-BZTzkADl.js", - "_use-spring-COy4hU03.js", - "_StompStore-BKQe4lAO.js", - "_EntityStore-B1wVZ1VC.js", - "_mdi-C7m9AGig.js" + "_react-select.esm-CbdimKhg.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_proxy-BQYsYRjY.js", + "_use-spring-BsypnnSW.js", + "_StompStore-Bh-Guhla.js", + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js" ] }, "src/components/InitialSetup/InitialSetup.tsx": { - "file": "InitialSetup-DXdZ9lbH.js", + "file": "InitialSetup-p38u0OlE.js", "name": "InitialSetup", "src": "src/components/InitialSetup/InitialSetup.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_index.esm-k48P7boK.js", - "_NSPanelToastContainer-DqBiCYgm.js", - "_proxy-BZTzkADl.js", - "_AnimatePresence-BrcXqfjQ.js", - "_mdi-C7m9AGig.js", - "_layout-UB6ft_05.js" + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_proxy-BQYsYRjY.js", + "_AnimatePresence-CpnHckGS.js", + "_mdi-Cr6PIsRR.js", + "_layout-HS0oHCMJ.js" ] }, "src/components/NSPanelPage/Logs.tsx": { - "file": "Logs-CetI0u-X.js", + "file": "Logs-B094dObe.js", "name": "Logs", "src": "src/components/NSPanelPage/Logs.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_SettingsStore-BRAdTFqa.js", - "_StompStore-BKQe4lAO.js" + "_SettingsStore-msVzBcHM.js", + "_StompStore-Bh-Guhla.js" ] }, "src/components/NSPanelPage/Sidebar.tsx": { - "file": "Sidebar-TExSla66.js", + "file": "Sidebar-CHcoOcQs.js", "name": "Sidebar", "src": "src/components/NSPanelPage/Sidebar.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_NSPanelToastContainer-DqBiCYgm.js", - "_StompStore-BKQe4lAO.js", - "_EntityStore-B1wVZ1VC.js", - "_mdi-C7m9AGig.js" + "_NSPanelToastContainer-D677tDZJ.js", + "_StompStore-Bh-Guhla.js", + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js" ] }, "src/components/NSPanelPage/Warnings.tsx": { - "file": "Warnings-B6qeeYwB.js", + "file": "Warnings-D5nCet1X.js", "name": "Warnings", "src": "src/components/NSPanelPage/Warnings.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_EntityStore-B1wVZ1VC.js", - "_mdi-C7m9AGig.js" + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js" ] }, "src/components/RoomPage/RoomPage.tsx": { - "file": "RoomPage-Bu2HHqaj.js", + "file": "RoomPage-CMRDvbEM.js", "name": "RoomPage", "src": "src/components/RoomPage/RoomPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_MultiStep_AddEditEntity-BmADEvMy.js", - "_react-select.esm-B911rKmb.js", - "_index.esm-k48P7boK.js", - "_NSPanelToastContainer-DqBiCYgm.js", + "_MultiStep_AddEditEntity-xcopfTe5.js", + "_react-select.esm-CbdimKhg.js", + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", - "_StompStore-BKQe4lAO.js", - "_EntityStore-B1wVZ1VC.js", - "_mdi-C7m9AGig.js" + "_StompStore-Bh-Guhla.js", + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js" ] }, "src/components/RoomsPage/RoomsView.tsx": { - "file": "RoomsView-COctz1MN.js", + "file": "RoomsView-qN1A3y9X.js", "name": "RoomsView", "src": "src/components/RoomsPage/RoomsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-9KjXuaJO.js", - "_index.esm-k48P7boK.js", - "_NSPanelToastContainer-DqBiCYgm.js", - "_proxy-BZTzkADl.js", - "_use-spring-COy4hU03.js", - "_EntityStore-B1wVZ1VC.js", - "_mdi-C7m9AGig.js", - "_layout-UB6ft_05.js", - "_fields-OWlKSje3.js" + "_sortable-Ke3drO00.js", + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_proxy-BQYsYRjY.js", + "_use-spring-BsypnnSW.js", + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js", + "_layout-HS0oHCMJ.js", + "_fields-Dr1KI0Cj.js" ] }, "src/components/SettingsPage/SettingsPage.tsx": { - "file": "SettingsPage-Crubx4dI.js", + "file": "SettingsPage-CzrUBqYz.js", "name": "SettingsPage", "src": "src/components/SettingsPage/SettingsPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_index.esm-k48P7boK.js", - "_NSPanelToastContainer-DqBiCYgm.js", - "_layout-UB6ft_05.js", - "_fields-OWlKSje3.js" + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_layout-HS0oHCMJ.js", + "_fields-Dr1KI0Cj.js" ] }, "src/main.tsx": { - "file": "main-DArmUgNn.js", + "file": "main-FKp56mKw.js", "name": "main", "src": "src/main.tsx", "isEntry": true, "dynamicImports": [ - "_MultiStep_AddEditEntity-BmADEvMy.js", + "_MultiStep_AddEditEntity-xcopfTe5.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", "src/components/IndexPage/NSPanelsView.tsx", - "_NSPanelToastContainer-DqBiCYgm.js", + "_NSPanelToastContainer-D677tDZJ.js", "src/components/InitialSetup/InitialSetup.tsx", "src/components/NSPanelPage/Sidebar.tsx", "src/components/NSPanelPage/Warnings.tsx", diff --git a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-BrcXqfjQ.js b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CpnHckGS.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-BrcXqfjQ.js rename to docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CpnHckGS.js index 83621a323..341044942 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-BrcXqfjQ.js +++ b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CpnHckGS.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-BZTzkADl.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-BQYsYRjY.js"; //#region node_modules/framer-motion/dist/es/utils/use-composed-ref.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-CRcue4RN.js b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DShidmI8.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-CRcue4RN.js rename to docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DShidmI8.js index 450dbbcb9..fba81cc39 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-CRcue4RN.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DShidmI8.js @@ -1,7 +1,7 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-9KjXuaJO.js"; -import { t as create } from "./react-Y4ytZYw3.js"; -import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-BmADEvMy.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-Ke3drO00.js"; +import { t as create } from "./react-Cm4z11-B.js"; +import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-xcopfTe5.js"; //#region src/components/EntitiesPage/GenericEntityBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-B1wVZ1VC.js b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-CHE3-bsC.js similarity index 92% rename from docker/web/nspanelmanager/web/react-components/dist/EntityStore-B1wVZ1VC.js rename to docker/web/nspanelmanager/web/react-components/dist/EntityStore-CHE3-bsC.js index 1afe828ee..5ce29ab90 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-B1wVZ1VC.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-CHE3-bsC.js @@ -1,6 +1,6 @@ -import { t as create } from "./react-Y4ytZYw3.js"; -import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; -import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; +import { t as create } from "./react-Cm4z11-B.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; //#region src/stores/EntityStore.ts var nspanel_stomp_status_update_callback = (message) => { const json_data = JSON.parse(message.body); diff --git a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DXdZ9lbH.js b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-p38u0OlE.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DXdZ9lbH.js rename to docker/web/nspanelmanager/web/react-components/dist/InitialSetup-p38u0OlE.js index eb24d67ff..6c1aea277 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DXdZ9lbH.js +++ b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-p38u0OlE.js @@ -1,10 +1,10 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { s as useForm } from "./index.esm-k48P7boK.js"; -import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; -import { t as motion } from "./proxy-BZTzkADl.js"; -import { t as AnimatePresence } from "./AnimatePresence-BrcXqfjQ.js"; -import { i as mdiInformationOutline, x as require_Icon } from "./mdi-C7m9AGig.js"; -import { i as api, t as Alert } from "./layout-UB6ft_05.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as motion } from "./proxy-BQYsYRjY.js"; +import { t as AnimatePresence } from "./AnimatePresence-CpnHckGS.js"; +import { i as mdiInformationOutline, x as require_Icon } from "./mdi-Cr6PIsRR.js"; +import { i as api, t as Alert } from "./layout-HS0oHCMJ.js"; //#region src/components/InitialSetup/Step1_Welcome.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); @@ -820,7 +820,7 @@ var Step7_Finished = ({ form, prevStep, isHomeAssistantAddon, dialogRef }) => { }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "mt-2 text-center", - children: "Initial setup is now finished. If you have any NSPanels already flashed and connected to the same MQTT broker they should show up automatically. In case they do not, there is the documentation and also a discord where you can get help. There is also the Github page where you can report issues and" + children: "Initial setup is now finished. If you have any NSPanels already flashed and connected to the same MQTT broker they should show up automatically. In case they do not, there is the documentation and also a discord where you can get help. There is also the Github page where you can report issues and contribute." }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "my-2 text-center font-bold", diff --git a/docker/web/nspanelmanager/web/react-components/dist/Logs-CetI0u-X.js b/docker/web/nspanelmanager/web/react-components/dist/Logs-B094dObe.js similarity index 97% rename from docker/web/nspanelmanager/web/react-components/dist/Logs-CetI0u-X.js rename to docker/web/nspanelmanager/web/react-components/dist/Logs-B094dObe.js index c27a420ee..e563a34a9 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Logs-CetI0u-X.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Logs-B094dObe.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { t as useSettingsStore } from "./SettingsStore-BRAdTFqa.js"; -import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { t as useSettingsStore } from "./SettingsStore-msVzBcHM.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; //#region src/components/NSPanelPage/Logs.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-BmADEvMy.js b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-xcopfTe5.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-BmADEvMy.js rename to docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-xcopfTe5.js index 55fe03f51..c49180932 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-BmADEvMy.js +++ b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-xcopfTe5.js @@ -1,11 +1,11 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { t as create } from "./react-Y4ytZYw3.js"; -import { t as useSettingsStore } from "./SettingsStore-BRAdTFqa.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-B911rKmb.js"; -import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-k48P7boK.js"; -import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; -import { t as motion } from "./proxy-BZTzkADl.js"; -import { t as AnimatePresence } from "./AnimatePresence-BrcXqfjQ.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { t as create } from "./react-Cm4z11-B.js"; +import { t as useSettingsStore } from "./SettingsStore-msVzBcHM.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-CbdimKhg.js"; +import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as motion } from "./proxy-BQYsYRjY.js"; +import { t as AnimatePresence } from "./AnimatePresence-CpnHckGS.js"; //#region src/stores/EntitiesPagesStore.ts function getCookie$1(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DqBiCYgm.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-D677tDZJ.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DqBiCYgm.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-D677tDZJ.js index 2b319ac7f..4748dc376 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DqBiCYgm.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-D677tDZJ.js @@ -1,4 +1,4 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; //#region node_modules/clsx/dist/clsx.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); function r(e) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-NSgV8rtx.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-1YvY26NZ.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-NSgV8rtx.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-1YvY26NZ.js index 12b33a887..bc4e2451f 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-NSgV8rtx.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-1YvY26NZ.js @@ -1,11 +1,11 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-B911rKmb.js"; -import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; -import { t as motion } from "./proxy-BZTzkADl.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-COy4hU03.js"; -import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; -import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-C7m9AGig.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-CbdimKhg.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as motion } from "./proxy-BQYsYRjY.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BsypnnSW.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-Cr6PIsRR.js"; //#region src/components/IndexPage/NSPanelBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-Bu2HHqaj.js b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-CMRDvbEM.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/RoomPage-Bu2HHqaj.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomPage-CMRDvbEM.js index eed578607..8d7037eae 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-Bu2HHqaj.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-CMRDvbEM.js @@ -1,12 +1,12 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-BmADEvMy.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-B911rKmb.js"; -import { l as useWatch, s as useForm } from "./index.esm-k48P7boK.js"; -import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; -import EntitiesPagesView from "./EntitiesPagesView-CRcue4RN.js"; -import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; -import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; -import { d as mdiTextShort, x as require_Icon } from "./mdi-C7m9AGig.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-xcopfTe5.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-CbdimKhg.js"; +import { l as useWatch, s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import EntitiesPagesView from "./EntitiesPagesView-DShidmI8.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { d as mdiTextShort, x as require_Icon } from "./mdi-Cr6PIsRR.js"; //#region src/components/RoomPage/RoomPage.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-COctz1MN.js b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-qN1A3y9X.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/RoomsView-COctz1MN.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomsView-qN1A3y9X.js index 769d72982..d0c9fb41c 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-COctz1MN.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-qN1A3y9X.js @@ -1,13 +1,13 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { r as DragDropProvider, t as useSortable } from "./sortable-9KjXuaJO.js"; -import { n as FormProvider, s as useForm } from "./index.esm-k48P7boK.js"; -import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; -import { t as motion } from "./proxy-BZTzkADl.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-COy4hU03.js"; -import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; -import { o as mdiMenu, x as require_Icon } from "./mdi-C7m9AGig.js"; -import { i as api, t as Alert } from "./layout-UB6ft_05.js"; -import { a as TextInput } from "./fields-OWlKSje3.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { r as DragDropProvider, t as useSortable } from "./sortable-Ke3drO00.js"; +import { n as FormProvider, s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as motion } from "./proxy-BQYsYRjY.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BsypnnSW.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { o as mdiMenu, x as require_Icon } from "./mdi-Cr6PIsRR.js"; +import { i as api, t as Alert } from "./layout-HS0oHCMJ.js"; +import { a as TextInput } from "./fields-Dr1KI0Cj.js"; //#region src/components/RoomsPage/RoomBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-Crubx4dI.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-CzrUBqYz.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsPage-Crubx4dI.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsPage-CzrUBqYz.js index 958309bdb..b94b6cb76 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-Crubx4dI.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-CzrUBqYz.js @@ -1,8 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-k48P7boK.js"; -import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; -import { a as getCookie, i as api, n as Card, r as Row, t as Alert } from "./layout-UB6ft_05.js"; -import { a as TextInput$1, i as Select$1, n as RadioGroup$1, r as SecretInput$1, t as NumberInput$1 } from "./fields-OWlKSje3.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { a as getCookie, i as api, n as Card, r as Row, t as Alert } from "./layout-HS0oHCMJ.js"; +import { a as TextInput$1, i as Select$1, n as RadioGroup$1, r as SecretInput$1, t as NumberInput$1 } from "./fields-Dr1KI0Cj.js"; //#region src/api/connectionTests.ts var import_react = /* @__PURE__ */ __toESM(require_react(), 1); async function errorMessage(response) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-BRAdTFqa.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-msVzBcHM.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsStore-BRAdTFqa.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsStore-msVzBcHM.js index 37423f201..3a6bb5b8b 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-BRAdTFqa.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-msVzBcHM.js @@ -1,4 +1,4 @@ -import { t as create } from "./react-Y4ytZYw3.js"; +import { t as create } from "./react-Cm4z11-B.js"; //#region src/stores/SettingsStore.ts function getCookie(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-TExSla66.js b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-CHcoOcQs.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/Sidebar-TExSla66.js rename to docker/web/nspanelmanager/web/react-components/dist/Sidebar-CHcoOcQs.js index f804d1583..5dc337f04 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-TExSla66.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-CHcoOcQs.js @@ -1,8 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { n as Notify } from "./NSPanelToastContainer-DqBiCYgm.js"; -import { t as useStompStore } from "./StompStore-BKQe4lAO.js"; -import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-C7m9AGig.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-Cr6PIsRR.js"; //#region src/components/NSPanelPage/Sidebar.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/StompStore-BKQe4lAO.js b/docker/web/nspanelmanager/web/react-components/dist/StompStore-Bh-Guhla.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/StompStore-BKQe4lAO.js rename to docker/web/nspanelmanager/web/react-components/dist/StompStore-Bh-Guhla.js index 175e869f8..1b04cd103 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/StompStore-BKQe4lAO.js +++ b/docker/web/nspanelmanager/web/react-components/dist/StompStore-Bh-Guhla.js @@ -1,6 +1,6 @@ -import { i as __commonJSMin } from "./main-DArmUgNn.js"; -import { t as create } from "./react-Y4ytZYw3.js"; -import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-DqBiCYgm.js"; +import { i as __commonJSMin } from "./main-FKp56mKw.js"; +import { t as create } from "./react-Cm4z11-B.js"; +import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-D677tDZJ.js"; //#region node_modules/tslib/tslib.es6.mjs /****************************************************************************** Copyright (c) Microsoft Corporation. diff --git a/docker/web/nspanelmanager/web/react-components/dist/Warnings-B6qeeYwB.js b/docker/web/nspanelmanager/web/react-components/dist/Warnings-D5nCet1X.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/Warnings-B6qeeYwB.js rename to docker/web/nspanelmanager/web/react-components/dist/Warnings-D5nCet1X.js index 5f9f54a7d..282d50e9c 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Warnings-B6qeeYwB.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Warnings-D5nCet1X.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { t as useEntityStatesStore } from "./EntityStore-B1wVZ1VC.js"; -import { x as require_Icon } from "./mdi-C7m9AGig.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { x as require_Icon } from "./mdi-Cr6PIsRR.js"; //#region src/components/NSPanelPage/Warnings.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/fields-OWlKSje3.js b/docker/web/nspanelmanager/web/react-components/dist/fields-Dr1KI0Cj.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/fields-OWlKSje3.js rename to docker/web/nspanelmanager/web/react-components/dist/fields-Dr1KI0Cj.js index e8acb557a..7f147bb62 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/fields-OWlKSje3.js +++ b/docker/web/nspanelmanager/web/react-components/dist/fields-Dr1KI0Cj.js @@ -1,5 +1,5 @@ -import { r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; -import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-k48P7boK.js"; +import { r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-CnTf2rLv.js"; require_react(); var import_jsx_runtime = require_jsx_runtime(); function Field({ name, label, hint, children }) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/index.esm-k48P7boK.js b/docker/web/nspanelmanager/web/react-components/dist/index.esm-CnTf2rLv.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/index.esm-k48P7boK.js rename to docker/web/nspanelmanager/web/react-components/dist/index.esm-CnTf2rLv.js index 68bf17436..475295e7c 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/index.esm-k48P7boK.js +++ b/docker/web/nspanelmanager/web/react-components/dist/index.esm-CnTf2rLv.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-DArmUgNn.js"; +import { c as __toESM, r as require_react } from "./main-FKp56mKw.js"; //#region node_modules/react-hook-form/dist/index.esm.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var isCheckBoxInput = (element) => element.type === "checkbox"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/layout-UB6ft_05.js b/docker/web/nspanelmanager/web/react-components/dist/layout-HS0oHCMJ.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/layout-UB6ft_05.js rename to docker/web/nspanelmanager/web/react-components/dist/layout-HS0oHCMJ.js index daede4b1c..f131b10be 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/layout-UB6ft_05.js +++ b/docker/web/nspanelmanager/web/react-components/dist/layout-HS0oHCMJ.js @@ -1,4 +1,4 @@ -import { r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; //#region node_modules/openapi-fetch/dist/index.mjs var PATH_PARAM_RE = /\{[^{}]+\}/g; var supportsRequestInitExt = () => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/main-DArmUgNn.js b/docker/web/nspanelmanager/web/react-components/dist/main-FKp56mKw.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/main-DArmUgNn.js rename to docker/web/nspanelmanager/web/react-components/dist/main-FKp56mKw.js index 47d80813a..71dff9542 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/main-DArmUgNn.js +++ b/docker/web/nspanelmanager/web/react-components/dist/main-FKp56mKw.js @@ -1,4 +1,4 @@ -const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-BmADEvMy.js","react-Y4ytZYw3.js","SettingsStore-BRAdTFqa.js","react-select.esm-B911rKmb.js","index.esm-k48P7boK.js","NSPanelToastContainer-DqBiCYgm.js","proxy-BZTzkADl.js","AnimatePresence-BrcXqfjQ.js","EntitiesPagesView-CRcue4RN.js","sortable-9KjXuaJO.js","NSPanelsView-NSgV8rtx.js","use-spring-COy4hU03.js","StompStore-BKQe4lAO.js","EntityStore-B1wVZ1VC.js","mdi-C7m9AGig.js","InitialSetup-DXdZ9lbH.js","layout-UB6ft_05.js","Sidebar-TExSla66.js","Warnings-B6qeeYwB.js","Logs-CetI0u-X.js","RoomPage-Bu2HHqaj.js","SettingsPage-Crubx4dI.js","fields-OWlKSje3.js","RoomsView-COctz1MN.js"])))=>i.map(i=>d[i]); +const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-xcopfTe5.js","react-Cm4z11-B.js","SettingsStore-msVzBcHM.js","react-select.esm-CbdimKhg.js","index.esm-CnTf2rLv.js","NSPanelToastContainer-D677tDZJ.js","proxy-BQYsYRjY.js","AnimatePresence-CpnHckGS.js","EntitiesPagesView-DShidmI8.js","sortable-Ke3drO00.js","NSPanelsView-1YvY26NZ.js","use-spring-BsypnnSW.js","StompStore-Bh-Guhla.js","EntityStore-CHE3-bsC.js","mdi-Cr6PIsRR.js","InitialSetup-p38u0OlE.js","layout-HS0oHCMJ.js","Sidebar-CHcoOcQs.js","Warnings-D5nCet1X.js","Logs-B094dObe.js","RoomPage-CMRDvbEM.js","SettingsPage-CzrUBqYz.js","fields-Dr1KI0Cj.js","RoomsView-qN1A3y9X.js"])))=>i.map(i=>d[i]); //#region \0rolldown/runtime.js var __create = Object.create; var __defProp = Object.defineProperty; @@ -10204,16 +10204,16 @@ var __vitePreload = function preload(baseModule, deps, importerUrl) { }; //#endregion //#region src/componentMap.tsx -var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-BmADEvMy.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); -var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-CRcue4RN.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); -var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-NSgV8rtx.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); -var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-DqBiCYgm.js").then((n) => n.t), [])); -var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-DXdZ9lbH.js"), __vite__mapDeps([15,4,5,6,7,14,16]))); -var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-TExSla66.js"), __vite__mapDeps([17,5,12,1,13,14]))); -var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-B6qeeYwB.js"), __vite__mapDeps([18,13,1,5,12,14]))); -var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-CetI0u-X.js"), __vite__mapDeps([19,2,1,12,5]))); -var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-Bu2HHqaj.js"), __vite__mapDeps([20,0,1,2,3,4,5,6,7,8,9,12,13,14]))); -var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-Crubx4dI.js"), __vite__mapDeps([21,4,5,16,22]))); +var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-xcopfTe5.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); +var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-DShidmI8.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); +var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-1YvY26NZ.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); +var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-D677tDZJ.js").then((n) => n.t), [])); +var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-p38u0OlE.js"), __vite__mapDeps([15,4,5,6,7,14,16]))); +var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-CHcoOcQs.js"), __vite__mapDeps([17,5,12,1,13,14]))); +var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-D5nCet1X.js"), __vite__mapDeps([18,13,1,5,12,14]))); +var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-B094dObe.js"), __vite__mapDeps([19,2,1,12,5]))); +var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-CMRDvbEM.js"), __vite__mapDeps([20,0,1,2,3,4,5,6,7,8,9,12,13,14]))); +var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-CzrUBqYz.js"), __vite__mapDeps([21,4,5,16,22]))); var componentMap = { MultiStep_AddEditEntity, EntitiesPagesView, @@ -10224,7 +10224,7 @@ var componentMap = { NSPanelWarnings, NSPanelLogs, RoomPage, - RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-COctz1MN.js"), __vite__mapDeps([23,9,4,5,6,11,13,1,12,14,16,22]))), + RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-qN1A3y9X.js"), __vite__mapDeps([23,9,4,5,6,11,13,1,12,14,16,22]))), SettingsPage }; //#endregion diff --git a/docker/web/nspanelmanager/web/react-components/dist/mdi-C7m9AGig.js b/docker/web/nspanelmanager/web/react-components/dist/mdi-Cr6PIsRR.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/mdi-C7m9AGig.js rename to docker/web/nspanelmanager/web/react-components/dist/mdi-Cr6PIsRR.js index 9ffcbaa74..37e30d6a3 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/mdi-C7m9AGig.js +++ b/docker/web/nspanelmanager/web/react-components/dist/mdi-Cr6PIsRR.js @@ -1,4 +1,4 @@ -import { i as __commonJSMin, r as require_react } from "./main-DArmUgNn.js"; +import { i as __commonJSMin, r as require_react } from "./main-FKp56mKw.js"; //#region node_modules/prop-types/lib/ReactPropTypesSecret.js /** * Copyright (c) 2013-present, Facebook, Inc. diff --git a/docker/web/nspanelmanager/web/react-components/dist/proxy-BZTzkADl.js b/docker/web/nspanelmanager/web/react-components/dist/proxy-BQYsYRjY.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/proxy-BZTzkADl.js rename to docker/web/nspanelmanager/web/react-components/dist/proxy-BQYsYRjY.js index 6b4a7071e..19fa0561a 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/proxy-BZTzkADl.js +++ b/docker/web/nspanelmanager/web/react-components/dist/proxy-BQYsYRjY.js @@ -1,4 +1,4 @@ -import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-FKp56mKw.js"; //#region node_modules/framer-motion/dist/es/context/LayoutGroupContext.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-Y4ytZYw3.js b/docker/web/nspanelmanager/web/react-components/dist/react-Cm4z11-B.js similarity index 96% rename from docker/web/nspanelmanager/web/react-components/dist/react-Y4ytZYw3.js rename to docker/web/nspanelmanager/web/react-components/dist/react-Cm4z11-B.js index 3e2bfecde..4950991a1 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-Y4ytZYw3.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-Cm4z11-B.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-DArmUgNn.js"; +import { c as __toESM, r as require_react } from "./main-FKp56mKw.js"; //#region node_modules/zustand/esm/vanilla.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var createStoreImpl = (createState) => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-B911rKmb.js b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-CbdimKhg.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/react-select.esm-B911rKmb.js rename to docker/web/nspanelmanager/web/react-components/dist/react-select.esm-CbdimKhg.js index c1e2779a3..4f340f2fc 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-B911rKmb.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-CbdimKhg.js @@ -1,4 +1,4 @@ -import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-DArmUgNn.js"; +import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-FKp56mKw.js"; //#region node_modules/@babel/runtime/helpers/esm/typeof.js function _typeof(o) { "@babel/helpers - typeof"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/sortable-9KjXuaJO.js b/docker/web/nspanelmanager/web/react-components/dist/sortable-Ke3drO00.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/sortable-9KjXuaJO.js rename to docker/web/nspanelmanager/web/react-components/dist/sortable-Ke3drO00.js index aebadaf24..a5e1a28ee 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/sortable-9KjXuaJO.js +++ b/docker/web/nspanelmanager/web/react-components/dist/sortable-Ke3drO00.js @@ -1,4 +1,4 @@ -import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-DArmUgNn.js"; +import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; //#region node_modules/@preact/signals-core/dist/signals-core.module.js var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var i = Symbol.for("preact-signals"); diff --git a/docker/web/nspanelmanager/web/react-components/dist/use-spring-COy4hU03.js b/docker/web/nspanelmanager/web/react-components/dist/use-spring-BsypnnSW.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/use-spring-COy4hU03.js rename to docker/web/nspanelmanager/web/react-components/dist/use-spring-BsypnnSW.js index 51813570b..2d3c69ade 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/use-spring-COy4hU03.js +++ b/docker/web/nspanelmanager/web/react-components/dist/use-spring-BsypnnSW.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react } from "./main-DArmUgNn.js"; -import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-BZTzkADl.js"; +import { c as __toESM, r as require_react } from "./main-FKp56mKw.js"; +import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-BQYsYRjY.js"; //#region node_modules/motion-dom/dist/es/utils/transform.mjs function transform(...args) { const useImmediate = !Array.isArray(args[0]); diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx index 99e1cef2a..228bdc02f 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx @@ -72,6 +72,7 @@ const Step7_Finished = ({

Initial setup is now finished. If you have any NSPanels already flashed and connected to the same MQTT broker they should show up automatically. In case they do not, there is the documentation and also a discord where you can get help. There is also the Github page where you can report issues and + contribute.

Thank you for your support and trust. Have fun and enjoy!

diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts index 1d2d06ea5..deb6804b2 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts @@ -1,6 +1,6 @@ import type { Settings, SettingsUpdateRequest } from "../../api/client"; -// The settings this page edits. Weather and time, and the theme, are edited elsewhere. +// The settings this initial setup guide edits. export const INITIAL_SETUP_FIELDS = [ "manager_address", "manager_port", diff --git a/docker/web/nspanelmanager/web/react-components/templates/scripts.html b/docker/web/nspanelmanager/web/react-components/templates/scripts.html index b2c50d21d..356d79050 100644 --- a/docker/web/nspanelmanager/web/react-components/templates/scripts.html +++ b/docker/web/nspanelmanager/web/react-components/templates/scripts.html @@ -1,2 +1,2 @@ {% load static %} - + From d51f2fb51259153f41b3bdac1ab6c4d492c1eea4 Mon Sep 17 00:00:00 2001 From: Tim Panajott Date: Sat, 14 Nov 2026 16:46:26 +0100 Subject: [PATCH 6/8] Rebuilt main.css --- .../nspanelmanager/web/static/css/main.css | 47 ------------------- 1 file changed, 47 deletions(-) diff --git a/docker/web/nspanelmanager/web/static/css/main.css b/docker/web/nspanelmanager/web/static/css/main.css index c68034c8c..9007eb758 100644 --- a/docker/web/nspanelmanager/web/static/css/main.css +++ b/docker/web/nspanelmanager/web/static/css/main.css @@ -3618,9 +3618,6 @@ .top-2\/3 { top: calc(2/3 * 100%); } - .top-3 { - top: calc(var(--spacing) * 3); - } .top-3\/3 { top: calc(3/3 * 100%); } @@ -3691,9 +3688,6 @@ .left-0 { left: calc(var(--spacing) * 0); } - .left-1 { - left: calc(var(--spacing) * 1); - } .left-1\/8 { left: calc(1/8 * 100%); } @@ -3703,39 +3697,21 @@ .left-2\/8 { left: calc(2/8 * 100%); } - .left-3 { - left: calc(var(--spacing) * 3); - } .left-3\/8 { left: calc(3/8 * 100%); } - .left-4 { - left: calc(var(--spacing) * 4); - } .left-4\/8 { left: calc(4/8 * 100%); } - .left-5 { - left: calc(var(--spacing) * 5); - } .left-5\/8 { left: calc(5/8 * 100%); } - .left-6 { - left: calc(var(--spacing) * 6); - } .left-6\/8 { left: calc(6/8 * 100%); } - .left-7 { - left: calc(var(--spacing) * 7); - } .left-7\/8 { left: calc(7/8 * 100%); } - .left-8 { - left: calc(var(--spacing) * 8); - } .left-8\/8 { left: calc(8/8 * 100%); } @@ -5830,9 +5806,6 @@ .max-h-0 { max-height: calc(var(--spacing) * 0); } - .max-h-11 { - max-height: calc(var(--spacing) * 11); - } .max-h-11\/12 { max-height: calc(11/12 * 100%); } @@ -5975,9 +5948,6 @@ .loading-xs { width: calc(var(--size-selector, 0.25rem) * 4); } - .w-1 { - width: calc(var(--spacing) * 1); - } .w-1\/2 { width: calc(1/2 * 100%); } @@ -6056,9 +6026,6 @@ .max-w-4xl { max-width: var(--container-4xl); } - .max-w-6 { - max-width: calc(var(--spacing) * 6); - } .max-w-6\/12 { max-width: calc(6/12 * 100%); } @@ -7445,9 +7412,6 @@ .border-transparent { border-color: transparent; } - .border-warning { - border-color: var(--color-warning); - } .border-warning\/50 { border-color: color-mix(in oklab, var(--color-warning) 50%, transparent); } @@ -7715,11 +7679,6 @@ .from-30\% { --tw-gradient-from-position: 30%; } - .via-accent { - --tw-gradient-via: var(--color-accent); - --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position); - --tw-gradient-stops: var(--tw-gradient-via-stops); - } .via-accent\/50 { --tw-gradient-via: color-mix(in oklab, var(--color-accent) 50%, transparent); --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position); @@ -8037,9 +7996,6 @@ font-size: 0.625rem; padding-inline: calc(0.25rem * 2 - var(--border)); } - .px-0 { - padding-inline: calc(var(--spacing) * 0); - } .px-0\.5 { padding-inline: calc(var(--spacing) * 0.5); } @@ -9041,9 +8997,6 @@ .shadow-initial { --tw-shadow-color: initial; } - .shadow-neutral { - --tw-shadow-color: var(--color-neutral); - } .shadow-neutral\/3 { --tw-shadow-color: color-mix(in oklab, var(--color-neutral) 3%, transparent); } From 047b2bb7c54722b122a1b3be00365262a990bccf Mon Sep 17 00:00:00 2001 From: Tim Panajott Date: Sun, 15 Nov 2026 20:02:03 +0100 Subject: [PATCH 7/8] Made it so that NSPanel internal state does not switch to "waiting" every reload_config call. Made it so that firmware, data file and GUI md5 checksums are only calculated if the mtime of that file has changed Fixed a bug where scenes regiered using the old HTMX setup were not loaded as they were defined as "nspm_scene" and the new ones are defined as "nspm" --- .../include/entity_manager/entity_manager.cpp | 5 +- .../mqtt_manager_config.cpp | 371 +++++++----------- .../mqtt_manager_config.hpp | 41 +- .../MQTTManager/include/nspanel/nspanel.cpp | 18 +- .../MQTTManager/include/nspanel/nspanel.hpp | 3 + docker/MQTTManager/src/main.cpp | 4 +- 6 files changed, 188 insertions(+), 254 deletions(-) diff --git a/docker/MQTTManager/include/entity_manager/entity_manager.cpp b/docker/MQTTManager/include/entity_manager/entity_manager.cpp index 97e2aad75..51688f519 100644 --- a/docker/MQTTManager/include/entity_manager/entity_manager.cpp +++ b/docker/MQTTManager/include/entity_manager/entity_manager.cpp @@ -170,7 +170,6 @@ void EntityManager::load_nspanels() { auto existing_nspanel = EntityManager::get_nspanel_by_id(nspanel_id); if (existing_nspanel) [[likely]] { (*existing_nspanel)->reload_config(); - (*existing_nspanel)->send_config(); } else { std::lock_guard mutex_guard(EntityManager::_nspanels_mutex); auto panel = std::shared_ptr(new NSPanel(nspanel_id)); @@ -368,7 +367,7 @@ void EntityManager::load_media_players() { void EntityManager::load_covers() { auto cover_ids = database_manager::database.select(&database_manager::Entity::id, sqlite_orm::from(), - sqlite_orm::where(sqlite_orm::glob(&database_manager::Entity::entity_type, "cover"))); + sqlite_orm::where(sqlite_orm::glob(&database_manager::Entity::entity_type, "cover"))); SPDLOG_INFO("Loading {} covers.", cover_ids.size()); // Check if any existing cover has been removed. @@ -489,7 +488,7 @@ void EntityManager::load_scenes() { SPDLOG_INFO("Scene {}::{} was found in database but not in config. Creating scene.", scene->get_id(), scene->get_name()); std::lock_guard mutex_guard(EntityManager::_entities_mutex); EntityManager::_entities.push_back(scene); - } else if (scene_settings.scene_type.compare("nspm_scene") == 0) { + } else if (scene_settings.scene_type.compare("nspm_scene") == 0 || scene_settings.scene_type.compare("nspm") == 0) { std::shared_ptr scene = std::shared_ptr(new NSPMScene(scene_settings.id)); SPDLOG_INFO("Scene {}::{} was found in database but not in config. Creating scene.", scene->get_id(), scene->get_name()); std::lock_guard mutex_guard(EntityManager::_entities_mutex); diff --git a/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.cpp b/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.cpp index 498eda8f1..bc65e2efe 100644 --- a/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.cpp +++ b/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.cpp @@ -2,6 +2,7 @@ #include "light/light.hpp" #include "openssl/evp.h" #include "web_helper/WebHelper.hpp" +#include #include #include #include @@ -15,6 +16,8 @@ #include #include #include +#include +#include #include #include #include @@ -30,6 +33,7 @@ #include #include #include +#include #include void MqttManagerConfig::load() { @@ -81,6 +85,7 @@ void MqttManagerConfig::load() { MqttManagerConfig::update_firmware_checksum(); MqttManagerConfig::update_tft_checksums(); + SPDLOG_DEBUG("Checksum calculation done."); MqttManagerConfig::populate_default_and_clean(); @@ -187,181 +192,107 @@ LightTurnOnBehaviour MqttManagerConfig::get_light_turn_on_behaviour() { } void MqttManagerConfig::update_firmware_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); SPDLOG_INFO("Updating/calculating MD5 checksums for all firmware files."); - // Update firmware checksum - auto firmware_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/firmware/sonoff/firmware.bin"); - if (firmware_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_firmware_sonoff = firmware_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for sonoff firmware was not able to be calculated."); - SPDLOG_INFO("Firmware checksum: {}", firmware_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for sonoff firmware was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for sonoff firmware!"); - } - - firmware_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/firmware/custom/firmware.bin"); - if (firmware_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_firmware_custom = firmware_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for custom firmware was not able to be calculated."); - SPDLOG_INFO("Firmware checksum: {}", firmware_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for custom firmware was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for custom firmware!"); - } - - // Update LittleFS checksum - auto littlefs_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/firmware/sonoff/data_file.bin"); - if (littlefs_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_littlefs_sonoff = littlefs_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for sonoff littlefs/data file was not able to be calculated."); - SPDLOG_INFO("LittleFS checksum: {}", littlefs_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for sonoff littlefs/data file was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for LittleFS!"); - } + std::vector files = { + "/usr/src/app/nspanelmanager/firmware/sonoff/firmware.bin", + "/usr/src/app/nspanelmanager/firmware/custom/firmware.bin", + "/usr/src/app/nspanelmanager/firmware/sonoff/data_file.bin", + "/usr/src/app/nspanelmanager/firmware/custom/data_file.bin", + }; + + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + bool recalculate_file = false; + for (auto &file : files) { + // Check if a cached key already exists for the file. + bool file_in_map = MqttManagerConfig::_checksums.find(file) != MqttManagerConfig::_checksums.end(); + std::expected file_mtime; + if (file_in_map) [[likely]] { + file_mtime = MqttManagerConfig::_get_file_mtime(file); + if (file_mtime.has_value()) [[likely]] { + if (MqttManagerConfig::_checksums[file].mtime != *file_mtime) { + recalculate_file = true; + } else [[likely]] { + recalculate_file = false; + } + } else { + SPDLOG_ERROR("Failed to check mtime for file '{}'. Will try to recalculate file checksum anyway.", file); + } + } else { + recalculate_file = true; + } - littlefs_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/firmware/custom/data_file.bin"); - if (littlefs_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_littlefs_custom = littlefs_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for custom littlefs/data file was not able to be calculated."); - SPDLOG_INFO("LittleFS checksum: {}", littlefs_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for custom littlefs/data file was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for LittleFS!"); + if (recalculate_file) [[unlikely]] { + auto checksum = MqttManagerConfig::_get_file_md5_checksum(file); + if (checksum.has_value()) [[likely]] { + MqttManagerConfig::_checksums[file] = { + .mtime = file_mtime.has_value() ? std::optional{*file_mtime} : std::nullopt, + .checksum = *checksum, + }; + } else { + SPDLOG_ERROR("Failed to calculate checksum for file '{}'. Error: {}", file, checksum.error()); + } + } } } void MqttManagerConfig::update_tft_checksums() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); SPDLOG_INFO("Updating/calculating MD5 checksums for all .tft GUI files."); - auto eu_tft1_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft1/gui.tft"); - if (eu_tft1_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_eu_tft1 = eu_tft1_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for EU tft1 was not able to be calculated."); - SPDLOG_INFO("EU TFT1 GUI file checksum: {}", eu_tft1_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for EU tft1 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for EU TFT1 Nextion GUI file!"); - } - - auto eu_tft2_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft2/gui.tft"); - if (eu_tft2_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_eu_tft2 = eu_tft2_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for EU tft2 was not able to be calculated."); - SPDLOG_INFO("EU TFT2 GUI file checksum: {}", eu_tft2_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for EU tft2 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for EU TFT2 Nextion GUI file!"); - } - - auto eu_tft3_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft3/gui.tft"); - if (eu_tft3_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_eu_tft3 = eu_tft3_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for EU tft3 was not able to be calculated."); - SPDLOG_INFO("EU TFT3 GUI file checksum: {}", eu_tft3_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for EU tft3 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for EU TFT3 Nextion GUI file!"); - } - - auto eu_tft4_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft4/gui.tft"); - if (eu_tft4_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_eu_tft4 = eu_tft4_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for EU tft4 was not able to be calculated."); - SPDLOG_INFO("EU TFT4 GUI file checksum: {}", eu_tft4_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for EU tft4 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for EU TFT4 Nextion GUI file!"); - } - - auto us_tft1_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft1/gui.tft"); - if (us_tft1_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_tft1 = us_tft1_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft1 was not able to be calculated."); - SPDLOG_INFO("US TFT1 GUI file checksum: {}", us_tft1_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft1 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US TFT1 Nextion GUI file!"); - } - - auto us_tft2_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft2/gui.tft"); - if (us_tft2_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_tft2 = us_tft2_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft2 was not able to be calculated."); - SPDLOG_INFO("US TFT2 GUI file checksum: {}", us_tft2_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft2 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US TFT2 Nextion GUI file!"); - } - - auto us_tft3_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft3/gui.tft"); - if (us_tft3_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_tft3 = us_tft3_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft3 was not able to be calculated."); - SPDLOG_INFO("US TFT3 GUI file checksum: {}", us_tft3_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft3 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US TFT3 Nextion GUI file!"); - } - - auto us_tft4_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft4/gui.tft"); - if (us_tft4_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_tft4 = us_tft4_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft4 was not able to be calculated."); - SPDLOG_INFO("US TFT4 GUI file checksum: {}", us_tft4_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft4 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US TFT4 Nextion GUI file!"); - } - - auto us_tft1_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft"); - if (us_tft1_horizontal_mirrored_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft1 = us_tft1_horizontal_mirrored_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft1 (mirrored) was not able to be calculated."); - SPDLOG_INFO("US landscape mirrored TFT1 GUI file checksum: {}", us_tft1_horizontal_mirrored_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft1 (mirrored) was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT1 Nextion GUI file!"); - } - - auto us_tft2_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft"); - if (us_tft2_horizontal_mirrored_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft2 = us_tft2_horizontal_mirrored_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft2 (mirrored) was not able to be calculated."); - SPDLOG_INFO("US landscape mirrored TFT2 GUI file checksum: {}", us_tft2_horizontal_mirrored_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft2 (mirrored) was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT2 Nextion GUI file!"); - } - - auto us_tft3_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft"); - if (us_tft3_horizontal_mirrored_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft3 = us_tft3_horizontal_mirrored_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft3 (mirrored) was not able to be calculated."); - SPDLOG_INFO("US landscape mirrored TFT3 GUI file checksum: {}", us_tft3_horizontal_mirrored_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft3 (mirrored) was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT3 Nextion GUI file!"); - } + std::vector files = { + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft1/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft2/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft3/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft4/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft1/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft2/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft3/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft4/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft", + }; + + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + bool recalculate_file = false; + for (auto &file : files) { + // Check if a cached key already exists for the file. + bool file_in_map = MqttManagerConfig::_checksums.find(file) != MqttManagerConfig::_checksums.end(); + std::expected file_mtime; + if (file_in_map) [[likely]] { + file_mtime = MqttManagerConfig::_get_file_mtime(file); + if (file_mtime.has_value()) [[likely]] { + if (MqttManagerConfig::_checksums[file].mtime != *file_mtime) { + recalculate_file = true; + } else [[likely]] { + recalculate_file = false; + } + } else { + SPDLOG_ERROR("Failed to check mtime for file '{}'. Will try to recalculate file checksum anyway.", file); + } + } else { + recalculate_file = true; + } - auto us_tft4_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft"); - if (us_tft4_horizontal_mirrored_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft4 = us_tft4_horizontal_mirrored_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft4 (mirrored) was not able to be calculated."); - SPDLOG_INFO("US landscape mirrored TFT4 GUI file checksum: {}", us_tft4_horizontal_mirrored_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft4 (mirrored) was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT4 Nextion GUI file!"); + if (recalculate_file) [[unlikely]] { + auto checksum = MqttManagerConfig::_get_file_md5_checksum(file); + if (checksum.has_value()) [[likely]] { + MqttManagerConfig::_checksums[file] = { + .mtime = file_mtime.has_value() ? std::optional{*file_mtime} : std::nullopt, + .checksum = *checksum, + }; + } else { + SPDLOG_ERROR("Failed to calculate checksum for file '{}'. Error: {}", file, checksum.error()); + } + } } } -std::optional MqttManagerConfig::_get_file_md5_checksum(std::string file_path) { +std::expected MqttManagerConfig::_get_file_md5_checksum(std::string file_path) { std::ifstream file(file_path, std::ifstream::binary); if (!file) { - return std::nullopt; + return std::unexpected("Failed to open file."); } EVP_MD_CTX *mdctx; @@ -372,17 +303,11 @@ std::optional MqttManagerConfig::_get_file_md5_checksum(std::string mdctx = EVP_MD_CTX_new(); EVP_DigestInit_ex(mdctx, EVP_md5(), NULL); - // MD5_Update - // char buffer[1024]; - // while (file.read(buffer, 1024)) { - // EVP_DigestUpdate(mdctx, buffer, file.gcount()); - // } - unsigned char buffer[8192]; while (file.read(reinterpret_cast(buffer), sizeof(buffer)) || file.gcount() > 0) { if (EVP_DigestUpdate(mdctx, buffer, file.gcount()) != 1) { EVP_MD_CTX_free(mdctx); - return ""; + return std::unexpected("Failed to update EVP digiest while processing file"); } } @@ -391,13 +316,6 @@ std::optional MqttManagerConfig::_get_file_md5_checksum(std::string EVP_DigestFinal_ex(mdctx, md5_digest, &md5_digest_len); EVP_MD_CTX_free(mdctx); - // char tmp[3] = {0}; - // std::string return_string; - // for (int i = 0; i < md5_digest_len; i++) { - // sprintf(tmp, "%02x", md5_digest[i]); - // return_string.append(tmp); - // } - std::stringstream ss; ss << std::hex << std::uppercase << std::setfill('0'); for (int i = 0; i < EVP_MD_size(EVP_md5()); i++) { @@ -408,132 +326,141 @@ std::optional MqttManagerConfig::_get_file_md5_checksum(std::string return boost::algorithm::to_lower_copy(ss.str()); // Convert to lowercase as the md5 checksum calculated in Django is calculated with lower case latters. } +std::expected MqttManagerConfig::_get_file_mtime(std::string file_path) { + std::error_code ec; + auto mtime = std::filesystem::last_write_time(file_path, ec); + if (ec) [[unlikely]] { + return std::unexpected(fmt::format("Failed to get last write time (mtime) file file '{}'. Error code: '{}', message: {}", file_path, ec.value(), ec.message())); + } + return mtime; +} + std::expected MqttManagerConfig::get_firmware_sonoff_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_firmware_sonoff.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/firmware/sonoff/firmware.bin") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_firmware_sonoff; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/firmware/sonoff/firmware.bin"].checksum; } std::expected MqttManagerConfig::get_firmware_custom_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_firmware_custom.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/firmware/custom/firmware.bin") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_firmware_custom; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/firmware/custom/firmware.bin"].checksum; } std::expected MqttManagerConfig::get_littlefs_sonoff_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_littlefs_sonoff.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/firmware/sonoff/data_file.bin") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_littlefs_sonoff; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/firmware/sonoff/data_file.bin"].checksum; } std::expected MqttManagerConfig::get_littlefs_custom_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_littlefs_custom.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/firmware/custom/data_file.bin") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_littlefs_custom; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/firmware/custom/data_file.bin"].checksum; } std::expected MqttManagerConfig::get_eu_tft1_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_eu_tft1.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft1/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_eu_tft1; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft1/gui.tft"].checksum; } std::expected MqttManagerConfig::get_eu_tft2_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_eu_tft2.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft2/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_eu_tft2; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft2/gui.tft"].checksum; } std::expected MqttManagerConfig::get_eu_tft3_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_eu_tft3.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft3/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_eu_tft3; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft3/gui.tft"].checksum; } std::expected MqttManagerConfig::get_eu_tft4_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_eu_tft4.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft4/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_eu_tft4; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft4/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_tft1_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_tft1.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft1/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_tft1; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft1/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_tft2_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_tft2.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft2/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_tft2; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft2/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_tft3_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_tft3.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft3/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_tft3; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft3/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_tft4_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_tft4.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft4/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_tft4; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft4/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_horizontal_mirrored_tft1_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft1.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft1; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_horizontal_mirrored_tft2_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft2.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft2; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_horizontal_mirrored_tft3_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft3.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft3; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_horizontal_mirrored_tft4_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft4.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft4; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft"].checksum; } std::string MqttManagerConfig::read_posix_tz_rule(const std::string &tzif_path) { diff --git a/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.hpp b/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.hpp index f8ce20763..46b331c3b 100644 --- a/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.hpp +++ b/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.hpp @@ -1,14 +1,17 @@ #ifndef MQTTMANAGER_CONFIG_HPP #define MQTTMANAGER_CONFIG_HPP -#include "light/light.hpp" +#include "filesystem" #include #include #include +#include #include #include +#include #include #include #include +#include #include #include #include @@ -167,24 +170,24 @@ class MqttManagerConfig { static inline LightTurnOnBehaviour _light_turn_on_behaviour = LightTurnOnBehaviour::COLOR_TEMPERATURE; - static std::optional _get_file_md5_checksum(std::string file_path); - static inline std::mutex _md5_checksum_files_mutex; - static inline std::string _md5_checksum_firmware_sonoff; - static inline std::string _md5_checksum_firmware_custom; - static inline std::string _md5_checksum_littlefs_sonoff; - static inline std::string _md5_checksum_littlefs_custom; - static inline std::string _md5_checksum_eu_tft1; - static inline std::string _md5_checksum_eu_tft2; - static inline std::string _md5_checksum_eu_tft3; - static inline std::string _md5_checksum_eu_tft4; - static inline std::string _md5_checksum_us_tft1; - static inline std::string _md5_checksum_us_tft2; - static inline std::string _md5_checksum_us_tft3; - static inline std::string _md5_checksum_us_tft4; - static inline std::string _md5_checksum_us_horizontal_mirrored_tft1; - static inline std::string _md5_checksum_us_horizontal_mirrored_tft2; - static inline std::string _md5_checksum_us_horizontal_mirrored_tft3; - static inline std::string _md5_checksum_us_horizontal_mirrored_tft4; + // A struct of values needed to cache and hold checksums for files. Stored with an unordered map + // where the key of the map is the path to the file. + struct _CachedChecksum { + std::optional mtime; + std::string checksum; + }; + + // Map of cached checksums. Key = file path. + static inline std::unordered_map _checksums; + + // Mutex for _checksums map + static inline std::mutex _checksums_mutex; + + // Get a checksum for a given file. Return error string in case of failure. + static std::expected _get_file_md5_checksum(std::string file_path); + + // Get the mtime (modified time) from a given file. Return error string in case of failure. + static std::expected _get_file_mtime(std::string file_path); static inline std::unordered_map _settings_values_cache; diff --git a/docker/MQTTManager/include/nspanel/nspanel.cpp b/docker/MQTTManager/include/nspanel/nspanel.cpp index 6400ff07e..8cf533f84 100644 --- a/docker/MQTTManager/include/nspanel/nspanel.cpp +++ b/docker/MQTTManager/include/nspanel/nspanel.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -61,10 +62,6 @@ NSPanel::NSPanel(uint32_t id) { this->_id = id; SPDLOG_INFO("Loading new NSPanel with ID {}.", id); this->reload_config(); - if (!this->_mqtt_config_topic.empty() && this->_state != MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT) { - SPDLOG_INFO("Loaded accepted NSPanel {}::{}.", this->_id, this->_name); - this->_state = MQTT_MANAGER_NSPANEL_STATE::WAITING; - } CommandManager::attach_callback(boost::bind(&NSPanel::command_callback, this, _1)); WebsocketServer::attach_stomp_callback(fmt::format("nspanel/{}/command", this->_mac), boost::bind(&NSPanel::handle_stomp_command_callback, this, _1)); @@ -143,7 +140,7 @@ void NSPanel::reload_config() { } else if (panel_settings.model.compare("web") == 0) { this->_model = MQTT_MANAGER_NSPANEL_MODEL::WEB; } else { - SPDLOG_ERROR("Failed to prase panel model for NSPanel {}::{}. Got value '{}'. Will assume sonoff.", panel_settings.id, panel_settings.friendly_name, panel_settings.model); + SPDLOG_ERROR("Failed to parse panel model for NSPanel {}::{}. Got value '{}'. Will assume sonoff.", panel_settings.id, panel_settings.friendly_name, panel_settings.model); this->_model = MQTT_MANAGER_NSPANEL_MODEL::SONOFF; } @@ -199,7 +196,7 @@ void NSPanel::reload_config() { if (!panel_settings.denied && !panel_settings.accepted) { // No decission has been made on wether ot accept or deny panel. It is therefore awaiting_accept this->_state = MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT; - } else if (this->_state == MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT || this->_state == MQTT_MANAGER_NSPANEL_STATE::DENIED) { + } else if (panel_settings.accepted && (this->_state == MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT || this->_state == MQTT_MANAGER_NSPANEL_STATE::DENIED)) { // The panel has just been accepted. Wait for it to register again. this->_state = MQTT_MANAGER_NSPANEL_STATE::WAITING; } @@ -522,8 +519,13 @@ void NSPanel::send_config() { } } - SPDLOG_DEBUG("Sending updated NSPanelConfig to panel {}::{} over MQTT.", this->_id, this->_name); - MQTT_Manager::publish_protobuf(this->_mqtt_config_topic, config, true); + google::protobuf::util::MessageDifferencer differencer; + if (!differencer.Equals(this->_last_send_config, config)) { + SPDLOG_DEBUG("Sending updated NSPanelConfig to panel {}::{} over MQTT.", this->_id, this->_name); + MQTT_Manager::publish_protobuf(this->_mqtt_config_topic, config, true); + } else { + SPDLOG_DEBUG("Not sending updated config for NSPanel {}::{} as no config change has occured from last sent config."); + } } NSPanel::~NSPanel() { diff --git a/docker/MQTTManager/include/nspanel/nspanel.hpp b/docker/MQTTManager/include/nspanel/nspanel.hpp index 31ec8e4e3..4c440be88 100644 --- a/docker/MQTTManager/include/nspanel/nspanel.hpp +++ b/docker/MQTTManager/include/nspanel/nspanel.hpp @@ -180,6 +180,9 @@ class NSPanel { // A thermostat temperature limit setting, or 0 if it is not a number. int _get_nspanel_temperature_limit_setting(std::string key); + // The last config sent to the panel that is currently retained in MQTT. + NSPanelConfig _last_send_config; + // Vars: uint32_t _id; database_manager::NSPanel _settings; // Settings loaded from database diff --git a/docker/MQTTManager/src/main.cpp b/docker/MQTTManager/src/main.cpp index b163bce99..54dde9281 100644 --- a/docker/MQTTManager/src/main.cpp +++ b/docker/MQTTManager/src/main.cpp @@ -39,8 +39,8 @@ void sigusr1_handler(int signal) { if (signal == SIGUSR1) { - SPDLOG_INFO("Reloading config from manager. Will wait 50ms for other processing to complete before proceeding with config reload."); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + SPDLOG_INFO("Reloading config from manager."); + // std::this_thread::sleep_for(std::chrono::milliseconds(50)); MqttManagerConfig::load(); MQTT_Manager::reload_config(); From 776a42675e4a3ca956ec4825e1bc0cde6e18b3a0 Mon Sep 17 00:00:00 2001 From: Tim Panajott Date: Sun, 15 Nov 2026 20:18:46 +0100 Subject: [PATCH 8/8] Updated test to reflect how NSPanel should behave and not as it did behave --- docker/MQTTManager/tests/nspanel_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/MQTTManager/tests/nspanel_test.cpp b/docker/MQTTManager/tests/nspanel_test.cpp index 622f5ee31..5595518d9 100644 --- a/docker/MQTTManager/tests/nspanel_test.cpp +++ b/docker/MQTTManager/tests/nspanel_test.cpp @@ -2,8 +2,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -756,10 +756,10 @@ TEST_F(NSPanelTest, panel_not_yet_accepted_is_awaiting_accept) { EXPECT_EQ(panel->get_state(), MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT); } -TEST_F(NSPanelTest, accepted_panel_is_loaded_as_waiting) { +TEST_F(NSPanelTest, accepted_panel_is_loaded_as_offline) { load_panel(); - EXPECT_EQ(panel->get_state(), MQTT_MANAGER_NSPANEL_STATE::WAITING); + EXPECT_EQ(panel->get_state(), MQTT_MANAGER_NSPANEL_STATE::OFFLINE); } // Accepting in the web interface sets accepted and reloads the manager. The panel must leave