From e184bcaac0260411f4c121c49bf0eb60f4092fcb Mon Sep 17 00:00:00 2001
From: Kennen <317052920@qq.com>
Date: Thu, 8 Jun 2023 19:04:16 +0800
Subject: [PATCH 1/3] feat(external-storage): Add test connection when type is
 mongo

---
 .../business/src/views/connections/Test.vue   |  6 ++
 .../src/views/external-storage/List.vue       | 71 +++++++++++++++++--
 2 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/packages/business/src/views/connections/Test.vue b/packages/business/src/views/connections/Test.vue
index 5589200e6f..3a2d24df53 100644
--- a/packages/business/src/views/connections/Test.vue
+++ b/packages/business/src/views/connections/Test.vue
@@ -97,6 +97,9 @@ export default {
     },
     formData: {
       value: Object
+    },
+    testType: {
+      value: String
     }
   },
   data() {
@@ -233,6 +236,9 @@ export default {
         type: 'testConnection',
         data: connection
       }
+      if (this.testType) {
+        msg.type = this.testType
+      }
       msg.data['updateSchema'] = false //默认值
       msg.data['editTest'] = false //默认值
       this.wsError = ''
diff --git a/packages/business/src/views/external-storage/List.vue b/packages/business/src/views/external-storage/List.vue
index a4f7713d4c..5ac30f2306 100644
--- a/packages/business/src/views/external-storage/List.vue
+++ b/packages/business/src/views/external-storage/List.vue
@@ -32,7 +32,7 @@
         :label="$t('public_create_time')"
         prop="createTimeFmt"
       ></ElTableColumn>
-      <ElTableColumn width="220" :label="$t('public_operation')">
+      <ElTableColumn width="320" :label="$t('public_operation')">
         <template #default="{ row }">
           <span class="mr-2">{{ $t('packages_business_external_storage_list_sheweimoren') }}</span>
           <ElSwitch
@@ -42,6 +42,10 @@
             @change="handleDefault(row)"
           ></ElSwitch>
           <ElDivider direction="vertical"></ElDivider>
+          <ElButton :disabled="row.type !== 'mongodb'" type="text" @click="handleTest(row)"
+            >{{ $t('public_connection_button_test') }}
+          </ElButton>
+          <ElDivider direction="vertical"></ElDivider>
           <ElButton type="text" :disabled="!row.canEdit" @click="handleEdit(row)">{{
             $t('public_button_edit')
           }}</ElButton>
@@ -109,6 +113,9 @@
         </ElFormItem>
       </ElForm>
       <span slot="footer" class="dialog-footer">
+        <ElButton :disabled="form.type !== 'mongodb'" @click="handleEditorTest()"
+          >{{ $t('public_connection_button_test') }}
+        </ElButton>
         <ElButton size="mini" @click="dialogVisible = false">{{ $t('public_button_cancel') }}</ElButton>
         <ElButton type="primary" size="mini" @click="submit">{{ $t('public_button_confirm') }}</ElButton>
       </span>
@@ -151,6 +158,14 @@
         </el-table-column>
       </el-table>
     </el-dialog>
+
+    <Test
+      ref="test"
+      :visible.sync="dialogTestVisible"
+      :formData="model"
+      test-type="testExternalStorage"
+      @returnTestData="returnTestData"
+    ></Test>
   </section>
 </template>
 <script>
@@ -159,14 +174,16 @@ import i18n from '@/i18n'
 import dayjs from 'dayjs'
 import { cloneDeep, escapeRegExp } from 'lodash'
 
-import { externalStorageApi } from '@tap/api'
+import { databaseTypesApi, externalStorageApi } from '@tap/api'
 import { TablePage, EXTERNAL_STORAGE_TYPE_MAP } from '@tap/business'
 import { FilterBar, Drawer } from '@tap/component'
 import { openUrl } from '@tap/shared'
 import { SchemaToForm } from '@tap/form'
+import Test from '@tap/business/src/views/connections/Test'
 
 export default {
-  components: { TablePage, FilterBar, Drawer, SchemaToForm },
+  components: { TablePage, FilterBar, Drawer, SchemaToForm, Test },
+  inject: ['checkAgent'],
   data() {
     return {
       loading: false,
@@ -201,7 +218,9 @@ export default {
       schemaLabelWidth: 120,
       showUsingTaskDialog: false,
       usingTasks: [],
-      schemaData: null
+      schemaData: null,
+      dialogTestVisible: false,
+      model: {}
     }
   },
   computed: {
@@ -473,7 +492,49 @@ export default {
     // 编辑
     handleEdit(row = {}) {
       this.openDialog(row)
-    }
+    },
+
+    handleTest(row = {}) {
+      this.startTest(row)
+    },
+
+    handleEditorTest() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          const schemaFormInstance = this.$refs.schemaToForm.getForm?.()
+          schemaFormInstance?.validate().then(async () => {
+            let formValues = this.$refs.schemaToForm?.getFormValues?.()
+
+            this.loading = true
+            let { id, name, type, uri, defaultStorage } = this.form
+            let params = Object.assign(
+              {
+                id,
+                name,
+                type,
+                uri,
+                defaultStorage
+              },
+              formValues
+            )
+
+            this.startTest(params)
+          })
+        }
+      })
+    },
+
+    startTest(data = {}) {
+      this.checkAgent(() => {
+        Object.assign(this.model, data)
+        this.dialogTestVisible = true
+        this.$refs.test.start(false)
+      }).catch(() => {
+        this.buried('connectionTestAgentFail')
+      })
+    },
+
+    returnTestData(data) {}
   }
 }
 </script>

