From 7ecd474a0a686ee020df11aa30e3d19b40b07585 Mon Sep 17 00:00:00 2001 From: mnianqi Date: Fri, 23 Oct 2026 17:55:23 +0800 Subject: [PATCH 1/4] feat(TAP-13081): show task conflicts when changing connection Agents --- packages/api/src/core/connections.ts | 27 +++ packages/business/src/locale/lang/en.js | 18 ++ packages/business/src/locale/lang/zh-CN.js | 18 ++ packages/business/src/locale/lang/zh-TW.js | 18 ++ .../connections/AgentTaskConflictDialog.vue | 181 ++++++++++++++++++ .../connections/BatchAgentSettingsDialog.vue | 9 +- .../src/views/connections/DatabaseForm.vue | 39 +++- .../business/src/views/connections/List.vue | 24 ++- .../connections/connectionAgentConflicts.ts | 68 +++++++ .../tests/connection-agent-conflicts.test.ts | 81 ++++++++ 10 files changed, 475 insertions(+), 8 deletions(-) create mode 100644 packages/business/src/views/connections/AgentTaskConflictDialog.vue create mode 100644 packages/business/src/views/connections/connectionAgentConflicts.ts create mode 100644 packages/business/tests/connection-agent-conflicts.test.ts diff --git a/packages/api/src/core/connections.ts b/packages/api/src/core/connections.ts index ccd83d5aa..8b002c672 100644 --- a/packages/api/src/core/connections.ts +++ b/packages/api/src/core/connections.ts @@ -44,6 +44,33 @@ export function batchUpdateConnectionAgentSettings( return requestClient.patch(`${BASE_URL}/batch-agent-settings`, params) } +export interface ConnectionAgentConflictReport { + total: number + hiddenCount: number + hasConflicts: boolean + items: Array<{ + id: string + name: string + syncType: string + status: string + code: string + reason: string + connections: Array<{ id: string; name: string }> + }> +} + +export function checkConnectionAgentSettings( + params: BatchUpdateConnectionAgentSettingsParams & { + skip?: number + limit?: number + }, +) { + return requestClient.post( + `${BASE_URL}/agent-settings-conflicts`, + params, + ) +} + export function checkConnection(id: string, params: any) { return requestClient.patch(`${BASE_URL}/${id}`, params) } diff --git a/packages/business/src/locale/lang/en.js b/packages/business/src/locale/lang/en.js index a1a76d40c..492c16ba0 100644 --- a/packages/business/src/locale/lang/en.js +++ b/packages/business/src/locale/lang/en.js @@ -1881,4 +1881,22 @@ export default { 'When any API Server connection pool resource is tight and triggers the alarm threshold', packages_business_api_server_connection_pool_idle_warn: 'When the number of connections in the connection pool of any API Server falls below the alarm threshold', + packages_business_agent_conflict_title: 'Agent changes conflict with tasks', + packages_business_agent_conflict_summary: + 'These changes conflict with {count} tasks. Adjust the task or connection settings before saving again.', + packages_business_agent_conflict_hidden: + 'You do not have permission to view {count} of these tasks. Contact an administrator to resolve them.', + packages_business_agent_conflict_type: 'Task type', + packages_business_agent_conflict_status: 'Task status', + packages_business_agent_conflict_connections: 'Changed connections', + packages_business_agent_conflict_reason: 'Conflict reason', + packages_business_agent_conflict_reason_connections: + 'The task connections have no mutually allowed Agent.', + packages_business_agent_conflict_reason_task: + 'The Agent specified by the task is not allowed by its connections.', + packages_business_agent_conflict_type_sync: 'Data development', + packages_business_agent_conflict_type_migrate: 'Data replication', + packages_business_agent_conflict_type_logCollector: 'Shared mining', + packages_business_agent_conflict_type_connHeartbeat: 'Heartbeat', + packages_business_agent_conflict_type_inspect: 'Data verification', } diff --git a/packages/business/src/locale/lang/zh-CN.js b/packages/business/src/locale/lang/zh-CN.js index 527cef6de..a533c85ea 100644 --- a/packages/business/src/locale/lang/zh-CN.js +++ b/packages/business/src/locale/lang/zh-CN.js @@ -1685,4 +1685,22 @@ export default { '当任一API Server 连接池资源紧张触发告警阈值时', packages_business_api_server_connection_pool_idle_warn: '当任一API Server 连接池连接数低于告警阈值时', + packages_business_agent_conflict_title: '切换 Agent 存在任务冲突', + packages_business_agent_conflict_summary: + '本次修改会与 {count} 个任务产生 Agent 冲突。请先调整任务或连接配置,再重新保存。', + packages_business_agent_conflict_hidden: + '其中有 {count} 个任务无权查看,请联系管理员处理。', + packages_business_agent_conflict_type: '任务类型', + packages_business_agent_conflict_status: '任务状态', + packages_business_agent_conflict_connections: '修改的连接', + packages_business_agent_conflict_reason: '冲突原因', + packages_business_agent_conflict_reason_connections: + '任务关联连接没有共同允许的 Agent。', + packages_business_agent_conflict_reason_task: + '任务指定的 Agent 不在连接允许的范围内。', + packages_business_agent_conflict_type_sync: '数据开发', + packages_business_agent_conflict_type_migrate: '数据复制', + packages_business_agent_conflict_type_logCollector: '共享挖掘', + packages_business_agent_conflict_type_connHeartbeat: '心跳任务', + packages_business_agent_conflict_type_inspect: '数据校验', } diff --git a/packages/business/src/locale/lang/zh-TW.js b/packages/business/src/locale/lang/zh-TW.js index 4713c01cc..e251845ec 100644 --- a/packages/business/src/locale/lang/zh-TW.js +++ b/packages/business/src/locale/lang/zh-TW.js @@ -1674,4 +1674,22 @@ export default { '當任一API Server 連接池資源緊張触发告警閾值時', packages_business_api_server_connection_pool_idle_warn: '當任一API Server 連接池連接數低於告警閾值時', + packages_business_agent_conflict_title: '切換 Agent 存在任務衝突', + packages_business_agent_conflict_summary: + '本次修改會與 {count} 個任務產生 Agent 衝突。請先調整任務或連線設定,再重新儲存。', + packages_business_agent_conflict_hidden: + '其中有 {count} 個任務無權檢視,請聯絡管理員處理。', + packages_business_agent_conflict_type: '任務類型', + packages_business_agent_conflict_status: '任務狀態', + packages_business_agent_conflict_connections: '修改的連線', + packages_business_agent_conflict_reason: '衝突原因', + packages_business_agent_conflict_reason_connections: + '任務關聯的連線沒有共同允許的 Agent。', + packages_business_agent_conflict_reason_task: + '任務指定的 Agent 不在連線允許的範圍內。', + packages_business_agent_conflict_type_sync: '資料開發', + packages_business_agent_conflict_type_migrate: '資料複製', + packages_business_agent_conflict_type_logCollector: '共享挖掘', + packages_business_agent_conflict_type_connHeartbeat: '心跳任務', + packages_business_agent_conflict_type_inspect: '資料校驗', } diff --git a/packages/business/src/views/connections/AgentTaskConflictDialog.vue b/packages/business/src/views/connections/AgentTaskConflictDialog.vue new file mode 100644 index 000000000..e4a05574e --- /dev/null +++ b/packages/business/src/views/connections/AgentTaskConflictDialog.vue @@ -0,0 +1,181 @@ + + + diff --git a/packages/business/src/views/connections/BatchAgentSettingsDialog.vue b/packages/business/src/views/connections/BatchAgentSettingsDialog.vue index 22deb3b09..fa93cb66e 100644 --- a/packages/business/src/views/connections/BatchAgentSettingsDialog.vue +++ b/packages/business/src/views/connections/BatchAgentSettingsDialog.vue @@ -20,6 +20,8 @@ interface ConnectionRow { shareCdcEnable?: boolean } +defineProps<{ loading?: boolean }>() + const emit = defineEmits<{ submit: [payload: BatchAgentSettingsPayload] }>() @@ -161,6 +163,8 @@ defineExpose({ open, close: handleClose }) :title="t('packages_business_agent_settings_dialog_title')" width="560px" :close-on-click-modal="false" + :close-on-press-escape="!loading" + :show-close="!loading" append-to-body destroy-on-close @closed="handleClose" @@ -186,9 +190,12 @@ defineExpose({ open, close: handleClose }) /> diff --git a/packages/business/src/views/connections/List.vue b/packages/business/src/views/connections/List.vue index 47c341c5e..03e425e84 100644 --- a/packages/business/src/views/connections/List.vue +++ b/packages/business/src/views/connections/List.vue @@ -3,6 +3,7 @@ import { batchUpdateConnectionTags, batchUpdateConnectionAgentSettings, checkConnectionTask, + checkConnectionAgentSettings, copyConnection, deleteConnection, exportConnections, @@ -39,6 +40,8 @@ import TablePage from '../../components/TablePage.vue' import UploadDialog from '../../components/UploadDialog.vue' import BatchTagDialog from '../../components/BatchTagDialog.vue' import BatchAgentSettingsDialog from './BatchAgentSettingsDialog.vue' +import AgentTaskConflictDialog from './AgentTaskConflictDialog.vue' +import { agentConflictReport } from './connectionAgentConflicts' import type { BatchAgentSettingsPayload } from './agentSettingsSchema' import { useHas } from '../../composables' import { CONNECTION_STATUS_MAP, CONNECTION_TYPE_MAP } from '../../shared' @@ -483,18 +486,33 @@ const handleBatchOperation = (command: string) => { } } +const agentConflictDialog = ref | null>(null) +const batchAgentSubmitting = ref(false) + const handleBatchAgentSettingsSubmit = async ( payload: BatchAgentSettingsPayload, ) => { + if (batchAgentSubmitting.value) return + batchAgentSubmitting.value = true try { + const report = await checkConnectionAgentSettings(payload) + if (report.hasConflicts) { + agentConflictDialog.value?.open(payload, report) + return + } await batchUpdateConnectionAgentSettings(payload) batchAgentSettingsDialog.value?.close() table.value?.clearSelection?.() await table.value?.fetch() ElMessage.success(i18n.t('public_message_save_ok')) } catch (error) { - console.error(error) - ElMessage.error(i18n.t('packages_business_message_saveFail')) + const report = agentConflictReport(error) + if (report?.hasConflicts) agentConflictDialog.value?.open(payload, report) + else ElMessage.error(i18n.t('packages_business_message_saveFail')) + } finally { + batchAgentSubmitting.value = false } } @@ -1085,6 +1103,7 @@ onUnmounted(() => { /> { :connection="testData" @return-test-data="returnTestData" /> + , + requestId = '', +): BatchUpdateConnectionAgentSettingsParams { + const type = String( + settings.accessNodeType || 'AUTOMATIC_PLATFORM_ALLOCATION', + ) + const clean = (value: unknown) => + typeof value === 'string' && value.trim() ? value.trim() : null + return { + requestId, + connectionIds: [...connectionIds], + settings: { + accessNodeType: type, + accessNodeProcessId: + type === 'AUTOMATIC_PLATFORM_ALLOCATION' + ? null + : clean(settings.accessNodeProcessId), + priorityProcessId: + type === 'MANUALLY_SPECIFIED_BY_THE_USER_AGENT_GROUP' + ? clean(settings.priorityProcessId) + : null, + }, + } +} + +export function agentConflictReport( + value: any, +): ConnectionAgentConflictReport | null { + const candidates = [ + value, + value?.data, + value?.response?.data, + value?.response?.data?.data, + ] + const report = candidates.find( + (candidate) => + candidate && + typeof candidate.hasConflicts === 'boolean' && + Array.isArray(candidate.items) && + Number.isFinite(candidate.total) && + candidate.total >= 0, + ) + if (!report) return null + const hiddenCount = + Number.isFinite(report.hiddenCount) && report.hiddenCount > 0 + ? report.hiddenCount + : 0 + return { + ...report, + hiddenCount, + hasConflicts: report.hasConflicts || report.total > 0 || hiddenCount > 0, + } +} + +export const conflictTaskRoutes: Record = { + sync: 'dataflowList', + migrate: 'migrateList', + logCollector: 'sharedMiningList', + connHeartbeat: 'HeartbeatTableList', + inspect: 'dataVerificationList', +} diff --git a/packages/business/tests/connection-agent-conflicts.test.ts b/packages/business/tests/connection-agent-conflicts.test.ts new file mode 100644 index 000000000..dd9113c27 --- /dev/null +++ b/packages/business/tests/connection-agent-conflicts.test.ts @@ -0,0 +1,81 @@ +import assert from 'node:assert/strict' +import test from 'node:test' +import { + agentCheckPayload, + agentConflictReport, + conflictTaskRoutes, +} from '../src/views/connections/connectionAgentConflicts.ts' + +test('automatic allocation clears stale manual and priority values without mutating the form', () => { + const ids = ['one', 'two'] + const settings = { + accessNodeType: 'AUTOMATIC_PLATFORM_ALLOCATION', + accessNodeProcessId: 'old', + priorityProcessId: 'old', + } + const payload = agentCheckPayload(ids, settings, 'request') + assert.deepEqual(payload.settings, { + accessNodeType: settings.accessNodeType, + accessNodeProcessId: null, + priorityProcessId: null, + }) + assert.equal(settings.accessNodeProcessId, 'old') + assert.notEqual(payload.connectionIds, ids) + assert.deepEqual(payload.connectionIds, ids) +}) + +test('single manual Agent and agent-group requests match the save payload', () => { + assert.deepEqual( + agentCheckPayload(['one'], { + accessNodeType: 'MANUALLY_SPECIFIED_BY_THE_USER', + accessNodeProcessId: ' agent ', + priorityProcessId: 'stale', + }).settings, + { + accessNodeType: 'MANUALLY_SPECIFIED_BY_THE_USER', + accessNodeProcessId: 'agent', + priorityProcessId: null, + }, + ) + const group = agentCheckPayload(['one'], { + accessNodeType: 'MANUALLY_SPECIFIED_BY_THE_USER_AGENT_GROUP', + accessNodeProcessId: ' group ', + priorityProcessId: ' agent ', + }) + assert.equal(group.settings.priorityProcessId, 'agent') + assert.equal(group.settings.accessNodeProcessId, 'group') +}) + +test('reads conflict details from preview and save-time errors including hidden tasks', () => { + const report = { items: [], total: 0, hiddenCount: 2, hasConflicts: false } + for (const value of [ + report, + { data: report }, + { + response: { + data: { code: 'Datasource.AgentTaskConflict', data: report }, + }, + }, + ]) { + assert.equal(agentConflictReport(value)?.hasConflicts, true) + assert.equal(agentConflictReport(value)?.hiddenCount, 2) + } + assert.equal(report.hasConflicts, false) +}) + +test('ordinary errors and malformed reports are not treated as task conflicts', () => { + for (const value of [ + null, + new Error('network'), + { data: { total: 5, items: [] } }, + { total: -1, items: [], hasConflicts: true }, + ]) { + assert.equal(agentConflictReport(value), null) + } +}) + +test('supports navigation for all five related task types', () => { + assert.equal(Object.keys(conflictTaskRoutes).length, 5) + assert.equal(conflictTaskRoutes.inspect, 'dataVerificationList') + assert.equal(conflictTaskRoutes.connHeartbeat, 'HeartbeatTableList') +}) From 295931abbfe12b8cf43111fb9ff3615b66302e71 Mon Sep 17 00:00:00 2001 From: mnianqi Date: Tue, 27 Oct 2026 22:23:13 +0800 Subject: [PATCH 2/4] feat(TAP-13081): batch edit task Agents from connection conflicts --- packages/api/src/core/connections.ts | 14 ++ packages/business/src/locale/lang/en.js | 13 ++ packages/business/src/locale/lang/zh-CN.js | 13 ++ packages/business/src/locale/lang/zh-TW.js | 13 ++ .../connections/AgentTaskConflictDialog.vue | 131 +++++++++++++++++- .../connections/BatchAgentSettingsDialog.vue | 6 +- .../src/views/connections/DatabaseForm.vue | 11 +- .../business/src/views/connections/List.vue | 7 +- .../connections/connectionAgentConflicts.ts | 8 ++ .../tests/connection-agent-conflicts.test.ts | 15 ++ 10 files changed, 219 insertions(+), 12 deletions(-) diff --git a/packages/api/src/core/connections.ts b/packages/api/src/core/connections.ts index 8b002c672..12d0907f8 100644 --- a/packages/api/src/core/connections.ts +++ b/packages/api/src/core/connections.ts @@ -53,12 +53,26 @@ export interface ConnectionAgentConflictReport { name: string syncType: string status: string + editable: boolean + revision: number | null code: string reason: string connections: Array<{ id: string; name: string }> }> } +export function updateConflictTaskAgents( + params: BatchUpdateConnectionAgentSettingsParams & { + taskEdits: Array<{ id: string; revision: number | null }> + taskSettings: BatchUpdateConnectionAgentSettingsParams['settings'] + }, +) { + return requestClient.post<{ + updatedTaskIds: string[] + failures: Array<{ id: string; code: string }> + }>(`${BASE_URL}/agent-settings-conflicts/tasks`, params) +} + export function checkConnectionAgentSettings( params: BatchUpdateConnectionAgentSettingsParams & { skip?: number diff --git a/packages/business/src/locale/lang/en.js b/packages/business/src/locale/lang/en.js index fb4490836..86dbe4f20 100644 --- a/packages/business/src/locale/lang/en.js +++ b/packages/business/src/locale/lang/en.js @@ -1,4 +1,17 @@ export default { + packages_business_agent_tasks_selected: 'Selected {count} tasks', + + packages_business_agent_tasks_retry: + 'The task changed, is not editable, or its save result is unknown. Refresh and retry.', + + packages_business_agent_tasks_hint: + 'Only editable inactive tasks can be selected. Task changes are saved first and remain saved if connection saving is canceled or fails.', + + packages_business_agent_tasks_edit: 'Batch edit task Agents', + packages_business_agent_tasks_saved: + '{count} tasks updated. These changes remain saved even if you cancel or connection saving fails.', + packages_business_agent_tasks_continue: 'Continue saving connection', + packages_business_status_wait_start: 'Ready To Start', packages_business_status_starting: 'Starting', packages_business_status_renewing: 'Resetting', diff --git a/packages/business/src/locale/lang/zh-CN.js b/packages/business/src/locale/lang/zh-CN.js index 991e8a062..f63f604ea 100644 --- a/packages/business/src/locale/lang/zh-CN.js +++ b/packages/business/src/locale/lang/zh-CN.js @@ -1,4 +1,17 @@ export default { + packages_business_agent_tasks_selected: '已选择 {count} 个任务', + + packages_business_agent_tasks_retry: + '任务已变化、不可编辑或保存结果不确定,请刷新确认后重试。', + + packages_business_agent_tasks_hint: + '仅可选择有编辑权限的非运行任务。任务设置先保存;取消或连接保存失败不会撤销任务修改。', + + packages_business_agent_tasks_edit: '批量修改任务 Agent', + packages_business_agent_tasks_saved: + '已修改 {count} 个任务。取消或连接保存失败不会撤销已保存的任务设置。', + packages_business_agent_tasks_continue: '继续保存连接', + packages_business_status_wait_start: '待启动', packages_business_status_starting: '启动中', packages_business_status_renewing: '重置中', diff --git a/packages/business/src/locale/lang/zh-TW.js b/packages/business/src/locale/lang/zh-TW.js index 86d14e1bb..1b27b3428 100644 --- a/packages/business/src/locale/lang/zh-TW.js +++ b/packages/business/src/locale/lang/zh-TW.js @@ -1,4 +1,17 @@ export default { + packages_business_agent_tasks_selected: '已選擇 {count} 個任務', + + packages_business_agent_tasks_retry: + '任務已變更、不可編輯或儲存結果不確定,請重新整理確認後重試。', + + packages_business_agent_tasks_hint: + '僅可選擇有編輯權限的非執行任務。任務設定先儲存;取消或連線儲存失敗不會撤銷任務修改。', + + packages_business_agent_tasks_edit: '批次修改任務 Agent', + packages_business_agent_tasks_saved: + '已修改 {count} 個任務。取消或連線儲存失敗不會撤銷已儲存的任務設定。', + packages_business_agent_tasks_continue: '繼續儲存連線', + packages_business_status_wait_start: '待啟動', packages_business_status_starting: '啟動中', packages_business_status_renewing: '重置中', diff --git a/packages/business/src/views/connections/AgentTaskConflictDialog.vue b/packages/business/src/views/connections/AgentTaskConflictDialog.vue index e4a05574e..50e004ae3 100644 --- a/packages/business/src/views/connections/AgentTaskConflictDialog.vue +++ b/packages/business/src/views/connections/AgentTaskConflictDialog.vue @@ -1,13 +1,15 @@