fix(library): keep revealed selection state consistent

Author: FelixTJDietrich

library/lib/apollon-editor.tsx

@@ -1144,11 +1144,13 @@ export class ApollonEditor {
     elementId: string | null,
     options?: { reveal?: boolean }
   ): void {
-    const { nodes, edges, setNodes, setEdges } = this.diagramStore.getState()
+    const { nodes, edges, setNodes, setEdges, setSelectedElementsId } =
+      this.diagramStore.getState()
 
     if (elementId === null) {
       setNodes((current) => current.map((n) => ({ ...n, selected: false })))
       setEdges((current) => current.map((e) => ({ ...e, selected: false })))
+      setSelectedElementsId([])
       this.assessmentSelectionStore.getState().selectMultipleElements([])
       this.popoverStore.getState().setPopOverElementId(null)
       return
@@ -1173,6 +1175,7 @@ export class ApollonEditor {
     setEdges((current) =>
       current.map((edge) => ({ ...edge, selected: edge.id === targetId }))
     )
+    setSelectedElementsId([targetId])
     // Selection follows what the caller asked for, not what had to be opened to
     // show it. Asking for a class selects the class and its members, so a host
     // list marks the whole group; asking for one method selects that method
@@ -1182,7 +1185,13 @@ export class ApollonEditor {
     this.assessmentSelectionStore
       .getState()
       .selectMultipleElements(assessedIdsFor(elementId, nodes))
-    this.popoverStore.getState().setPopOverElementId(targetId)
+    this.popoverStore
+      .getState()
+      .setPopOverElementId(
+        this.metadataStore.getState().mode === Apollon.ApollonMode.Assessment
+          ? targetId
+          : null
+      )
 
     if (options?.reveal === false || !isTopLevel) return
 

library/tests/unit/revealAssessment.test.ts

@@ -73,7 +73,10 @@ describe("ApollonEditor.revealAssessment", () => {
 
     const internals = editor as unknown as {
       diagramStore: {
-        getState: () => { nodes: { id: string; selected?: boolean }[] }
+        getState: () => {
+          nodes: { id: string; selected?: boolean }[]
+          selectedElementIds: string[]
+        }
       }
       popoverStore: { getState: () => { popoverElementId: string | null } }
       assessmentSelectionStore: {
@@ -86,6 +89,9 @@ describe("ApollonEditor.revealAssessment", () => {
       .map((node) => node.id)
 
     expect(selected).toEqual(["node-b"])
+    expect(internals.diagramStore.getState().selectedElementIds).toEqual([
+      "node-b",
+    ])
     expect(internals.popoverStore.getState().popoverElementId).toBe("node-b")
     expect(
       internals.assessmentSelectionStore.getState().selectedElementIds
@@ -121,7 +127,12 @@ describe("ApollonEditor.revealAssessment", () => {
     editor.revealAssessment(null)
 
     const internals = editor as unknown as {
-      diagramStore: { getState: () => { nodes: { selected?: boolean }[] } }
+      diagramStore: {
+        getState: () => {
+          nodes: { selected?: boolean }[]
+          selectedElementIds: string[]
+        }
+      }
       popoverStore: { getState: () => { popoverElementId: string | null } }
       assessmentSelectionStore: {
         getState: () => { selectedElementIds: string[] }
@@ -130,6 +141,7 @@ describe("ApollonEditor.revealAssessment", () => {
     expect(
       internals.diagramStore.getState().nodes.some((node) => node.selected)
     ).toBe(false)
+    expect(internals.diagramStore.getState().selectedElementIds).toEqual([])
     expect(internals.popoverStore.getState().popoverElementId).toBeNull()
     expect(
       internals.assessmentSelectionStore.getState().selectedElementIds
@@ -163,4 +175,27 @@ describe("ApollonEditor.revealAssessment", () => {
     }
     expect(internals.popoverStore.getState().popoverElementId).toBe("ghost-id")
   })
+
+  it("selects without opening editing UI outside assessment mode", () => {
+    editor.destroy()
+    editor = new ApollonEditor(container, {
+      mode: ApollonMode.Modelling,
+      model: MODEL,
+    })
+
+    editor.revealAssessment("node-b")
+
+    const internals = editor as unknown as {
+      diagramStore: {
+        getState: () => {
+          selectedElementIds: string[]
+        }
+      }
+      popoverStore: { getState: () => { popoverElementId: string | null } }
+    }
+    expect(internals.diagramStore.getState().selectedElementIds).toEqual([
+      "node-b",
+    ])
+    expect(internals.popoverStore.getState().popoverElementId).toBeNull()
+  })
 })