block column reorder in results view

specify · May 16, 2024 · 687fd7a · 687fd7a
1 parent 13bafa9
commit 687fd7a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/WorkBench/WbSpreadsheet.tsx b/specifyweb/frontend/js_src/lib/components/WorkBench/WbSpreadsheet.tsx
@@ -37,6 +37,7 @@ function WbSpreadsheetComponent({
   data,
   workbench,
   mappings,
+  isResultsOpen,
   checkDeletedFail,
   spreadsheetChanged,
   onClickDisambiguate: handleClickDisambiguate,
@@ -48,6 +49,7 @@ function WbSpreadsheetComponent({
   readonly data: RA<RA<string | null>>;
   readonly workbench: Workbench;
   readonly mappings: WbMapping | undefined;
+  readonly isResultsOpen: boolean;
   readonly checkDeletedFail: (statusCode: number) => boolean;
   readonly spreadsheetChanged: () => void;
   readonly onClickDisambiguate: () => void;
@@ -205,13 +207,14 @@ function WbSpreadsheetComponent({
     comments,
   } = useHotProps({ dataset, mappings, physicalColToMappingCol });
 
-  const hooks = useHotHooks(
+  const hooks = useHotHooks({
     workbench,
     physicalColToMappingCol,
     spreadsheetChanged,
     checkDeletedFail,
-    isReadOnly
-  );
+    isReadOnly,
+    isResultsOpen,
+  });
 
   return (
     <section className="flex-1 overflow-hidden overscroll-none">

diff --git a/specifyweb/frontend/js_src/lib/components/WorkBench/WbView.tsx b/specifyweb/frontend/js_src/lib/components/WorkBench/WbView.tsx
@@ -227,6 +227,7 @@ export function WbView({
             hot={hot}
             isUploaded={isUploaded}
             mappings={mappings}
+            isResultsOpen={showResults}
             setHotTable={setHotTable}
             spreadsheetChanged={spreadsheetChanged}
             workbench={workbench}

diff --git a/specifyweb/frontend/js_src/lib/components/WorkBench/hooks.ts b/specifyweb/frontend/js_src/lib/components/WorkBench/hooks.ts
@@ -472,7 +472,7 @@ export function useHotHooks({
     },
 
     beforeColumnMove: (_columnIndexes, _finalIndex, dropIndex) =>
-      dropIndex !== undefined || workbench.hot !== undefined,
+      !isResultsOpen && (dropIndex !== undefined || workbench.hot !== undefined),
 
     // Save new visualOrder on the back end
     afterColumnMove: (_columnIndexes, _finalIndex, dropIndex) => {