Austenem/CAT-933 fix helper panel dialogs (#3554)

* add checks for dialogs * add changelog * update doc
hubmapconsortium · Oct 2, 2024 · af196d9 · af196d9
1 parent 75e6350
commit af196d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG-fix-helper-panel-dialogs.md b/CHANGELOG-fix-helper-panel-dialogs.md
@@ -0,0 +1 @@
+- Fix bug on dataset detail page for workspace dialogs opened in succession for different processed datasets. 
diff --git a/...atic/js/components/workspaces/AddDatasetsFromDetailDialog/AddDatasetsFromDetailDialog.tsx b/...atic/js/components/workspaces/AddDatasetsFromDetailDialog/AddDatasetsFromDetailDialog.tsx
@@ -17,8 +17,7 @@ function AddDatasetsFromDetailDialog({ uuid, dialogType }: AddDatasetsFromDetail
   }
 
   return (
-    // We're populating the table provider with the dataset from the detail page so as not to duplicate logic from the search dialog
-    <SelectableTableProvider tableLabel="Add Datasets From Detail Dialog" selectedRows={new Set([uuid])}>
+    <SelectableTableProvider key={uuid} tableLabel="Add Datasets From Detail Dialog" selectedRows={new Set([uuid])}>
       <AddDatasetsFromSearchDialog />
     </SelectableTableProvider>
   );

diff --git a/context/app/static/js/components/workspaces/NewWorkspaceDialog/useCreateWorkspaceForm.ts b/context/app/static/js/components/workspaces/NewWorkspaceDialog/useCreateWorkspaceForm.ts
@@ -146,7 +146,12 @@ function useCreateWorkspaceForm({
     if (initialProtectedDatasets && initialProtectedDatasets !== '') {
       setValue('protected-datasets', initialProtectedDatasets);
     }
-  }, [initialProtectedDatasets, setValue]);
+    // Necessary to update dialog state between different processed datasets on detail pages
+    if (initialSelectedDatasets && initialSelectedDatasets.length !== 0) {
+      setValue('datasets', initialSelectedDatasets);
+      setValue('workspace-name', checkedWorkspaceName);
+    }
+  }, [initialProtectedDatasets, initialSelectedDatasets, checkedWorkspaceName, setValue]);
 
   useEffect(() => {
     if (dialogIsOpen) {