From 8bb68369e4796c26e6134aa27f14fdff5f94d81d Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 28 May 2020 18:56:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[Update]=20=E9=9C=80=E6=94=B9=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E6=8C=87=E5=AE=9Atab=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetPermission/AssetPermissionList.vue    | 18 +++++++++++++++---
 .../DatabaseAppPermissionList.vue              |  6 +++++-
 .../RemoteAppPermissionList.vue                |  6 +++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue
index bb3a6a176..e2bce4233 100644
--- a/src/views/perms/AssetPermission/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionList.vue
@@ -50,7 +50,11 @@ export default {
             }
           },
           user_groups_amount: {
-            label: this.$t('perms.UserGroups')
+            label: this.$t('perms.UserGroups'),
+            formatter: DetailFormatter,
+            routeQuery: {
+              activeTab: 'AssetPermissionUser'
+            }
           },
           assets_amount: {
             label: this.$t('perms.Asset'),
@@ -60,10 +64,18 @@ export default {
             }
           },
           nodes_amount: {
-            label: this.$t('perms.Node')
+            label: this.$t('perms.Node'),
+            formatter: DetailFormatter,
+            routeQuery: {
+              activeTab: 'AssetPermissionAsset'
+            }
           },
           system_users_amount: {
-            label: this.$t('perms.SystemUser')
+            label: this.$t('perms.SystemUser'),
+            formatter: DetailFormatter,
+            routeQuery: {
+              activeTab: 'AssetPermissionAsset'
+            }
           }
         },
         actions: {
diff --git a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionList.vue
index de1dd3ec1..3e060d0fb 100644
--- a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionList.vue
@@ -43,7 +43,11 @@ export default {
             }
           },
           system_users_amount: {
-            label: this.$t('perms.SystemUser')
+            label: this.$t('perms.SystemUser'),
+            formatter: DetailFormatter,
+            routeQuery: {
+              activeTab: 'DatabaseAppPermissionDatabaseApp'
+            }
           }
         }
       },
diff --git a/src/views/perms/RemoteAppPermission/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermission/RemoteAppPermissionList.vue
index 6d262b0d8..365f3e64b 100644
--- a/src/views/perms/RemoteAppPermission/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermission/RemoteAppPermissionList.vue
@@ -42,7 +42,11 @@ export default {
             }
           },
           system_users_amount: {
-            label: this.$t('assets.SystemUsers')
+            label: this.$t('assets.SystemUsers'),
+            formatter: DetailFormatter,
+            routeQuery: {
+              activeTab: 'RemoteAppPermissionRemoteApp'
+            }
           }
         }
       },

