Oneric/admin-fe
1
0
Fork 0
forked from AkkomaGang/admin-fe
Code Pull requests Activity

Fix deleting settings when changing between mailer adapters

Browse source
This commit is contained in:
Angelina Filippova 2019-12-26 20:50:56 +03:00
parent fd0392c190
commit 00dce737ae
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/api/settings.js
View file

@ -30,6 +30,16 @@ export async function updateSettings(configs, authHost, token) {
}) })
} }
export async function removeSettings(configs, authHost, token) {
return await request({
baseURL: baseName(authHost),
url: `/api/pleroma/admin/config`,
method: 'post',
headers: authHeaders(token),
data: { configs }
})
}
export async function uploadMedia(file, authHost, token) { export async function uploadMedia(file, authHost, token) {
const formData = new FormData() const formData = new FormData()
formData.append('file', file) formData.append('file', file)

18
src/store/modules/settings.js
View file

@ -1,4 +1,4 @@
import { fetchDescription, fetchSettings, updateSettings, uploadMedia } from '@/api/settings' import { fetchDescription, fetchSettings, removeSettings, updateSettings, uploadMedia } from '@/api/settings'
import { parseNonTuples, parseTuples, partialUpdate, valueHasTuples, wrapUpdatedSettings } from './normalizers' import { parseNonTuples, parseTuples, partialUpdate, valueHasTuples, wrapUpdatedSettings } from './normalizers'
const settings = { const settings = {
@ -27,9 +27,6 @@ const settings = {
CLEAR_UPDATED_SETTINGS: (state) => { CLEAR_UPDATED_SETTINGS: (state) => {
state.updatedSettings = {} state.updatedSettings = {}
}, },
REWRITE_CONFIG: (state, { tab, data }) => {
state.settings[tab] = data
},
SET_DESCRIPTION: (state, data) => { SET_DESCRIPTION: (state, data) => {
state.description = data state.description = data
}, },
@ -69,8 +66,8 @@ const settings = {
commit('SET_SETTINGS', response.data.configs) commit('SET_SETTINGS', response.data.configs)
commit('SET_LOADING', false) commit('SET_LOADING', false)
}, },
RewriteConfig({ commit }, { tab, data }) { async RemoveSetting({ getters }, configs) {
commit('REWRITE_CONFIG', { tab, data }) await removeSettings(configs, getters.authHost, getters.token)
}, },
async SubmitChanges({ getters, commit, state }) { async SubmitChanges({ getters, commit, state }) {
const updatedData = Object.keys(state.updatedSettings).reduce((acc, group) => { const updatedData = Object.keys(state.updatedSettings).reduce((acc, group) => {
@ -103,7 +100,14 @@ const settings = {
? commit('UPDATE_SETTINGS', { group, key, input, value, type }) ? commit('UPDATE_SETTINGS', { group, key, input, value, type })
: commit('UPDATE_SETTINGS', { group, key: input, input: '_value', value, type }) : commit('UPDATE_SETTINGS', { group, key: input, input: '_value', value, type })
}, },
UpdateState({ commit }, { group, key, input, value }) { UpdateState({ commit, dispatch, state }, { group, key, input, value }) {
if (key === 'Pleroma.Emails.Mailer' && input === ':adapter') {
const subkeys = Object.keys(state.settings[group][key]).filter(el => el !== ':adapter')
const emailsValue = subkeys.map(el => {
return { 'tuple': [el, state.settings[group][key][el]] }
})
dispatch('RemoveSetting', [{ group, key, value: emailsValue, delete: true, subkeys }])
}
key key
? commit('UPDATE_STATE', { group, key, input, value }) ? commit('UPDATE_STATE', { group, key, input, value })
: commit('UPDATE_STATE', { group, key: input, input: 'value', value }) : commit('UPDATE_STATE', { group, key: input, input: 'value', value })