fix: Type error and incorrect filename formatting

CBIIT · Mar 28, 2024 · b09141f · b09141f
1 parent d8d6c77
commit b09141f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/components/DataSubmissions/ExportValidationButton.test.tsx b/src/components/DataSubmissions/ExportValidationButton.test.tsx
@@ -46,7 +46,8 @@ describe('ExportValidationButton cases', () => {
     conciergeName: '',
     conciergeEmail: '',
     createdAt: '',
-    updatedAt: ''
+    updatedAt: '',
+    intention: 'New'
   };
 
   const baseQCResult: Omit<QCResult, "submissionID"> = {
@@ -121,13 +122,15 @@ describe('ExportValidationButton cases', () => {
   });
 
   it.each<{ original: string, expected: string }>([
-    { original: "A B C 1 2 3", expected: "ABC123" },
-    { original: "long name".repeat(100), expected: "longname".repeat(100) },
+    { original: "A B C 1 2 3", expected: "A-B-C-1-2-3" },
+    { original: "long name".repeat(100), expected: "long-name".repeat(100) },
     { original: "", expected: "" },
-    { original: `non $alpha name $@!819`, expected: "nonalphaname819" },
+    { original: `non $alpha name $@!819`, expected: "non-alpha-name-819" },
     { original: "  ", expected: "" },
-    { original: `_-"a-b+c=d`, expected: "abcd" },
-  ])("should safely name the CSV export file dynamically using submission name and export date", async ({ original, expected }) => {
+    { original: `_-"a-b+c=d`, expected: "-a-bcd" },
+    { original: "CRDCDH-1234", expected: "CRDCDH-1234" },
+    { original: "SPACE-AT-END ", expected: "SPACE-AT-END" },
+  ])("should safely create the CSV filename using submission name and export date", async ({ original, expected }) => {
     jest.useFakeTimers().setSystemTime(new Date('2021-01-19T14:54:01Z'));
 
     const mocks: MockedResponse<SubmissionQCResultsResp>[] = [{

diff --git a/src/components/DataSubmissions/ExportValidationButton.tsx b/src/components/DataSubmissions/ExportValidationButton.tsx
@@ -70,7 +70,8 @@ export const ExportValidationButton: React.FC<Props> = ({ submission, fields, di
     }
 
     try {
-      const filename = `${filterAlphaNumeric(submission.name)}-${dayjs().format("YYYY-MM-DDTHHmmss")}.csv`;
+      const filteredName = filterAlphaNumeric(submission.name?.trim()?.replaceAll(" ", "-"), "-");
+      const filename = `${filteredName}-${dayjs().format("YYYY-MM-DDTHHmmss")}.csv`;
       const unpacked = unpackQCResultSeverities(d.submissionQCResults.results);
       const fieldset = Object.entries(fields);
       const csvArray = [];