specify
diff --git a/‎requirements.txt
Lines changed: 3 additions & 3 deletions b/‎requirements.txt
Lines changed: 3 additions & 3 deletions
diff --git a/‎specifyweb/frontend/js_src/lib/components/BatchEdit/index.tsx
Lines changed: 15 additions & 4 deletions b/‎specifyweb/frontend/js_src/lib/components/BatchEdit/index.tsx
Lines changed: 15 additions & 4 deletions
diff --git a/‎specifyweb/frontend/js_src/lib/components/WbActions/index.tsx
Lines changed: 5 additions & 0 deletions b/‎specifyweb/frontend/js_src/lib/components/WbActions/index.tsx
Lines changed: 5 additions & 0 deletions
diff --git a/‎specifyweb/frontend/js_src/lib/components/WbPlanView/Mapper.tsx
Lines changed: 96 additions & 36 deletions b/‎specifyweb/frontend/js_src/lib/components/WbPlanView/Mapper.tsx
Lines changed: 96 additions & 36 deletions
@@ -2,8 +2,8 @@ setuptools>=50.0.0
 tzdata
 wheel
 backports.zoneinfo==0.2.1
-kombu==5.2.4
-celery[redis]==5.2.7
+kombu==5.5.2
+celery[redis]==5.5.1
 Django==4.2.18
 mysqlclient==2.1.1
 SQLAlchemy==1.2.11
@@ -12,4 +12,4 @@ pycryptodome==3.21.0
 PyJWT==2.3.0
 django-auth-ldap==1.2.17
 jsonschema==3.2.0
-typing-extensions==4.3.0
+typing-extensions==4.12.2
@@ -123,13 +123,16 @@ export function BatchEditFromQuery({
       })
     );
 
