Merge pull request #5224 from specify/issue-5223

Set default cotype on the frontend

specifyweb/context/views.py

@@ -28,6 +28,7 @@
 from specifyweb.specify.models import Collection, Institution, \
     Specifyuser, Spprincipal, Spversion
 from specifyweb.specify.schema import base_schema
+from specifyweb.specify.api import uri_for_model
 from specifyweb.specify.serialize_datamodel import datamodel_to_json
 from specifyweb.specify.specify_jar import specify_jar
 from specifyweb.specify.views import login_maybe_required, openapi
@@ -340,7 +341,8 @@ def domain(request):
         'embeddedPaleoContext': collection.discipline.ispaleocontextembedded,
         'paleoContextChildTable': collection.discipline.paleocontextchildtable,
         'catalogNumFormatName': collection.catalognumformatname,
-        }
+        'defaultCollectionObjectType': uri_for_model(collection.collectionobjecttype.__class__, collection.collectionobjecttype.id) if collection.collectionobjecttype is not None else None
+    }
 
     return HttpResponse(json.dumps(domain), content_type='application/json')
 

specifyweb/frontend/js_src/lib/components/DataModel/__tests__/businessRules.test.ts

@@ -85,7 +85,6 @@ describe('Collection Object business rules', () => {
   const getBaseCollectionObject = () =>
     new tables.CollectionObject.Resource({
       id: collectionObjectlId,
-      collectionobjecttype: collectionObjectTypeUrl,
       determinations: [
         {
           taxon: getResourceApiUrl('Taxon', otherTaxonId),
@@ -116,6 +115,9 @@ describe('Collection Object business rules', () => {
     const collectionObject = getBaseCollectionObject();
 
     expect(collectionObject.get('collectingEvent')).toBeDefined();
+    expect(collectionObject.get('collectionObjectType')).toEqual(
+      schema.defaultCollectionObjectType
+    );
   });
 
   const otherCollectionObjectTypeUrl = getResourceApiUrl(

specifyweb/frontend/js_src/lib/components/DataModel/__tests__/resourceApi.test.ts

@@ -34,6 +34,7 @@ const determinationsResponse: RA<Partial<SerializedRecord<Determination>>> = [
 
 const collectionObjectResponse = {
   id: collectionObjectId,
+  collectionobjecttype: getResourceApiUrl('CollectionObjectType', 1),
   resource_uri: collectionObjectUrl,
   accession: accessionUrl,
   catalognumber: '000029432',
@@ -203,6 +204,7 @@ describe('needsSaved', () => {
     const resource = new tables.CollectionObject.Resource({
       id: collectionObjectId,
     });
+
     expect(resource.needsSaved).toBe(false);
     resource.set('text1', 'a');
     expect(resource.needsSaved).toBe(true);
@@ -212,6 +214,7 @@ describe('needsSaved', () => {
     const resource = new tables.CollectionObject.Resource({
       id: collectionObjectId,
     });
+
     expect(resource.needsSaved).toBe(false);
     resource.set('determinations', []);
     expect(resource.needsSaved).toBe(true);
@@ -329,7 +332,7 @@ describe('placeInSameHierarchy', () => {
 
   test('invalid hierarchy', async () => {
     const collectionObject = new tables.CollectionObject.Resource({
-      id: 100,
+      id: collectionObjectId,
     });
     const author = new tables.Author.Resource();
     await expect(

specifyweb/frontend/js_src/lib/components/DataModel/__tests__/schemaBase.test.ts

@@ -14,6 +14,7 @@ test('domain data is fetched and parsed correctly', async () =>
     },
     embeddedCollectingEvent: false,
     embeddedPaleoContext: true,
+    defaultCollectionObjectType: '/api/specify/collectionobjecttype/1/',
     fieldPartSeparator: '-',
     orgHierarchy: [
       'CollectionObject',

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

@@ -13,6 +13,7 @@ import {
 import type { SpecifyResource } from './legacyTypes';
 import { fetchResource, idFromUrl } from './resource';
 import { setSaveBlockers } from './saveBlockers';
+import { schema } from './schema';
 import type { Collection } from './specifyTable';
 import { tables } from './tables';
 import type {
@@ -154,6 +155,16 @@ export const businessRuleDefs: MappedBusinessRuleDefs = {
           new tables.CollectingEvent.Resource()
         );
       }
+
+      // Set the default CoType
+      if (
+        typeof schema.defaultCollectionObjectType === 'string' &&
+        typeof collectionObject.get('collectionObjectType') !== 'string'
+      )
+        collectionObject.set(
+          'collectionObjectType',
+          schema.defaultCollectionObjectType
+        );
     },
     fieldChecks: {
       collectionObjectType: async (resource): Promise<undefined> => {

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

@@ -21,6 +21,7 @@ type Schema = {
   readonly embeddedPaleoContext: boolean;
   readonly paleoContextChildTable: string;
   readonly catalogNumFormatName: string;
+  readonly defaultCollectionObjectType: string | null;
   readonly orgHierarchy: readonly [
     'CollectionObject',
     'Collection',
@@ -50,6 +51,9 @@ const schemaBase: Writable<Schema> = {
   paleoContextChildTable: undefined!,
   catalogNumFormatName: undefined!,
 
+  // Default collectionObjectType for the collection
+  defaultCollectionObjectType: undefined!,
+
   // The scoping hierarchy of Specify objects.
   orgHierarchy: [
     'CollectionObject',
@@ -90,6 +94,7 @@ export const fetchContext = load<
   schemaBase.embeddedPaleoContext = data.embeddedPaleoContext;
   schemaBase.paleoContextChildTable = data.paleoContextChildTable;
   schemaBase.catalogNumFormatName = data.catalogNumFormatName;
+  schemaBase.defaultCollectionObjectType = data.defaultCollectionObjectType;
   return schemaBase;
 });
 

specifyweb/frontend/js_src/lib/tests/ajax/static/context/domain.json

@@ -6,5 +6,6 @@
   "embeddedCollectingEvent": false,
   "embeddedPaleoContext": true,
   "paleoContextChildTable": "collectionobject",
-  "catalogNumFormatName": "CatalogNumberNumeric"
+  "catalogNumFormatName": "CatalogNumberNumeric",
+  "defaultCollectionObjectType": "/api/specify/collectionobjecttype/1/"
 }