Batch Edit: Match/Create record for independent relationship if all visible fields are null. (#7087)

alesan99 · web-flow · commit 276647223eb9 · 2025-08-11T10:28:00.000-05:00
* (bug): Regenerate predicates if no fields in predicates found * Lint code with ESLint and Prettier Triggered by c883cfc on branch refs/heads/issue-6569
diff --git a/specifyweb/frontend/js_src/lib/components/Attachments/__tests__/UploadAttachment.test.tsx b/specifyweb/frontend/js_src/lib/components/Attachments/__tests__/UploadAttachment.test.tsx
@@ -1,24 +1,25 @@
+import { fireEvent, waitFor } from '@testing-library/react';
 import React from 'react';
-import { mount } from '../../../tests/reactUtils';
-import { UploadAttachment } from '../Plugin';
+
 import { clearIdStore } from '../../../hooks/useId';
-import { LoadingContext } from '../../Core/Contexts';
-import { f } from '../../../utils/functools';
-import { fireEvent, waitFor } from '@testing-library/react';
-import { overrideAttachmentSettings } from '../attachments';
-import attachmentSettings from '../../../tests/ajax/static/context/attachment_settings.json';
 import { overrideAjax } from '../../../tests/ajax';
-import * as Attachments from '../attachments';
+import attachmentSettings from '../../../tests/ajax/static/context/attachment_settings.json';
 import { requireContext } from '../../../tests/helpers';
-import { deserializeResource } from '../../DataModel/serializers';
-import { testAttachment } from './utils';
+import { mount } from '../../../tests/reactUtils';
+import { f } from '../../../utils/functools';
+import { LoadingContext } from '../../Core/Contexts';
 import { SpecifyResource } from '../../DataModel/legacyTypes';
+import { deserializeResource } from '../../DataModel/serializers';
 import { Attachment } from '../../DataModel/types';
+import { overrideAttachmentSettings } from '../attachments';
+import * as Attachments from '../attachments';
+import { UploadAttachment } from '../Plugin';
+import { testAttachment } from './utils';
 
 requireContext();
 
 async function uploadFileMock() {
-  return deserializeResource(testAttachment) as SpecifyResource<Attachment>;
+  return deserializeResource(testAttachment) ;
 }
 
 beforeEach(() => {
@@ -57,7 +58,7 @@ describe('UploadAttachment', () => {
     fireEvent.change(input, { target: { files: [testFile] } });
 
     await waitFor(() => {
-      expect(handleUploaded).toBeCalled();
+      expect(handleUploaded).toHaveBeenCalled();
     });
   });
 });
diff --git a/specifyweb/workbench/upload/upload_table.py b/specifyweb/workbench/upload/upload_table.py
@@ -603,6 +603,23 @@ def _handle_row(self, skip_match: bool, allow_null: bool) -> UploadResult:
             # nothing to upload
             return UploadResult(NullRecord(info), to_one_results, {})
         if not skip_match:
+            assert not is_edit_table, "Trying to match update table!"
+
+            if not filter_predicate.filters and self.current_id is not None:
+                # Technically, we'll get always the empty predicate back if self.current_id is None
+                # So, we can skip the check for "self.current_id is not None:". But, it 
+                # is an optimization (a micro-one)
+                filter_predicate = self.get_django_predicates(
+                    should_defer_match=self._should_defer_match,
+                    # to_one_results should be completely empty (or all nulls)
+                    # Having it here is an optimization.
+                    to_one_override=to_one_results,
+                    consider_dependents=False,
+                    # Don't necessarily reduce the empty fields now.
+                    is_origin=False,
+                    origin_is_editable=False
+                )
+
             match = self._match(filter_predicate, info)
             if match:
                 return UploadResult(match, to_one_results, {})
