diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue index 3f89b1591..24cf12818 100644 --- a/src/components/AccountCreateUpdateForm/index.vue +++ b/src/components/AccountCreateUpdateForm/index.vue @@ -49,7 +49,7 @@ export default { protocols: [ { name: 'ssh', - secret_types: ['password', 'ssh_key', 'token', 'api_key'] + secret_types: ['password', 'ssh_key', 'token', 'access_key'] } ] }, @@ -61,7 +61,7 @@ export default { [this.$t('common.Basic'), ['name', 'username', ...this.controlShowField()]], [this.$t('assets.Secret'), [ 'secret_type', 'secret', 'ssh_key', - 'token', 'api_key', 'passphrase' + 'token', 'access_key', 'passphrase' ]], [this.$t('common.Other'), ['push_now', 'on_invalid', 'is_active', 'comment']] ], @@ -153,11 +153,11 @@ export default { component: UploadSecret, hidden: (formValue) => formValue.secret_type !== 'token' }, - api_key: { - id: 'api_key', + access_key: { + id: 'access_key', label: this.$t('assets.AccessKey'), component: UploadSecret, - hidden: (formValue) => formValue.secret_type !== 'api_key' + hidden: (formValue) => formValue.secret_type !== 'access_key' }, secret_type: { type: 'radio-group', @@ -209,7 +209,7 @@ export default { }, { label: this.$t('assets.AccessKey'), - value: 'api_key' + value: 'access_key' } ] const secretTypes = [] diff --git a/src/components/AccountListTable/AccountCreateUpdate.vue b/src/components/AccountListTable/AccountCreateUpdate.vue index 63b460e60..7d372aeba 100644 --- a/src/components/AccountListTable/AccountCreateUpdate.vue +++ b/src/components/AccountListTable/AccountCreateUpdate.vue @@ -101,7 +101,13 @@ export default { }).catch(error => this.setFieldError(error)) }, handleResult(resp, error) { - const bulkCreate = !this.asset + let bulkCreate = !this.asset + if (error && !Array.isArray(error)) { + bulkCreate = false + } + // if (resp && !Array.isArray(resp)) { + // bulkCreate = false + // } if (!bulkCreate) { if (!error) { this.$message.success(this.$tc('common.createSuccessMsg')) @@ -111,7 +117,6 @@ export default { } else { let result if (error) { - console.log('Error: ', error) result = error.response.data } else { result = resp diff --git a/src/components/AccountListTable/AccountList.vue b/src/components/AccountListTable/AccountList.vue index 76e4e17d2..1c16490fb 100644 --- a/src/components/AccountListTable/AccountList.vue +++ b/src/components/AccountListTable/AccountList.vue @@ -338,8 +338,11 @@ export default { this.$refs.ListTable.reloadTable() }, showBulkCreateResult(results) { + this.showResultDialog = false this.createAccountResults = results - this.showResultDialog = true + setTimeout(() => { + this.showResultDialog = true + }, 100) } } } diff --git a/src/components/AccountListTable/BulkCreateResultDialog.vue b/src/components/AccountListTable/BulkCreateResultDialog.vue index 0ab753d17..860242ea0 100644 --- a/src/components/AccountListTable/BulkCreateResultDialog.vue +++ b/src/components/AccountListTable/BulkCreateResultDialog.vue @@ -74,7 +74,8 @@ export default { total: this.$tc('common.Total'), created: this.$tc('common.Created'), updated: this.$tc('common.Updated'), - skipped: this.$tc('common.Skipped') + skipped: this.$tc('common.Skipped'), + error: this.$tc('common.Error') } const grouped = _.groupBy(this.result, 'state') const groupedLength = _.mapValues(grouped, 'length')