Allow to upload COG in WB

specifyweb/businessrules/rules/cojo_rules.py

@@ -1,28 +1,27 @@
-import os
-import sys
 from enum import Enum
 
+from django.db.models import Max
+
 from specifyweb.businessrules.exceptions import BusinessRuleException
 from specifyweb.businessrules.orm_signal_handler import orm_signal_handler
 from specifyweb.specify.models import Collectionobjectgroupjoin
 
+
 class COGType(Enum):
     DISCRETE = "Discrete"
     CONSOLIDATED = "Consolidated"
     DRILL_CORE = "Drill Core"
 
-def is_running_tests():
-    return any(module in sys.modules for module in ('pytest', 'unittest'))
 
 @orm_signal_handler('pre_save', 'Collectionobjectgroupjoin')
 def cojo_pre_save(cojo):
     # Ensure the both the childcog and childco fields are not null.
-    # if cojo.childcog == None and cojo.childco == None:
-    #     raise BusinessRuleException('Both childcog and childco cannot be null.')
+    if cojo.childcog is None and cojo.childco is None:
+        raise BusinessRuleException('Both childcog and childco cannot be null.')
 
     # Ensure the childcog and childco fields are not both set.
-    # if cojo.childcog != None and cojo.childco != None:
-    #     raise BusinessRuleException('Both childcog and childco cannot be set.')
+    if cojo.childcog is not None and cojo.childco is not None:
+        raise BusinessRuleException('Both childcog and childco cannot be set.')
 
     # For records with the same parentcog field, there can be only one isPrimare field set to True.
     # So when a record is saved with isPrimary set to True, we need to set all other records with the same parentcog
@@ -41,24 +40,33 @@ def cojo_pre_save(cojo):
         cojo.childcog is not None
         and cojo.childcog.cojo is not None
         and cojo.childcog.cojo.id is not cojo.id
-        and not is_running_tests()
     ):
-        raise BusinessRuleException('ChildCog is already in use as a child in another COG.')
+        raise BusinessRuleException(
+            'ChildCog is already in use as a child in another COG.')
 
     if (
         cojo.childco is not None
         and cojo.childco.cojo is not None
         and cojo.childco.cojo.id is not cojo.id
-        and not is_running_tests()
     ):
-        raise BusinessRuleException('ChildCo is already in use as a child in another COG.')
-
+        raise BusinessRuleException(
+            'ChildCo is already in use as a child in another COG.')
+
+    if cojo.precedence is None:
+        others = Collectionobjectgroupjoin.objects.filter(
+            parentcog=cojo.parentcog
+        )
+        top = others.aggregate(Max('precedence'))['precedence__max']
+        cojo.precedence = 0 if top is None else top + 1
+
+
 @orm_signal_handler('post_save', 'Collectionobjectgroupjoin')
 def cojo_post_save(cojo):
     """
         For Consolidated COGs, mark the first CO child as primary if none have been set by the user
     """
-    co_children = Collectionobjectgroupjoin.objects.filter(parentcog=cojo.parentcog, childco__isnull=False)
+    co_children = Collectionobjectgroupjoin.objects.filter(
+        parentcog=cojo.parentcog, childco__isnull=False)
     if len(co_children) > 0 and not co_children.filter(isprimary=True).exists() and cojo.parentcog.cogtype.type == COGType.CONSOLIDATED.value:
         first_child = co_children.first()
         first_child.isprimary = True

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

