From c7a16bdfe2cebe51c232ae3fe3101d35c4f877a2 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 22 Mar 2023 12:43:53 +0200 Subject: grouped settings/managed drafts support added --- .../settings_modal/helpers/group_setting.js | 14 ++++++++++ .../settings_modal/helpers/group_setting.vue | 15 ++++++++++ src/components/settings_modal/helpers/setting.js | 32 +++++++++++++++++++--- 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 src/components/settings_modal/helpers/group_setting.js create mode 100644 src/components/settings_modal/helpers/group_setting.vue (limited to 'src/components/settings_modal/helpers') diff --git a/src/components/settings_modal/helpers/group_setting.js b/src/components/settings_modal/helpers/group_setting.js new file mode 100644 index 00000000..12a49000 --- /dev/null +++ b/src/components/settings_modal/helpers/group_setting.js @@ -0,0 +1,14 @@ +import { isEqual } from 'lodash' + +import Setting from './setting.js' + +export default { + ...Setting, + computed: { + ...Setting.computed, + isDirty () { + console.log(this.state, this.draft) + return !isEqual(this.state, this.draft) + } + } +} diff --git a/src/components/settings_modal/helpers/group_setting.vue b/src/components/settings_modal/helpers/group_setting.vue new file mode 100644 index 00000000..a4df4bf3 --- /dev/null +++ b/src/components/settings_modal/helpers/group_setting.vue @@ -0,0 +1,15 @@ + + + diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js index d42ae763..d2e1a6f4 100644 --- a/src/components/settings_modal/helpers/setting.js +++ b/src/components/settings_modal/helpers/setting.js @@ -48,15 +48,32 @@ export default { }, data () { return { - draft: null + localDraft: null } }, created () { - if (this.realDraftMode) { + if (this.realDraftMode && this.realSource !== 'admin') { this.draft = this.state } }, computed: { + draft: { + // TODO allow passing shared draft object? + get () { + if (this.realSource === 'admin') { + return get(this.$store.state.adminSettings.draft, this.path) + } else { + return this.localDraft + } + }, + set (value) { + if (this.realSource === 'admin') { + this.$store.commit('updateAdminDraft', { path: this.canonPath, value }) + } else { + this.localDraft = value + } + } + }, state () { const value = get(this.configSource, this.path) if (value === undefined) { @@ -130,11 +147,18 @@ export default { return this.state !== this.defaultState } }, + canonPath () { + return Array.isArray(this.path) ? this.path : this.path.split('.') + }, isDirty () { - return this.realDraftMode && this.draft !== this.state + if (this.realSource === 'admin' && this.canonPath.length > 3) { + return false // should not show draft buttons for "grouped" values + } else { + return this.realDraftMode && this.draft !== this.state + } }, canHardReset () { - return this.realSource === 'admin' && this.$store.state.adminSettings.modifiedPaths.has(this.path) + return this.realSource === 'admin' && this.$store.state.adminSettings.modifiedPaths.has(this.canonPath.join(' -> ')) }, matchesExpertLevel () { return (this.expert || 0) <= this.$store.state.config.expertLevel > 0 -- cgit v1.2.3-70-g09d2