diff --git a/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue b/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue index 5457187b0..c6686126d 100644 --- a/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue +++ b/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue @@ -30,7 +30,7 @@ export default { columnsShow: { default: [ 'automation', 'backup_name', 'trigger', - 'date_start', 'date_finished', 'duration', 'actions' + 'date_start', 'date_finished', 'actions' ] }, columnsMeta: { diff --git a/src/views/accounts/AccountBackup/AccountBackupList.vue b/src/views/accounts/AccountBackup/AccountBackupList.vue index 2b4f41828..9844319fc 100644 --- a/src/views/accounts/AccountBackup/AccountBackupList.vue +++ b/src/views/accounts/AccountBackup/AccountBackupList.vue @@ -38,7 +38,7 @@ export default { columnsShow: { min: ['name', 'actions'], default: [ - 'name', 'backup_type', 'org_name', 'periodic_display', + 'name', 'backup_type', 'periodic_display', 'executed_amount', 'is_active', 'actions' ] }, diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue index 497a01acc..bb33d13cd 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue @@ -22,7 +22,7 @@ export default { ], columnsShow: { default: [ - 'automation', 'change_secret_name', 'status', + 'automation', 'change_secret_name', 'trigger', 'status', 'date_start', 'date_finished', 'actions' ] }, diff --git a/src/views/accounts/AccountChangeSecret/index.vue b/src/views/accounts/AccountChangeSecret/index.vue index 76058c4b0..8934928ba 100644 --- a/src/views/accounts/AccountChangeSecret/index.vue +++ b/src/views/accounts/AccountChangeSecret/index.vue @@ -36,7 +36,7 @@ export default { ) }, { - title: this.$t('AccountRecord'), + title: this.$t('RecordList'), name: 'ChangeSecretRecord', hidden: () => !this.$hasPerm('accounts.view_changesecretrecord'), component: () => import( diff --git a/src/views/accounts/AccountPush/AccountPushExecutionList.vue b/src/views/accounts/AccountPush/AccountPushExecutionList.vue index b18ffa193..6a2a483a0 100644 --- a/src/views/accounts/AccountPush/AccountPushExecutionList.vue +++ b/src/views/accounts/AccountPush/AccountPushExecutionList.vue @@ -28,7 +28,7 @@ export default { ], columnsShow: { default: [ - 'automation', 'push_user_name', 'status', + 'automation', 'push_user_name', 'trigger', 'status', 'date_start', 'date_finished', 'actions' ] }, diff --git a/src/views/accounts/AccountPush/index.vue b/src/views/accounts/AccountPush/index.vue index f6e91577d..af4e0b3db 100644 --- a/src/views/accounts/AccountPush/index.vue +++ b/src/views/accounts/AccountPush/index.vue @@ -28,7 +28,7 @@ export default { component: () => import('@/views/accounts/AccountPush/AccountPushExecutionList.vue') }, { - title: this.$t('AccountRecord'), + title: this.$t('RecordList'), name: 'AccountPushRecord', hidden: () => !this.$hasPerm('accounts.view_pushsecretrecord'), component: () => import( diff --git a/src/views/pam/Integration/index.vue b/src/views/pam/Integration/index.vue index 62512bf99..837cd3b7a 100644 --- a/src/views/pam/Integration/index.vue +++ b/src/views/pam/Integration/index.vue @@ -26,7 +26,7 @@ export default { }, { name: 'records', - title: this.$t('Records'), + title: this.$t('RecordList'), hidden: !this.$hasPerm('audits.view_integrationapplicationlog'), component: () => import('@/views/pam/Integration/components/CallRecords.vue') }, diff --git a/src/views/pam/RiskDetect/AccountCheckExecutionList.vue b/src/views/pam/RiskDetect/AccountCheckExecutionList.vue index 04e2bf9a8..5fdc4272c 100644 --- a/src/views/pam/RiskDetect/AccountCheckExecutionList.vue +++ b/src/views/pam/RiskDetect/AccountCheckExecutionList.vue @@ -8,7 +8,7 @@ import { openTaskPage } from '@/utils/jms' import { DetailFormatter } from '@/components/Table/TableFormatters' export default { - name: 'AccountPushExecutionList', + name: 'CheckAccountExecutionList', components: { GenericListTable }, @@ -24,7 +24,7 @@ export default { tableConfig: { url: '/api/v1/accounts/check-account-executions/', columns: [ - 'task_name', 'asset_amount', + 'automation', 'task_name', 'asset_amount', 'node_amount', 'status', 'trigger', 'date_start', 'date_finished', 'actions' ], @@ -36,9 +36,16 @@ export default { }, columnsMeta: { automation: { - label: this.$t('TaskID'), - formatter: function(row) { - return {row.automation} + label: this.$t('ID'), + formatter: DetailFormatter, + formatterArgs: { + route: 'AccountCheckExecutionDetail', + getRoute: ({ row }) => ({ + name: 'AccountCheckExecutionDetail', + params: { id: row.id } + }), + drawer: true, + can: this.$hasPerm('accounts.view_checkaccountexecution') } }, task_name: { @@ -68,12 +75,6 @@ export default { status: { label: this.$t('Result') }, - timedelta: { - label: this.$t('TimeDelta'), - formatter: function(row) { - return row.timedelta.toFixed(2) + 's' - } - }, actions: { formatterArgs: { hasDelete: false, @@ -83,26 +84,17 @@ export default { { name: 'log', type: 'primary', - can: this.$hasPerm('accounts.view_pushaccountexecution'), + can: this.$hasPerm('accounts.view_checkaccountexecution'), title: this.$t('Log'), callback: function({ row }) { openTaskPage(row['id']) } }, - { - name: 'detail', - title: this.$t('Detail'), - type: 'info', - can: this.$hasPerm('accounts.view_pushaccountexecution'), - callback: function({ row }) { - return this.$router.push({ name: 'AccountCheckExecutionDetail', params: { id: row.id }}) - } - }, { name: 'report', title: this.$t('Report'), type: 'success', - can: this.$hasPerm('accounts.view_pushaccountexecution'), + can: this.$hasPerm('accounts.view_checkaccountexecution'), callback: function({ row }) { window.open(`/api/v1/accounts/check-account-executions/${row.id}/report/`) }