fix modified indicator for local settings

This commit is contained in:
Henry Jameson 2026-03-23 15:37:31 +02:00
commit b08d5dd8df
3 changed files with 17 additions and 2 deletions

View file

@ -322,8 +322,9 @@ export default {
switch (this.realSource) { switch (this.realSource) {
case 'profile': case 'profile':
return {} return {}
default: default: {
return get(useInstanceStore().prefsStorage, this.path) return get(useSyncConfigStore().mergedConfigDefault, this.path)
}
} }
}, },
isProfileSetting() { isProfileSetting() {

View file

@ -4,6 +4,7 @@ import { defineStore } from 'pinia'
import { instanceDefaultProperties } from '../modules/config.js' import { instanceDefaultProperties } from '../modules/config.js'
import { import {
instanceDefaultConfig, instanceDefaultConfig,
defaultConfigLocal,
staticOrApiConfigDefault, staticOrApiConfigDefault,
} from '../modules/default_config_state.js' } from '../modules/default_config_state.js'
import apiService from '../services/api/api.service.js' import apiService from '../services/api/api.service.js'
@ -55,6 +56,7 @@ const defaultState = {
// Instance admins can override default settings for the whole instance // Instance admins can override default settings for the whole instance
prefsStorage: { prefsStorage: {
...instanceDefaultConfig, ...instanceDefaultConfig,
...defaultConfigLocal,
}, },
// Known domains list for user's domain-muting // Known domains list for user's domain-muting

View file

@ -758,6 +758,18 @@ export const useSyncConfigStore = defineStore('sync_config', {
) )
return result return result
}, },
mergedConfigDefault: (state) => {
const instancePrefs = useInstanceStore().prefsStorage
const result = Object.fromEntries(
Object.entries(state.prefsStorage.simple).map(([k, value]) => [
k,
LOCAL_ONLY_KEYS.has(k)
? (instancePrefs[k] ?? defaultConfigLocal[k])
: (instancePrefs[k] ?? instanceDefaultConfig[k]),
]),
)
return result
},
mergedConfigWithoutDefaults: (state) => { mergedConfigWithoutDefaults: (state) => {
const localPrefs = useLocalConfigStore().prefsStorage const localPrefs = useLocalConfigStore().prefsStorage
const result = Object.fromEntries( const result = Object.fromEntries(