Update processing nested values

src/store/modules/normalizers.js

@@ -3,6 +3,14 @@ const nonAtomsObjects = ['match_actor', ':match_actor']
 const objects = ['digest', 'pleroma_fe', 'masto_fe', 'poll_limits', 'styling']
 const objectParents = ['mascots']
 
+const getCurrentValue = (object, keys) => {
+  if (keys.length === 0) {
+    return object
+  }
+  const [currentKey, ...restKeys] = keys
+  return getCurrentValue(object[currentKey], restKeys)
+}
+
 const getValueWithoutKey = (key, [type, value]) => {
   if (type === 'atom' && value.length > 1) {
     return `:${value}`
@@ -124,6 +132,42 @@ export const partialUpdate = (group, key) => {
   return true
 }
 
+export const processNested = (valueForState, valueForUpdatedSettings, group, parentKey, parents, settings, updatedSettings) => {
+  const [{ key, type }, ...otherParents] = parents
+  const path = [group, parentKey, ...parents.reverse().map(parent => parent.key)]
+
+  const updatedValueForState = valueExists(settings, path)
+    ? { ...getCurrentValue(settings[group][parentKey], parents.map(el => el.key).slice(0, -1)),
+      ...{ [key]: valueForState }}
+    : { [key]: valueForState }
+  const updatedValueForUpdatedSettings = valueExists(updatedSettings, path)
+    ? { ...getCurrentValue(settings[group][parentKey], parents.map(el => el.key).slice(0, -1)),
+      ...{ [key]: [type, valueForUpdatedSettings] }}
+    : { [key]: [type, valueForUpdatedSettings] }
+
+  // if (group === ':mime' && key === ':types') {
+  //   updatedValueForState = { ...settings[group][key].value, ...updatedValueForState }
+  //   updatedValueForUpdatedSettings = {
+  //     ...Object.keys(settings[group][key].value)
+  //       .reduce((acc, el) => {
+  //         return { ...acc, [el]: [['list', 'string'], settings[group][key].value[el]] }
+  //       }, {}),
+  //     ...updatedValueForUpdatedSettings
+  //   }
+  // }
+  return otherParents.length === 1
+    ? { valueForState: updatedValueForState, valueForUpdatedSettings: updatedValueForUpdatedSettings, setting: otherParents[0] }
+    : processNested(updatedValueForState, updatedValueForUpdatedSettings, group, parentKey, otherParents, settings, updatedSettings)
+}
+
+const valueExists = (value, path) => {
+  if (path.length === 0) {
+    return true
+  }
+  const [element, ...rest] = path
+  return value[element] ? valueExists(value[element], rest) : false
+}
+
 export const valueHasTuples = (key, value) => {
   const valueIsArrayOfNonObjects = Array.isArray(value) && value.length > 0 && value.every(el => typeof el !== 'object')
   return key === ':meta' ||

src/views/settings/components/Inputs.vue

@@ -59,11 +59,13 @@
       <div v-for="subSetting in setting.children" :key="subSetting.key">
         <inputs
           :setting-group="settingGroup"
+          :setting-parent="[...settingParent, setting, subSetting]"
           :setting="subSetting"
           :data="data[setting.key]"
           :custom-label-width="'100px'"
           :label-class="'center-label'"
-          :input-class="'keyword-inner-input'"/>
+          :input-class="'keyword-inner-input'"
+          :nested="true"/>
       </div>
     </div>
     <!-- special inputs -->
@@ -86,6 +88,7 @@ import AceEditor from 'vue2-ace-editor'
 import 'brace/mode/elixir'
 import 'default-passive-events'
 import { AutoLinkerInput, BackendsLoggerInput, EditableKeywordInput, IconsInput, MascotsInput, ProxyUrlInput, PruneInput, RateLimitInput, SslOptionsInput } from './inputComponents'
+import { processNested } from '@/store/modules/normalizers'
 
 export default {
   name: 'Inputs',
@@ -148,9 +151,9 @@ export default {
       }
     },
     settingParent: {
-      type: Object,
+      type: Array,
       default: function() {
-        return {}
+        return []
       },
       required: false
     }
@@ -161,7 +164,7 @@ export default {
         return this.data[this.setting.key] ? this.data[this.setting.key][0] : ''
       },
       set: function(value) {
-        this.processNestedData([value], this.settingGroup.group, this.settingGroup.key, this.settingParent.key, this.settingParent.type, this.setting.key, this.setting.type)
+        this.processNestedData([value], this.settingGroup.group, this.settingGroup.key, this.settingParent[0].key, this.settingParent[0].type)
       }
     },
     inputValue() {
@@ -174,7 +177,7 @@ export default {
         this.setting.key === 'Pleroma.Web.Auth.Authenticator' ||
         this.setting.key === ':admin_token') {
         return this.data.value
-      } else if (this.settingGroup.group === ':mime' && this.settingParent.key === ':types') {
+      } else if (this.settingGroup.group === ':mime' && this.settingParent[0].key === ':types') {
         return this.data.value[this.setting.key]
       } else if (this.setting.type === 'atom') {
         return this.data[this.setting.key] && this.data[this.setting.key][0] === ':' ? this.data[this.setting.key].substr(1) : this.data[this.setting.key]
@@ -202,27 +205,15 @@ export default {
         type === 'map' ||
         (Array.isArray(type) && type.includes('keyword') && type.findIndex(el => el.includes('list') && el.includes('string')) !== -1)
     },
-    processNestedData(value, group, key, parentInput, parentType, childInput, childType) {
+    processNestedData(value, group, parentKey, parents) {
-      const valueExists = value => value[group] && value[group][key] && value[group][key][parentInput]
+      const { valueForState,
-      let updatedValueForState = valueExists(this.settings)
+        valueForUpdatedSettings,
-        ? { ...this.settings[group][key][parentInput], ...{ [childInput]: value }}
+        setting } = processNested(value, value, group, parentKey, parents.reverse(), this.settings, this.updatedSettings)
-        : { [childInput]: value }
-      let updatedValue = valueExists(this.updatedSettings)
-        ? { ...this.updatedSettings[group][key][parentInput][1], ...{ [childInput]: [childType, value] }}
-        : { [childInput]: [childType, value] }
 
-      if (group === ':mime' && parentInput === ':types') {
+      this.$store.dispatch('UpdateSettings',
-        updatedValueForState = { ...this.settings[group][parentInput].value, ...updatedValueForState }
+        { group, key: parentKey, input: setting.key, value: valueForUpdatedSettings, type: setting.type })
-        updatedValue = {
+      this.$store.dispatch('UpdateState',
-          ...Object.keys(this.settings[group][parentInput].value)
+        { group, key: parentKey, input: setting.key, value: valueForState })
-            .reduce((acc, el) => {
-              return { ...acc, [el]: [['list', 'string'], this.settings[group][parentInput].value[el]] }
-            }, {}),
-          ...updatedValue
-        }
-      }
-      this.$store.dispatch('UpdateSettings', { group, key, input: parentInput, value: updatedValue, type: parentType })
-      this.$store.dispatch('UpdateState', { group, key, input: parentInput, value: updatedValueForState })
     },
     renderMultipleSelect(type) {
       return Array.isArray(type) && this.setting.key !== ':backends' && (
@@ -233,9 +224,9 @@ export default {
         this.setting.key === ':args'
       )
     },
-    update(value, group, key, parent, input, type, nested) {
+    update(value, group, key, parents, input, type, nested) {
       nested
-        ? this.processNestedData(value, group, key, parent.key, parent.type, input, type)
+        ? this.processNestedData(value, group, key, parents)
         : this.updateSetting(value, group, key, input, type)
     },
     updateSetting(value, group, key, input, type) {

src/views/settings/components/Setting.vue

@@ -33,7 +33,7 @@
           <div v-for="subSetting in setting.children" :key="subSetting.key">
             <inputs
               :setting-group="settingGroup"
-              :setting-parent="setting"
+              :setting-parent="[setting]"
               :setting="subSetting"
               :data="data[setting.key]"
               :nested="true"/>

src/views/settings/components/inputComponents/SslOptionsInput.vue

@@ -4,7 +4,7 @@
       <el-form-item :label="subSetting.label" :label-width="customLabelWidth">
         <el-select
           v-if="subSetting.type.includes('list') && subSetting.type.includes('atom')"
-          :value="data[setting.key][subSetting.key]"
+          :value="subSettingValue(subSetting)"
           multiple
           filterable
           allow-create
@@ -64,6 +64,9 @@ export default {
     inputValue(key) {
       return this.data[this.setting.key][key]
     },
+    subSettingValue(subSetting) {
+      return this.data && this.data[this.setting.key] ? this.data[this.setting.key][subSetting.key] : []
+    },
     update(value, childKey) {
       const [group, key, parentKey, input] = [this.settingGroup.group, this.settingGroup.key, this.setting.key, this.settingParent.key]
       const { updatedSettings, description } = this.$store.state.settings