render bed summary on /bed-management path (#12)

METS-Programme · Oct 10, 2023 · 59dc035 · 59dc035
1 parent 8da2308
commit 59dc035
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/src/bed-admission/active-patients/active-patients-table.component.tsx b/src/bed-admission/active-patients/active-patients-table.component.tsx
@@ -215,15 +215,15 @@ const ActivePatientsTable: React.FC<ActiveVisitsTableProps> = ({
       },
       actions: {
         content: (
-          <>
+          <div className={styles.displayFlex}>
             {renderActionButton(entry)}
             {status === "completed" && (
               <ViewActionsMenu
                 to={`\${openmrsSpaBase}/patient/${entry?.patientUuid}/chart`}
                 from={fromPage}
               />
             )}
-          </>
+          </div>
         ),
       },
       notes: {

diff --git a/src/bed-admission/active-patients/styles.scss b/src/bed-admission/active-patients/styles.scss
@@ -7,6 +7,10 @@
   background-color: $ui-01;
 }
 
+.displayFlex {
+  display: flex;
+}
+
 .section {
   border-right: 1px solid colors.$gray-20;
 }

diff --git a/src/header/header.component.tsx b/src/header/header.component.tsx
@@ -25,9 +25,7 @@ const Header: React.FC<HeaderProps> = ({
   return (
     <div className={styles.header}>
       <div className={styles["left-justified-items"]}>
-        <ConfigurableLink
-          to={`${window.getOpenmrsSpaBase()}bed-management/summary`}
-        >
+        <ConfigurableLink to={`${window.getOpenmrsSpaBase()}bed-management`}>
           <Illustration />
         </ConfigurableLink>
         <div className={styles["page-labels"]}>

diff --git a/src/index.ts b/src/index.ts
@@ -42,7 +42,7 @@ export const adminCardLink = getAsyncLifecycle(
 
 export const summaryLeftPanelLink = getSyncLifecycle(
   createLeftPanelLink({
-    name: "summary",
+    name: "bed-management",
     title: "Summary",
   }),
   options

diff --git a/src/left-panel-link.component.tsx b/src/left-panel-link.component.tsx
@@ -30,7 +30,7 @@ function LinkExtension({ config }: { config: LinkConfig }) {
   return (
     <ConfigurableLink
       to={`${window.getOpenmrsSpaBase()}bed-management${
-        name ? `/${name}` : ""
+        name && name !== "bed-management" ? `/${name}` : ""
       }`}
       className={`cds--side-nav__link ${
         name === urlSegment && "active-left-nav-link"

diff --git a/src/root.component.tsx b/src/root.component.tsx
@@ -23,7 +23,7 @@ const Root: React.FC = () => {
       <LeftPanel />
       <main className={styles.container}>
         <Routes>
-          <Route path="/summary" element={<Home />} />
+          <Route path="/" element={<Home />} />
           <Route path="/location/:location" element={<WardWithBeds />} />
           <Route path="/administration" element={<BedAdministrationTable />} />
         </Routes>

diff --git a/src/ward-with-beds/ward-with-beds.component.tsx b/src/ward-with-beds/ward-with-beds.component.tsx
@@ -117,7 +117,7 @@ const WardWithBeds: React.FC = () => {
               iconDescription="Return to summary"
               onClick={() =>
                 navigate({
-                  to: `${window.getOpenmrsSpaBase()}bed-management/summary`,
+                  to: `${window.getOpenmrsSpaBase()}bed-management`,
                 })
               }
             >