Add app name to download file name

Signed-off-by: ibolton336 <[email protected]>
konveyor · Sep 27, 2023 · 033af7e · 033af7e
1 parent a7cb60c
commit 033af7e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.../applications/components/application-detail-drawer/application-detail-drawer-analysis.tsx b/.../applications/components/application-detail-drawer/application-detail-drawer-analysis.tsx
@@ -139,7 +139,7 @@ export const ApplicationDetailDrawerAnalysis: React.FC<
                       position="top"
                     >
                       <DownloadButton
-                        id={application.id}
+                        application={application}
                         mimeType={MimeType.TAR}
                       />
                     </Tooltip>
@@ -149,7 +149,7 @@ export const ApplicationDetailDrawerAnalysis: React.FC<
                       position="top"
                     >
                       <DownloadButton
-                        id={application.id}
+                        application={application}
                         mimeType={MimeType.YAML}
                       />
                     </Tooltip>

diff --git a/...pp/pages/applications/components/application-detail-drawer/components/download-button.tsx b/...pp/pages/applications/components/application-detail-drawer/components/download-button.tsx
@@ -3,17 +3,18 @@ import { Alert, Button } from "@patternfly/react-core";
 import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
 import { Spinner } from "@patternfly/react-core";
 import { useDownloadStaticReport } from "@app/queries/applications";
+import { Application } from "@app/api/models";
 
 export enum MimeType {
   TAR = "tar",
   YAML = "yaml",
 }
 interface IDownloadButtonProps {
-  id: number;
+  application: Application;
   mimeType: MimeType;
 }
 export const DownloadButton: React.FC<IDownloadButtonProps> = ({
-  id,
+  application,
   mimeType,
 }) => {
   const {
@@ -24,7 +25,7 @@ export const DownloadButton: React.FC<IDownloadButtonProps> = ({
 
   const handleDownload = () => {
     downloadFile({
-      applicationId: id,
+      application: application,
       mimeType: mimeType,
     });
   };

diff --git a/client/src/app/queries/applications.ts b/client/src/app/queries/applications.ts
@@ -1,7 +1,7 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import axios, { AxiosError } from "axios";
 
-import { MimeType } from "@app/api/models";
+import { Application, MimeType } from "@app/api/models";
 import {
   APPLICATIONS,
   createApplication,
@@ -21,7 +21,7 @@ export const ApplicationsQueryKey = "applications";
 export const ReportQueryKey = "report";
 
 interface DownloadOptions {
-  applicationId: number;
+  application: Application;
   mimeType: MimeType;
 }
 
@@ -141,19 +141,19 @@ export const useBulkDeleteApplicationMutation = (
 };
 
 export const downloadStaticReport = async ({
-  applicationId,
+  application,
   mimeType,
 }: DownloadOptions): Promise<void> => {
   const yamlAcceptHeader = "application/x-yaml";
-  let url = `${APPLICATIONS}/${applicationId}/analysis/report`;
+  let url = `${APPLICATIONS}/${application.id}/analysis/report`;
 
   switch (mimeType) {
     case MimeType.YAML:
-      url = `${APPLICATIONS}/${applicationId}/analysis`;
+      url = `${APPLICATIONS}/${application.id}/analysis`;
       break;
     case MimeType.TAR:
     default:
-      url = `${APPLICATIONS}/${applicationId}/analysis/report`;
+      url = `${APPLICATIONS}/${application.id}/analysis/report`;
   }
 
   try {
@@ -171,7 +171,7 @@ export const downloadStaticReport = async ({
     }
 
     const blob = new Blob([response.data]);
-    saveAs(blob, `analysis-report-app-${applicationId}.${mimeType}`);
+    saveAs(blob, `analysis-report-app-${application.name}.${mimeType}`);
   } catch (error) {
     console.error("There was an error downloading the file:", error);
     throw error;