fix: clear select/load dialog layer ids when layers are removed (#1628)

* fix: clear select/load dialog layer ids when layers are removed

Null the Select-by-Expression/Location and Load-Features preselected
layer pointers on delete (and on new/load project) so dialogs cannot
reopen against a gone layer.

* fix: preserve dialog pointers when removeChildren is false

Only clear selectByExpressionLayerId, selectByLocationLayerId, and
loadEditorFeaturesLayerId when removeLayerGroup actually removes children.
Adds regression test for the removeChildren=false path.

Author: Ayush7614

packages/core/src/store.ts

@@ -1625,6 +1625,15 @@ export const useAppStore = create<AppState>()(
           selectedFeatureId: s.selectedLayerId === id ? null : s.selectedFeatureId,
           selectedFeatureIds: s.selectedLayerId === id ? [] : s.selectedFeatureIds,
           identifyLayerId: s.identifyLayerId === id ? null : s.identifyLayerId,
+          ui: {
+            ...s.ui,
+            selectByExpressionLayerId:
+              s.ui.selectByExpressionLayerId === id ? null : s.ui.selectByExpressionLayerId,
+            selectByLocationLayerId:
+              s.ui.selectByLocationLayerId === id ? null : s.ui.selectByLocationLayerId,
+            loadEditorFeaturesLayerId:
+              s.ui.loadEditorFeaturesLayerId === id ? null : s.ui.loadEditorFeaturesLayerId,
+          },
           isDirty: true,
         })),
 
@@ -1953,6 +1962,26 @@ export const useAppStore = create<AppState>()(
               s.identifyLayerId !== null && removedIds.has(s.identifyLayerId)
                 ? null
                 : s.identifyLayerId,
+            ui: removeChildren
+              ? {
+                  ...s.ui,
+                  selectByExpressionLayerId:
+                    s.ui.selectByExpressionLayerId !== null &&
+                    removedIds.has(s.ui.selectByExpressionLayerId)
+                      ? null
+                      : s.ui.selectByExpressionLayerId,
+                  selectByLocationLayerId:
+                    s.ui.selectByLocationLayerId !== null &&
+                    removedIds.has(s.ui.selectByLocationLayerId)
+                      ? null
+                      : s.ui.selectByLocationLayerId,
+                  loadEditorFeaturesLayerId:
+                    s.ui.loadEditorFeaturesLayerId !== null &&
+                    removedIds.has(s.ui.loadEditorFeaturesLayerId)
+                      ? null
+                      : s.ui.loadEditorFeaturesLayerId,
+                }
+              : s.ui,
             isDirty: true,
           };
         }),
@@ -2129,6 +2158,8 @@ export const useAppStore = create<AppState>()(
             selectByExpressionLayerId: null,
             selectByLocationOpen: false,
             selectByLocationLayerId: null,
+            loadEditorFeaturesOpen: false,
+            loadEditorFeaturesLayerId: null,
           },
         }));
         clearHistory();
@@ -2180,6 +2211,8 @@ export const useAppStore = create<AppState>()(
             selectByExpressionLayerId: null,
             selectByLocationOpen: false,
             selectByLocationLayerId: null,
+            loadEditorFeaturesOpen: false,
+            loadEditorFeaturesLayerId: null,
           },
         }));
         clearHistory();

tests/ui-layer-pointers.test.ts

