Retain sample selection after modal pop history state (#4623)

* new e2e assertions * fix modal history pops
voxel51 · Aug 6, 2024 · 73eec95 · 73eec95
1 parent 35084b7
commit 73eec95
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 15 deletions.
diff --git a/app/packages/app/src/Sync.tsx b/app/packages/app/src/Sync.tsx
@@ -117,9 +117,29 @@ const dispatchSideEffect = ({
     return;
   }
 
+  session.modalSelector = nextEntry.state.modalSelector;
+
+  if (
+    currentEntry.state.event === "modal" ||
+    nextEntry.state.event === "modal"
+  ) {
+    if (nextEntry.state.event !== "modal") {
+      session.selectedLabels = [];
+    }
+    commitMutation<setSampleMutation>(environment, {
+      mutation: setSample,
+      variables: {
+        groupId: nextEntry.state.modalSelector?.groupId,
+        id: nextEntry.state.modalSelector?.id,
+        subscription,
+      },
+    });
+    return;
+  }
+
   session.selectedLabels = [];
   session.selectedSamples = new Set();
-  session.modalSelector = nextEntry.state.modalSelector;
+
 
   const currentDataset: string | undefined =
     // @ts-ignore
@@ -139,20 +159,6 @@ const dispatchSideEffect = ({
     return;
   }
 
-  if (
-    currentEntry.state.event === "modal" ||
-    nextEntry.state.event === "modal"
-  ) {
-    commitMutation<setSampleMutation>(environment, {
-      mutation: setSample,
-      variables: {
-        groupId: nextEntry.state.modalSelector?.groupId,
-        id: nextEntry.state.modalSelector?.id,
-        subscription,
-      },
-    });
-    return;
-  }
 
   // @ts-ignore
   const data: DatasetPageQuery$data = nextEntry.data;

diff --git a/e2e-pw/src/oss/specs/selection.spec.ts b/e2e-pw/src/oss/specs/selection.spec.ts
@@ -92,5 +92,11 @@ extensionDatasetNamePairs.forEach(([extension, datasetName]) => {
     await modal.assert.verifySelectionCount(1);
     await modal.close();
     await grid.assert.isSelectionCountEqualTo(1);
+
+    await grid.openNthSample(1);
+    await modal.assert.verifySelectionCount(1);
+    await grid.url.back();
+    await modal.assert.isClosed();
+    await grid.assert.isSelectionCountEqualTo(1);
   });
 });