From de252625954bb3d78f63893d418aadfed8295bea Mon Sep 17 00:00:00 2001 From: librelad Date: Sat, 30 May 2026 21:10:27 +0100 Subject: [PATCH] =?UTF-8?q?refactor(webui):=20kill=20core/lib=20=E2=80=94?= =?UTF-8?q?=20promote=20to=20named=20subsystems?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The generic core/lib/ wrapper (and its task/config/util sub-buckets) is gone. Each child is now a named core subsystem describing what it IS: core/lib/task/ -> core/tasks/ (task kernel: bus, refresh, manager, router, actions, commands, parameter-preserve) core/lib/config/ -> core/config/ (config-shared.js→field-factory.js, config-options.js→options.js; options-before-factory order kept) core/lib/util/system-live -> core/live/live-system.js core/lib/util/lp-ui -> core/ui-mode/lp-ui.js (stays FIRST eager — no FOUC) core/lib/util/data-loader -> core/data/data-loader.js core/lib/util/dom-helpers -> core/dom/dom-helpers.js core/lib/util/ui-helpers -> core/app-meta/app-helpers.js (getAppIcon survivor) core/lib/util/dismissible -> core/ui-state/dismissible.js (generic+eager, stays core — NOT a backup widget) core/boot/theme-registry -> core/theme/theme-registry.js (theming, not bootstrap) Path-only moves (git mv) + literal rewrites in index.html, system-loader.js (config/task/apps bundles) and apps-manager ensureTaskScripts. Class/global names unchanged (ConfigShared/ConfigOptions/LiveSystem/getAppIcon) so consumers are untouched. All 16 referenced paths verified to resolve; full node --check sweep clean. Signed-off-by: librelad --- .../components/apps/core/js/apps-manager.js | 8 ++++---- .../ui-helpers.js => app-meta/app-helpers.js} | 0 .../frontend/core/boot/system-loader.js | 18 +++++++++--------- .../field-factory.js} | 0 .../config-options.js => config/options.js} | 0 .../core/{lib/util => data}/data-loader.js | 0 .../core/{lib/util => dom}/dom-helpers.js | 0 .../system-live.js => live/live-system.js} | 0 .../core/{lib/task => tasks}/task-actions.js | 0 .../core/{lib/task => tasks}/task-commands.js | 0 .../core/{lib/task => tasks}/task-event-bus.js | 0 .../core/{lib/task => tasks}/task-manager.js | 0 .../task => tasks}/task-parameter-preserve.js | 0 .../task => tasks}/task-refresh-coordinator.js | 0 .../core/{lib/task => tasks}/task-router.js | 0 .../core/{boot => theme}/theme-registry.js | 0 .../core/{lib/util => ui-mode}/lp-ui.js | 0 .../core/{lib/util => ui-state}/dismissible.js | 0 .../libreportal/frontend/core/ui/topbar.html | 2 +- containers/libreportal/frontend/index.html | 16 ++++++++-------- 20 files changed, 22 insertions(+), 22 deletions(-) rename containers/libreportal/frontend/core/{lib/util/ui-helpers.js => app-meta/app-helpers.js} (100%) rename containers/libreportal/frontend/core/{lib/config/config-shared.js => config/field-factory.js} (100%) rename containers/libreportal/frontend/core/{lib/config/config-options.js => config/options.js} (100%) rename containers/libreportal/frontend/core/{lib/util => data}/data-loader.js (100%) rename containers/libreportal/frontend/core/{lib/util => dom}/dom-helpers.js (100%) rename containers/libreportal/frontend/core/{lib/util/system-live.js => live/live-system.js} (100%) rename containers/libreportal/frontend/core/{lib/task => tasks}/task-actions.js (100%) rename containers/libreportal/frontend/core/{lib/task => tasks}/task-commands.js (100%) rename containers/libreportal/frontend/core/{lib/task => tasks}/task-event-bus.js (100%) rename containers/libreportal/frontend/core/{lib/task => tasks}/task-manager.js (100%) rename containers/libreportal/frontend/core/{lib/task => tasks}/task-parameter-preserve.js (100%) rename containers/libreportal/frontend/core/{lib/task => tasks}/task-refresh-coordinator.js (100%) rename containers/libreportal/frontend/core/{lib/task => tasks}/task-router.js (100%) rename containers/libreportal/frontend/core/{boot => theme}/theme-registry.js (100%) rename containers/libreportal/frontend/core/{lib/util => ui-mode}/lp-ui.js (100%) rename containers/libreportal/frontend/core/{lib/util => ui-state}/dismissible.js (100%) diff --git a/containers/libreportal/frontend/components/apps/core/js/apps-manager.js b/containers/libreportal/frontend/components/apps/core/js/apps-manager.js index 4e82237..fb68a4c 100755 --- a/containers/libreportal/frontend/components/apps/core/js/apps-manager.js +++ b/containers/libreportal/frontend/components/apps/core/js/apps-manager.js @@ -1287,10 +1287,10 @@ class AppsManager { // Only load scripts if they're not already loaded const scripts = [ - { name: 'TaskManager', src: '/core/lib/task/task-manager.js' }, - { name: 'TaskCommands', src: '/core/lib/task/task-commands.js' }, - { name: 'TaskActions', src: '/core/lib/task/task-actions.js' }, - { name: 'TaskRouter', src: '/core/lib/task/task-router.js' }, + { name: 'TaskManager', src: '/core/tasks/task-manager.js' }, + { name: 'TaskCommands', src: '/core/tasks/task-commands.js' }, + { name: 'TaskActions', src: '/core/tasks/task-actions.js' }, + { name: 'TaskRouter', src: '/core/tasks/task-router.js' }, { name: 'TasksManager', src: '/components/tasks/js/tasks-manager.js' } ]; diff --git a/containers/libreportal/frontend/core/lib/util/ui-helpers.js b/containers/libreportal/frontend/core/app-meta/app-helpers.js similarity index 100% rename from containers/libreportal/frontend/core/lib/util/ui-helpers.js rename to containers/libreportal/frontend/core/app-meta/app-helpers.js diff --git a/containers/libreportal/frontend/core/boot/system-loader.js b/containers/libreportal/frontend/core/boot/system-loader.js index c54d2ab..69bbbb7 100755 --- a/containers/libreportal/frontend/core/boot/system-loader.js +++ b/containers/libreportal/frontend/core/boot/system-loader.js @@ -39,8 +39,8 @@ class SystemLoader { global: 'configManager', dependencies: ['data'], scripts: [ - '/core/lib/config/config-options.js', - '/core/lib/config/config-shared.js', + '/core/config/options.js', + '/core/config/field-factory.js', '/components/admin/config/js/config-validator.js', '/components/admin/config/js/toggle-manager.js', '/components/admin/config/js/config-core.js', @@ -162,12 +162,12 @@ class SystemLoader { global: 'tasksManager', dependencies: [], scripts: [ - '/core/lib/task/task-event-bus.js', - '/core/lib/task/task-commands.js', - '/core/lib/task/task-actions.js', - '/core/lib/task/task-router.js', - '/core/lib/task/task-manager.js', - '/core/lib/task/task-parameter-preserve.js', + '/core/tasks/task-event-bus.js', + '/core/tasks/task-commands.js', + '/core/tasks/task-actions.js', + '/core/tasks/task-router.js', + '/core/tasks/task-manager.js', + '/core/tasks/task-parameter-preserve.js', '/components/tasks/js/tasks-manager.js', // base: class + constructor + init + bus wiring // prototype-augment clusters (load after base; ordered via async=false): '/components/tasks/js/tasks-format.js', @@ -208,7 +208,7 @@ class SystemLoader { dependencies: ['data'], scripts: [ '/components/apps/port-manager/js/port-manager.js', - '/core/lib/task/task-manager.js', // Add TaskManager for backup functionality + '/core/tasks/task-manager.js', // Add TaskManager for backup functionality '/core/ui/backup-app-card.js', '/components/apps/services/js/services-manager.js', '/components/apps/tools/js/tools-manager.js', diff --git a/containers/libreportal/frontend/core/lib/config/config-shared.js b/containers/libreportal/frontend/core/config/field-factory.js similarity index 100% rename from containers/libreportal/frontend/core/lib/config/config-shared.js rename to containers/libreportal/frontend/core/config/field-factory.js diff --git a/containers/libreportal/frontend/core/lib/config/config-options.js b/containers/libreportal/frontend/core/config/options.js similarity index 100% rename from containers/libreportal/frontend/core/lib/config/config-options.js rename to containers/libreportal/frontend/core/config/options.js diff --git a/containers/libreportal/frontend/core/lib/util/data-loader.js b/containers/libreportal/frontend/core/data/data-loader.js similarity index 100% rename from containers/libreportal/frontend/core/lib/util/data-loader.js rename to containers/libreportal/frontend/core/data/data-loader.js diff --git a/containers/libreportal/frontend/core/lib/util/dom-helpers.js b/containers/libreportal/frontend/core/dom/dom-helpers.js similarity index 100% rename from containers/libreportal/frontend/core/lib/util/dom-helpers.js rename to containers/libreportal/frontend/core/dom/dom-helpers.js diff --git a/containers/libreportal/frontend/core/lib/util/system-live.js b/containers/libreportal/frontend/core/live/live-system.js similarity index 100% rename from containers/libreportal/frontend/core/lib/util/system-live.js rename to containers/libreportal/frontend/core/live/live-system.js diff --git a/containers/libreportal/frontend/core/lib/task/task-actions.js b/containers/libreportal/frontend/core/tasks/task-actions.js similarity index 100% rename from containers/libreportal/frontend/core/lib/task/task-actions.js rename to containers/libreportal/frontend/core/tasks/task-actions.js diff --git a/containers/libreportal/frontend/core/lib/task/task-commands.js b/containers/libreportal/frontend/core/tasks/task-commands.js similarity index 100% rename from containers/libreportal/frontend/core/lib/task/task-commands.js rename to containers/libreportal/frontend/core/tasks/task-commands.js diff --git a/containers/libreportal/frontend/core/lib/task/task-event-bus.js b/containers/libreportal/frontend/core/tasks/task-event-bus.js similarity index 100% rename from containers/libreportal/frontend/core/lib/task/task-event-bus.js rename to containers/libreportal/frontend/core/tasks/task-event-bus.js diff --git a/containers/libreportal/frontend/core/lib/task/task-manager.js b/containers/libreportal/frontend/core/tasks/task-manager.js similarity index 100% rename from containers/libreportal/frontend/core/lib/task/task-manager.js rename to containers/libreportal/frontend/core/tasks/task-manager.js diff --git a/containers/libreportal/frontend/core/lib/task/task-parameter-preserve.js b/containers/libreportal/frontend/core/tasks/task-parameter-preserve.js similarity index 100% rename from containers/libreportal/frontend/core/lib/task/task-parameter-preserve.js rename to containers/libreportal/frontend/core/tasks/task-parameter-preserve.js diff --git a/containers/libreportal/frontend/core/lib/task/task-refresh-coordinator.js b/containers/libreportal/frontend/core/tasks/task-refresh-coordinator.js similarity index 100% rename from containers/libreportal/frontend/core/lib/task/task-refresh-coordinator.js rename to containers/libreportal/frontend/core/tasks/task-refresh-coordinator.js diff --git a/containers/libreportal/frontend/core/lib/task/task-router.js b/containers/libreportal/frontend/core/tasks/task-router.js similarity index 100% rename from containers/libreportal/frontend/core/lib/task/task-router.js rename to containers/libreportal/frontend/core/tasks/task-router.js diff --git a/containers/libreportal/frontend/core/boot/theme-registry.js b/containers/libreportal/frontend/core/theme/theme-registry.js similarity index 100% rename from containers/libreportal/frontend/core/boot/theme-registry.js rename to containers/libreportal/frontend/core/theme/theme-registry.js diff --git a/containers/libreportal/frontend/core/lib/util/lp-ui.js b/containers/libreportal/frontend/core/ui-mode/lp-ui.js similarity index 100% rename from containers/libreportal/frontend/core/lib/util/lp-ui.js rename to containers/libreportal/frontend/core/ui-mode/lp-ui.js diff --git a/containers/libreportal/frontend/core/lib/util/dismissible.js b/containers/libreportal/frontend/core/ui-state/dismissible.js similarity index 100% rename from containers/libreportal/frontend/core/lib/util/dismissible.js rename to containers/libreportal/frontend/core/ui-state/dismissible.js diff --git a/containers/libreportal/frontend/core/ui/topbar.html b/containers/libreportal/frontend/core/ui/topbar.html index e817ebd..efc3e30 100755 --- a/containers/libreportal/frontend/core/ui/topbar.html +++ b/containers/libreportal/frontend/core/ui/topbar.html @@ -78,7 +78,7 @@