UHM-8309: remove extra '/' from the returnUrl

openmrs · Feb 4, 2025 · a58f318 · a58f318
1 parent e5b6439
commit a58f318
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/app/js/components/shared/BreadCrumb/BreadCrumb.jsx b/app/js/components/shared/BreadCrumb/BreadCrumb.jsx
@@ -56,8 +56,15 @@ class BreadCrumb extends Component {
     }
     let outputBreadcrumb;
     const contextPath = window.location.href.split('/')[3];
-    const url = localStorage.getItem('returnUrl');
-    const returnUrl = `/${contextPath}/${url}`;
+    let url = localStorage.getItem('returnUrl');
+    if (url && (url !== 'null') && (url.length > 1)) {
+      if (url.startsWith("/")) {
+        url = url.substring(1); // skip the leading "/"
+      }
+    } else {
+      url = '';
+    }
+    const returnUrl = url ? `/${contextPath}/${url}` : `/${contextPath}`;
 
     const homePageBreadcrumb = (
       <span>