From 94d3bf3125c387705e4d1540e38cfb26d9f10f31 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 11 Sep 2025 15:05:15 +0800
Subject: [PATCH] fix: add null checks before filtering tool IDs in
 ApplicationSetting.vue

---
 ui/src/views/application/ApplicationSetting.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui/src/views/application/ApplicationSetting.vue b/ui/src/views/application/ApplicationSetting.vue
index 12a1b112e..f8f350510 100644
--- a/ui/src/views/application/ApplicationSetting.vue
+++ b/ui/src/views/application/ApplicationSetting.vue
@@ -789,11 +789,15 @@ const openParamSettingDialog = () => {
 }
 
 function removeTool(id: any) {
-  applicationForm.value.tool_ids = applicationForm.value.tool_ids.filter((v: any) => v !== id)
+  if (applicationForm.value.tool_ids) {
+    applicationForm.value.tool_ids = applicationForm.value.tool_ids.filter((v: any) => v !== id)
+  }
 }
 
 function removeMcpTool(id: any) {
-  applicationForm.value.mcp_tool_ids = applicationForm.value.mcp_tool_ids.filter((v: any) => v !== id)
+  if (applicationForm.value.mcp_tool_ids) {
+    applicationForm.value.mcp_tool_ids = applicationForm.value.mcp_tool_ids.filter((v: any) => v !== id)
+  }
 }
 
 const mcpServersDialogRef = ref()
@@ -828,7 +832,7 @@ function getToolSelectOptions() {
       ? {
           scope: 'WORKSPACE',
           tool_type: 'CUSTOM',
-          workspace_id: application.value?.workspace_id,
+          workspace_id: applicationForm.value?.workspace_id,
         }
       : {
           scope: 'WORKSPACE',
@@ -851,7 +855,7 @@ function getMcpToolSelectOptions() {
       ? {
           scope: 'WORKSPACE',
           tool_type: 'MCP',
-          workspace_id: application.value?.workspace_id,
+          workspace_id: applicationForm.value?.workspace_id,
         }
       : {
           scope: 'WORKSPACE',