@@ -237,6 +237,13 @@ const fieldOverwrites: typeof globalFieldOverrides = {
   CollectionObject: {
     collectionObjectType: { visibility: 'optional' },
   },
+  CollectionObjectGroupType: {
+    type: { visibility: 'optional' },
+  },
+  CollectionObjectGroupJoin: {
+    precedence: { visibility: 'optional' },
+    isSubstrate: { visibility: 'optional' },
+  },
   LoanPreparation: {
     isResolved: { visibility: 'optional' },
   },

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

@@ -10,7 +10,6 @@ import type { Collection } from '../DataModel/specifyTable';
 import { getTable } from '../DataModel/tables';
 import type { PickList } from '../DataModel/types';
 import { IntegratedRecordSelector } from '../FormSliders/IntegratedRecordSelector';
-import { relationshipIsToMany } from '../WbPlanView/mappingHelpers';
 
 export function PickListEditor({
   resource,
@@ -56,8 +55,7 @@ export function PickListEditor({
         relationship={relationship}
         sortField={undefined}
         onAdd={
-          relationshipIsToMany(relationship) &&
-          relationship.type !== 'zero-to-one'
+          relationship.type.includes('-to-many')
             ? undefined
             : ([resource]): void =>
                 void resource.set(relationship.name, resource as never)

specifyweb/frontend/js_src/lib/components/FormSliders/RecordSelector.tsx

@@ -8,7 +8,6 @@ import type { SpecifyResource } from '../DataModel/legacyTypes';
 import type { Relationship } from '../DataModel/specifyField';
 import type { SpecifyTable } from '../DataModel/specifyTable';
 import { useSearchDialog } from '../SearchDialog';
-import { relationshipIsToMany } from '../WbPlanView/mappingHelpers';
 import { Slider } from './Slider';
 
 export type RecordSelectorProps<SCHEMA extends AnySchema> = {
@@ -84,9 +83,7 @@ export function useRecordSelector<SCHEMA extends AnySchema>({
   );
 
   const isToOne =
-    field === undefined
-      ? false
-      : !relationshipIsToMany(field) || field.type === 'zero-to-one';
+    field === undefined ? false : !field.type.includes('-to-many');
 
   const handleResourcesSelected = React.useMemo(
     () =>

specifyweb/frontend/js_src/lib/components/FormSliders/RecordSelectorFromCollection.tsx

@@ -14,7 +14,6 @@ import type { SpecifyResource } from '../DataModel/legacyTypes';
 import { resourceOn } from '../DataModel/resource';
 import type { Relationship } from '../DataModel/specifyField';
 import type { Collection } from '../DataModel/specifyTable';
-import { relationshipIsToMany } from '../WbPlanView/mappingHelpers';
 import type {
   RecordSelectorProps,
   RecordSelectorState,
@@ -58,8 +57,7 @@ export function RecordSelectorFromCollection<SCHEMA extends AnySchema>({
 
   const isDependent = collection instanceof DependentCollection;
   const isLazy = collection instanceof LazyCollection;
-  const isToOne =
-    !relationshipIsToMany(relationship) || relationship.type === 'zero-to-one';
+  const isToOne = !relationship.type.includes('-to-many');
 
   // Listen for changes to collection
   React.useEffect(

specifyweb/frontend/js_src/lib/components/Forms/SubView.tsx

@@ -139,10 +139,11 @@ export function SubView({
 
   return (
     <SubViewContext.Provider value={contextValue}>
-      {!RECURSIVE_RENDERING_EXCEPTIONS.has(parentResource.specifyTable) &&
+      {(!RECURSIVE_RENDERING_EXCEPTIONS.has(parentResource.specifyTable) &&
         parentContext
-        .map(({ relationship }) => relationship)
-        .includes(relationship) || collection === false ? undefined : (
+          .map(({ relationship }) => relationship)
+          .includes(relationship)) ||
+      collection === false ? undefined : (
         <>
           {isButton && (
             <Button.BorderedGray

specifyweb/frontend/js_src/lib/components/InitialContext/systemInfo.ts

@@ -22,7 +22,7 @@ type SystemInfo = {
   readonly institution_guid: LocalizedString;
   readonly isa_number: LocalizedString;
   readonly stats_url: string | null;
-  readonly discipline_type: string
+  readonly discipline_type: string;
 };
 
 let systemInfo: SystemInfo;
@@ -45,7 +45,7 @@ export const fetchContext = load<SystemInfo>(
           collection: systemInfo.collection,
           collectionGUID: systemInfo.collection_guid,
           isaNumber: systemInfo.isa_number,
-          disciplineType: systemInfo.discipline_type
+          disciplineType: systemInfo.discipline_type,
         },
         /*
          * I don't know if the receiving server handles GET parameters in a

specifyweb/frontend/js_src/lib/components/PickLists/fetch.ts

@@ -159,7 +159,9 @@ async function fetchFromField(
     fields: { [fieldName]: ['string', 'number', 'boolean', 'null'] },
     distinct: true,
     domainFilter: true,
-    filterChronostrat: tableName === tables.GeologicTimePeriod.name.toLowerCase() && fieldName === "name", // Prop for age filter in QueryBuilder
+    filterChronostrat:
+      tableName === tables.GeologicTimePeriod.name.toLowerCase() &&
+      fieldName === 'name', // Prop for age filter in QueryBuilder
   }).then((rows) =>
     rows
       .map((row) => row[fieldName] ?? '')

specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx

@@ -524,41 +524,45 @@ export function QueryComboBox({
                                 .map(serializeResource)
                                 .map(({ fieldName, startValue }) =>
                                   fieldName === 'rankId'
-                                ? {
-                                    field: 'rankId',
-                                    isRelationship: false,
-                                    isNot: false,
-                                    operation: 'less',
-                                    value: startValue,
-                                  }
-                                : fieldName === 'nodeNumber'
-                                  ? {
-                                      field: 'nodeNumber',
-                                      isRelationship: false,
-                                      operation: 'between',
-                                      isNot: true,
-                                      value: startValue,
-                                    }
-                                  : fieldName === 'collectionRelTypeId'
                                     ? {
-                                        field: 'id',
+                                        field: 'rankId',
                                         isRelationship: false,
-                                        operation: 'in',
                                         isNot: false,
+                                        operation: 'less',
                                         value: startValue,
                                       }
-                                    : fieldName === 'taxonTreeDefId'
+                                    : fieldName === 'nodeNumber'
                                       ? {
-                                          field: 'definition',
-                                          isRelationship: true,
-                                          operation: 'in',
-                                          isNot: false,
-                                          value: startValue
+                                          field: 'nodeNumber',
+                                          isRelationship: false,
+                                          operation: 'between',
+                                          isNot: true,
+                                          value: startValue,
                                         }
-                                    : f.error(`extended filter not created`, {
-                                        fieldName,
-                                        startValue,
-                                      }))
+                                      : fieldName === 'collectionRelTypeId'
+                                        ? {
+                                            field: 'id',
+                                            isRelationship: false,
+                                            operation: 'in',
+                                            isNot: false,
+                                            value: startValue,
+                                          }
+                                        : fieldName === 'taxonTreeDefId'
+                                          ? {
+                                              field: 'definition',
+                                              isRelationship: true,
+                                              operation: 'in',
+                                              isNot: false,
+                                              value: startValue,
+                                            }
+                                          : f.error(
+                                              `extended filter not created`,
+                                              {
+                                                fieldName,
+                                                startValue,
+                                              }
+                                            )
+                                )
                             ),
                           })
                       : undefined

specifyweb/frontend/js_src/lib/components/SearchDialog/index.tsx

@@ -139,7 +139,13 @@ const filterResults = <SCHEMA extends AnySchema>(
 
 function testFilter<SCHEMA extends AnySchema>(
   resource: SpecifyResource<SCHEMA>,
-  { operation, field, value, isNot, isRelationship }: QueryComboBoxFilter<SCHEMA>
+  {
+    operation,
+    field,
+    value,
+    isNot,
+    isRelationship,
+  }: QueryComboBoxFilter<SCHEMA>
 ): boolean {
   const values = value.split(',').map(f.trim);
   const result =
@@ -151,7 +157,9 @@ function testFilter<SCHEMA extends AnySchema>(
           values.some((value) => {
             const fieldValue = resource.get(field);
             // eslint-disable-next-line eqeqeq
-            return isRelationship ? value == strictIdFromUrl(fieldValue!).toString() : value == fieldValue
+            return isRelationship
+              ? value == strictIdFromUrl(fieldValue!).toString()
+              : value == fieldValue;
           })
         : operation === 'less'
           ? values.every((value) => (resource.get(field) ?? 0) < value)

specifyweb/frontend/js_src/lib/components/WbPlanView/autoMapper.ts

@@ -30,6 +30,7 @@ import {
   getNameFromTreeRankName,
   getNumberFromToManyIndex,
   mappingPathToString,
+  relationshipIsRemoteToOne,
   relationshipIsToMany,
   valueIsToManyIndex,
   valueIsTreeRank,
@@ -809,7 +810,10 @@ export class AutoMapper {
       .forEach((relationship) => {
         const localPath = [...mappingPath, relationship.name];
 
-        if (relationshipIsToMany(relationship))
+        if (
+          relationshipIsToMany(relationship) ||
+          relationshipIsRemoteToOne(relationship)
+        )
           localPath.push(formatToManyIndex(1));
 
         const newDepthLevel = localPath.length;

specifyweb/frontend/js_src/lib/components/WbPlanView/helpers.ts

@@ -28,6 +28,7 @@ import {
   formatToManyIndex,
   formatTreeRank,
   mappingPathToString,
+  relationshipIsRemoteToOne,
   relationshipIsToMany,
   valueIsToManyIndex,
   valueIsTreeRank,
@@ -266,10 +267,13 @@ export function mutateMappingPath({
   const table = getTable(parentTableName ?? '');
   const currentField = table?.getField(mappingPath[index] ?? '');
   const isCurrentToMany =
-    currentField?.isRelationship === true && relationshipIsToMany(currentField);
+    currentField?.isRelationship === true &&
+    (relationshipIsToMany(currentField) ||
+      relationshipIsRemoteToOne(currentField));
   const newField = table?.getField(newValue);
   const isNewToMany =
-    newField?.isRelationship === true && relationshipIsToMany(newField);
+    newField?.isRelationship === true &&
+    (relationshipIsToMany(newField) || relationshipIsRemoteToOne(newField));
   const isNewTree =
     newField?.isRelationship === true &&
     isTreeTable(newField.relatedTable.name);

specifyweb/frontend/js_src/lib/components/WbPlanView/mappingHelpers.ts

@@ -22,6 +22,21 @@ export const relationshipIsToMany = (
   relationship?.type.includes('-to-many') === true ||
   relationship?.type === 'zero-to-one';
 
+/**
+ * Returns whether the relatation is one-to-one from the remote side
+ * (the foreign key exists on the other table of the relationship)
+ *
+ * In the WorkBench, remote one-to-one relationships are parsed as to-many
+ * in the upload plan
+ *
+ * See https://github.com/specify/specify7/pull/6073#discussion_r1915397675
+ */
+export const relationshipIsRemoteToOne = (
+  relationship: Relationship | undefined
+): boolean =>
+  relationship?.type === 'one-to-one' &&
+  relationship.databaseColumn === undefined;
+
 export type FieldType = Exclude<keyof CollectionObject, 'tableName'>;
 
 /** Returns whether a value is a -to-many index (e.x #1, #2, etc...) */

specifyweb/frontend/js_src/lib/components/WbPlanView/modelHelpers.ts

@@ -18,6 +18,7 @@ import type { MappingPath } from './Mapper';
 import {
   formatTreeRank,
   getNumberFromToManyIndex,
+  relationshipIsRemoteToOne,
   relationshipIsToMany,
   valueIsToManyIndex,
   valueIsTreeRank,
@@ -103,8 +104,10 @@ export function findRequiredMissingFields(
           // Disable circular relationships
           (isCircularRelationship(parentRelationship, relationship) ||
             // Skip -to-many inside -to-many
-            (relationshipIsToMany(parentRelationship) &&
-              relationshipIsToMany(relationship)))
+            ((relationshipIsToMany(parentRelationship) ||
+              relationshipIsRemoteToOne(parentRelationship)) &&
+              (relationshipIsToMany(relationship) ||
+                relationshipIsRemoteToOne(relationship))))
         )
           return [];