From e92d29c2a768daca58a9e9e40126d2a426cede7b Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Thu, 28 May 2020 20:31:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=E9=A1=B5=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=8D=A1=E7=89=87=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |   1 +
 src/i18n/langs/en.json                        |   1 +
 .../SystemUser/SystemUserCreateUpdate.vue     |  17 ++-
 .../SystemUser/SystemUserDetail/AssetList.vue | 138 ++++++++++++++----
 .../SystemUser/SystemUserDetail/Detail.vue    |  55 ++++++-
 5 files changed, 177 insertions(+), 35 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index dae9036e3..426885885 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -10,6 +10,7 @@
   },
   "assets": {
     "Action": "动作",
+    "CmdFilter": "命令过滤器",
     "UpdateAssetUserToken": "更新资产用户认证信息",
     "Password": "密码",
     "RefreshHardware": "更新硬件信息",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 721263d78..8ac8c70e8 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -10,6 +10,7 @@
   },
   "assets": {
     "Action": "Action",
+    "CmdFilter": "CmdFilter",
     "UpdateAssetUserToken": "Update asset user auth",
     "Password": "Password",
     "RefreshHardware": "Refresh hardware",
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
index 9bf40a8da..3f3eb2db9 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue
@@ -4,8 +4,8 @@
 
 <script>
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
-import select2 from '@/components/Select2'
 import UploadKey from '@/components/UploadKey'
+import { Select2 } from '@/components'
 export default {
   name: 'SystemUserCreateUpdate',
   components: { GenericCreateUpdatePage },
@@ -71,9 +71,20 @@ export default {
           }
         },
         cmd_filters: {
-          component: select2,
+          component: Select2,
           el: {
-            placeholder: '命令过滤器'
+            multiple: true,
+            value: [],
+            ajax: {
+              url: '/api/v1/assets/cmd-filters/',
+              processResults(data) {
+                const results = data.results.map((item) => {
+                  return { label: item.name, value: item.id }
+                })
+                const more = !!data.next
+                return { results: results, pagination: more, total: data.count }
+              }
+            }
           }
         },
         priority: {
diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
index aa536be2a..df79d636f 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
@@ -1,13 +1,31 @@
 <template>
-  <el-row :gutter="20">
-    <el-col :span="14">
-      <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
-    </el-col>
-    <el-col :span="10">
-      <QuickActions type="primary" :actions="quickActions" />
-      <RelationCard type="info" style="margin-top: 15px" v-bind="nodeReletionConfig" />
-    </el-col>
-  </el-row>
+  <div>
+    <el-row :gutter="20">
+      <el-col :span="14">
+        <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
+      </el-col>
+      <el-col :span="10">
+        <QuickActions type="primary" :actions="quickActions" />
+        <RelationCard type="info" style="margin-top: 15px" v-bind="nodeReletionConfig" />
+      </el-col>
+    </el-row>
+    <Dialog width="50" :title="this.$t('assets.UpdateAssetUserToken')" :visible.sync="showDialog" @confirm="handleConfirm()" @cancel="handleCancel()">
+      <el-form label-position="right" label-width="80px" :model="dialogInfo">
+        <el-form-item :label="this.$t('assets.Hostname')">
+          <el-input v-model="dialogInfo.hostname" disabled />
+        </el-form-item>
+        <el-form-item :label="this.$t('assets.Username')">
+          <el-input v-model="dialogInfo.username" disabled />
+        </el-form-item>
+        <el-form-item :label="this.$t('assets.Password')">
+          <el-input v-model="dialogInfo.password" type="password" />
+        </el-form-item>
+        <el-form-item :label="this.$t('assets.sshkey')">
+          <input type="file" @change="Onchange">
+        </el-form-item>
+      </el-form>
+    </Dialog>
+  </div>
 </template>
 
 <script>
@@ -15,13 +33,15 @@ import ListTable from '@/components/ListTable/index'
 import { CustomActionsFormatter, DateFormatter } from '@/components/ListTable/formatters'
 import QuickActions from '@/components/QuickActions/index'
 import RelationCard from '@/components/RelationCard'
+import Dialog from '@/components/Dialog'
 
 export default {
   name: 'Detail',
   components: {
     QuickActions,
     ListTable,
-    RelationCard
+    RelationCard,
+    Dialog
   },
   props: {
     object: {
@@ -31,6 +51,14 @@ export default {
   },
   data() {
     return {
+      showDialog: false,
+      dialogInfo: {
+        asset: '',
+        username: '',
+        hostname: '',
+        password: '',
+        key: ''
+      },
       AutoPushConfig: {
         icon: 'fa-info',
         title: this.$t('assets.QuickUpdate'),
@@ -87,24 +115,6 @@ export default {
               )
             }.bind(this)
           }
-        },
-        {
-          title: this.$t('assets.PushSystemUserNow'),
-          attrs: {
-            type: 'primary',
-            label: this.$t('assets.Push')
-          },
-          callbacks: {
-            click: function() {
-              this.$axios.post(
-                `api/v1/assets/system-users/${this.object.id}/tasks/`,
-                { action: 'push' }
-              ).then(res => {
-                window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
-              }
-              )
-            }.bind(this)
-          }
         }
       ],
       tableConfig: {
@@ -148,16 +158,33 @@ export default {
                   }
                 },
                 {
-                  name: 'Test',
+                  name: this.$t('common.Test'),
                   title: this.$t('common.Test'),
                   callback: (val) => {
-                    console.log('Test')
+                    console.log(val.cellValue)
+                    this.$axios.post(
+                      `api/v1/assets/asset-users/tasks/?id=${val.cellValue}`,
+                      { action: 'test' }
+                    ).then(res => {
+                      window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
+                    })
                   }
                 },
+                {
+                  name: this.$t('common.Update'),
+                  title: this.$t('common.Update'),
+                  callback: function(val) {
+                    console.log(val)
+                    this.showDialog = true
+                    this.dialogInfo.asset = val.row.asset
+                    this.dialogInfo.hostname = val.row.hostname
+                    this.dialogInfo.username = val.row.username
+                  }.bind(this)
+                },
                 {
                   name: 'Push',
                   title: this.$t('common.Push'),
-                  callback: (val) => {
+                  callback: function(val) {
                     console.log('Push')
                   }
                 }
@@ -240,6 +267,55 @@ export default {
         }
       }
       )
+    },
+    handleCancel() {
+      this.dialogInfo = {
+        asset: '',
+        username: '',
+        hostname: '',
+        password: '',
+        key: ''
+      }
+      this.showDialog = false
+    },
+    Onchange(e) {
+      const vm = this
+      // TODO 校验文件类型
+      const reader = new FileReader()
+      reader.onload = function() {
+        vm.dialogInfo.key = this.result
+      }
+      reader.readAsText(
+        e.target.files[0]
+      )
+    },
+    handleConfirm() {
+      const data = {
+        asset: this.dialogInfo.asset,
+        username: this.dialogInfo.username
+      }
+      if (this.dialogInfo.password !== '') {
+        data.password = this.dialogInfo.password
+      }
+      if (this.dialogInfo.key !== '') {
+        data.key = this.dialogInfo.key
+      }
+      this.$axios.post(
+        `/api/v1/assets/asset-users/`,
+        data
+      ).then(res => {
+        this.$message.success(this.$t('common.updateSuccessMsg'))
+      }).catch(err => {
+        this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
+      })
+      this.dialogInfo = {
+        asset: '',
+        username: '',
+        hostname: '',
+        password: '',
+        key: ''
+      }
+      this.showDialog = false
     }
   }
 }
