(fix) Fix core app routing to use getOpenmrsSpaBase() (#853)

openmrs · Dec 15, 2023 · 7518b3e · 7518b3e
1 parent 907c2ef
commit 7518b3e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/apps/esm-login-app/src/root.component.tsx b/packages/apps/esm-login-app/src/root.component.tsx
@@ -8,12 +8,12 @@ export interface RootProps {}
 
 const Root: React.FC<RootProps> = () => {
   return (
-    <BrowserRouter basename={window.spaBase}>
+    <BrowserRouter basename={window.getOpenmrsSpaBase()}>
       <Routes>
-        <Route path="/login" element={<Login />} />
-        <Route path="/login/confirm" element={<Login />} />
-        <Route path="/login/location" element={<LocationPicker />} />
-        <Route path="/logout" element={<RedirectLogout />} />
+        <Route path="login" element={<Login />} />
+        <Route path="login/confirm" element={<Login />} />
+        <Route path="login/location" element={<LocationPicker />} />
+        <Route path="logout" element={<RedirectLogout />} />
       </Routes>
     </BrowserRouter>
   );

diff --git a/packages/apps/esm-offline-tools-app/src/root.component.tsx b/packages/apps/esm-offline-tools-app/src/root.component.tsx
@@ -8,12 +8,12 @@ import styles from './root.styles.scss';
 
 const Root: React.FC = () => {
   return (
-    <BrowserRouter basename={window.spaBase}>
+    <BrowserRouter basename={window.getOpenmrsSpaBase()}>
       <DesktopSideNav />
       <div className={classNames('omrs-main-content', styles.mainContentContainer)}>
         <Routes>
-          <Route path="/offline-tools" element={<Home />} />
-          <Route path="/offline-tools/:page" element={<OfflineToolsPage />}>
+          <Route path="offline-tools" element={<Home />} />
+          <Route path="offline-tools/:page" element={<OfflineToolsPage />}>
             <Route path=":patientUuid" element={<OfflineToolsPage />} />
           </Route>
         </Routes>

diff --git a/packages/apps/esm-primary-navigation-app/src/root.component.tsx b/packages/apps/esm-primary-navigation-app/src/root.component.tsx
@@ -7,12 +7,12 @@ export interface RootProps {}
 
 const Root: React.FC<RootProps> = () => {
   return (
-    <BrowserRouter basename={window.spaBase}>
+    <BrowserRouter basename={window.getOpenmrsSpaBase()}>
       <Routes>
-        <Route path="/login/*" element={null} />
-        <Route path="/logout/*" element={null} />
+        <Route path="login/*" element={null} />
+        <Route path="logout/*" element={null} />
         <Route
-          path="/*"
+          path="*"
           element={
             <div className={styles.primaryNavContainer}>
               <Navbar />