feat: CQDG-861 fix allow custom filename to dataset filemanifest

Ferlab-Ste-Justine · Oct 1, 2024 · b5a73b0 · b5a73b0
1 parent 1d3bdde
commit b5a73b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/components/reports/DownloadFileManifestModal/index.tsx b/src/components/reports/DownloadFileManifestModal/index.tsx
@@ -58,9 +58,6 @@ const DownloadFileManifestModal = ({
     setIsModalVisible(false);
   };
 
-  const _fileName =
-    fileName || (isFamilyChecked ? ReportType.FILE_MANIFEST_FAMILY : ReportType.FILE_MANIFEST);
-
   const Content = () => (
     <Text>
       <p>
@@ -95,7 +92,8 @@ const DownloadFileManifestModal = ({
     dispatch(
       fetchReport({
         data: {
-          name: _fileName,
+          fileName,
+          name: ReportType.FILE_MANIFEST,
           sqon,
           withFamily: isFamilyChecked,
         },

diff --git a/src/services/api/reports/index.ts b/src/services/api/reports/index.ts
@@ -31,7 +31,8 @@ export const headers = (): AxiosRequestHeaders => ({
 });
 
 const generateReport = (config: ReportConfig) => {
-  const name = config.name;
+  const name = config.name as ReportType;
+  const url = REPORTS_ROUTES[name];
 
   let reportSqon;
   if (!config.sqon || isEmpty(config.sqon)) {
@@ -43,13 +44,14 @@ const generateReport = (config: ReportConfig) => {
     reportSqon = config.sqon;
   }
 
+  const fileNameToUse = config.fileName || name;
+
   /** the quotes in string are required by format function, else it throws an error */
-  const fileName = `'cqdg_${name}'_yyyyMMdd`;
+  const fileName = `'cqdg_${fileNameToUse}'_yyyyMMdd`;
   const fileNameFormatted = format(new Date(), fileName);
-  const route = config.withFamily ? ReportType.FILE_MANIFEST_FAMILY : ReportType.FILE_MANIFEST;
 
   return downloader({
-    url: REPORTS_ROUTES[route],
+    url,
     method: 'POST',
     responseType: 'blob',
     data: {

diff --git a/src/services/api/reports/models.ts b/src/services/api/reports/models.ts
@@ -3,6 +3,7 @@ import { ISyntheticSqon } from '@ferlab/ui/core/data/sqon/types';
 export type ReportConfig = {
   sqon: ISyntheticSqon;
   name: string;
+  fileName?: string;
   withFamily?: boolean;
   withoutFiles?: boolean;
 };