From e62bffd20aa0510ede389ea30f69a55b4eb031b1 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 20 Oct 2022 15:40:05 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B=20?=
 =?UTF-8?q?account?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountHistoryTable/index.vue     |  2 +-
 src/components/AccountListTable/AddAccount.vue   |  7 +------
 .../AccountListTable/UpdateSecretInfo.vue        |  2 +-
 .../{ShowSecretInfo.vue => ViewSecret.vue}       | 16 ++++++++--------
 src/components/AccountListTable/index.vue        | 12 +++++++-----
 5 files changed, 18 insertions(+), 21 deletions(-)
 rename src/components/AccountListTable/{ShowSecretInfo.vue => ViewSecret.vue} (73%)

diff --git a/src/components/AccountHistoryTable/index.vue b/src/components/AccountHistoryTable/index.vue
index 82fb7cff8..a7d4e5925 100644
--- a/src/components/AccountHistoryTable/index.vue
+++ b/src/components/AccountHistoryTable/index.vue
@@ -7,7 +7,7 @@
 
 <script>
 import { ActionsFormatter, DetailFormatter } from '@/components/TableFormatters'
-import ShowSecretInfo from '../AccountListTable/ShowSecretInfo'
+import ShowSecretInfo from '../AccountListTable/ViewSecret'
 import { GenericListPage } from '@/layout/components'
 
 export default {
diff --git a/src/components/AccountListTable/AddAccount.vue b/src/components/AccountListTable/AddAccount.vue
index b8fd80cb2..c1e9f4bf7 100644
--- a/src/components/AccountListTable/AddAccount.vue
+++ b/src/components/AccountListTable/AddAccount.vue
@@ -13,7 +13,6 @@
     <AccountCreateUpdateForm
       v-if="!loading"
       :platform="platform"
-      :protocols="protocols"
       :account="account"
       @add="addAccount"
       @edit="editAccount"
@@ -41,11 +40,7 @@ export default {
     },
     account: {
       type: Object,
-      default: () => ({
-        name: '',
-        username: '',
-        secret: ''
-      })
+      default: () => ({})
     }
   },
   data() {
diff --git a/src/components/AccountListTable/UpdateSecretInfo.vue b/src/components/AccountListTable/UpdateSecretInfo.vue
index b035b3b8d..9c8e770ea 100644
--- a/src/components/AccountListTable/UpdateSecretInfo.vue
+++ b/src/components/AccountListTable/UpdateSecretInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <Dialog
     width="50"
-    :title="this.$t('assets.UpdateAssetUserToken')"
+    :title="this.$tc('assets.UpdateAssetUserToken')"
     :visible.sync="visible"
     :destroy-on-close="true"
     @confirm="handleConfirm()"
diff --git a/src/components/AccountListTable/ShowSecretInfo.vue b/src/components/AccountListTable/ViewSecret.vue
similarity index 73%
rename from src/components/AccountListTable/ShowSecretInfo.vue
rename to src/components/AccountListTable/ViewSecret.vue
index 6cbab634d..9c7b5d92e 100644
--- a/src/components/AccountListTable/ShowSecretInfo.vue
+++ b/src/components/AccountListTable/ViewSecret.vue
@@ -17,17 +17,17 @@
     >
       <div>
         <el-form label-position="right" label-width="80px" :model="authInfo">
-          <el-form-item :label="this.$t('assets.Name')">
-            <el-input v-model="account['asset_name']" readonly />
+          <el-form-item :label="this.$tc('assets.Name')">
+            <el-input v-model="account['name']" readonly />
           </el-form-item>
-          <el-form-item :label="this.$t('assets.Username')">
+          <el-form-item :label="this.$tc('assets.Username')">
             <el-input v-model="account['username']" readonly />
           </el-form-item>
-          <el-form-item :label="this.$t('assets.Password')">
-            <el-input v-model="authInfo.password" type="password" show-password />
+          <el-form-item v-if="account['secret_type'] === 'password'" :label="this.$tc('assets.Password')">
+            <el-input v-model="authInfo.secret" type="password" show-password />
           </el-form-item>
-          <el-form-item :label="this.$t('users.SSHKey')">
-            <el-input v-model="authInfo['private_key']" class="item-textarea" type="textarea" show-password />
+          <el-form-item v-else :label="this.$tc('assets.Key')">
+            <el-input v-model="authInfo.secret" type="textarea" :rows="10" />
           </el-form-item>
         </el-form>
       </div>
@@ -56,7 +56,7 @@ export default {
   },
   data() {
     return {
-      dialogTitle: this.$t('common.ViewSecret'),
+      dialogTitle: this.$tc('common.ViewSecret'),
       authInfo: {},
       showAuthInfo: false,
       url: `/api/v1/assets/account-secrets/${this.account.id}/`
diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue
index 6921712ab..c4735f4f1 100644
--- a/src/components/AccountListTable/index.vue
+++ b/src/components/AccountListTable/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
-    <ShowSecretInfo v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" />
+    <ViewSecret v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" />
     <UpdateSecretInfo
       v-if="showUpdateSecretDialog"
       :visible.sync="showUpdateSecretDialog"
@@ -21,7 +21,7 @@
 <script>
 import ListTable from '@/components/ListTable/index'
 import { ActionsFormatter } from '@/components/TableFormatters'
-import ShowSecretInfo from './ShowSecretInfo'
+import ViewSecret from './ViewSecret'
 import UpdateSecretInfo from './UpdateSecretInfo'
 import AddAccount from './AddAccount'
 import { connectivityMeta } from './const'
@@ -33,7 +33,7 @@ export default {
   components: {
     ListTable,
     UpdateSecretInfo,
-    ShowSecretInfo,
+    ViewSecret,
     AddAccount
   },
   props: {
@@ -130,7 +130,7 @@ export default {
                 {
                   name: 'View',
                   title: this.$t('common.View'),
-                  can: this.$hasPerm('assets.view_assetaccountsecret'),
+                  can: this.$hasPerm('assets.view_accountsecret'),
                   type: 'primary',
                   callback: ({ row }) => {
                     vm.account = row
@@ -168,7 +168,7 @@ export default {
                 {
                   name: 'Update',
                   title: this.$t('common.Update'),
-                  can: this.$hasPerm('assets.change_assetaccountsecret') && !this.$store.getters.currentOrgIsRoot,
+                  can: this.$hasPerm('assets.change_account') && !this.$store.getters.currentOrgIsRoot,
                   callback: ({ row }) => {
                     vm.account = row
                     vm.showAddDialog = false
@@ -233,6 +233,8 @@ export default {
         actionColumn.formatterArgs.extraActions.push(item)
       }
     }
+
+    console.log('Has perm: ', this.$hasPerm('assets.change_account'))
   },
   methods: {
     onUpdateAuthDone(account) {