Add serie data entry feature

Fixes #545
specify · Apr 17, 2024 · 0680b87 · 0680b87
1 parent f1c1404
commit 0680b87
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 9 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/legacyTypes.ts b/specifyweb/frontend/js_src/lib/components/DataModel/legacyTypes.ts
@@ -177,10 +177,7 @@ export type SpecifyResource<SCHEMA extends AnySchema> = {
   viewUrl(): string;
   isNew(): boolean;
   isBeingInitialized(): boolean;
-  clone(
-    cloneAll: boolean,
-    bulkAmount: number
-  ): Promise<SpecifyResource<SCHEMA>>;
+  clone(cloneAll: boolean): Promise<SpecifyResource<SCHEMA>>;
   // eslint-disable-next-line @typescript-eslint/naming-convention
   toJSON(): SerializedRecord<AnySchema>;
   getRelatedObjectCount(

diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/resourceApi.ts b/specifyweb/frontend/js_src/lib/components/DataModel/resourceApi.ts
@@ -134,9 +134,8 @@ export const ResourceBase = Backbone.Model.extend({
   handleChanged() {
     this.needsSaved = true;
   },
-  async clone(cloneAll = false, bulkAmount = 1) {
+  async clone(cloneAll = false) {
     const self = this;
-    console.log(bulkAmount);
 
     const exemptFields = getFieldsToNotClone(this.specifyTable, cloneAll).map(
       (fieldName) => fieldName.toLowerCase()

diff --git a/specifyweb/frontend/js_src/lib/components/Forms/Save.tsx b/specifyweb/frontend/js_src/lib/components/Forms/Save.tsx
@@ -196,7 +196,9 @@ export function SaveButton<SCHEMA extends AnySchema = AnySchema>({
   const copyButton = (
     label: LocalizedString,
     description: LocalizedString,
-    handleClick: () => Promise<SpecifyResource<SCHEMA>>
+    handleClick: () =>
+      | Promise<SpecifyResource<SCHEMA>[]>
+      | Promise<SpecifyResource<SCHEMA>>
   ): JSX.Element => (
     <ButtonComponent
       className={saveBlocked ? '!cursor-not-allowed' : undefined}
@@ -205,7 +207,18 @@ export function SaveButton<SCHEMA extends AnySchema = AnySchema>({
       onClick={(): void => {
         // Scroll to the top of the form on clone
         smoothScroll(form, 0);
-        loading(handleClick().then(handleAdd));
+        // loading(handleClick().then(handleAdd));
+        loading(
+          handleClick().then((result) => {
+            if (Array.isArray(result)) {
+              result.forEach((newResource) => {
+                if (handleAdd) handleAdd(newResource);
+              });
+            } else {
+              if (handleAdd) handleAdd(result);
+            }
+          })
+        );
       }}
     >
       {label}
@@ -240,7 +253,28 @@ export function SaveButton<SCHEMA extends AnySchema = AnySchema>({
             copyButton(
               formsText.carryForward(),
               formsText.carryForwardDescription(),
-              async () => resource.clone(false, carryForwardAmount)
+              // async () => {
+              //   return resource.clone(false);
+              // }
+              async () => {
+                const clones = [];
+                for (let i = 0; i < carryForwardAmount; i++) {
+                  clones.push(
+                    await resource
+                      .clone(false)
+                      .then(async (resource) => {
+                        const formatter = resource.specifyTable
+                          .strictGetLiteralField('catalogNumber')
+                          .getUiFormatter()!;
+                        const wildCard = formatter.valueOrWild();
+                        await resource.set('catalogNumber', wildCard as never);
+                        return resource;
+                      })
+                      .then((resource) => resource.save())
+                  );
+                }
+                return clones;
+              }
             )}
           {showAdd &&
             copyButton(