Merge pull request #9249 from GuoLiBin6/feat/glb-to-4.0/src

feat: container image secret

Author: GuoLiBin6

containers/Ai/views/container-image-secret/components/List.vue

@@ -0,0 +1,19 @@
+<template>
+  <list id="ContainerImageSecretList" type="container_image" :get-params="getParams" />
+</template>
+
+<script>
+import List from '../../container-secret/components/List.vue'
+
+export default {
+  name: 'ContainerImageSecretList',
+  components: {
+    List,
+  },
+  props: {
+    getParams: {
+      type: Object,
+    },
+  },
+}
+</script>

containers/Ai/views/container-secret/components/List.vue

@@ -19,6 +19,8 @@ import { getNameFilter } from '@/utils/common/tableFilter'
 import SingleActionsMixin from '../mixins/singleActions'
 import ColumnsMixin from '../mixins/columns'
 
+const credentialIdFilterFormatter = (val) => `id.equals('${val}')`
+
 export default {
   name: 'ContainerSecretList',
   mixins: [WindowsMixin, ListMixin, ColumnsMixin, SingleActionsMixin],
@@ -27,6 +29,10 @@ export default {
     getParams: {
       type: Object,
     },
+    type: {
+      type: String,
+      default: 'container_secret',
+    },
   },
   data () {
     return {
@@ -39,7 +45,7 @@ export default {
           id: {
             label: this.$t('table.title.id'),
             filter: true,
-            formatter: val => `id.equals('${val}')`,
+            formatter: credentialIdFilterFormatter,
           },
           name: getNameFilter(),
         },
@@ -62,6 +68,7 @@ export default {
             buttonType: 'primary',
             validate: true,
           }),
+          hidden: this.type === 'container_image',
         },
         {
           label: this.$t('table.action.delete'),
@@ -84,13 +91,26 @@ export default {
   },
   created () {
     this.initSidePageTab('detail')
-    this.list.fetchData()
+    const q = this.$route.query || {}
+    if (this.type === 'container_image' && q.type === 'container_image' && q.id) {
+      const idStr = String(Array.isArray(q.id) ? q.id[0] : q.id).trim()
+      if (idStr) {
+        this.list.changeFilter({
+          id: [idStr],
+          __condition_id: 'equals',
+        })
+      } else {
+        this.list.fetchData()
+      }
+    } else {
+      this.list.fetchData()
+    }
   },
   methods: {
     getParam () {
       const ret = {
         ...this.getParams,
-        'filter.0': 'type.equals(container_secret)',
+        'filter.0': `type.equals(${this.type})`,
       }
       if (this.$store.getters.scope === 'project') {
         const uid = this.$store.getters.userInfo?.id

containers/Ai/views/container-secret/dialogs/Update.vue

@@ -1,6 +1,6 @@
 <template>
   <base-dialog :width="700" @cancel="cancelDialog">
-    <div slot="header">{{ $t('table.action.modify') }} - {{ $t('aice.container_secret') }}</div>
+    <div slot="header">{{ $t('table.action.modify') }} - {{ $t('dictionary.keypair') }}</div>
     <div slot="body">
       <a-spin :spinning="loadingDetail">
         <a-form v-if="!loadingDetail" :form="form.fc" hideRequiredMark v-bind="formItemLayout">
@@ -9,7 +9,7 @@
               v-decorator="decorators.name"
               :placeholder="$t('common.tips.input', [$t('common.name')])" />
           </a-form-item>
-          <a-form-item :label="$t('aice.container_secret')" :extra="$t('aice.container_secret.env_hint') + ' ' + $t('aice.container_secret.add_pair')">
+          <a-form-item :label="$t('dictionary.keypair')" :extra="$t('aice.container_secret.env_hint') + ' ' + $t('aice.container_secret.add_pair')">
             <div v-for="(item, index) in items" :key="item.id" class="d-flex align-items-start mb-2">
               <a-input
                 v-model="item.key"

containers/Ai/views/container-secret/mixins/columns.js

@@ -20,6 +20,15 @@ export default {
         field: 'type',
         title: this.$t('table.title.type'),
         width: 140,
+        formatter: ({ row }) => {
+          if (row.type === 'container_image') {
+            return this.$t('common.container_image_secret')
+          } else if (row.type === 'container_secret') {
+            return this.$t('common.container_secret')
+          } else {
+            return row.type || '-'
+          }
+        },
       },
       getTagTableColumn({
         onManager: this.onManager,

containers/Ai/views/credentials/index.vue

@@ -12,21 +12,34 @@
 <script>
 import AccessKeyList from './components/AccessKeyList'
 import ContainerSecretList from '../container-secret/components/List'
+import ContainerImageSecretList from '../container-image-secret/components/List'
 
 export default {
   name: 'CredentialIndex',
   components: {
     AccessKeyList,
     ContainerSecretList,
+    ContainerImageSecretList,
   },
   data () {
+    const type = this.$route.query.type
+    let currentComponent = 'AccessKeyList'
+    if (type === 'container_image') {
+      currentComponent = 'ContainerImageSecretList'
+    } else if (type === 'container_secret') {
+      currentComponent = 'ContainerSecretList'
+    }
     return {
-      currentComponent: 'AccessKeyList',
+      currentComponent,
       tabs: [
         {
           key: 'AccessKeyList',
           label: this.$t('scope.text_4'),
         },
+        {
+          key: 'ContainerImageSecretList',
+          label: this.$t('common.container_image_secret'),
+        },
         {
           key: 'ContainerSecretList',
           label: this.$t('common.container_secret'),

containers/K8S/views/repos/utils/columns.js

@@ -1,4 +1,5 @@
 import i18n from '@/locales'
+import router from '@/router'
 
 export const getTypeTableColumn = () => {
   return {
@@ -25,7 +26,7 @@ export const getCredentialTableColumn = () => {
     slots: {
       default: ({ row }, h) => {
         if (row.credential_id) {
-          return [<a-tag color="green">{row.credential_id}</a-tag>]
+          return [<a-tag color="green" style="cursor: pointer;" onClick={() => router.push(`/credentials/?type=container_image&id=${row.credential_id}`)}>{row.credential_id}</a-tag>]
         }
         return [<a-tag>{i18n.t('k8s.repo.credential.none')}</a-tag>]
       },

src/locales/en.json

@@ -6472,5 +6472,6 @@
   "common.application": "Application",
   "common.inference": "Inference",
   "common.image": "Image",
-  "common.container_secret": "Container Secret"
+  "common.container_secret": "Container Secret",
+  "common.container_image_secret": "Container Image Secret"
 }

src/locales/ja-JP.json

@@ -6492,5 +6492,6 @@
   "common.application": "アプリケーション",
   "common.inference": "推論",
   "common.image": "イメージ",
-  "common.container_secret": "コンテナシークレット"
+  "common.container_secret": "コンテナシークレット",
+  "common.container_image_secret": "コンテナイメージレポジトリシークレット"
 }

src/locales/zh-CN.json

@@ -6503,5 +6503,6 @@
   "common.application": "应用",
   "common.inference": "推理",
   "common.image": "镜像",
-  "common.container_secret": "容器密钥"
+  "common.container_secret": "容器密钥",
+  "common.container_image_secret": "容器镜像仓库密钥"
 }