+  const isDisabled =
+    queryFieldSpecs.some(containsSystemTables) ||
+    queryFieldSpecs.some(hasHierarchyBaseTable) ||
+    containsDisallowedTables(query);
+
   return (
     <>
       <Button.Small
-        disabled={
-          queryFieldSpecs.some(containsSystemTables) ||
-          queryFieldSpecs.some(hasHierarchyBaseTable)
-        }
+        disabled={isDisabled}
+        title={isDisabled ? batchEditText.batchEditDisabled() : undefined}
         onClick={() => {
           loading(
             treeRanksPromise.then(async () => {
@@ -205,5 +208,13 @@ const hasHierarchyBaseTable = (queryFieldSpec: QueryFieldSpec) =>
     queryFieldSpec.baseTable.name.toLowerCase() as 'collection'
   );
 
+// Using tables.SpAuditLog here leads to an error in some cases where the tables data hasn't loaded correctly
+const DISALLOWED_TABLES = ['spauditlog'];
+
+const containsDisallowedTables = (query: SpecifyResource<SpQuery>) =>
+  DISALLOWED_TABLES.some(
+    (tableName) => query.get('contextName').toLowerCase() === tableName
+  );
+
 // Error filters
 const filters = [containsFaultyNestedToMany, containsSystemTables];
@@ -58,6 +58,7 @@ export function WbActions({
     useBooleanState();
   const [operationCompleted, openOperationCompleted, closeOperationCompleted] =
     useBooleanState();
+
   const { mode, refreshInitiatorAborted, startUpload, triggerStatusComponent } =
     useWbActions({
       datasetId: dataset.id,
@@ -262,6 +263,10 @@ function useWbActions({
   const refreshInitiatorAborted = React.useRef<boolean>(false);
   const loading = React.useContext(LoadingContext);
 
+  /**
+   * NOTE: Only validate and upload use startUpload
+   * For rollback, we directly call the API inside the RollbackConfirmation component
+   */
   const startUpload = (newMode: WbStatus): void => {
     workbench.validation.stopLiveValidation();
     loading(
 
@@ -40,6 +40,7 @@ import type { MappingElementProps } from './LineComponents';
 import { getMappingLineProps, MappingLineComponent } from './LineComponents';
 import { columnOptionsAreDefault } from './linesGetter';
 import {
+  BatchEditPrefsView,
   ChangeBaseTable,
   EmptyDataSetDialog,
   mappingOptionsMenu,
@@ -102,17 +103,36 @@ export type MappingState = State<
     readonly autoMapperSuggestions?: RA<AutoMapperSuggestion>;
     readonly openSelectElement?: SelectElementPosition;
     readonly validationResults: RA<MappingPath>;
+    readonly batchEditPrefs?: BatchEditPrefs;
   }
 >;
 
+export type ReadonlySpec = {
+  readonly mustMatch: boolean;
+  readonly columnOptions: boolean;
+  readonly batchEditPrefs: boolean;
+};
+
+export type BatchEditPrefs = {
+  readonly deferForNullCheck: boolean;
+  readonly deferForMatch: boolean;
+};
+
+export const DEFAULT_BATCH_EDIT_PREFS: BatchEditPrefs = {
+  deferForMatch: true,
+  deferForNullCheck: false,
+} as const;
+
 export const getDefaultMappingState = ({
   changesMade,
   lines,
   mustMatchPreferences,
+  batchEditPrefs,
 }: {
   readonly changesMade: boolean;
   readonly lines: RA<MappingLine>;
   readonly mustMatchPreferences: IR<boolean>;
+  readonly batchEditPrefs?: BatchEditPrefs;
 }): MappingState => ({
   type: 'MappingState',
   showHiddenFields: getCache('wbPlanViewUi', 'showHiddenFields') ?? false,
@@ -124,6 +144,7 @@ export const getDefaultMappingState = ({
   focusedLine: 0,
   changesMade,
   mustMatchPreferences,
+  batchEditPrefs,
 });
 
 // REFACTOR: split component into smaller components
@@ -133,19 +154,23 @@ export function Mapper(props: {
   readonly onChangeBaseTable: () => void;
   readonly onSave: (
     lines: RA<MappingLine>,
-    mustMatchPreferences: IR<boolean>
+    mustMatchPreferences: IR<boolean>,
+    batchEditPrefs?: BatchEditPrefs
   ) => Promise<void>;
   // Initial values for the state:
   readonly changesMade: boolean;
   readonly lines: RA<MappingLine>;
   readonly mustMatchPreferences: IR<boolean>;
+  readonly readonlySpec?: ReadonlySpec;
+  readonly batchEditPrefs?: BatchEditPrefs;
 }): JSX.Element {
   const [state, dispatch] = React.useReducer(
     reducer,
     {
       changesMade: props.changesMade,
       lines: props.lines,
       mustMatchPreferences: props.mustMatchPreferences,
+      batchEditPrefs: props.batchEditPrefs,
     },
     getDefaultMappingState
   );
@@ -264,7 +289,13 @@ export function Mapper(props: {
     const validationResults = ignoreValidation ? [] : validate();
     if (validationResults.length === 0) {
       unsetUnloadProtect();
-      loading(props.onSave(state.lines, state.mustMatchPreferences));
+      loading(
+        props.onSave(
+          state.lines,
+          state.mustMatchPreferences,
+          state.batchEditPrefs
+        )
+      );
     } else
       dispatch({
         type: 'ValidationAction',
@@ -294,6 +325,11 @@ export function Mapper(props: {
     mappingPathIsComplete(state.mappingView) &&
     getMappedFieldsBind(state.mappingView).length === 0;
 
+  const disableSave =
+    props.readonlySpec === undefined
+      ? isReadOnly
+      : Object.values(props.readonlySpec).every(Boolean);
+
   return (
     <Layout
       buttonsLeft={
@@ -337,38 +373,61 @@ export function Mapper(props: {
               })
             }
           />
-          <MustMatch
-            getMustMatchPreferences={(): IR<boolean> =>
-              getMustMatchTables({
-                baseTableName: props.baseTableName,
-                lines: state.lines,
-                mustMatchPreferences: state.mustMatchPreferences,
-              })
-            }
-            onChange={(mustMatchPreferences): void =>
-              dispatch({
-                type: 'MustMatchPrefChangeAction',
-                mustMatchPreferences,
-              })
-            }
-            onClose={(): void => {
-              /*
-               * Since setting table as must match causes all of its fields to
-               * be optional, we may have to rerun validation on
-               * mustMatchPreferences changes
-               */
-              if (
-                state.validationResults.length > 0 &&
-                state.lines.some(({ mappingPath }) =>
-                  mappingPathIsComplete(mappingPath)
-                )
-              )
+          {typeof props.batchEditPrefs === 'object' ? (
+            <ReadOnlyContext.Provider
+              value={
+                props.dataset.uploadresult?.success ??
+                props.readonlySpec?.batchEditPrefs ??
+                isReadOnly
+              }
+            >
+              <BatchEditPrefsView
+                prefs={props.batchEditPrefs}
+                onChange={(prefs) =>
+                  dispatch({
+                    type: 'ChangeBatchEditPrefs',
+                    prefs,
+                  })
+                }
+              />
+            </ReadOnlyContext.Provider>
+          ) : null}
+          <ReadOnlyContext.Provider
+            value={props.readonlySpec?.mustMatch ?? isReadOnly}
+          >
+            <MustMatch
+              getMustMatchPreferences={(): IR<boolean> =>
+                getMustMatchTables({
+                  baseTableName: props.baseTableName,
+                  lines: state.lines,
+                  mustMatchPreferences: state.mustMatchPreferences,
+                })
+              }
+              onChange={(mustMatchPreferences): void =>
                 dispatch({
-                  type: 'ValidationAction',
-                  validationResults: validate(),
-                });
-            }}
-          />
+                  type: 'ChangeMustMatchPrefAction',
+                  mustMatchPreferences,
+                })
+              }
+              onClose={(): void => {
+                /*
+                 * Since setting table as must match causes all of its fields to
+                 * be optional, we may have to rerun validation on
+                 * mustMatchPreferences changes
+                 */
+                if (
+                  state.validationResults.length > 0 &&
+                  state.lines.some(({ mappingPath }) =>
+                    mappingPathIsComplete(mappingPath)
+                  )
+                )
+                  dispatch({
+                    type: 'ValidationAction',
+                    validationResults: validate(),
+                  });
+              }}
+            />
+          </ReadOnlyContext.Provider>
           {!isReadOnly && (
             <Button.Small
               className={
@@ -396,11 +455,12 @@ export function Mapper(props: {
           >
             {isReadOnly ? wbText.dataEditor() : commonText.cancel()}
           </Link.Small>
-          {!isReadOnly && (
+          {!disableSave && (
             <Button.Small
               disabled={!state.changesMade}
               variant={className.saveButton}
-              onClick={(): void => handleSave(false)}
+              // This is a bit complicated to resolve correctly. Each component should have its own validator..
+              onClick={(): void => handleSave(isReadOnly)}
             >
               {commonText.save()}
             </Button.Small>
@@ -557,7 +617,7 @@ export function Mapper(props: {
                   customSelectSubtype: 'simple',
                   fieldsData: mappingOptionsMenu({
                     id: (suffix) => id(`column-options-${line}-${suffix}`),
-                    isReadOnly,
+                    isReadOnly: props.readonlySpec?.columnOptions ?? isReadOnly,
                     columnOptions,
                     onChangeMatchBehaviour: (matchBehavior) =>
                       dispatch({