From 3135edf4343b17ece15fbe42d240c4289ae35095 Mon Sep 17 00:00:00 2001
From: Sychev Andrey <nukemoore@gmail.com>
Date: Tue, 14 Jul 2026 12:04:21 +0200
Subject: [PATCH] dbeaver/pro#9638 fix: update project filtering logic to use
 project IDs for active projects

Changed all four spots from reference equality to id comparison, matching the rest of the codebase, see https://github.com/dbeaver/cloudbeaver/issues/4430
---
 .../src/Tree/ProjectsRenderer/navigationTreeProjectFilter.ts  | 4 ++--
 .../navigationTreeProjectsExpandStateGetter.ts                | 4 ++--
 .../ProjectsRenderer/navigationTreeProjectFilter.ts           | 2 +-
 .../navigationTreeProjectsExpandStateGetter.ts                | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/navigationTreeProjectFilter.ts b/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/navigationTreeProjectFilter.ts
index 5177c90169..af3c9432f0 100644
--- a/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/navigationTreeProjectFilter.ts
+++ b/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/navigationTreeProjectFilter.ts
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ export function navigationTreeProjectFilter(
         if (isRMProjectNode(node)) {
           const project = projectsNavNodeService.getProject(node.uri);
 
-          if (!project || !projectsService.activeProjects.includes(project)) {
+          if (!project || !projectsService.activeProjects.some(({ id }) => id === project.id)) {
             return false;
           }
 
diff --git a/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts b/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
index 64aaad0c47..b36a51f4a8 100644
--- a/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
+++ b/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ export function navigationTreeProjectsExpandStateGetter(
     let active = false;
     const project = projectsNavNodeService.getByNodeId(nodeId);
     if (project) {
-      active = projectsService.activeProjects.includes(project);
+      active = projectsService.activeProjects.some(({ id }) => id === project.id);
     }
 
     return {
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectFilter.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectFilter.ts
index 93f49119c9..676fbdce14 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectFilter.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectFilter.ts
@@ -37,7 +37,7 @@ export function navigationTreeProjectFilter(
         if (isProjectNode(node)) {
           const project = projectsNavNodeService.getProject(node.uri);
 
-          if (!project || !projectsService.activeProjects.includes(project)) {
+          if (!project || !projectsService.activeProjects.some(({ id }) => id === project.id)) {
             return false;
           }
 
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
index 9c5efeb8c2..097b1ea6ef 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ export function navigationTreeProjectsExpandStateGetter(
     let active = false;
     const project = projectsNavNodeService.getByNodeId(nodeId);
     if (project) {
-      active = projectsService.activeProjects.includes(project);
+      active = projectsService.activeProjects.some(({ id }) => id === project.id);
     }
 
     return {