Merge branch 'production' into issue-5376

specify · Nov 7, 2024 · b3526a4 · b3526a4
2 parents e68e727 + a75e847
commit b3526a4
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 65 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/Forms/Save.tsx b/specifyweb/frontend/js_src/lib/components/Forms/Save.tsx
@@ -229,6 +229,10 @@ export function SaveButton<SCHEMA extends AnySchema = AnySchema>({
 
   const [carryForwardAmount, setCarryForwardAmount] = React.useState<number>(1);
 
+  const isCOGorCOJO =
+    resource.specifyTable.name === 'CollectionObjectGroup' ||
+    resource.specifyTable.name === 'CollectionObjectGroupJoin';
+
   return (
     <>
       {typeof handleAdd === 'function' && canCreate ? (
@@ -237,7 +241,8 @@ export function SaveButton<SCHEMA extends AnySchema = AnySchema>({
           (isInRecordSet === false || isInRecordSet === undefined) &&
           isSaveDisabled &&
           showCarry &&
-          showBulkCarry ? (
+          showBulkCarry &&
+          !isCOGorCOJO ? (
             <Input.Integer
               aria-label={formsText.bulkCarryForwardCount()}
               className="!w-fit"
@@ -251,65 +256,70 @@ export function SaveButton<SCHEMA extends AnySchema = AnySchema>({
               }
             />
           ) : null}
-          {showCarry &&
-            copyButton(
-              formsText.carryForward(),
-              formsText.carryForwardDescription(),
-              /**
-               * FEATURE: Extend this functionality to all tables
-               * See https://github.com/specify/specify7/pull/4804
-               *
-               */
-              resource.specifyTable.name === 'CollectionObject' &&
-                carryForwardAmount > 1
-                ? async (): Promise<RA<SpecifyResource<SCHEMA>>> => {
-                    const formatter =
-                      tables.CollectionObject.strictGetLiteralField(
-                        'catalogNumber'
-                      ).getUiFormatter()!;
-                    const wildCard = formatter.valueOrWild();
-
-                    const clonePromises = Array.from(
-                      { length: carryForwardAmount },
-                      async () => {
-                        const clonedResource = await resource.clone(
-                          false,
-                          true
-                        );
-                        clonedResource.set('catalogNumber', wildCard as never);
-                        return clonedResource;
-                      }
-                    );
-
-                    const clones = await Promise.all(clonePromises);
-
-                    const backendClones = await ajax<
-                      RA<SerializedRecord<SCHEMA>>
-                    >(
-                      `/api/specify/bulk/${resource.specifyTable.name.toLowerCase()}/`,
-                      {
-                        method: 'POST',
-                        headers: { Accept: 'application/json' },
-                        body: clones,
-                      }
-                    ).then(({ data }) =>
-                      data.map((resource) =>
-                        deserializeResource(serializeResource(resource))
-                      )
-                    );
-
-                    return Promise.all([resource, ...backendClones]);
-                  }
-                : async (): Promise<RA<SpecifyResource<SCHEMA>>> => [
-                    await resource.clone(false),
-                  ]
-            )}
-          {showClone &&
-            copyButton(
-              formsText.clone(),
-              formsText.cloneDescription(),
-              async () => [await resource.clone(true)]
-            )}
+          {showCarry && !isCOGorCOJO
+            ? copyButton(
+                formsText.carryForward(),
+                formsText.carryForwardDescription(),
+                /**
+                 * FEATURE: Extend this functionality to all tables
+                 * See https://github.com/specify/specify7/pull/4804
+                 *
+                 */
+                resource.specifyTable.name === 'CollectionObject' &&
+                  carryForwardAmount > 1
+                  ? async (): Promise<RA<SpecifyResource<SCHEMA>>> => {
+                      const formatter =
+                        tables.CollectionObject.strictGetLiteralField(
+                          'catalogNumber'
+                        ).getUiFormatter()!;
+                      const wildCard = formatter.valueOrWild();
+
+                      const clonePromises = Array.from(
+                        { length: carryForwardAmount },
+                        async () => {
+                          const clonedResource = await resource.clone(
+                            false,
+                            true
+                          );
+                          clonedResource.set(
+                            'catalogNumber',
+                            wildCard as never
+                          );
+                          return clonedResource;
+                        }
+                      );
+
+                      const clones = await Promise.all(clonePromises);
+
+                      const backendClones = await ajax<
+                        RA<SerializedRecord<SCHEMA>>
+                      >(
+                        `/api/specify/bulk/${resource.specifyTable.name.toLowerCase()}/`,
+                        {
+                          method: 'POST',
+                          headers: { Accept: 'application/json' },
+                          body: clones,
+                        }
+                      ).then(({ data }) =>
+                        data.map((resource) =>
+                          deserializeResource(serializeResource(resource))
+                        )
+                      );
+
+                      return Promise.all([resource, ...backendClones]);
+                    }
+                  : async (): Promise<RA<SpecifyResource<SCHEMA>>> => [
+                      await resource.clone(false),
+                    ]
+              )
+            : undefined}
+          {showClone && !isCOGorCOJO
+            ? copyButton(
+                formsText.clone(),
+                formsText.cloneDescription(),
+                async () => [await resource.clone(true)]
+              )
+            : undefined}
           {showAdd &&
             copyButton(
               commonText.add(),

diff --git a/specifyweb/frontend/js_src/lib/tests/jsdom.js b/specifyweb/frontend/js_src/lib/tests/jsdom.js
@@ -6,11 +6,13 @@ const { window } = new JSDOM('<!DOCTYPE html><p>Hello world</p>');
 // Define window and other globals
 globalThis.window = window;
 globalThis.document = window.document;
-global.navigator = {
-  userAgent: 'node.js',
-  appVersion: 'node.js',
-  platform: 'node.js',
-};
+if (!global.navigator) {
+  global.navigator = {
+    userAgent: 'node.js',
+    appVersion: 'node.js',
+    platform: 'node.js',
+  };
+}
 
 // You can also define other browser-specific globals as needed
 global.HTMLElement = window.HTMLElement;