Allow Independent Subviews via API

specifyweb/frontend/js_src/lib/components/DataModel/__tests__/__snapshots__/specifyTable.test.ts.snap

@@ -26,6 +26,7 @@ exports[`fields are loaded 1`] = `
   "[literalField CollectionObject.text2]",
   "[literalField CollectionObject.inventoryDate]",
   "[literalField CollectionObject.inventoryDatePrecision]",
+  "[literalField CollectionObject.isMemberOfCOG]",
   "[literalField CollectionObject.modifier]",
   "[literalField CollectionObject.name]",
   "[literalField CollectionObject.notifications]",
@@ -101,6 +102,108 @@ exports[`fields are loaded 1`] = `
 ]
 `;
 
+exports[`indexed fields are loaded 1`] = `
+{
+  "accession": "[relationship CollectionObject.accession]",
+  "actualTotalCountAmt": "[literalField CollectionObject.actualTotalCountAmt]",
+  "agent1": "[relationship CollectionObject.agent1]",
+  "altCatalogNumber": "[literalField CollectionObject.altCatalogNumber]",
+  "appraisal": "[relationship CollectionObject.appraisal]",
+  "availability": "[literalField CollectionObject.availability]",
+  "catalogNumber": "[literalField CollectionObject.catalogNumber]",
+  "catalogedDate": "[literalField CollectionObject.catalogedDate]",
+  "catalogedDatePrecision": "[literalField CollectionObject.catalogedDatePrecision]",
+  "catalogedDateVerbatim": "[literalField CollectionObject.catalogedDateVerbatim]",
+  "cataloger": "[relationship CollectionObject.cataloger]",
+  "cojo": "[relationship CollectionObject.cojo]",
+  "collectingEvent": "[relationship CollectionObject.collectingEvent]",
+  "collection": "[relationship CollectionObject.collection]",
+  "collectionMemberId": "[literalField CollectionObject.collectionMemberId]",
+  "collectionObjectAttachments": "[relationship CollectionObject.collectionObjectAttachments]",
+  "collectionObjectAttribute": "[relationship CollectionObject.collectionObjectAttribute]",
+  "collectionObjectAttrs": "[relationship CollectionObject.collectionObjectAttrs]",
+  "collectionObjectCitations": "[relationship CollectionObject.collectionObjectCitations]",
+  "collectionObjectProperties": "[relationship CollectionObject.collectionObjectProperties]",
+  "collectionObjectType": "[relationship CollectionObject.collectionObjectType]",
+  "conservDescriptions": "[relationship CollectionObject.conservDescriptions]",
+  "container": "[relationship CollectionObject.container]",
+  "containerOwner": "[relationship CollectionObject.containerOwner]",
+  "countAmt": "[literalField CollectionObject.countAmt]",
+  "createdByAgent": "[relationship CollectionObject.createdByAgent]",
+  "currentDetermination": "[relationship CollectionObject.currentDetermination]",
+  "date1": "[literalField CollectionObject.date1]",
+  "date1Precision": "[literalField CollectionObject.date1Precision]",
+  "deaccessioned": "[literalField CollectionObject.deaccessioned]",
+  "description": "[literalField CollectionObject.description]",
+  "determinations": "[relationship CollectionObject.determinations]",
+  "dnaSequences": "[relationship CollectionObject.dnaSequences]",
+  "embargoAuthority": "[relationship CollectionObject.embargoAuthority]",
+  "embargoReason": "[literalField CollectionObject.embargoReason]",
+  "embargoReleaseDate": "[literalField CollectionObject.embargoReleaseDate]",
+  "embargoReleaseDatePrecision": "[literalField CollectionObject.embargoReleaseDatePrecision]",
+  "embargoStartDate": "[literalField CollectionObject.embargoStartDate]",
+  "embargoStartDatePrecision": "[literalField CollectionObject.embargoStartDatePrecision]",
+  "exsiccataItems": "[relationship CollectionObject.exsiccataItems]",
+  "fieldNotebookPage": "[relationship CollectionObject.fieldNotebookPage]",
+  "fieldNumber": "[literalField CollectionObject.fieldNumber]",
+  "guid": "[literalField CollectionObject.guid]",
+  "integer1": "[literalField CollectionObject.integer1]",
+  "integer2": "[literalField CollectionObject.integer2]",
+  "inventorizedBy": "[relationship CollectionObject.inventorizedBy]",
+  "inventoryDate": "[literalField CollectionObject.inventoryDate]",
+  "inventoryDatePrecision": "[literalField CollectionObject.inventoryDatePrecision]",
+  "isMemberOfCOG": "[literalField CollectionObject.isMemberOfCOG]",
+  "leftSideRels": "[relationship CollectionObject.leftSideRels]",
+  "modifiedByAgent": "[relationship CollectionObject.modifiedByAgent]",
+  "modifier": "[literalField CollectionObject.modifier]",
+  "name": "[literalField CollectionObject.name]",
+  "notifications": "[literalField CollectionObject.notifications]",
+  "number1": "[literalField CollectionObject.number1]",
+  "number2": "[literalField CollectionObject.number2]",
+  "numberOfDuplicates": "[literalField CollectionObject.numberOfDuplicates]",
+  "objectCondition": "[literalField CollectionObject.objectCondition]",
+  "ocr": "[literalField CollectionObject.ocr]",
+  "otherIdentifiers": "[relationship CollectionObject.otherIdentifiers]",
+  "paleoContext": "[relationship CollectionObject.paleoContext]",
+  "preparations": "[relationship CollectionObject.preparations]",
+  "projectNumber": "[literalField CollectionObject.projectNumber]",
+  "projects": "[relationship CollectionObject.projects]",
+  "remarks": "[literalField CollectionObject.remarks]",
+  "reservedInteger3": "[literalField CollectionObject.reservedInteger3]",
+  "reservedInteger4": "[literalField CollectionObject.reservedInteger4]",
+  "reservedText": "[literalField CollectionObject.reservedText]",
+  "reservedText2": "[literalField CollectionObject.reservedText2]",
+  "reservedText3": "[literalField CollectionObject.reservedText3]",
+  "restrictions": "[literalField CollectionObject.restrictions]",
+  "rightSideRels": "[relationship CollectionObject.rightSideRels]",
+  "sgrStatus": "[literalField CollectionObject.sgrStatus]",
+  "text1": "[literalField CollectionObject.text1]",
+  "text2": "[literalField CollectionObject.text2]",
+  "text3": "[literalField CollectionObject.text3]",
+  "text4": "[literalField CollectionObject.text4]",
+  "text5": "[literalField CollectionObject.text5]",
+  "text6": "[literalField CollectionObject.text6]",
+  "text7": "[literalField CollectionObject.text7]",
+  "text8": "[literalField CollectionObject.text8]",
+  "timestampCreated": "[literalField CollectionObject.timestampCreated]",
+  "timestampModified": "[literalField CollectionObject.timestampModified]",
+  "totalCountAmt": "[literalField CollectionObject.totalCountAmt]",
+  "totalValue": "[literalField CollectionObject.totalValue]",
+  "treatmentEvents": "[relationship CollectionObject.treatmentEvents]",
+  "uniqueIdentifier": "[literalField CollectionObject.uniqueIdentifier]",
+  "version": "[literalField CollectionObject.version]",
+  "visibility": "[literalField CollectionObject.visibility]",
+  "visibilitySetBy": "[relationship CollectionObject.visibilitySetBy]",
+  "voucherRelationships": "[relationship CollectionObject.voucherRelationships]",
+  "yesNo1": "[literalField CollectionObject.yesNo1]",
+  "yesNo2": "[literalField CollectionObject.yesNo2]",
+  "yesNo3": "[literalField CollectionObject.yesNo3]",
+  "yesNo4": "[literalField CollectionObject.yesNo4]",
+  "yesNo5": "[literalField CollectionObject.yesNo5]",
+  "yesNo6": "[literalField CollectionObject.yesNo6]",
+}
+`;
+
 exports[`literal fields are loaded 1`] = `
 [
   "[literalField CollectionObject.actualTotalCountAmt]",
@@ -127,6 +230,7 @@ exports[`literal fields are loaded 1`] = `
   "[literalField CollectionObject.text2]",
   "[literalField CollectionObject.inventoryDate]",
   "[literalField CollectionObject.inventoryDatePrecision]",
+  "[literalField CollectionObject.isMemberOfCOG]",
   "[literalField CollectionObject.modifier]",
   "[literalField CollectionObject.name]",
   "[literalField CollectionObject.notifications]",

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

@@ -294,6 +294,7 @@ test('getFieldsToNotClone', () => {
     'catalogNumber',
     'timestampModified',
     'guid',
+    'isMemberOfCOG',
     'timestampCreated',
     'totalCountAmt',
     'uniqueIdentifier',
@@ -307,6 +308,7 @@ test('getFieldsToNotClone', () => {
     'catalogNumber',
     'timestampModified',
     'guid',
+    'isMemberOfCOG',
     'text1',
     'timestampCreated',
     'totalCountAmt',

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

@@ -147,7 +147,7 @@ const accessionsResponse = [
 ];
 
 overrideAjax(
-  '/api/specify/accession/?domainfilter=false&addressofrecord=42&offset=0',
+  '/api/specify/accession/?addressofrecord=42&domainfilter=false&limit=0',
   {
     meta: { total_count: 2 },
     objects: accessionsResponse,

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

@@ -364,103 +364,4 @@ test('tableScoping', () =>
   ).toMatchSnapshot());
 
 test('indexed fields are loaded', () =>
-  expect(tables.CollectionObject.field).toMatchInlineSnapshot(`
-    {
-      "accession": "[relationship CollectionObject.accession]",
-      "actualTotalCountAmt": "[literalField CollectionObject.actualTotalCountAmt]",
-      "agent1": "[relationship CollectionObject.agent1]",
-      "altCatalogNumber": "[literalField CollectionObject.altCatalogNumber]",
-      "appraisal": "[relationship CollectionObject.appraisal]",
-      "availability": "[literalField CollectionObject.availability]",
-      "catalogNumber": "[literalField CollectionObject.catalogNumber]",
-      "catalogedDate": "[literalField CollectionObject.catalogedDate]",
-      "catalogedDatePrecision": "[literalField CollectionObject.catalogedDatePrecision]",
-      "catalogedDateVerbatim": "[literalField CollectionObject.catalogedDateVerbatim]",
-      "cataloger": "[relationship CollectionObject.cataloger]",
-      "cojo": "[relationship CollectionObject.cojo]",
-      "collectingEvent": "[relationship CollectionObject.collectingEvent]",
-      "collection": "[relationship CollectionObject.collection]",
-      "collectionMemberId": "[literalField CollectionObject.collectionMemberId]",
-      "collectionObjectAttachments": "[relationship CollectionObject.collectionObjectAttachments]",
-      "collectionObjectAttribute": "[relationship CollectionObject.collectionObjectAttribute]",
-      "collectionObjectAttrs": "[relationship CollectionObject.collectionObjectAttrs]",
-      "collectionObjectCitations": "[relationship CollectionObject.collectionObjectCitations]",
-      "collectionObjectProperties": "[relationship CollectionObject.collectionObjectProperties]",
-      "collectionObjectType": "[relationship CollectionObject.collectionObjectType]",
-      "conservDescriptions": "[relationship CollectionObject.conservDescriptions]",
-      "container": "[relationship CollectionObject.container]",
-      "containerOwner": "[relationship CollectionObject.containerOwner]",
-      "countAmt": "[literalField CollectionObject.countAmt]",
-      "createdByAgent": "[relationship CollectionObject.createdByAgent]",
-      "currentDetermination": "[relationship CollectionObject.currentDetermination]",
-      "date1": "[literalField CollectionObject.date1]",
-      "date1Precision": "[literalField CollectionObject.date1Precision]",
-      "deaccessioned": "[literalField CollectionObject.deaccessioned]",
-      "description": "[literalField CollectionObject.description]",
-      "determinations": "[relationship CollectionObject.determinations]",
-      "dnaSequences": "[relationship CollectionObject.dnaSequences]",
-      "embargoAuthority": "[relationship CollectionObject.embargoAuthority]",
-      "embargoReason": "[literalField CollectionObject.embargoReason]",
-      "embargoReleaseDate": "[literalField CollectionObject.embargoReleaseDate]",
-      "embargoReleaseDatePrecision": "[literalField CollectionObject.embargoReleaseDatePrecision]",
-      "embargoStartDate": "[literalField CollectionObject.embargoStartDate]",
-      "embargoStartDatePrecision": "[literalField CollectionObject.embargoStartDatePrecision]",
-      "exsiccataItems": "[relationship CollectionObject.exsiccataItems]",
-      "fieldNotebookPage": "[relationship CollectionObject.fieldNotebookPage]",
-      "fieldNumber": "[literalField CollectionObject.fieldNumber]",
-      "guid": "[literalField CollectionObject.guid]",
-      "integer1": "[literalField CollectionObject.integer1]",
-      "integer2": "[literalField CollectionObject.integer2]",
-      "inventorizedBy": "[relationship CollectionObject.inventorizedBy]",
-      "inventoryDate": "[literalField CollectionObject.inventoryDate]",
-      "inventoryDatePrecision": "[literalField CollectionObject.inventoryDatePrecision]",
-      "leftSideRels": "[relationship CollectionObject.leftSideRels]",
-      "modifiedByAgent": "[relationship CollectionObject.modifiedByAgent]",
-      "modifier": "[literalField CollectionObject.modifier]",
-      "name": "[literalField CollectionObject.name]",
-      "notifications": "[literalField CollectionObject.notifications]",
-      "number1": "[literalField CollectionObject.number1]",
-      "number2": "[literalField CollectionObject.number2]",
-      "numberOfDuplicates": "[literalField CollectionObject.numberOfDuplicates]",
-      "objectCondition": "[literalField CollectionObject.objectCondition]",
-      "ocr": "[literalField CollectionObject.ocr]",
-      "otherIdentifiers": "[relationship CollectionObject.otherIdentifiers]",
-      "paleoContext": "[relationship CollectionObject.paleoContext]",
-      "preparations": "[relationship CollectionObject.preparations]",
-      "projectNumber": "[literalField CollectionObject.projectNumber]",
-      "projects": "[relationship CollectionObject.projects]",
-      "remarks": "[literalField CollectionObject.remarks]",
-      "reservedInteger3": "[literalField CollectionObject.reservedInteger3]",
-      "reservedInteger4": "[literalField CollectionObject.reservedInteger4]",
-      "reservedText": "[literalField CollectionObject.reservedText]",
-      "reservedText2": "[literalField CollectionObject.reservedText2]",
-      "reservedText3": "[literalField CollectionObject.reservedText3]",
-      "restrictions": "[literalField CollectionObject.restrictions]",
-      "rightSideRels": "[relationship CollectionObject.rightSideRels]",
-      "sgrStatus": "[literalField CollectionObject.sgrStatus]",
-      "text1": "[literalField CollectionObject.text1]",
-      "text2": "[literalField CollectionObject.text2]",
-      "text3": "[literalField CollectionObject.text3]",
-      "text4": "[literalField CollectionObject.text4]",
-      "text5": "[literalField CollectionObject.text5]",
-      "text6": "[literalField CollectionObject.text6]",
-      "text7": "[literalField CollectionObject.text7]",
-      "text8": "[literalField CollectionObject.text8]",
-      "timestampCreated": "[literalField CollectionObject.timestampCreated]",
-      "timestampModified": "[literalField CollectionObject.timestampModified]",
-      "totalCountAmt": "[literalField CollectionObject.totalCountAmt]",
-      "totalValue": "[literalField CollectionObject.totalValue]",
-      "treatmentEvents": "[relationship CollectionObject.treatmentEvents]",
-      "uniqueIdentifier": "[literalField CollectionObject.uniqueIdentifier]",
-      "version": "[literalField CollectionObject.version]",
-      "visibility": "[literalField CollectionObject.visibility]",
-      "visibilitySetBy": "[relationship CollectionObject.visibilitySetBy]",
-      "voucherRelationships": "[relationship CollectionObject.voucherRelationships]",
-      "yesNo1": "[literalField CollectionObject.yesNo1]",
-      "yesNo2": "[literalField CollectionObject.yesNo2]",
-      "yesNo3": "[literalField CollectionObject.yesNo3]",
-      "yesNo4": "[literalField CollectionObject.yesNo4]",
-      "yesNo5": "[literalField CollectionObject.yesNo5]",
-      "yesNo6": "[literalField CollectionObject.yesNo6]",
-    }
-  `));
+  expect(tables.CollectionObject.field).toMatchSnapshot());

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

@@ -2,8 +2,11 @@
 
 import _ from 'underscore';
 
+import { removeKey } from '../../utils/utils';
 import { assert } from '../Errors/assert';
 import { Backbone } from './backbone';
+import type { AnySchema } from './helperTypes';
+import type { SpecifyResource } from './legacyTypes';
 
 // REFACTOR: remove @ts-nocheck
 
@@ -14,6 +17,10 @@ const Base = Backbone.Collection.extend({
   },
 });
 
+export const isRelationshipCollection = (value: unknown): boolean =>
+  value instanceof DependentCollection ||
+  value instanceof IndependentCollection;
+
 function notSupported() {
   throw new Error('method is not supported');
 }
@@ -134,7 +141,7 @@ export const LazyCollection = Base.extend({
     options.data =
       options.data ||
       _.extend({ domainfilter: this.domainfilter }, this.filters);
-    options.data.offset = this.length;
+    options.data.offset = options.offset || this.length;
 
     _(options).has('limit') && (options.data.limit = options.limit);
     this._fetch = Backbone.Collection.prototype.fetch.call(this, options);
@@ -154,6 +161,106 @@ export const LazyCollection = Base.extend({
   },
 });
 
+export const IndependentCollection = LazyCollection.extend({
+  __name__: 'IndependentCollectionBase',
+  constructor(options, records = []) {
+    this.table = this.model;
+    assert(_.isArray(records));
+    Base.call(this, records, options);
+    this.filters = options.filters || {};
+    this.domainfilter =
+      Boolean(options.domainfilter) &&
+      this.model?.specifyTable.getScopingRelationship() !== undefined;
+
+    this.removed = new Set<string>();
+    this.updated = {};
+  },
+  initialize(_tables, options) {
+    this.on(
+      'change',
+      function (resource: SpecifyResource<AnySchema>) {
+        if (!resource.isBeingInitialized()) {
+          this.updated[resource.cid] = resource;
+          this.trigger('saverequired');
+        }
+      },
+      this
+    );
+
+    this.on(
+      'add',
+      function (resource: SpecifyResource<AnySchema>) {
+        if (!resource.isNew()) {
+          (this.removed as Set<string>).delete(resource.url());
+          this.updated[resource.cid] = resource.url();
+        } else {
+          this.updated[resource.cid] = resource;
+        }
+        this._totalCount += 1;
+        this.trigger('saverequired');
+      },
+      this
+    );
+
+    this.on(
+      'remove',
+      function (resource: SpecifyResource<AnySchema>) {
+        if (!resource.isNew()) {
+          (this.removed as Set<string>).add(resource.url());
+        }
+        this.updated = removeKey(this.updated, resource.cid);
+        this._totalCount -= 1;
+        this.trigger('saverequired');
+      },
+      this
+    );
+
+    this.listenTo(options.related, 'saved', function () {
+      this.updated = {};
+      this.removed = new Set<string>();
+    });
+
+    setupToOne(this, options);
+  },
+  parse(resp) {
+    const self = this;
+    const records = Reflect.apply(
+      LazyCollection.prototype.parse,
+      this,
+      arguments
+    );
+
+    this._totalCount -= (this.removed as Set<string>).size;
+
+    return records.filter(
+      ({ resource_uri }) => !(this.removed as Set<string>).has(resource_uri)
+    );
+  },
+  async fetch(options) {
+    if (this.related.isBeingInitialized()) {
+      return this;
+    }
+    this.filters[this.field.name.toLowerCase()] = this.related.id;
+
+    const offset =
+      this.length === 0 && this.removed.size > 0
+        ? this.removed.size
+        : this.length;
+
+    options = { ...(options ?? {}), silent: true, offset };
+
+    return Reflect.apply(LazyCollection.prototype.fetch, this, [options]);
+  },
+  toApiJSON(options) {
+    const self = this;
+
+    return {
+      update: Object.values(this.updated),
+      remove: Array.from(self.removed),
+    };
+  },
+});
+
 export const ToOneCollection = LazyCollection.extend({
   __name__: 'LazyToOneCollectionBase',
   initialize(_models, options) {