diff --git a/src/views/assets/SystemUser/SystemUserDetail/Detail.vue b/src/views/assets/SystemUser/SystemUserDetail/Detail.vue
index 92a1c9f62..5468cfbb3 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/Detail.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/Detail.vue
@@ -5,6 +5,7 @@
     </el-col>
     <el-col :span="10">
       <AutoPushCard v-bind="AutoPushConfig" />
+      <RelationCard v-if="object.protocol === 'ssh'" ref="RelationCard" type="info" style="margin-top: 15px" v-bind="nodeRelationConfig" />
     </el-col>
   </el-row>
 </template>a
@@ -12,12 +13,14 @@
 <script>
 import DetailCard from '@/components/DetailCard'
 import AutoPushCard from './AutoPushCard'
+import RelationCard from '@/components/RelationCard/index'
 
 export default {
   name: 'Detail',
   components: {
     DetailCard,
-    AutoPushCard
+    AutoPushCard,
+    RelationCard
   },
   props: {
     object: {
@@ -37,6 +40,56 @@ export default {
             auto_push: this.object.auto_push
           }
         ]
+      },
+      nodeRelationConfig: {
+        icon: 'fa-info',
+        hasObjectsId: this.object.cmd_filters,
+        title: this.$t('assets.CmdFilter'),
+        objectsAjax: {
+          url: '/api/v1/assets/cmd-filters/',
+          processResults(data) {
+            let results = data.results
+            results = results.map((item) => {
+              return { label: item.name, value: item.id }
+            })
+            const more = !!data.next
+            return { results: results, pagination: more, total: data.count }
+          }
+        },
+        performAdd: (items) => {
+          const objectId = this.object.id
+          const relationUrl = `/api/v1/assets/system-users/${objectId}/`
+          const objectOldRelationCmdFilters = this.object.cmd_filters
+          items.map(v => objectOldRelationCmdFilters.push(v.value))
+          const data = { cmd_filters: objectOldRelationCmdFilters }
+          return this.$axios.patch(relationUrl, data)
+        },
+        performDelete: (item) => {
+          const objectId = this.object.id
+          const relationUrl = `/api/v1/assets/system-users/${objectId}/`
+          const objectOldRelationCmdFilters = this.object.cmd_filters
+          const objectNewRelationCmdFilters = objectOldRelationCmdFilters.filter(v => v !== item.value)
+          const data = { cmd_filters: objectNewRelationCmdFilters }
+          return this.$axios.patch(relationUrl, data)
+        },
+        onAddSuccess: (objects, that) => {
+          this.$log.debug('Select value', that.select2.value)
+          that.iHasObjects = [...that.iHasObjects, ...objects]
+          that.$refs.select2.clearSelected()
+          this.$message.success(this.$t('common.updateSuccessMsg'))
+          // setTimeout(() => location.reload(), 300)
+        },
+        onDeleteSuccess: (obj, that) => {
+          const theRemoveIndex = that.iHasObjects.findIndex((v) => v.value === obj.value)
+          that.iHasObjects.splice(theRemoveIndex, 1)
+          while (that.select2.disabledValues.indexOf(obj.value) !== -1) {
+            const i = that.select2.disabledValues.indexOf(obj.value)
+            this.$log.debug('disabled values remove index: ', i)
+            that.select2.disabledValues.splice(i, 1)
+          }
+          this.$message.success(this.$t('common.deleteSuccessMsg'))
+          // setTimeout(() => location.reload(), 300)
+        }
       }
     }
   },