From 40ef4447f8ee813cc11f7da07f965178d8d6f3d3 Mon Sep 17 00:00:00 2001
From: Kennen <317052920@qq.com>
Date: Fri, 9 Jun 2023 10:58:46 +0800
Subject: [PATCH 2/3] feat(external-storage/List): Set params when value is
 change

---
 .../business/src/views/external-storage/List.vue     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/business/src/views/external-storage/List.vue b/packages/business/src/views/external-storage/List.vue
index 5ac30f2306..83019406ff 100644
--- a/packages/business/src/views/external-storage/List.vue
+++ b/packages/business/src/views/external-storage/List.vue
@@ -194,6 +194,7 @@ export default {
         keyword: ''
       },
       dialogVisible: false,
+      dialogForm: {},
       form: {},
       rules: {
         name: [
@@ -367,6 +368,7 @@ export default {
     },
     openDialog(row) {
       this.dialogVisible = true
+      this.dialogForm = row || {}
       this.form = row
         ? cloneDeep(row)
         : {
@@ -495,7 +497,7 @@ export default {
     },
 
     handleTest(row = {}) {
-      this.startTest(row)
+      this.startTest({ id: row.id })
     },
 
     handleEditorTest() {
@@ -517,8 +519,14 @@ export default {
               },
               formValues
             )
+            let result = { id }
+            for (let key in params) {
+              if (params[key] !== this.dialogForm[key]) {
+                result[key] = params[key]
+              }
+            }
 
-            this.startTest(params)
+            this.startTest(result)
           })
         }
       })

From f32b10f5c4b7f068e50bc160198fb989cf8d3635 Mon Sep 17 00:00:00 2001
From: Kennen <317052920@qq.com>
Date: Fri, 9 Jun 2023 15:54:48 +0800
Subject: [PATCH 3/3] style(@busniess/connection/Test): Add align-items-center
 className

---
 packages/business/src/views/connections/Test.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/business/src/views/connections/Test.vue b/packages/business/src/views/connections/Test.vue
index 3a2d24df53..140f727316 100644
--- a/packages/business/src/views/connections/Test.vue
+++ b/packages/business/src/views/connections/Test.vue
@@ -20,11 +20,11 @@
         <span v-else>{{ $t('packages_business_dataForm_test_error') }}</span>
       </div>
       <div v-else>
-        <div class="test-status" v-if="['invalid', 'ERROR'].includes(status)">
-          <VIcon :style="{ color: colorMap[status] }">error</VIcon>
+        <div class="test-status flex align-items-center" v-if="['invalid', 'ERROR'].includes(status)">
+          <VIcon :style="{ color: colorMap[status] }" size="16">error</VIcon>
           <span class="test-title">{{ $t('packages_business_dataForm_test_testResultFail') }}</span>
         </div>
-        <div class="test-status" v-if="['ready'].includes(status)">
+        <div class="test-status flex align-items-center" v-if="['ready'].includes(status)">
           <i class="el-icon-success" :style="{ color: colorMap[status] }"></i>
           <span class="test-title">{{ $t('packages_business_dataForm_test_testResultSuccess') }}</span>
         </div>