Fix default values and error cells disappearing when toggling results

specify · May 13, 2024 · a4a5a8a · a4a5a8a
1 parent 5497c85
commit a4a5a8a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/WbActions/useResults.ts b/specifyweb/frontend/js_src/lib/components/WbActions/useResults.ts
@@ -2,15 +2,17 @@ import type Handsontable from 'handsontable';
 import React from 'react';
 
 import { useBooleanState } from '../../hooks/useBooleanState';
-import { getHotPlugin } from '../WorkBench/handsontable';
+import { getHotPlugin, identifyDefaultValues } from '../WorkBench/handsontable';
 import type { Workbench } from '../WorkBench/WbView';
 
 export function useResults({
   hot,
   workbench,
+  triggerDatasetRefresh,
 }: {
   readonly hot: Handsontable | undefined;
   readonly workbench: Workbench;
+  readonly triggerDatasetRefresh: () => void;
 }) {
   const [showResults, _, closeResults, toggleResults] = useBooleanState();
 
@@ -57,21 +59,27 @@ export function useResults({
       )
       .map(hot.toVisualColumn);
 
-    if (showResults) {
-      getHotPlugin(hot, 'hiddenRows').hideRows(rowsToHide);
-      getHotPlugin(hot, 'hiddenColumns').hideColumns(colsToHide);
+    hot.batch(() => {
+      if (showResults) {
+        identifyDefaultValues(hot, workbench.mappings);
+        getHotPlugin(hot, 'hiddenRows').hideRows(rowsToHide);
+        getHotPlugin(hot, 'hiddenColumns').hideColumns(colsToHide);
 
-      workbench.utils.toggleCellTypes('newCells', 'remove');
-    } else {
-      getHotPlugin(hot, 'hiddenRows').showRows(
-        rowsToHide.filter((visualRow) => !initialHiddenRows.includes(visualRow))
-      );
-      getHotPlugin(hot, 'hiddenColumns').showColumns(
-        colsToHide.filter((visualCol) => !initialHiddenCols.includes(visualCol))
-      );
-    }
-
-    hot.render();
+        workbench.utils.toggleCellTypes('newCells', 'remove');
+      } else {
+        getHotPlugin(hot, 'hiddenRows').showRows(
+          rowsToHide.filter(
+            (visualRow) => !initialHiddenRows.includes(visualRow)
+          )
+        );
+        getHotPlugin(hot, 'hiddenColumns').showColumns(
+          colsToHide.filter(
+            (visualCol) => !initialHiddenCols.includes(visualCol)
+          )
+        );
+        triggerDatasetRefresh();
+      }
+    });
   }, [showResults]);
 
   return { showResults, closeResults, toggleResults };

diff --git a/specifyweb/frontend/js_src/lib/components/WorkBench/WbView.tsx b/specifyweb/frontend/js_src/lib/components/WorkBench/WbView.tsx
@@ -151,6 +151,7 @@ export function WbView({
   const { showResults, closeResults, toggleResults } = useResults({
     hot,
     workbench,
+    triggerDatasetRefresh,
   });
 
   const { openDisambiguationDialog, disambiguationDialogs } =

diff --git a/specifyweb/frontend/js_src/lib/components/WorkBench/handsontable.ts b/specifyweb/frontend/js_src/lib/components/WorkBench/handsontable.ts
@@ -20,7 +20,7 @@ export function configureHandsontable(
   setSort(hot, dataset);
 }
 
-function identifyDefaultValues(
+export function identifyDefaultValues(
   hot: Handsontable,
   mappings: WbMapping | undefined
 ): void {