Merge branch 'develop' into TAP-11431

Author: feynmx

apps/daas/src/i18n/langs/en.js

@@ -472,11 +472,11 @@ export default {
   connection_reload_schema_confirm_msg:
     'If there are too many schemas in this library, it may take a long time. Make sure to refresh the schema of the data source',
   connection_reload_schema_fail: 'Schema load failed',
-  apiaudit_time_line:"Time Line",
-  apiaudit_req_start_point: "Request start",
-  apiaudit_req_end_point: "Request to end",
-  apiaudit_db_start_point: "Database response starts",
-  apiaudit_db_end_point: "Database response completed",
+  apiaudit_time_line: 'Time Line',
+  apiaudit_req_start_point: 'Request start',
+  apiaudit_req_end_point: 'Request to end',
+  apiaudit_db_start_point: 'Database response starts',
+  apiaudit_db_end_point: 'Database response completed',
   //Dag
   //Task edit缓存节点提示
   task_list_status_all: 'All status',

apps/daas/src/i18n/langs/zh-CN.js

@@ -449,11 +449,11 @@ export default {
   apiaudit_success: '成功',
   apiaudit_placeholder: '请输入名称/ID',
   apiaudit_client_name_placeholder: '请输入客户端名称',
-  apiaudit_time_line:"时间线",
-  apiaudit_req_start_point: "请求开始",
-  apiaudit_req_end_point: "请求结束",
-  apiaudit_db_start_point: "数据库响应开始",
-  apiaudit_db_end_point: "数据库响应结束",
+  apiaudit_time_line: '时间线',
+  apiaudit_req_start_point: '请求开始',
+  apiaudit_req_end_point: '请求结束',
+  apiaudit_db_start_point: '数据库响应开始',
+  apiaudit_db_end_point: '数据库响应结束',
 
   // 连接
   connection_list_form_database_type: '数据库类型',

apps/daas/src/views/cluster/Cluster.vue

@@ -22,6 +22,7 @@ import {
 import { getConnectors, getSupervisor } from '@tap/api/src/core/proxy'
 import {
   fetchWorkers,
+  getProcessInfo,
   queryAllBindWorker,
   unbindByProcessId,
 } from '@tap/api/src/core/workers'
@@ -80,10 +81,6 @@ interface SearchParams {
   keyword: string
 }
 
-interface ApiResponse<T> {
-  items: T[]
-}
-
 interface ClusterData {
   uuid: string
   id?: string
@@ -144,33 +141,21 @@ const childRules = ref()
 const tree = ref()
 const engineTable = ref()
 const tagForm = ref()
-const editAgentForm = ref()
 
 // State
 const hideDownload = ref(import.meta.env.VUE_APP_HIDE_CLUSTER_DOWNLOAD)
 const waterfallData = ref([])
 const currentData = ref<ClusterData | null>(null)
 const dialogForm = ref(false)
-const activeIndex = ref('1')
-const serveStatus = ref('')
-const isStop = ref(false)
-const engineState = ref('')
-const managementState = ref('')
-const apiServerState = ref('')
 const editItem = ref({})
 const timer = ref(null)
-const downLoadAgetntdialog = ref(false)
 const editAgentDialog = ref(false)
-const deleteDialogVisible = ref(false)
-const downLoadNum = ref(0)
 const version = ref(null)
 const ips = ref([])
 const custIP = ref('')
 const custId = ref('')
 const agentName = ref('')
 const currentNde = ref({})
-const delData = ref('')
-const processIdData = ref([])
 const searchParams = ref<SearchParams>({
   keyword: '',
 })
@@ -562,6 +547,25 @@ const getDataApi = async (noFilter?: boolean) => {
       }, 0)
     }
   }
+  // Fetch running task counts
+  if (processId.length > 0) {
+    try {
+      const processData = await getProcessInfo(processId)
+      if (processData) {
+        for (const item of clusterData) {
+          const pid = item.systemInfo?.process_id
+          if (pid && (processData as any)[pid]) {
+            ;(item as any).runningTaskNum = (processData as any)[
+              pid
+            ].runningTaskNum
+          }
+        }
+      }
+    } catch {
+      /* ignore */
+    }
+  }
+
   waterfallData.value = clusterData
 
   apiServerData.value = _apiServerData
@@ -626,6 +630,16 @@ const getStatus = (type: string) => {
   return STATUS_MAP[type] || '-'
 }
 
+const navigateToTaskList = (item: any, syncType: 'migrate' | 'sync') => {
+  const processId = item.systemInfo?.process_id
+  if (!processId) return
+  const routeName = syncType === 'migrate' ? 'migrateList' : 'dataflowList'
+  router.push({
+    name: routeName,
+    query: { agentId: processId, status: 'running' },
+  })
+}
+
 const openNetStatDialog = (row: any) => {
   netStatDialog.visible = true
   netStatDialog.data = row.engine.netStat || []
@@ -1389,7 +1403,7 @@ const onUpdateLicenseSuccess = () => {
             <div class="flex-1 border rounded-xl p-4">
               <div class="flex align-center justify-content-between mb-3">
                 <span class="section-title font-color-dark fs-6 fw-sub"
-                  >API server</span
+                  >API Server</span
                 >
               </div>
               <ElTable :data="apiServerData">
@@ -1488,12 +1502,38 @@ const onUpdateLicenseSuccess = () => {
                       <h2 class="name fs-6">
                         {{ item.agentName || item.systemInfo.hostname }}
                       </h2>
-                      <div class="uuid fs-8 my-1">
+                      <div class="uuid fs-8 my-2">
                         {{ item.systemInfo.uuid }}
                       </div>
-                      <span class="ip">{{
-                        item.custIP ? item.custIP : item.systemInfo.ip
-                      }}</span>
+                      <div class="flex gap-2">
+                        <span class="ip">{{
+                          item.custIP ? item.custIP : item.systemInfo.ip
+                        }}</span>
+                        <el-tag
+                          v-if="item.runningTaskNum?.migrate > 0"
+                          type="primary"
+                          size="small"
+                          class="cursor-pointer"
+                          @click.stop="navigateToTaskList(item, 'migrate')"
+                        >
+                          {{ $t('public_task_type_migrate')
+                          }}<span class="ml-1 fw-bold">{{
+                            item.runningTaskNum?.migrate || 0
+                          }}</span>
+                        </el-tag>
+                        <el-tag
+                          v-if="item.runningTaskNum?.sync > 0"
+                          type="primary"
+                          size="small"
+                          class="cursor-pointer"
+                          @click.stop="navigateToTaskList(item, 'sync')"
+                        >
+                          {{ $t('public_task_type_sync')
+                          }}<span class="ml-1 fw-bold">{{
+                            item.runningTaskNum?.sync || 0
+                          }}</span>
+                        </el-tag>
+                      </div>
                     </div>
                   </div>
                   <div
@@ -1749,7 +1789,7 @@ const onUpdateLicenseSuccess = () => {
                   </el-row>
                   <el-row :gutter="16" class="data-list">
                     <el-col :span="6">
-                      <span class="txt fw-normal">API server</span>
+                      <span class="txt fw-normal">API Server</span>
                     </el-col>
                     <el-col :span="4">
                       <span
@@ -1763,7 +1803,7 @@ const onUpdateLicenseSuccess = () => {
                           `status-${item.apiServer.serviceStatus}`,
                           'status',
                         ]"
-                        >{{ getStatus(item.apiServer.status) }}</span
+                        >{{ getStatus(item.apiServer.serviceStatus) }}</span
                       >
                     </el-col>
                     <el-col :span="10">
@@ -2133,7 +2173,6 @@ const onUpdateLicenseSuccess = () => {
         @close="editAgentDialog = false"
       >
         <el-form
-          ref="editAgentForm"
           label-width="100px"
           class="edit-agent-form"
           label-position="top"
@@ -2174,11 +2213,9 @@ const onUpdateLicenseSuccess = () => {
             <ElButton @click="editAgentDialog = false">{{
               $t('public_button_cancel')
             }}</ElButton>
-            <ElButton
-              type="primary"
-              @click="submitEditAgent('editAgentForm')"
-              >{{ $t('public_button_confirm') }}</ElButton
-            >
+            <ElButton type="primary" @click="submitEditAgent">{{
+              $t('public_button_confirm')
+            }}</ElButton>
           </div>
         </template>
       </el-dialog>