From d58fe6f84d352acaf960f7360eb79f000bf6726c Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Tue, 15 Aug 2023 01:24:52 +0100 Subject: [PATCH] Fix :mime, :extensions freaking out adminfe --- src/store/modules/normalizers.js | 5 +++-- src/store/modules/settings.js | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/store/modules/normalizers.js b/src/store/modules/normalizers.js index 43622ae9..421451fd 100644 --- a/src/store/modules/normalizers.js +++ b/src/store/modules/normalizers.js @@ -37,7 +37,7 @@ const getValueWithoutKey = (key, [type, value]) => { updatedArray[index] = { 'tuple': ['ExSyslogger', ':ex_syslogger'] } } return updatedArray - } else if (key === ':types') { + } else if ([':types', ':extensions'].includes(key)) { return Object.keys(value).reduce((acc, key) => { return { ...acc, [key]: value[key][1] } }, {}) } return value @@ -186,7 +186,7 @@ export const processNested = (valueForState, valueForUpdatedSettings, group, par ...{ [key]: [type, valueForUpdatedSettings] }} : { [key]: [type, valueForUpdatedSettings] } - if (group === ':mime' && parents[0].key === ':types') { + if (group === ':mime' && [':types', ':extensions'].includes(parents[0].key)) { updatedValueForState = settings[group][parents[0].key] ? { ...settings[group][parents[0].key].value, ...updatedValueForState } : updatedValueForState @@ -229,6 +229,7 @@ export const valueHasTuples = (key, value) => { const valueIsArrayOfNonObjects = Array.isArray(value) && value.length > 0 && value.every(el => typeof el !== 'object') return key === ':meta' || key === ':types' || + key === ':extensions' || key === ':backends' || key === ':compiled_template_engines' || key === ':compiled_format_encoders' || diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index abe50ea7..b67b293e 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -120,7 +120,8 @@ const settings = { const searchObject = formSearchObject(data) commit('SET_SEARCH', searchObject) commit('SET_TABS', tabs) - } catch (_e) { + } catch (e) { + console.error(e) commit('TOGGLE_TABS', true) commit('SET_LOADING', false) return