From 774462ac04c4285e1f0734d932fa3867d5b009bc Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 28 May 2020 20:45:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0API-key?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/ApiKey.vue | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/dashboard/ApiKey.vue b/src/views/dashboard/ApiKey.vue
index d5b86990d..af435f5d4 100644
--- a/src/views/dashboard/ApiKey.vue
+++ b/src/views/dashboard/ApiKey.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Dialog width="70%" :visible.sync="showDialog" :title="this.$t('setting.ApiKeyList')" :show-cancel="false" :show-confirm="false">
+    <Dialog width="45%" :visible.sync="showDialog" :title="this.$t('setting.ApiKeyList')" :show-cancel="false" :show-confirm="false">
       <div>
         <el-alert type="success"> {{ helpMessage }} </el-alert>
         <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
@@ -27,15 +27,24 @@ export default {
       showDialog: false,
       helpMessage: this.$t('setting.helpText.ApiKeyList'),
       tableConfig: {
+        hasSelection: true,
         url: `/api/v1/authentication/access-keys/`,
         columns: [
-          'id', 'secret', 'is_active', 'date_created', 'actions'
+          'id_display', 'secret', 'is_active', 'date_created', 'actions'
         ],
-        hasSelection: false,
         columnsMeta: {
+          id_display: {
+            label: 'ID',
+            width: '315px'
+          },
           secret: {
+            label: '密文',
+            width: '315px',
             formatter: ShowKeyFormatter
           },
+          is_active: {
+            width: '80px'
+          },
           date_created: {
             label: this.$t('setting.DateCreated'),
             formatter: DateFormatter
@@ -67,12 +76,12 @@ export default {
 
       },
       headerActions: {
+        hasSearch: true,
         hasRightActions: false,
         hasExport: false,
         hasImport: false,
         hasRefresh: true,
         hasBulkDelete: false,
-        hasSearch: false,
         hasCreate: false,
         extraActions: [
           {
@@ -80,7 +89,7 @@ export default {
             title: this.$t('setting.Create'),
             type: 'primary',
             can: true,
-            callback: () => {
+            callback: function() {
               this.$axios.post(
                 `/api/v1/authentication/access-keys/`
               ).then(res => {
@@ -88,8 +97,8 @@ export default {
                 this.$message.success(this.$t('common.updateSuccessMsg'))
               }).catch(error => {
                 this.$message.error(this.$t('common.updateErrorMsg' + ' ' + error))
-              }).bind(this)
-            }
+              })
+            }.bind(this)
           }
         ]
       }