diff --git a/src/views/sessions/CommandStorageCreate.vue b/src/views/sessions/CommandStorageCreate.vue deleted file mode 100644 index a3486c939..000000000 --- a/src/views/sessions/CommandStorageCreate.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - - - diff --git a/src/views/sessions/CommandStorageUpdate.vue b/src/views/sessions/CommandStorageCreateUpdate.vue similarity index 53% rename from src/views/sessions/CommandStorageUpdate.vue rename to src/views/sessions/CommandStorageCreateUpdate.vue index 91facfb52..5883c76f1 100644 --- a/src/views/sessions/CommandStorageUpdate.vue +++ b/src/views/sessions/CommandStorageCreateUpdate.vue @@ -3,10 +3,12 @@ @@ -28,75 +30,79 @@ export default { comment: '' }, commandStorageData: {}, - updateSuccessUrl: { name: 'Storage', params: { activeMenu: 'command' }}, - es: { - initial: { - type: 'es' + successUrl: { name: 'Storage', params: { activeMenu: 'command' }}, + + fieldsMeta: { + name: { + label: this.$t('sessions.name') }, - fields: [ - ['', ['name', 'type', 'hosts', 'index', 'doc_type', 'comment']] - ], - fieldsMeta: { - name: { - label: this.$t('sessions.name') - }, - comment: { - label: this.$t('sessions.comment') - }, - type: { - type: 'select', - label: this.$t('sessions.type'), - disabled: true, - rules: [ - { required: true } - ] - }, - hosts: { - label: this.$t('sessions.hosts'), - rules: [ - { required: true } - ] - }, - index: { - label: this.$t('sessions.index'), - rules: [ - { required: true } - ] - }, - doc_type: { - label: this.$t('sessions.docType'), - rules: [ - { required: true } - ] - } + comment: { + label: this.$t('sessions.comment') + }, + type: { + type: 'select', + label: this.$t('sessions.type'), + disabled: true, + rules: [ + { required: true } + ] + }, + hosts: { + label: this.$t('sessions.hosts'), + rules: [ + { required: true } + ] + }, + index: { + label: this.$t('sessions.index'), + rules: [ + { required: true } + ] + }, + doc_type: { + label: this.$t('sessions.docType'), + rules: [ + { required: true } + ] } }, + fieldsMap: { + es: ['name', 'type', 'hosts', 'index', 'doc_type', 'comment'] + }, url: '/api/v1/terminal/command-storages/' } }, computed: { selectFields() { - return this.renderCommandStorage.fields + return this.fieldsMap[this.currentType] }, - selectedFieldsMeta() { - return this.renderCommandStorage.fieldsMeta + initial() { + return { type: this.currentType } }, - renderCommandStorage() { - switch (this.formData.type.toLowerCase()) { - case 'es': - return this.es - default: - return {} + currentType() { + const params = this.$route.params + const query = this.$route.query + if (params.id) { + return this.formData.type + } else if (query.type) { + return query.type } + return 'es' } }, mounted() { - getCommandStorage(this.$route.params.id).then(data => { - this.commandStorageData = data - console.log(data) - this.formData = this.convertMataToForm(this.commandStorageData) + const params = this.$route.params + const query = this.$route.query + if (params.id) { + getCommandStorage(this.$route.params.id).then(data => { + this.commandStorageData = data + this.formData = this.convertMataToForm(this.commandStorageData) + this.loading = false + }) + } + if (query.type) { this.loading = false - }) + } }, methods: { convertMataToForm(commandStorageData) { diff --git a/src/views/sessions/ReplayStorageCreate.vue b/src/views/sessions/ReplayStorageCreate.vue deleted file mode 100644 index dc0d25826..000000000 --- a/src/views/sessions/ReplayStorageCreate.vue +++ /dev/null @@ -1,337 +0,0 @@ - - - - - diff --git a/src/views/sessions/ReplayStorageCreateUpdate.vue b/src/views/sessions/ReplayStorageCreateUpdate.vue new file mode 100644 index 000000000..3e4aac62b --- /dev/null +++ b/src/views/sessions/ReplayStorageCreateUpdate.vue @@ -0,0 +1,291 @@ + + + + + diff --git a/src/views/sessions/ReplayStorageUpdate.vue b/src/views/sessions/ReplayStorageUpdate.vue deleted file mode 100644 index a21b1adff..000000000 --- a/src/views/sessions/ReplayStorageUpdate.vue +++ /dev/null @@ -1,396 +0,0 @@ - - - - - diff --git a/src/views/sessions/index.js b/src/views/sessions/index.js index 50c01a0ec..c629b165b 100644 --- a/src/views/sessions/index.js +++ b/src/views/sessions/index.js @@ -66,28 +66,28 @@ export default [ { path: 'replay-storage/create', name: 'CreateReplayStorage', - component: () => import('@/views/sessions/ReplayStorageCreate'), + component: () => import('@/views/sessions/ReplayStorageCreateUpdate'), meta: { title: 'CreateReplayStorage' }, hidden: true }, { path: 'command-storage/create', name: 'CreateCommandStorage', - component: () => import('@/views/sessions/CommandStorageCreate'), + component: () => import('@/views/sessions/CommandStorageCreateUpdate'), meta: { title: 'CreateCommandStorage' }, hidden: true }, { path: 'replay-storage/:id/update', name: 'ReplayStorageUpdate', - component: () => import('@/views/sessions/ReplayStorageUpdate'), + component: () => import('@/views/sessions/ReplayStorageCreateUpdate'), meta: { title: 'ReplayStorageUpdate' }, hidden: true }, { path: 'command-storage/:id/update', name: 'CommandStorageUpdate', - component: () => import('@/views/sessions/CommandStorageUpdate'), + component: () => import('@/views/sessions/CommandStorageCreateUpdate'), meta: { title: 'CommandStorageUpdate' }, hidden: true }