From 3c45c223c737f73fa21bcf86214df333b7f1354b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Fri, 10 Apr 2026 00:03:04 +0300 Subject: [PATCH] fix instance identity stuff --- src/boot/after_store.js | 12 ++++++++---- src/modules/default_config_state.js | 9 +++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/boot/after_store.js b/src/boot/after_store.js index a345e2ae5..d16852bf8 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -42,6 +42,7 @@ import VBodyScrollLock from 'src/directives/body_scroll_lock' import { INSTANCE_DEFAULT_CONFIG_DEFINITIONS, INSTANCE_IDENTITY_DEFAULT_DEFINITIONS, + INSTANCE_IDENTIY_EXTERNAL, } from 'src/modules/default_config_state.js' let staticInitialResults = null @@ -170,12 +171,14 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => { config = Object.assign({}, staticConfig, apiConfig) } - Object.keys(INSTANCE_IDENTITY_DEFAULT_DEFINITIONS).forEach((source) => + Object.keys(INSTANCE_IDENTITY_DEFAULT_DEFINITIONS).forEach((source) => { + if (source === 'name') return + if (INSTANCE_IDENTIY_EXTERNAL.has(source)) return useInstanceStore().set({ value: config[source], path: `instanceIdentity.${source}`, - }), - ) + }) + }) Object.keys(INSTANCE_DEFAULT_CONFIG_DEFINITIONS).forEach((source) => useInstanceStore().set({ @@ -277,7 +280,7 @@ const getNodeInfo = async ({ store }) => { const metadata = data.metadata const features = metadata.features useInstanceStore().set({ - path: 'name', + path: 'instanceIdentity.name', value: metadata.nodeName, }) useInstanceStore().set({ @@ -527,6 +530,7 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => { useInterfaceStore().setLayoutWidth(windowWidth()) useInterfaceStore().setLayoutHeight(windowHeight()) + window.syncConfig = useSyncConfigStore() window.mergedConfig = useMergedConfigStore() window.localConfig = useLocalConfigStore() diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js index f642d6398..ecd580577 100644 --- a/src/modules/default_config_state.js +++ b/src/modules/default_config_state.js @@ -112,10 +112,19 @@ export const INSTANCE_IDENTITY_DEFAULT_DEFINITIONS = { type: 'string', required: false, }, + name: { + description: 'Instance Name', + type: 'string', + required: false, + }, } export const INSTANCE_IDENTITY_DEFAULT = convertDefinitions( INSTANCE_IDENTITY_DEFAULT_DEFINITIONS, ) +export const INSTANCE_IDENTIY_EXTERNAL = new Set([ + 'tos', + 'instanceSpecificPanelContent', +]) /// This object contains setting entries that makes sense /// at the user level. The defaults can also be overriden by