Wc 129 dataset form redirect fix

client/src/components/DataFiles/DataFilesModals/DataFilesFormModal.jsx

@@ -16,17 +16,21 @@ const DataFilesFormModal = () => {
   const location = useLocation();
 
   const reloadPage = (updatedPath = '') => {
-    // Updated regex to capture the URL up until the last project segment
     let projectUrl = location.pathname.replace(
-      /(\/projects\/[^/]+\/[^/]+)\/?.*/,
+      /(\/projects\/[^/]+\/[^/]+\/?.*)/,
       '$1'
     );
 
     if (projectUrl.endsWith('/')) {
       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);
   };
 

client/src/redux/sagas/_custom/drp.sagas.js

@@ -50,9 +50,10 @@ function* executeOperation(
           ? `${path}/${file.path.split('/').pop()}`
           : path;
 
+      // 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);