From 380c4bb21cf9d418da19cee8958da2d67b0cb3f1 Mon Sep 17 00:00:00 2001
From: wbean <wbean1990@gmail.com>
Date: Thu, 30 Jul 2026 18:19:13 +0800
Subject: [PATCH] fix(sidebar): apply Doris table name filters

---
 .../connectionStore.metadataLoading.spec.ts   | 71 +++++++++++++++++++
 apps/desktop/src/stores/connectionStore.ts    |  6 +-
 2 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/stores/__tests__/connectionStore.metadataLoading.spec.ts b/apps/desktop/src/stores/__tests__/connectionStore.metadataLoading.spec.ts
index 6a0e2a2cd..977bec78c 100644
--- a/apps/desktop/src/stores/__tests__/connectionStore.metadataLoading.spec.ts
+++ b/apps/desktop/src/stores/__tests__/connectionStore.metadataLoading.spec.ts
@@ -37,6 +37,16 @@ function mysqlConnection(): ConnectionConfig {
   } as ConnectionConfig;
 }
 
+function dorisConnection(): ConnectionConfig {
+  return {
+    ...mysqlConnection(),
+    id: "doris-1",
+    name: "Doris",
+    db_type: "doris",
+    port: 9030,
+  } as ConnectionConfig;
+}
+
 function oracleConnection(): ConnectionConfig {
   return {
     id: "oracle-1",
@@ -597,6 +607,67 @@ describe("connectionStore metadata loading", () => {
     expect(currentTableGroup().children?.map((node) => node.label)).toEqual(["new_users"]);
   });
 
+  it("applies include filters to Doris internal table groups", async () => {
+    const listTables = vi.fn().mockResolvedValue([{ name: "ads_pgc_report", table_type: "BASE TABLE", comment: null }]);
+
+    vi.doMock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
+    vi.doMock("@/lib/backend/api", () => ({
+      checkConnectionHealth: vi.fn().mockResolvedValue(undefined),
+      deleteSchemaCachePrefix: vi.fn().mockResolvedValue(undefined),
+      listTables,
+      loadSchemaCache: vi.fn().mockResolvedValue(null),
+      saveSchemaCache: vi.fn().mockResolvedValue(undefined),
+      saveConnections: vi.fn().mockResolvedValue(undefined),
+      saveSidebarLayout: vi.fn().mockResolvedValue(undefined),
+    }));
+
+    const { useConnectionStore } = await import("@/stores/connectionStore");
+    const store = useConnectionStore();
+    const connection = dorisConnection();
+    const tableGroup: TreeNode = {
+      id: "doris-1:warehouse:__tables",
+      label: "tree.tables",
+      type: "group-tables",
+      connectionId: connection.id,
+      database: "warehouse",
+      isExpanded: false,
+      children: [],
+    };
+    store.connections = [connection];
+    store.connectedIds.add(connection.id);
+    store.treeNodes = [
+      {
+        id: connection.id,
+        label: connection.name,
+        type: "connection",
+        connectionId: connection.id,
+        isExpanded: true,
+        children: [
+          {
+            id: "doris-1:warehouse",
+            label: "warehouse",
+            type: "database",
+            connectionId: connection.id,
+            database: "warehouse",
+            isExpanded: true,
+            children: [tableGroup],
+          },
+        ],
+      },
+    ];
+
+    const scopeKey = store.tableNameFilterScopeKey({
+      connectionId: connection.id,
+      database: "warehouse",
+      nodeKind: "group-tables",
+    });
+    const revision = store.setSidebarTableNameFilter(scopeKey, { includePatterns: ["ads_pgc_%"], excludePatterns: [] });
+    await store.refreshTreeNodeForTableNameFilter(tableGroup, scopeKey, revision);
+
+    expect(listTables).toHaveBeenCalledWith(connection.id, "warehouse", "warehouse", undefined, 1001, 0, ["TABLE"], undefined, { includePatterns: ["ads_pgc_%"], excludePatterns: [] });
+    expect(tableGroup.children?.map((node) => node.label)).toEqual(["ads_pgc_report"]);
+  });
+
   it("clears a stale connection error after a schema metadata retry succeeds", async () => {
     const listSchemaInfos = vi
       .fn()
diff --git a/apps/desktop/src/stores/connectionStore.ts b/apps/desktop/src/stores/connectionStore.ts
index 970059aba..c7f723637 100644
--- a/apps/desktop/src/stores/connectionStore.ts
+++ b/apps/desktop/src/stores/connectionStore.ts
@@ -1613,7 +1613,7 @@ export const useConnectionStore = defineStore("connection", () => {
     const tableNameFilter = activeTableNameFilterForScope({
       connectionId: options.node.connectionId,
       database: options.node.database,
-      schema: options.effectiveSchema ?? options.querySchema,
+      schema: options.node.schema,
       nodeKind: options.node.type,
       catalog: options.node.catalog,
     });
@@ -4033,7 +4033,7 @@ export const useConnectionStore = defineStore("connection", () => {
           const tableNameFilter = activeTableNameFilterForScope({
             connectionId,
             database,
-            schema: effectiveSchema ?? querySchema,
+            schema,
             nodeKind: simpleObjectDisplay ? "simple-tables" : "group-tables",
           });
           const isSidebarTableSearch = !!options?.sidebarTableSearchParentId;
@@ -4167,7 +4167,7 @@ export const useConnectionStore = defineStore("connection", () => {
           const tableNameFilter = activeTableNameFilterForScope({
             connectionId: node.connectionId,
             database: node.database,
-            schema: effectiveSchema ?? querySchema,
+            schema: node.schema,
             nodeKind: node.type,
             catalog: node.catalog,
           });