diff --git a/src/store/modules/normalizers.js b/src/store/modules/normalizers.js
index 2fec92ab137c0faa0fe4befd6fe7ba844345d8c5..82677d00c822b2ce59079407cae9b979157cc914 100644
--- a/src/store/modules/normalizers.js
+++ b/src/store/modules/normalizers.js
@@ -93,7 +93,7 @@ export const parseTuples = (tuples, key) => {
return [...acc, { [mascot.tuple[0]]: { ...mascot.tuple[1], id: `f${(~~(Math.random() * 1e8)).toString(16)}` }}]
}, [])
} else if (Array.isArray(item.tuple[1]) &&
- (item.tuple[0] === ':groups' || item.tuple[0] === ':replace' || item.tuple[0] === ':retries' || item.tuple[0] === ':headers' || item.tuple[0] === ':params' || item.tuple[0] === ':crontab')) {
+ (item.tuple[0] === ':groups' || item.tuple[0] === ':replace' || item.tuple[0] === ':retries' || item.tuple[0] === ':headers' || item.tuple[0] === ':params' || item.tuple[0] === ':crontab' || item.tuple[0] === ':match_actor')) {
if (item.tuple[0] === ':crontab') {
accum[item.tuple[0]] = item.tuple[1].reduce((acc, group) => {
return [...acc, { [group.tuple[1]]: { value: group.tuple[0], id: `f${(~~(Math.random() * 1e8)).toString(16)}` }}]
@@ -103,10 +103,6 @@ export const parseTuples = (tuples, key) => {
return [...acc, { [group.tuple[0]]: { value: group.tuple[1], id: `f${(~~(Math.random() * 1e8)).toString(16)}` }}]
}, [])
}
- } else if (item.tuple[0] === ':match_actor') {
- accum[item.tuple[0]] = Object.keys(item.tuple[1]).reduce((acc, regex) => {
- return [...acc, { [regex]: { value: item.tuple[1][regex], id: `f${(~~(Math.random() * 1e8)).toString(16)}` }}]
- }, [])
} else if (item.tuple[0] === ':icons') {
accum[item.tuple[0]] = item.tuple[1].map(icon => {
return Object.keys(icon).map(name => {
@@ -240,8 +236,10 @@ const wrapValues = (settings, currentState) => {
if (
type === 'keyword' ||
type.includes('keyword') ||
- type.includes('tuple') && type.includes('list') ||
- setting === ':replace'
+ (type.includes('tuple') && type.includes('list')) ||
+ setting === ':replace' ||
+ (type.includes('map') && type.includes('string')) ||
+ type.includes('map') && type.findIndex(el => el.includes('list') && el.includes('string')) !== -1
) {
return { 'tuple': [setting, wrapValues(value, currentState)] }
} else if (type === 'atom' && value.length > 0) {
@@ -254,15 +252,10 @@ const wrapValues = (settings, currentState) => {
return { 'tuple': [value, setting] }
} else if (type === 'map') {
const mapValue = Object.keys(value).reduce((acc, key) => {
- acc[key] = setting === ':match_actor' ? value[key] : value[key][1]
+ acc[key] = value[key][1]
return acc
}, {})
- const mapCurrentState = setting === ':match_actor'
- ? currentState[setting].reduce((acc, element) => {
- return { ...acc, ...{ [Object.keys(element)[0]]: Object.values(element)[0].value }}
- }, {})
- : currentState[setting]
- return { 'tuple': [setting, { ...mapCurrentState, ...mapValue }] }
+ return { 'tuple': [setting, { ...currentState[setting], ...mapValue }] }
} else if (setting === ':ip') {
const ip = value.split('.').map(s => parseInt(s, 10))
return { 'tuple': [setting, { 'tuple': ip }] }
diff --git a/src/views/settings/components/Inputs.vue b/src/views/settings/components/Inputs.vue
index 0ba74f5522a258fbecb1ed594510cadae6c4a067..44e4ad193c49b13b6276e38d15d14e5d41f36d3c 100644
--- a/src/views/settings/components/Inputs.vue
+++ b/src/views/settings/components/Inputs.vue
@@ -281,11 +281,14 @@ export default {
},
methods: {
editableKeyword(key, type) {
- return type === 'map' ||
- (Array.isArray(type) && type.includes('keyword') && type.includes('integer')) ||
- (Array.isArray(type) && type.includes('keyword') && type.includes('string')) ||
- (Array.isArray(type) && type.includes('tuple') && type.includes('list')) ||
- (Array.isArray(type) && type.includes('keyword') && type.findIndex(el => el.includes('list') && el.includes('string')) !== -1)
+ return Array.isArray(type) && (
+ (type.includes('map') && type.includes('string')) ||
+ (type.includes('map') && type.findIndex(el => el.includes('list') && el.includes('string')) !== -1) ||
+ (type.includes('keyword') && type.includes('integer')) ||
+ (type.includes('keyword') && type.includes('string')) ||
+ (type.includes('tuple') && type.includes('list')) ||
+ (type.includes('keyword') && type.findIndex(el => el.includes('list') && el.includes('string')) !== -1)
+ )
},
getFormattedDescription(desc) {
return marked(desc)
diff --git a/src/views/settings/components/Setting.vue b/src/views/settings/components/Setting.vue
index 5db1ed57cabb8c3a5ab6119e0b100c677b8a1227..7593fb3d2c417065afa1d3510d522959bc21ffe5 100644
--- a/src/views/settings/components/Setting.vue
+++ b/src/views/settings/components/Setting.vue
@@ -121,7 +121,8 @@ export default {
compound({ type, key, children }) {
return type === 'keyword' ||
type === 'map' ||
- type.includes('keyword')
+ type.includes('keyword') ||
+ type.includes('map')
},
divideSetting(key) {
return [':sslopts', ':tlsopts', ':adapter', ':poll_limits', ':queues', ':styling', ':invalidation', ':multi_factor_authentication'].includes(key)
diff --git a/src/views/settings/components/inputComponents/EditableKeywordInput.vue b/src/views/settings/components/inputComponents/EditableKeywordInput.vue
index 6939547abddafd592743fe1ba63cad173a87da80..de3ec21aab1cbb6d732bc140dde2faf73090f6c4 100644
--- a/src/views/settings/components/inputComponents/EditableKeywordInput.vue
+++ b/src/views/settings/components/inputComponents/EditableKeywordInput.vue
@@ -25,7 +25,7 @@
</div>
<el-button :size="isDesktop ? 'medium' : 'mini'" icon="el-icon-plus" circle @click="addRowToEditableKeyword"/>
</div>
- <div v-else :data-search="setting.key || setting.group">
+ <div v-else-if="editableKeywordWithSelect" :data-search="setting.key || setting.group">
<div v-for="element in data" :key="getId(element)" class="setting-input">
<el-input :value="getKey(element)" placeholder="key" class="name-input" @input="parseEditableKeyword($event, 'key', element)"/> :
<el-select :value="getValue(element)" multiple filterable allow-create class="value-input" @change="parseEditableKeyword($event, 'value', element)"/>
@@ -70,12 +70,16 @@ export default {
},
computed: {
editableKeywordWithInteger() {
- return Array.isArray(this.setting.type) && this.setting.type.includes('keyword') && this.setting.type.includes('integer')
+ return this.setting.type.includes('keyword') && this.setting.type.includes('integer')
+ },
+ editableKeywordWithSelect() {
+ return this.setting.type.includes('map') && this.setting.type.findIndex(el => el.includes('list') && el.includes('string')) !== -1
},
editableKeywordWithString() {
- return Array.isArray(this.setting.type) && this.setting.key !== ':crontab' && (
+ return this.setting.key !== ':crontab' && (
(this.setting.type.includes('keyword') && this.setting.type.includes('string')) ||
- (this.setting.type.includes('tuple') && this.setting.type.includes('list'))
+ (this.setting.type.includes('tuple') && this.setting.type.includes('list')) ||
+ (this.setting.type.includes('map') && this.setting.type.includes('string'))
)
},
isDesktop() {