fix (projectDetails): download - file name renamed when user download…

… forms or tasks
hotosm · Nov 6, 2023 · 100fbd4 · 100fbd4
1 parent ab8ddce
commit 100fbd4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/frontend/src/api/Project.js b/src/frontend/src/api/Project.js
@@ -63,11 +63,11 @@ export const ProjectById = (url, existingProjectList, projectId) => {
   };
 };
 
-export const DownloadProjectForm = (url, payload) => {
+export const DownloadProjectForm = (url, payload, projectId) => {
   return async (dispatch) => {
     dispatch(ProjectActions.SetDownloadProjectFormLoading({ type: payload, loading: true }));
 
-    const fetchProjectForm = async (url, payload) => {
+    const fetchProjectForm = async (url, payload, projectId) => {
       try {
         let response;
         if (payload === 'form') {
@@ -79,7 +79,7 @@ export const DownloadProjectForm = (url, payload) => {
         }
         const a = document.createElement('a');
         a.href = window.URL.createObjectURL(response.data);
-        a.download = `Project_form.${payload === 'form' ? '.xls' : '.geojson'}`;
+        a.download = `${payload === 'form' ? `project_form_${projectId}.xls` : `task_polygons_${projectId}.geojson`}`;
         a.click();
         dispatch(ProjectActions.SetDownloadProjectFormLoading({ type: payload, loading: false }));
       } catch (error) {
@@ -88,7 +88,7 @@ export const DownloadProjectForm = (url, payload) => {
         dispatch(ProjectActions.SetDownloadProjectFormLoading({ type: payload, loading: false }));
       }
     };
-    await fetchProjectForm(url, payload);
+    await fetchProjectForm(url, payload, projectId);
   };
 };
 export const DownloadDataExtract = (url, payload) => {

diff --git a/src/frontend/src/components/ProjectDetails/ProjectOptions.tsx b/src/frontend/src/components/ProjectDetails/ProjectOptions.tsx
@@ -19,11 +19,19 @@ const ProjectOptions = ({ setToggleGenerateModal }) => {
   const handleDownload = (downloadType) => {
     if (downloadType === 'form') {
       dispatch(
-        DownloadProjectForm(`${import.meta.env.VITE_API_URL}/projects/download_form/${decodedId}/`, downloadType),
+        DownloadProjectForm(
+          `${import.meta.env.VITE_API_URL}/projects/download_form/${decodedId}/`,
+          downloadType,
+          decodedId,
+        ),
       );
     } else if (downloadType === 'geojson') {
       dispatch(
-        DownloadProjectForm(`${import.meta.env.VITE_API_URL}/projects/${decodedId}/download_tasks`, downloadType),
+        DownloadProjectForm(
+          `${import.meta.env.VITE_API_URL}/projects/${decodedId}/download_tasks`,
+          downloadType,
+          decodedId,
+        ),
       );
     }
   };