Wc 129 dataset form redirect fix

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

@@ -15,19 +15,16 @@ const DataFilesFormModal = () => {
   const history = useHistory();
   const location = useLocation();
 
-  const reloadPage = (updatedPath = '') => {
-    // Updated regex to capture the URL up until the last project segment
-    let projectUrl = location.pathname.replace(
-      /(\/projects\/[^/]+\/[^/]+)\/?.*/,
-      '$1'
-    );
+  const reloadPage = (updatedPath = '') => {  
+    const match = location.pathname.match(/^\/workbench\/data\/tapis\/[^\/]+\/[^\/]+\/[^\/]+/);
+    if (!match) return;
 
-    if (projectUrl.endsWith('/')) {
-      projectUrl = projectUrl.slice(0, -1);
-    }
-
-    const path = updatedPath ? `${projectUrl}/${updatedPath}` : `${projectUrl}`;
-    history.replace(path);
+    const projectUrl = match[0];
+
+    const cleanProjectUrl = projectUrl.replace(/\/$/, '');
+    const cleanUpdatedPath = updatedPath.replace(/^\/+/, '');
+
+    history.replace(`${cleanProjectUrl}/${cleanUpdatedPath}`);
   };
 
   const { form, selectedFile, formName, additionalData, useReloadCallback } =

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(`/${file.name}`, `/${values.name}`)
           : newPath;
 
       yield call(reloadCallback, reloadPath);