feat(OY2-26082): package actions multi-file download

Enterprise-CMCS · Jan 12, 2024 · 43199b8 · 43199b8
1 parent 5c3dd43
commit 43199b8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/services/ui/src/pages/detail/package-activity/PackageActivity.tsx b/src/services/ui/src/pages/detail/package-activity/PackageActivity.tsx
@@ -42,9 +42,6 @@ export const PA_InitialSubmission: FC<opensearch.changelog.Document> = (
                         hook.onUrl(ATC).then(window.open);
                       }}
                     >
-                      {hook.loading && (
-                        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-                      )}
                       {ATC.filename}
                     </Button>
                   </Table.TableCell>
@@ -93,7 +90,6 @@ export const PA_ResponseSubmitted: FC<opensearch.changelog.Document> = (
               hook.onUrl(ATC).then(window.open);
             }}
           >
-            {hook.loading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
             {ATC.filename}
           </Button>
         ))}
@@ -124,7 +120,6 @@ export const PA_ResponseWithdrawn: FC<opensearch.changelog.Document> = (
               hook.onUrl(ATC).then(window.open);
             }}
           >
-            {hook.loading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
             {ATC.filename}
           </Button>
         ))}
@@ -153,7 +148,6 @@ export const PA_RaiIssued: FC<opensearch.changelog.Document> = (props) => {
               hook.onUrl(ATC).then(window.open);
             }}
           >
-            {hook.loading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
             {ATC.filename}
           </Button>
         ))}

diff --git a/src/services/ui/src/pages/detail/package-activity/hook.ts b/src/services/ui/src/pages/detail/package-activity/hook.ts
@@ -36,12 +36,12 @@ export const useAttachmentService = (
     setLoading(true);
     const zip = new JSZip();
 
-    const remoteZips = attachments.map(async (ATT) => {
+    const remoteZips = attachments.map(async (ATT, index) => {
       const url = await onUrl(ATT);
       if (!url) return;
       const response = await fetch(url);
       const data = await response.blob();
-      zip.file(ATT.filename, data);
+      zip.file(`${ATT.filename}_${index + 1}`, data);
       return data;
     });
 

diff --git a/src/services/ui/src/pages/detail/package-activity/index.tsx b/src/services/ui/src/pages/detail/package-activity/index.tsx
@@ -24,7 +24,6 @@ export const PackageActivities: FC<opensearch.main.Document> = (props) => {
     [props.changelog]
   );
 
-  // TODO: OY2-26538
   const onDownloadAll = () => {
     const attachments = props.changelog?.reduce((ACC, ATT) => {
       if (!ATT._source.attachments) return ACC;