Refactor path generation logic in DataFilesFormModal

TACC · Dec 4, 2024 · 2a39834 · 2a39834
1 parent 8d12c24
commit 2a39834
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesFormModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesFormModal.jsx
@@ -25,7 +25,11 @@ const DataFilesFormModal = () => {
       projectUrl = projectUrl.slice(0, -1);
     }
 
-    const path = updatedPath ? `${projectUrl}/${updatedPath}` : projectUrl;
+    // Avoid appending updatedPath if it's already part of projectUrl
+    const path = updatedPath && !projectUrl.endsWith(updatedPath)
+    ? `${projectUrl}/${updatedPath}`
+    : projectUrl;
+
     history.replace(path);
   };
 

diff --git a/client/src/redux/sagas/_custom/drp.sagas.js b/client/src/redux/sagas/_custom/drp.sagas.js
@@ -53,7 +53,7 @@ function* executeOperation(
       // Check if the file name has changed. If not, keep the same path
       const reloadPath =
         isEdit && file.name !== values.name
-          ? newPath.replace(`/${file.name}`, `/${values.name}`)
+          ? newPath.replace(new RegExp(`/${file.name}$`), `/${values.name}`)
           : newPath;
 
       yield call(reloadCallback, reloadPath);