Use functions to get filesnames

swisstopo · Dec 10, 2024 · bd5de35 · bd5de35
1 parent e2f683b
commit bd5de35
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/client/src/pages/detail/detailHeader.tsx b/src/client/src/pages/detail/detailHeader.tsx
@@ -85,14 +85,17 @@ const DetailHeader = ({
     history.push("/");
   };
 
+  const getFileName = (name: string) => {
+    return name.replace(/\s/g, "_");
+  };
   const handleJsonExport = () => {
     const jsonString = JSON.stringify([borehole], null, 2);
-    downloadData(jsonString, borehole.name.replace(/\s/g, "_"), "application/json");
+    downloadData(jsonString, getFileName(borehole.name), "application/json");
   };
 
   const handleCSVExport = async () => {
     const csvData = await exportCSVBorehole([borehole.id]);
-    downloadData(csvData, borehole.name.replace(/\s/g, "_"), "text/csv");
+    downloadData(csvData, getFileName(borehole.name), "text/csv");
   };
 
   return (

diff --git a/src/client/src/pages/overview/boreholeTable/bottomBarContainer.tsx b/src/client/src/pages/overview/boreholeTable/bottomBarContainer.tsx
@@ -94,15 +94,19 @@ const BottomBarContainer = ({
     setIsBusy(false);
   };
 
+  const getBulkExportFilename = (suffix: string) => {
+    return `bulkexport_${new Date().toISOString().split("T")[0]}.${suffix}`;
+  };
+
   const handleExportMultipleJson = async () => {
     const paginatedResponse = await getAllBoreholes(selectionModel, 1, selectionModel.length);
     const jsonString = JSON.stringify(paginatedResponse.boreholes, null, 2);
-    downloadData(jsonString, `bulkexport_${new Date().toISOString().split("T")[0]}.json`, "application/json");
+    downloadData(jsonString, getBulkExportFilename("json"), "application/json");
   };
 
   const handleExportMultipleCsv = async () => {
     const csvData = await exportCSVBorehole(selectionModel.slice(0, 100));
-    downloadData(csvData, `bulkexport_${new Date().toISOString().split("T")[0]}.csv`, "text/csv");
+    downloadData(csvData, getBulkExportFilename("csv"), "text/csv");
   };
 
   const showPromptExportMoreThan100 = (callback: () => void) => {