This commit is contained in:
Henry Jameson 2026-04-05 13:23:53 +03:00
commit 1b59cb3bdf
3 changed files with 84 additions and 25 deletions

View file

@ -17,6 +17,7 @@ import {
LOCAL_ONLY_KEYS,
ROOT_CONFIG,
ROOT_CONFIG_DEFINITIONS,
validateSetting,
} from 'src/modules/default_config_state.js'
import {
newExporter,
@ -164,7 +165,7 @@ const SettingsModal = {
})
})
} else {
const definition = ROOT_CONFIG_DEFINITIONS[entry]
const definition = ROOT_CONFIG_DEFINITIONS[path]
const finalValue = validateSetting({
path: `simple.${path}`,

View file

@ -5,18 +5,10 @@ import { useLocalConfigStore } from 'src/stores/local_config.js'
import { useSyncConfigStore } from 'src/stores/sync_config.js'
import {
INSTANCE_DEFAULT_CONFIG,
LOCAL_DEFAULT_CONFIG,
LOCAL_ONLY_KEYS,
THEME_CONFIG,
ROOT_CONFIG,
} from 'src/modules/default_config_state.js'
const ROOT_CONFIG = {
...INSTANCE_DEFAULT_CONFIG,
...LOCAL_DEFAULT_CONFIG,
...THEME_CONFIG,
}
export const useMergedConfigStore = defineStore('merged_config', {
getters: {
mergedConfig: () => {