From d0c885c295b9fe4d2c514b2d4bd0b17de4d989dc Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Tue, 25 Feb 2020 00:24:46 +0300 Subject: [PATCH] Form search object and put it in state --- src/store/modules/normalizers.js | 10 ++++++++++ src/store/modules/settings.js | 8 +++++++- src/views/settings/index.vue | 17 ++++++++++++----- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/store/modules/normalizers.js b/src/store/modules/normalizers.js index 123847aa..994ae958 100644 --- a/src/store/modules/normalizers.js +++ b/src/store/modules/normalizers.js @@ -254,3 +254,13 @@ const wrapValues = (settings, currentState) => { } }) } + +export const formSearchObject = description => { + return description.reduce((acc, setting) => { + if (setting.children) { + const updatedAcc = { ...acc, [setting.key]: _.compact([setting.key, setting.label, setting.description]) } + return { ...updatedAcc, ...formSearchObject(setting.children) } + } + return { ...acc, [setting.key]: _.compact([setting.key, setting.label, setting.description]) } + }, {}) +} diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index ab7a3b36..b3a5d126 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,5 +1,5 @@ import { fetchDescription, fetchSettings, removeSettings, restartApp, updateSettings } from '@/api/settings' -import { checkPartialUpdate, parseNonTuples, parseTuples, valueHasTuples, wrapUpdatedSettings } from './normalizers' +import { checkPartialUpdate, formSearchObject, parseNonTuples, parseTuples, valueHasTuples, wrapUpdatedSettings } from './normalizers' import _ from 'lodash' const settings = { @@ -10,6 +10,7 @@ const settings = { description: [], loading: true, needReboot: false, + searchData: {}, settings: {}, updatedSettings: {} }, @@ -32,6 +33,9 @@ const settings = { SET_LOADING: (state, status) => { state.loading = status }, + SET_SEARCH: (state, description) => { + state.searchData = description + }, SET_SETTINGS: (state, data) => { const newSettings = data.reduce((acc, { group, key, value }) => { const parsedValue = valueHasTuples(key, value) @@ -77,6 +81,8 @@ const settings = { const response = await fetchSettings(getters.authHost, getters.token) const description = await fetchDescription(getters.authHost, getters.token) commit('SET_DESCRIPTION', description.data) + const res = formSearchObject(description.data) + commit('SET_SEARCH', res) commit('SET_SETTINGS', response.data.configs) commit('TOGGLE_REBOOT', response.data.need_reboot) } catch (_e) { diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue index 93b21a0e..1e73be0f 100644 --- a/src/views/settings/index.vue +++ b/src/views/settings/index.vue @@ -24,14 +24,12 @@ + class="settings-search-input"/> @@ -234,7 +232,8 @@ export default { { value: 'webPush', label: i18n.t('settings.webPush') }, { value: 'upload', label: i18n.t('settings.upload') }, { value: 'other', label: i18n.t('settings.other') } - ] + ], + searchQuery: '' } }, computed: { @@ -260,6 +259,9 @@ export default { }, needReboot() { return this.$store.state.settings.needReboot + }, + searchData() { + return this.$store.state.settings.searchData } }, mounted: function() { @@ -276,6 +278,11 @@ export default { type: 'success', message: i18n.t('settings.restartSuccess') }) + }, + querySearch(queryString, cb) { + const results = this.searchData + // call callback function to return suggestions + cb(results) } } }