From dd88974338c7eb9c81ac5fea71c1a906d2f91147 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Sat, 5 Sep 2020 23:41:06 +0300 Subject: [PATCH] Fix fetching MRF data in case it's undefined --- src/store/modules/users.js | 9 ++++++--- src/views/settings/components/MRF.vue | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/store/modules/users.js b/src/store/modules/users.js index ddac3938..ef272356 100644 --- a/src/store/modules/users.js +++ b/src/store/modules/users.js @@ -223,9 +223,12 @@ const users = { }, async FetchTagPolicySetting({ commit, getters }) { const { data } = await fetchSettings(getters.authHost, getters.token) - const mrfPolicies = data.configs - .find(el => el.key === ':mrf').value - .find(el => el.tuple[0] === ':policies').tuple[1] || [] + const mrfSettings = data.configs.find(el => el.key === ':mrf') + ? data.configs.find(el => el.key === ':mrf').value + : [] + const mrfPolicies = mrfSettings.find(el => el.tuple[0] === ':policies') + ? mrfSettings.find(el => el.tuple[0] === ':policies').tuple[1] + : [] commit('SET_TAG_POLICY', Array.isArray(mrfPolicies) ? mrfPolicies : [mrfPolicies]) }, diff --git a/src/views/settings/components/MRF.vue b/src/views/settings/components/MRF.vue index a7275d83..dd92b3cb 100644 --- a/src/views/settings/components/MRF.vue +++ b/src/views/settings/components/MRF.vue @@ -69,7 +69,7 @@ export default { }) }, showMrfPolicy(key) { - const selectedMrfPolicies = _.get(this.settings.settings, [':pleroma', ':mrf', ':policies']) + const selectedMrfPolicies = _.get(this.settings.settings, [':pleroma', ':mrf', ':policies']) || [] const mappedPolicies = this.mrfSettings.reduce((acc, { key, related_policy }) => { if (key !== ':mrf') { acc[key] = related_policy