From fea6155306e8c89c7d8306019566f0d27a0d35f2 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 20 Feb 2023 17:59:57 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20account=20tasks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataTable/index.vue        | 12 +++++++
 .../AssetAccountDetail/Activity.vue           | 36 -------------------
 .../AssetAccountDetail/Detail.vue             | 31 +++++++++++++---
 .../Platform/PlatformDetail/Automation.vue    |  5 ++-
 src/views/settings/Ldap/SyncSettingDialog.vue | 15 +++++---
 src/views/tasks/TaskDetail/TaskHistory.vue    |  8 +++--
 6 files changed, 58 insertions(+), 49 deletions(-)
 delete mode 100644 src/views/accounts/AssetAccount/AssetAccountDetail/Activity.vue

diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue
index 26ea2428c..aee79a1c5 100644
--- a/src/components/AutoDataTable/index.vue
+++ b/src/components/AutoDataTable/index.vue
@@ -232,6 +232,16 @@ export default {
       }
       return col
     },
+    addOrderingIfNeed(col) {
+      if (col.prop) {
+        const column = this.meta[col.prop] || {}
+        if (column.order) {
+          col.sortable = 'custom'
+          col['column-key'] = col.prop
+        }
+      }
+      return col
+    },
     setDefaultFormatterIfNeed(col) {
       if (!col.formatter) {
         col.formatter = (row, column, cellValue) => {
@@ -247,6 +257,7 @@ export default {
       }
       return col
     },
+
     generateColumn(name) {
       const colMeta = this.meta[name] || {}
       const customMeta = this.config.columnsMeta ? this.config.columnsMeta[name] : {}
@@ -258,6 +269,7 @@ export default {
       col = Object.assign(col, customMeta)
       col = this.addHelpTipsIfNeed(col)
       col = this.addFilterIfNeed(col)
+      col = this.addOrderingIfNeed(col)
       return col
     },
     generateTotalColumns() {
diff --git a/src/views/accounts/AssetAccount/AssetAccountDetail/Activity.vue b/src/views/accounts/AssetAccount/AssetAccountDetail/Activity.vue
deleted file mode 100644
index ce9ade964..000000000
--- a/src/views/accounts/AssetAccount/AssetAccountDetail/Activity.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <el-row :gutter="20">
-    <el-col :md="12" :sm="24">
-      <TimelineCard :title="activityTitle" :url="activityUrl" />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import TimelineCard from '@/components/TimelineCard'
-
-export default {
-  name: 'AssetActivity',
-  components: {
-    TimelineCard
-  },
-  props: {
-    object: {
-      type: Object,
-      default: () => {}
-    }
-  },
-  data() {
-    return {
-      activityUrl: `/api/v1/audits/activities/?resource_id=${this.object.id}`,
-      activityTitle: `${this.$t('common.Activity')} - ${this.$t('audits.OperateRecord')} (${this.$t('common.Last30')})`
-    }
-  },
-  mounted() {
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
index 28a67de04..6440a82b9 100644
--- a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
@@ -1,10 +1,10 @@
 <template>
   <el-row :gutter="20">
     <el-col :md="14" :sm="24">
-      <AutoDetailCard :url="url" :excludes="excludes" :object="object" />
+      <AutoDetailCard :excludes="excludes" :object="object" :url="url" />
     </el-col>
     <el-col :md="10" :sm="24">
-      <QuickActions type="primary" :actions="quickActions" />
+      <QuickActions :actions="quickActions" type="primary" />
     </el-col>
   </el-row>
 </template>
@@ -78,8 +78,29 @@ export default {
           callbacks: Object.freeze({
             click: () => {
               this.$axios.post(
-                `/api/v1/accounts/accounts/${this.object.id}/verify/`,
-                { action: 'test' }
+                `/api/v1/accounts/accounts/tasks/`,
+                {
+                  action: 'test',
+                  accounts: [this.object.id]
+                }
+              ).then(res => {
+                openTaskPage(res['task'])
+              })
+            }
+          })
+        },
+        {
+          title: this.$t('assets.PushAccount'),
+          attrs: {
+            type: 'primary',
+            label: this.$t('assets.Push'),
+            disabled: !vm.$hasPerm('accounts.create_account')
+          },
+          callbacks: Object.freeze({
+            click: () => {
+              this.$axios.post(
+                `/api/v1/accounts/accounts/tasks/`,
+                { action: 'verify', accounts: [this.object.id] }
               ).then(res => {
                 openTaskPage(res['task'])
               })
@@ -124,5 +145,5 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 </style>
diff --git a/src/views/assets/Platform/PlatformDetail/Automation.vue b/src/views/assets/Platform/PlatformDetail/Automation.vue
index 7b28dfd6e..db1886eed 100644
--- a/src/views/assets/Platform/PlatformDetail/Automation.vue
+++ b/src/views/assets/Platform/PlatformDetail/Automation.vue
@@ -1,6 +1,6 @@
 <template>
   <IBox v-if="!loading">
-    <GenericCreateUpdateForm v-bind="$data" />
+    <GenericCreateUpdateForm class="form" v-bind="$data" />
   </IBox>
 </template>
 
@@ -69,5 +69,8 @@ export default {
 </script>
 
 <style scoped>
+.form >>> .el-select {
+  width: 100%;
+}
 
 </style>
diff --git a/src/views/settings/Ldap/SyncSettingDialog.vue b/src/views/settings/Ldap/SyncSettingDialog.vue
index ab54e5b5a..f5a6c7c46 100644
--- a/src/views/settings/Ldap/SyncSettingDialog.vue
+++ b/src/views/settings/Ldap/SyncSettingDialog.vue
@@ -1,27 +1,27 @@
 <template>
   <Dialog
-    :title="$tc('setting.SyncSetting')"
     :destroy-on-close="true"
     :show-cancel="false"
     :show-confirm="false"
-    width="50%"
+    :title="$tc('setting.SyncSetting')"
     top="10%"
     v-bind="$attrs"
+    width="50%"
     v-on="$listeners"
   >
     <GenericCreateUpdateForm
-      v-bind="settings"
       :has-detail-in-msg="false"
+      v-bind="settings"
+      @submitSuccess="onSuccess"
     />
   </Dialog>
 </template>
 
 <script>
 import { GenericCreateUpdateForm } from '@/layout/components'
-import { Dialog } from '@/components'
+import { CronTab, Dialog } from '@/components'
 import Select2 from '@/components/FormFields/Select2'
 import { Required } from '@/components/DataForm/rules'
-import { CronTab } from '@/components'
 
 export default {
   name: 'SyncSettingDialog',
@@ -67,6 +67,11 @@ export default {
         submitMethod: () => 'patch'
       }
     }
+  },
+  methods: {
+    onSuccess() {
+      this.$emit('update:visible', false)
+    }
   }
 }
 </script>
diff --git a/src/views/tasks/TaskDetail/TaskHistory.vue b/src/views/tasks/TaskDetail/TaskHistory.vue
index 63a8b5096..27f4bbcb5 100644
--- a/src/views/tasks/TaskDetail/TaskHistory.vue
+++ b/src/views/tasks/TaskDetail/TaskHistory.vue
@@ -1,5 +1,5 @@
 <template>
-  <ListTable ref="list" :table-config="tableConfig" :header-actions="headerActions" />
+  <ListTable ref="list" :header-actions="headerActions" :table-config="tableConfig" />
 </template>
 
 <script type="text/jsx">
@@ -24,8 +24,12 @@ export default {
         hasSelection: false,
         url: `/api/v1/ops/task-executions/?task_id=${this.object.id}`,
         columns: [
-          'id', 'is_finished', 'is_success', 'time_cost', 'date_start', 'actions'
+          'id', 'is_finished', 'is_success', 'time_cost', 'date_start',
+          'date_published', 'date_finished', 'actions'
         ],
+        columnsShow: {
+          default: ['id', 'is_finished', 'is_success', 'time_cost', 'date_start', 'actions']
+        },
         columnsMeta: {
           is_finished: {
             label: this.$t('ops.isFinished'),