@@ -0,0 +1,115 @@
+import assert from "node:assert/strict";
+import { beforeEach, describe, it } from "node:test";
+import { useAppStore } from "@geolibre/core";
+import { geojsonLayer } from "./helpers/layer-fixtures";
+
+describe("UI layer pointer cleanup", () => {
+  beforeEach(() => {
+    useAppStore.getState().newProject({ name: "Pointer cleanup" });
+  });
+
+  describe("removeLayer clears dialog layer ids", () => {
+    it("clears selectByExpressionLayerId", () => {
+      const store = useAppStore.getState();
+      store.addLayer(geojsonLayer({ id: "target" }));
+      store.setSelectByExpressionOpen(true, "target");
+      assert.equal(useAppStore.getState().ui.selectByExpressionLayerId, "target");
+
+      useAppStore.getState().removeLayer("target");
+      assert.equal(useAppStore.getState().ui.selectByExpressionLayerId, null);
+    });
+
+    it("clears selectByLocationLayerId", () => {
+      const store = useAppStore.getState();
+      store.addLayer(geojsonLayer({ id: "target" }));
+      store.setSelectByLocationOpen(true, "target");
+      assert.equal(useAppStore.getState().ui.selectByLocationLayerId, "target");
+
+      useAppStore.getState().removeLayer("target");
+      assert.equal(useAppStore.getState().ui.selectByLocationLayerId, null);
+    });
+
+    it("clears loadEditorFeaturesLayerId", () => {
+      const store = useAppStore.getState();
+      store.addLayer(geojsonLayer({ id: "target" }));
+      store.setLoadEditorFeaturesOpen(true, "target");
+      assert.equal(useAppStore.getState().ui.loadEditorFeaturesLayerId, "target");
+
+      useAppStore.getState().removeLayer("target");
+      assert.equal(useAppStore.getState().ui.loadEditorFeaturesLayerId, null);
+    });
+
+    it("does not clear pointers for unrelated layers", () => {
+      const store = useAppStore.getState();
+      store.addLayer(geojsonLayer({ id: "keep", name: "Keep" }));
+      store.addLayer(geojsonLayer({ id: "gone", name: "Gone" }));
+      store.setSelectByExpressionOpen(true, "keep");
+      store.setSelectByLocationOpen(true, "keep");
+      store.setLoadEditorFeaturesOpen(true, "keep");
+
+      useAppStore.getState().removeLayer("gone");
+      const ui = useAppStore.getState().ui;
+      assert.equal(ui.selectByExpressionLayerId, "keep");
+      assert.equal(ui.selectByLocationLayerId, "keep");
+      assert.equal(ui.loadEditorFeaturesLayerId, "keep");
+    });
+  });
+
+  describe("removeLayerGroup clears dialog layer ids", () => {
+    it("clears pointers when group children are removed", () => {
+      const store = useAppStore.getState();
+      const groupId = store.addLayerGroup("G");
+      store.addLayer(geojsonLayer({ id: "child", groupId }));
+      store.setSelectByExpressionOpen(true, "child");
+      store.setSelectByLocationOpen(true, "child");
+      store.setLoadEditorFeaturesOpen(true, "child");
+
+      useAppStore.getState().removeLayerGroup(groupId, { removeChildren: true });
+      const ui = useAppStore.getState().ui;
+      assert.equal(ui.selectByExpressionLayerId, null);
+      assert.equal(ui.selectByLocationLayerId, null);
+      assert.equal(ui.loadEditorFeaturesLayerId, null);
+    });
+
+    it("preserves pointers when removeChildren is false", () => {
+      const store = useAppStore.getState();
+      const groupId = store.addLayerGroup("G");
+      store.addLayer(geojsonLayer({ id: "child", groupId }));
+      store.setSelectByExpressionOpen(true, "child");
+      store.setSelectByLocationOpen(true, "child");
+      store.setLoadEditorFeaturesOpen(true, "child");
+
+      useAppStore.getState().removeLayerGroup(groupId, { removeChildren: false });
+      const ui = useAppStore.getState().ui;
+      assert.equal(ui.selectByExpressionLayerId, "child");
+      assert.equal(ui.selectByLocationLayerId, "child");
+      assert.equal(ui.loadEditorFeaturesLayerId, "child");
+    });
+  });
+
+  describe("newProject/loadProject clear load-editor-features state", () => {
+    it("newProject clears loadEditorFeaturesOpen and layerId", () => {
+      const store = useAppStore.getState();
+      store.addLayer(geojsonLayer({ id: "target" }));
+      store.setLoadEditorFeaturesOpen(true, "target");
+      assert.equal(useAppStore.getState().ui.loadEditorFeaturesOpen, true);
+
+      useAppStore.getState().newProject();
+      const ui = useAppStore.getState().ui;
+      assert.equal(ui.loadEditorFeaturesOpen, false);
+      assert.equal(ui.loadEditorFeaturesLayerId, null);
+    });
+
+    it("loadProject clears loadEditorFeaturesOpen and layerId", () => {
+      const store = useAppStore.getState();
+      store.addLayer(geojsonLayer({ id: "target" }));
+      store.setLoadEditorFeaturesOpen(true, "target");
+      assert.equal(useAppStore.getState().ui.loadEditorFeaturesOpen, true);
+
+      useAppStore.getState().loadProject({ name: "Loaded", layers: [], version: 1 });
+      const ui = useAppStore.getState().ui;
+      assert.equal(ui.loadEditorFeaturesOpen, false);
+      assert.equal(ui.loadEditorFeaturesLayerId, null);
+    });
+  });
+});