Merge V7.12.0.5 into main

specifyweb/backend/delete_blockers/views.py

@@ -1,6 +1,7 @@
 from django import http
 from django.db import router, transaction
 from django.db.models.deletion import Collector
+from django.db.models import ForeignKey
 
 from specifyweb.middleware.general import require_http_methods
 from specifyweb.specify.api.crud import (
@@ -43,13 +44,66 @@ def _collect_delete_blockers(obj, using) -> list[dict]:
     collector.collect([obj])
     return flatten([
         [
-            {
-                'table': sub_objs[0].__class__.__name__,
-                'field': field.name,
-                'ids': [sub_obj.id for sub_obj in sub_objs]
-            }
+            _serialize_delete_blocker(field, sub_objs)
         ] for field, sub_objs in collector.delete_blockers
     ])
 
+def _serialize_delete_blocker(field, sub_objs) -> dict:
+    normalized = _normalize_many_to_many_blocker(field, sub_objs)
+    if normalized is not None:
+        return normalized
+
+    return {
+        'table': sub_objs[0].__class__.__name__,
+        'field': field.name,
+        'ids': [sub_obj.id for sub_obj in sub_objs]
+    }
+
+def _normalize_many_to_many_blocker(field, sub_objs) -> dict | None:
+    through_model = sub_objs[0].__class__
+    if hasattr(through_model, 'specify_model'):
+        return None
+
+    foreign_keys = [
+        model_field
+        for model_field in through_model._meta.fields
+        if isinstance(model_field, ForeignKey)
+    ]
+    if len(foreign_keys) != 2:
+        return None
+
+    other_field = next(
+        (
+            model_field
+            for model_field in foreign_keys
+            if model_field.name != field.name
+        ),
+        None,
+    )
+    if other_field is None:
+        return None
+
+    other_model = other_field.related_model
+    if not hasattr(other_model, 'specify_model'):
+        return None
+
+    relationship = next(
+        (
+            relationship
+            for relationship in other_model.specify_model.relationships
+            if getattr(relationship, 'through_model', None) == through_model.__name__
+            and getattr(relationship, 'through_field', None) == other_field.name
+        ),
+        None,
+    )
+    if relationship is None:
+        return None
+
+    return {
+        'table': other_model.specify_model.name,
+        'field': relationship.name,
+        'ids': [getattr(sub_obj, other_field.attname) for sub_obj in sub_objs],
+    }
+
 def flatten(l):
     return [item for sublist in l for item in sublist]

specifyweb/frontend/js_src/lib/components/DataModel/businessRuleDefs.ts

@@ -201,9 +201,10 @@ export const businessRuleDefs: MappedBusinessRuleDefs = {
         return undefined;
       },
       catalogNumber: async (resource): Promise<undefined> => {
-        const preferences = await import(
-          '../Preferences/collectionPreferences'
-        ).then(({ collectionPreferences }) => collectionPreferences);
+        const preferences =
+          await import('../Preferences/collectionPreferences').then(
+            ({ collectionPreferences }) => collectionPreferences
+          );
 
         const uniqueCatalogNumberAccrossComponentAndCOPref = preferences.get(
           'uniqueCatalogNumberAccrossComponentAndCO',
@@ -429,9 +430,10 @@ export const businessRuleDefs: MappedBusinessRuleDefs = {
         return undefined;
       },
       catalogNumber: async (resource): Promise<undefined> => {
-        const preferences = await import(
-          '../Preferences/collectionPreferences'
-        ).then(({ collectionPreferences }) => collectionPreferences);
+        const preferences =
+          await import('../Preferences/collectionPreferences').then(
+            ({ collectionPreferences }) => collectionPreferences
+          );
 
         const uniqueCatalogNumberAccrossComponentAndCOPref = preferences.get(
           'uniqueCatalogNumberAccrossComponentAndCO',

specifyweb/frontend/js_src/lib/components/ExpressSearchConfig/ExpressSearchConfigDialog.tsx

@@ -14,7 +14,7 @@ type ExpressSearchConfigDialogProps = {
   readonly isOpen: boolean;
   readonly onClose: () => void;
   readonly onSave?: () => void;
-}
+};
 
 export function ExpressSearchConfigDialog({
   isOpen,
@@ -76,7 +76,7 @@ export function ExpressSearchConfigDialog({
       isOpen={isOpen}
       onClose={onClose}
     >
-        <ExpressSearchConfigEditor
+      <ExpressSearchConfigEditor
         key={String(isOpen)}
         onChangeJSON={handleChangeJSON}
       />

specifyweb/frontend/js_src/lib/components/ExpressSearchConfig/ResultsOrderingTab.tsx

@@ -11,12 +11,17 @@ import { genericTables } from '../DataModel/tables';
 
 function tableLabel(tableName: string): string {
   return (
-    (genericTables[tableName as keyof typeof genericTables]?.label as string | undefined) ??
-    camelToHuman(tableName)
+    (genericTables[tableName as keyof typeof genericTables]?.label as
+      | string
+      | undefined) ?? camelToHuman(tableName)
   );
 }
 
-export function ResultsOrderingTab({ config, relatedQueriesDefinitions = [], onChangeConfig }: any) {
+export function ResultsOrderingTab({
+  config,
+  relatedQueriesDefinitions = [],
+  onChangeConfig,
+}: any) {
   const baseTables = config.tables
     .filter((t: any) => t.searchFields.some((sf: any) => sf.inUse !== false))
     .map((t: any) => ({
@@ -29,8 +34,12 @@ export function ResultsOrderingTab({ config, relatedQueriesDefinitions = [], onC
   const activeQueries = config.relatedQueries
     .filter((rq: any) => rq.isActive)
     .map((rq: any) => {
-      const def = relatedQueriesDefinitions.find((def: any) => def.id === rq.id);
-      const title = def?.name ? getExpressSearchQueryTitle(def.name) : undefined;
+      const def = relatedQueriesDefinitions.find(
+        (def: any) => def.id === rq.id
+      );
+      const title = def?.name
+        ? getExpressSearchQueryTitle(def.name)
+        : undefined;
 
       if (!def || !title || title === String(def.name)) {
         return undefined;
@@ -86,7 +95,9 @@ export function ResultsOrderingTab({ config, relatedQueriesDefinitions = [], onC
 
   return (
     <div className="flex flex-col gap-2 h-full min-h-[400px]">
-      <h3 className="font-bold mb-2">{expressSearchConfigText.configureResultsOrdering()}</h3>
+      <h3 className="font-bold mb-2">
+        {expressSearchConfigText.configureResultsOrdering()}
+      </h3>
       <p className="text-sm text-gray-500 mb-4">
         {expressSearchConfigText.reorderResultsOrderingDescription()}
       </p>
@@ -99,7 +110,10 @@ export function ResultsOrderingTab({ config, relatedQueriesDefinitions = [], onC
           >
             <span className="font-medium">{item.label}</span>
             <div className="flex gap-2">
-              <Button.BorderedGray disabled={index === 0} onClick={() => moveItem(index, 'up')}>
+              <Button.BorderedGray
+                disabled={index === 0}
+                onClick={() => moveItem(index, 'up')}
+              >
                 {icons.chevronUp}
               </Button.BorderedGray>
               <Button.BorderedGray

specifyweb/frontend/js_src/lib/components/ExpressSearchConfig/__tests__/ExpressSearchConfigEditor.test.tsx

@@ -27,19 +27,19 @@ const mockConfigResponse = {
         tableName: 'CollectionObject',
         displayOrder: 0,
         searchFields: [],
-        displayFields: []
-      }
+        displayFields: [],
+      },
     ],
-    relatedQueries: []
+    relatedQueries: [],
   },
   related_queries_definitions: [],
   schema_metadata: [
     {
       name: 'CollectionObject',
       title: 'Collection Object',
-      fields: []
-    }
-  ]
+      fields: [],
+    },
+  ],
 };
 
 describe('ExpressSearchConfigEditor', () => {
@@ -65,42 +65,43 @@ describe('ExpressSearchConfigEditor', () => {
     });
 
     expect(onChangeJSON).toHaveBeenCalled();
-    const latestConfig = onChangeJSON.mock.calls[onChangeJSON.mock.calls.length - 1][0];
+    const latestConfig =
+      onChangeJSON.mock.calls[onChangeJSON.mock.calls.length - 1][0];
     expect(latestConfig.tables[0].tableName).toBe('Agent');
     expect(latestConfig.tables[0].searchFields[0].fieldName).toBe('firstName');
   });
 
   test('renders loading state initially', async () => {
     const { getByText } = mount(
-      <ExpressSearchConfigEditor 
-        onChange={jest.fn()} 
-        onSetCleanup={jest.fn()} 
+      <ExpressSearchConfigEditor
+        onChange={jest.fn()}
+        onSetCleanup={jest.fn()}
       />
     );
     expect(getByText('Loading...')).toBeInTheDocument();
-    
+
     // Wait for it to finish loading to avoid act warnings
     await act(async () => {
-      await new Promise(resolve => setTimeout(resolve, 0));
+      await new Promise((resolve) => setTimeout(resolve, 0));
     });
   });
 
   test('renders tabs after data load', async () => {
     const { findByRole } = mount(
-      <ExpressSearchConfigEditor 
-        onChange={jest.fn()} 
-        onSetCleanup={jest.fn()} 
+      <ExpressSearchConfigEditor
+        onChange={jest.fn()}
+        onSetCleanup={jest.fn()}
       />
     );
-    
+
     expect(await findByRole('tablist')).toBeInTheDocument();
   });
 
   test('switches tabs correctly', async () => {
     const { findByText, getByRole, user } = mount(
-      <ExpressSearchConfigEditor 
-        onChange={jest.fn()} 
-        onSetCleanup={jest.fn()} 
+      <ExpressSearchConfigEditor
+        onChange={jest.fn()}
+        onSetCleanup={jest.fn()}
       />
     );
 
@@ -112,7 +113,7 @@ describe('ExpressSearchConfigEditor', () => {
     await act(async () => {
       await user.click(relatedTab);
     });
-    
+
     expect(await findByText('Related Tables Tab')).toBeInTheDocument();
 
     // Click Results Ordering

specifyweb/frontend/js_src/lib/components/ExpressSearchConfig/__tests__/RelatedTablesTab.test.tsx

@@ -43,7 +43,9 @@ describe('RelatedTablesTab', () => {
 
     expect(onChangeConfig).toHaveBeenCalledTimes(1);
     const newConfig = onChangeConfig.mock.calls[0][0];
-    expect(newConfig.relatedQueries.find((rq: any) => rq.id === '2').isActive).toBe(true);
+    expect(
+      newConfig.relatedQueries.find((rq: any) => rq.id === '2').isActive
+    ).toBe(true);
 
     const activeRow = rows[0];
     const activeCheckbox = activeRow.querySelector('input[type="checkbox"]');
@@ -54,6 +56,8 @@ describe('RelatedTablesTab', () => {
 
     expect(onChangeConfig).toHaveBeenCalledTimes(2);
     const secondConfig = onChangeConfig.mock.calls[1][0];
-    expect(secondConfig.relatedQueries.find((rq: any) => rq.id === '1').isActive).toBe(false);
+    expect(
+      secondConfig.relatedQueries.find((rq: any) => rq.id === '1').isActive
+    ).toBe(false);
   });
 });

specifyweb/frontend/js_src/lib/components/ExpressSearchConfig/__tests__/ResultsOrderingTab.test.tsx

@@ -39,9 +39,7 @@ describe('ResultsOrderingTab', () => {
           displayFields: [],
         },
       ],
-      relatedQueries: [
-        { id: '8', isActive: true, displayOrder: 1 },
-      ],
+      relatedQueries: [{ id: '8', isActive: true, displayOrder: 1 }],
     };
 
     const onChangeConfig = jest.fn();

specifyweb/frontend/js_src/lib/components/FormCells/FormTable.tsx

@@ -214,8 +214,8 @@ export function FormTable<SCHEMA extends AnySchema>({
         resource.cid,
         Boolean(
           resource.specifyTable.name === 'Preparation' &&
-            collectionPreparationPref &&
-            resource.isNew()
+          collectionPreparationPref &&
+          resource.isNew()
         ),
       ])
     )

specifyweb/frontend/js_src/lib/components/FormParse/__tests__/index.test.ts

@@ -471,6 +471,30 @@ describe('parseFormDefinition', () => {
 describe('getColumnDefinitions', () => {
   requireContext();
 
+  test('prefers linux definition over generic definition', () =>
+    expect(
+      getColumnDefinitions(
+        xml(
+          `<viewdef>
+            <columnDef>Generic</columnDef>
+            <columnDef os="lnx">Linux</columnDef>
+          </viewdef>`
+        )
+      )
+    ).toBe('Linux'));
+
+  test('uses generic definition if linux definition is not available', () =>
+    expect(
+      getColumnDefinitions(
+        xml(
+          `<viewdef>
+            <columnDef os="mac">Mac</columnDef>
+            <columnDef>Generic</columnDef>
+          </viewdef>`
+        )
+      )
+    ).toBe('Generic'));
+
   test('fall back to first definition available', () =>
     expect(
       getColumnDefinitions(
@@ -510,7 +534,7 @@ theories(getColumnDefinition, [
       ),
       undefined,
     ],
-    out: 'B',
+    out: 'A',
   },
 ]);
 

specifyweb/frontend/js_src/lib/components/FormParse/index.ts

@@ -90,6 +90,8 @@ export const formTypes = ['form', 'formTable'] as const;
 export type FormType = (typeof formTypes)[number];
 export type FormMode = 'edit' | 'search' | 'view';
 
+const defaultColumnDefinitionOs = 'lnx';
+
 let views: R<ViewDefinition | undefined> = {};
 
 export const getViewSetApiUrl = (viewName: string): string =>
@@ -540,10 +542,25 @@ function getColumnDefinitions(viewDefinition: SimpleXmlNode): string {
 const getColumnDefinition = (
   viewDefinition: SimpleXmlNode,
   os: string | undefined
-): string | undefined =>
-  viewDefinition.children.columnDef?.find((child) =>
-    typeof os === 'string' ? getParsedAttribute(child, 'os') === os : true
-  )?.text;
+): string | undefined => {
+  const columnDefinitions = viewDefinition.children.columnDef;
+  if (columnDefinitions === undefined) return undefined;
+
+  if (typeof os === 'string')
+    return columnDefinitions.find(
+      (child) => getParsedAttribute(child, 'os') === os
+    )?.text;
+
+  return (
+    columnDefinitions.find(
+      (child) => getParsedAttribute(child, 'os') === defaultColumnDefinitionOs
+    )?.text ??
+    columnDefinitions.find(
+      (child) => getParsedAttribute(child, 'os') === undefined
+    )?.text ??
+    columnDefinitions[0]?.text
+  );
+};
 
 const parseRows = async (
   rawRows: RA<SimpleXmlNode>,