From f7d2ccba8ac9273d75f61fe75cfa7c728b0d598a Mon Sep 17 00:00:00 2001
From: mherman22 <hermanmuhereza22@gmail.com>
Date: Thu, 21 Nov 2024 01:07:24 +0300
Subject: [PATCH 1/3] Ensure admin management pages are within a fullwidth grid

---
 frontend/src/components/admin/Admin.js        |  9 +++
 .../BatchTestReassignmentAndCancelation.js    |  2 +-
 .../calculatedValue/CalculatedValueForm.tsx   |  2 +-
 .../generalConfig/common/ConfigMenuDisplay.js |  9 ++-
 .../admin/labNumber/LabNumberManagement.js    |  4 +-
 .../admin/menu/BillingMenuManagement.js       |  8 ++-
 .../components/admin/menu/CommonProperties.js | 11 +++-
 .../admin/menu/DictionaryManagement.js        |  6 +-
 .../admin/menu/GlobalMenuManagement.js        |  7 +-
 .../admin/menu/NonConformityMenuManagement.js |  7 +-
 .../admin/menu/PatientMenuManagement.js       |  7 +-
 .../admin/menu/StudyMenuManagement.js         |  7 +-
 .../admin/program/ProgramManagement.js        |  4 +-
 .../admin/reflexTests/ReflexTestManagement.js |  2 +-
 .../admin/testManagement/ViewTestCatalog.js   |  2 +-
 .../TestNotificationConfigMenu.js             | 66 ++++++++++---------
 .../admin/userManagement/UserManagement.js    |  2 +-
 17 files changed, 100 insertions(+), 55 deletions(-)

diff --git a/frontend/src/components/admin/Admin.js b/frontend/src/components/admin/Admin.js
index a9fabca2e2..09ad0d75b5 100644
--- a/frontend/src/components/admin/Admin.js
+++ b/frontend/src/components/admin/Admin.js
@@ -285,54 +285,63 @@ function Admin() {
       <PathRoute path="#NonConformityConfigurationMenu">
         <ConfigMenuDisplay
           menuType="NonConformityConfigurationMenu"
+          label="Non Conformity Configuration Menu"
           id="sidenav.label.admin.formEntry.nonconformityconfig"
         />
       </PathRoute>
       <PathRoute path="#MenuStatementConfigMenu">
         <ConfigMenuDisplay
           menuType="MenuStatementConfigMenu"
+          label="Menu Statement Configuration Menu"
           id="sidenav.label.admin.formEntry.menustatementconfig"
         />
       </PathRoute>
       <PathRoute path="#ValidationConfigurationMenu">
         <ConfigMenuDisplay
           menuType="ValidationConfigurationMenu"
+          label="Validation Configuration Menu"
           id="sidenav.label.admin.formEntry.validationconfig"
         />
       </PathRoute>
       <PathRoute path="#SampleEntryConfigurationMenu">
         <ConfigMenuDisplay
           menuType="SampleEntryConfigMenu"
+          label="Sample Entry Configuration Menu"
           id="sidenav.label.admin.formEntry.sampleEntryconfig"
         />
       </PathRoute>
       <PathRoute path="#WorkPlanConfigurationMenu">
         <ConfigMenuDisplay
           menuType="WorkplanConfigurationMenu"
+          label="WorkPlan Configuration Menu"
           id="sidenav.label.admin.formEntry.Workplanconfig"
         />
       </PathRoute>
       <PathRoute path="#SiteInformationMenu">
         <ConfigMenuDisplay
           menuType="SiteInformationMenu"
+          label="Site Information Menu"
           id="sidenav.label.admin.formEntry.siteInfoconfig"
         />
       </PathRoute>
       <PathRoute path="#ResultConfigurationMenu">
         <ConfigMenuDisplay
           menuType="ResultConfigurationMenu"
+          label="Result Configuration Menu"
           id="sidenav.label.admin.formEntry.resultConfig"
         />
       </PathRoute>
       <PathRoute path="#PatientConfigurationMenu">
         <ConfigMenuDisplay
           menuType="PatientConfigurationMenu"
+          label="Patient Configuration Menu"
           id="sidenav.label.admin.formEntry.patientconfig"
         />
       </PathRoute>
       <PathRoute path="#PrintedReportsConfigurationMenu">
         <ConfigMenuDisplay
           menuType="PrintedReportsConfigurationMenu"
+          label="PrintedReports Configuration Menu"
           id="sidenav.label.admin.formEntry.PrintedReportsconfig"
         />
       </PathRoute>
diff --git a/frontend/src/components/admin/BatchTestReassignmentAndCancellation/BatchTestReassignmentAndCancelation.js b/frontend/src/components/admin/BatchTestReassignmentAndCancellation/BatchTestReassignmentAndCancelation.js
index 1fd1783d94..7ec885deff 100644
--- a/frontend/src/components/admin/BatchTestReassignmentAndCancellation/BatchTestReassignmentAndCancelation.js
+++ b/frontend/src/components/admin/BatchTestReassignmentAndCancellation/BatchTestReassignmentAndCancelation.js
@@ -407,7 +407,7 @@ function BatchTestReassignmentAndCancelation() {
       {notificationVisible === true ? <AlertDialog /> : ""}
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16} md={8} sm={4}>
             <Section>
               <Section>
diff --git a/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx b/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
index ee0b9fb105..57396646bd 100644
--- a/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
+++ b/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
@@ -623,7 +623,7 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
   return (
     <div className="adminPageContent">
       <PageBreadCrumb breadcrumbs={breadcrumbs} />
-      <Grid>
+      <Grid fullWidth={true}>
         <Column lg={16}>
           <Section>
             <Heading>
diff --git a/frontend/src/components/admin/generalConfig/common/ConfigMenuDisplay.js b/frontend/src/components/admin/generalConfig/common/ConfigMenuDisplay.js
index 2d4eca72a6..bf6ccce46b 100644
--- a/frontend/src/components/admin/generalConfig/common/ConfigMenuDisplay.js
+++ b/frontend/src/components/admin/generalConfig/common/ConfigMenuDisplay.js
@@ -35,7 +35,6 @@ import { FormattedMessage, useIntl } from "react-intl";
 import PageBreadCrumb from "../../../common/PageBreadCrumb.js";
 import GenericConfigEdit from "../../generalConfig/common/GenericConfigEdit.js";
 
-let breadcrumbs = [{ label: "home.label", link: "/" }];
 function ConfigMenuDisplay(props) {
   const { notificationVisible, setNotificationVisible, addNotification } =
     useContext(NotificationContext);
@@ -54,6 +53,12 @@ function ConfigMenuDisplay(props) {
 
   const [ConfigEdit, setConfigEdit] = useState(false);
 
+  let breadcrumbs = [
+    { label: "home.label", link: "/" },
+    { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+    { label: `${props.label}`, link: `/MasterListsPage#${props.menuType}` },
+  ];
+
   function handleModify(event) {
     event.preventDefault();
     setConfigEdit(true);
@@ -185,7 +190,7 @@ function ConfigMenuDisplay(props) {
           {notificationVisible === true ? <AlertDialog /> : ""}
           <div className="adminPageContent">
             <PageBreadCrumb breadcrumbs={breadcrumbs} />
-            <Grid>
+            <Grid fullWidth={true}>
               <Column lg={16} md={8} sm={4}>
                 <Section>
                   <Heading>
diff --git a/frontend/src/components/admin/labNumber/LabNumberManagement.js b/frontend/src/components/admin/labNumber/LabNumberManagement.js
index 96bf9f5054..e26ca9916d 100644
--- a/frontend/src/components/admin/labNumber/LabNumberManagement.js
+++ b/frontend/src/components/admin/labNumber/LabNumberManagement.js
@@ -159,7 +159,7 @@ function LabNumberManagement() {
       {loading && <Loading />}
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16}>
             <Section>
               <Heading>
@@ -169,7 +169,7 @@ function LabNumberManagement() {
           </Column>
         </Grid>
         <Form onSubmit={handleSubmit}>
-          <Grid>
+          <Grid fullWidth={true}>
             <Column lg={8}>
               <Select
                 id="lab_number_type"
diff --git a/frontend/src/components/admin/menu/BillingMenuManagement.js b/frontend/src/components/admin/menu/BillingMenuManagement.js
index adc3fc1778..381f14a859 100644
--- a/frontend/src/components/admin/menu/BillingMenuManagement.js
+++ b/frontend/src/components/admin/menu/BillingMenuManagement.js
@@ -22,7 +22,10 @@ import {
 import { FormattedMessage, useIntl } from "react-intl";
 import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 
-let breadcrumbs = [{ label: "home.label", link: "/" }];
+let breadcrumbs = [
+  { label: "home.label", link: "/" },
+  { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+];
 function BillingMenuManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
     useContext(NotificationContext);
@@ -87,13 +90,14 @@ function BillingMenuManagement() {
       {loading && <Loading />}
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16} md={8} sm={4}>
             <Section>
               <Heading>
                 <FormattedMessage id="menu.billing.title" />
               </Heading>
             </Section>
+            <br />
             <Section>
               <Form onSubmit={handleSubmit}>
                 <div className="formInlineDiv">
diff --git a/frontend/src/components/admin/menu/CommonProperties.js b/frontend/src/components/admin/menu/CommonProperties.js
index 1880c300ab..21f427d3b4 100644
--- a/frontend/src/components/admin/menu/CommonProperties.js
+++ b/frontend/src/components/admin/menu/CommonProperties.js
@@ -64,7 +64,16 @@ export const CommonProperties = () => {
     <>
       <div className="adminPageContent">
         {notificationVisible === true ? <AlertDialog /> : ""}
-        <PageBreadCrumb breadcrumbs={[{ label: "home.label", link: "/" }]} />
+        <PageBreadCrumb
+          breadcrumbs={[
+            { label: "home.label", link: "/" },
+            { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+            {
+              label: "common properties",
+              link: "/MasterListsPage#commonproperties",
+            },
+          ]}
+        />
         <Grid fullWidth={true}>
           <Column lg={16} md={8} sm={4}>
             <Section>
diff --git a/frontend/src/components/admin/menu/DictionaryManagement.js b/frontend/src/components/admin/menu/DictionaryManagement.js
index 2a281015ca..0d42548435 100644
--- a/frontend/src/components/admin/menu/DictionaryManagement.js
+++ b/frontend/src/components/admin/menu/DictionaryManagement.js
@@ -402,7 +402,11 @@ function DictionaryManagement() {
       <PageBreadCrumb
         breadcrumbs={[
           { label: "home.label", link: "/" },
-          { label: "dictionary.label.modify", link: "/DictionaryManagement" },
+          { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+          {
+            label: "dictionary.label.modify",
+            link: "/MasterListsPage#DictionaryManagement",
+          },
         ]}
       />
       <Grid fullWidth={true}>
diff --git a/frontend/src/components/admin/menu/GlobalMenuManagement.js b/frontend/src/components/admin/menu/GlobalMenuManagement.js
index 7bcc039aae..5bd3fb7394 100644
--- a/frontend/src/components/admin/menu/GlobalMenuManagement.js
+++ b/frontend/src/components/admin/menu/GlobalMenuManagement.js
@@ -22,7 +22,10 @@ import {
 import { FormattedMessage, useIntl } from "react-intl";
 import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 
-let breadcrumbs = [{ label: "home.label", link: "/" }];
+let breadcrumbs = [
+  { label: "home.label", link: "/" },
+  { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+];
 function GlobalMenuManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
     useContext(NotificationContext);
@@ -103,7 +106,7 @@ function GlobalMenuManagement() {
       {loading && <Loading />}
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16}>
             <Section>
               <Heading>
diff --git a/frontend/src/components/admin/menu/NonConformityMenuManagement.js b/frontend/src/components/admin/menu/NonConformityMenuManagement.js
index 29f7d6822d..834d0c6771 100644
--- a/frontend/src/components/admin/menu/NonConformityMenuManagement.js
+++ b/frontend/src/components/admin/menu/NonConformityMenuManagement.js
@@ -22,7 +22,10 @@ import {
 import { FormattedMessage, useIntl } from "react-intl";
 import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 
-let breadcrumbs = [{ label: "home.label", link: "/" }];
+let breadcrumbs = [
+  { label: "home.label", link: "/" },
+  { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+];
 function NonConformityMenuManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
     useContext(NotificationContext);
@@ -86,7 +89,7 @@ function NonConformityMenuManagement() {
       {loading && <Loading />}
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16}>
             <Section>
               <Heading>
diff --git a/frontend/src/components/admin/menu/PatientMenuManagement.js b/frontend/src/components/admin/menu/PatientMenuManagement.js
index 99ecb362eb..c1668ede28 100644
--- a/frontend/src/components/admin/menu/PatientMenuManagement.js
+++ b/frontend/src/components/admin/menu/PatientMenuManagement.js
@@ -23,7 +23,10 @@ import {
 import { FormattedMessage, useIntl } from "react-intl";
 import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 
-let breadcrumbs = [{ label: "home.label", link: "/" }];
+let breadcrumbs = [
+  { label: "home.label", link: "/" },
+  { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+];
 function PatientMenuManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
     useContext(NotificationContext);
@@ -85,7 +88,7 @@ function PatientMenuManagement() {
       {notificationVisible === true ? <AlertDialog /> : ""}
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16}>
             <Section>
               <Heading>
diff --git a/frontend/src/components/admin/menu/StudyMenuManagement.js b/frontend/src/components/admin/menu/StudyMenuManagement.js
index 03856538b1..5204f5bd46 100644
--- a/frontend/src/components/admin/menu/StudyMenuManagement.js
+++ b/frontend/src/components/admin/menu/StudyMenuManagement.js
@@ -22,7 +22,10 @@ import {
 import { FormattedMessage, useIntl } from "react-intl";
 import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 
-let breadcrumbs = [{ label: "home.label", link: "/" }];
+let breadcrumbs = [
+  { label: "home.label", link: "/" },
+  { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+];
 
 function StudyMenuManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
@@ -196,7 +199,7 @@ function StudyMenuManagement() {
       {loading && <Loading />}
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16}>
             <Section>
               <Heading>
diff --git a/frontend/src/components/admin/program/ProgramManagement.js b/frontend/src/components/admin/program/ProgramManagement.js
index 573cae5d5e..c71b86ecaf 100644
--- a/frontend/src/components/admin/program/ProgramManagement.js
+++ b/frontend/src/components/admin/program/ProgramManagement.js
@@ -172,7 +172,7 @@ function ProgramManagement() {
       {notificationVisible === true ? <AlertDialog /> : ""}
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16}>
             <Section>
               <Heading>
@@ -182,7 +182,7 @@ function ProgramManagement() {
           </Column>
         </Grid>
         <Form onSubmit={handleSubmit}>
-          <Grid>
+          <Grid fullWidth={true}>
             <Column lg={8}>
               <Select
                 id="additionalQuestionsSelect"
diff --git a/frontend/src/components/admin/reflexTests/ReflexTestManagement.js b/frontend/src/components/admin/reflexTests/ReflexTestManagement.js
index 8a3d9b40ec..ef94912f8b 100644
--- a/frontend/src/components/admin/reflexTests/ReflexTestManagement.js
+++ b/frontend/src/components/admin/reflexTests/ReflexTestManagement.js
@@ -12,7 +12,7 @@ function ReflexTestManagement() {
     <>
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16}>
             <Section>
               <Heading>
diff --git a/frontend/src/components/admin/testManagement/ViewTestCatalog.js b/frontend/src/components/admin/testManagement/ViewTestCatalog.js
index e0b570b52f..07bb3ba9c0 100644
--- a/frontend/src/components/admin/testManagement/ViewTestCatalog.js
+++ b/frontend/src/components/admin/testManagement/ViewTestCatalog.js
@@ -330,7 +330,7 @@ const TestCatalog = () => {
       <PageBreadCrumb breadcrumbs={breadcrumbs} />
       <br />
       <div className="orderLegendBody">
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={12}>
             <h1>
               {" "}
diff --git a/frontend/src/components/admin/testNotificationConfigMenu/TestNotificationConfigMenu.js b/frontend/src/components/admin/testNotificationConfigMenu/TestNotificationConfigMenu.js
index 6ef6f8e534..ccd841d021 100644
--- a/frontend/src/components/admin/testNotificationConfigMenu/TestNotificationConfigMenu.js
+++ b/frontend/src/components/admin/testNotificationConfigMenu/TestNotificationConfigMenu.js
@@ -38,7 +38,7 @@ import {
 } from "../../common/CustomNotification.js";
 import { FormattedMessage, injectIntl, useIntl } from "react-intl";
 import PageBreadCrumb from "../../common/PageBreadCrumb.js";
-import { Settings } from "@carbon/icons-react";
+import { Edit } from "@carbon/icons-react";
 import ActionPaginationButtonType from "../../common/ActionPaginationButtonType.js";
 
 let breadcrumbs = [
@@ -248,7 +248,7 @@ function TestNotificationConfigMenu() {
               id: "testnotification.testdefault.editIcon",
             })}
             onClick={() => handleEditButtonClick(row.cells[0].value)}
-            renderIcon={Settings}
+            renderIcon={Edit}
             kind="tertiary"
           />
         </TableCell>
@@ -265,41 +265,43 @@ function TestNotificationConfigMenu() {
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
         <Grid fullWidth={true}>
-          <Column lg={16} md={8} sm={4}>
+          <Column lg={16}>
             <Section>
-              <Section>
-                <Heading>
-                  <FormattedMessage id="testnotificationconfig.browse.title" />
-                </Heading>
-              </Section>
+              <Heading>
+                <FormattedMessage id="testnotificationconfig.browse.title" />
+              </Heading>
+            </Section>
+            <br />
+            <Section>
+              <Column
+                lg={16}
+                md={8}
+                sm={4}
+                style={{ display: "flex", gap: "10px" }}
+              >
+                <Button
+                  disabled={saveButton}
+                  onClick={testNotificationConfigMenuSavePostCall}
+                  type="button"
+                >
+                  <FormattedMessage id="label.button.save" />
+                </Button>{" "}
+                <Button
+                  onClick={() =>
+                    window.location.assign(
+                      "/MasterListsPage#testNotificationConfigMenu",
+                    )
+                  }
+                  kind="tertiary"
+                  type="button"
+                >
+                  <FormattedMessage id="label.button.exit" />
+                </Button>
+              </Column>
             </Section>
           </Column>
         </Grid>
         <div className="orderLegendBody">
-          <br />
-          <Grid fullWidth={true}>
-            <Column lg={16} md={8} sm={4}>
-              <Button
-                disabled={saveButton}
-                onClick={testNotificationConfigMenuSavePostCall}
-                type="button"
-              >
-                <FormattedMessage id="label.button.save" />
-              </Button>{" "}
-              <Button
-                onClick={() =>
-                  window.location.assign(
-                    "/MasterListsPage#testNotificationConfigMenu",
-                  )
-                }
-                kind="tertiary"
-                type="button"
-              >
-                <FormattedMessage id="label.button.exit" />
-              </Button>
-            </Column>
-          </Grid>
-          <br />
           <Grid fullWidth={true}>
             <Column lg={16} md={8} sm={4}>
               <br />
diff --git a/frontend/src/components/admin/userManagement/UserManagement.js b/frontend/src/components/admin/userManagement/UserManagement.js
index b8ae04f069..8db8e6b3a0 100644
--- a/frontend/src/components/admin/userManagement/UserManagement.js
+++ b/frontend/src/components/admin/userManagement/UserManagement.js
@@ -353,7 +353,7 @@ function UserManagement() {
       {notificationVisible === true ? <AlertDialog /> : ""}
       <div className="adminPageContent">
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
-        <Grid>
+        <Grid fullWidth={true}>
           <Column lg={16} md={8} sm={4}>
             <Section>
               <Heading>

From c119cffccecc13e15ba21eb082a47292aff306e1 Mon Sep 17 00:00:00 2001
From: mherman22 <hermanmuhereza22@gmail.com>
Date: Thu, 21 Nov 2024 11:09:38 +0300
Subject: [PATCH 2/3] add more breadcrumbs to admin ui

---
 .../admin/barcodeConfiguration/BarcodeConfiguration.js   | 4 ++++
 .../admin/calculatedValue/CalculatedValueForm.tsx        | 9 ++++++++-
 .../components/admin/labNumber/LabNumberManagement.js    | 9 ++++++++-
 .../src/components/admin/menu/BillingMenuManagement.js   | 4 ++++
 .../src/components/admin/menu/GlobalMenuManagement.js    | 4 ++++
 .../components/admin/menu/NonConformityMenuManagement.js | 4 ++++
 .../src/components/admin/menu/PatientMenuManagement.js   | 4 ++++
 .../src/components/admin/menu/StudyMenuManagement.js     | 4 ++++
 .../src/components/admin/program/ProgramManagement.js    | 9 ++++++++-
 .../components/admin/reflexTests/ReflexTestManagement.js | 9 ++++++++-
 10 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/admin/barcodeConfiguration/BarcodeConfiguration.js b/frontend/src/components/admin/barcodeConfiguration/BarcodeConfiguration.js
index e60b2647a3..96cba22818 100644
--- a/frontend/src/components/admin/barcodeConfiguration/BarcodeConfiguration.js
+++ b/frontend/src/components/admin/barcodeConfiguration/BarcodeConfiguration.js
@@ -29,6 +29,10 @@ import BarcodeConfigurationFormValues from "../../formModel/innitialValues/Barco
 let breadcrumbs = [
   { label: "home.label", link: "/" },
   { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "sidenav.label.admin.barcodeconfiguration",
+    link: "/MasterListsPage#barcodeConfiguration",
+  },
 ];
 function BarcodeConfiguration() {
   const { notificationVisible, setNotificationVisible, addNotification } =
diff --git a/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx b/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
index 57396646bd..a92ee2bf23 100644
--- a/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
+++ b/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
@@ -38,7 +38,14 @@ import {
 } from "../../common/CustomNotification";
 import PageBreadCrumb from "../../common/PageBreadCrumb";
 
-const breadcrumbs = [{ label: "home.label", link: "/" }];
+const breadcrumbs = [
+  { label: "home.label", link: "/" },
+  { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "sidenav.label.admin.testmgt.calculated",
+    link: "/MasterListsPage#calculatedValue",
+  },
+];
 interface CalculatedValueProps {}
 
 type TestListField = "TEST_RESULT" | "FINAL_RESULT";
diff --git a/frontend/src/components/admin/labNumber/LabNumberManagement.js b/frontend/src/components/admin/labNumber/LabNumberManagement.js
index e26ca9916d..dd3a707e53 100644
--- a/frontend/src/components/admin/labNumber/LabNumberManagement.js
+++ b/frontend/src/components/admin/labNumber/LabNumberManagement.js
@@ -28,7 +28,14 @@ import { FormattedMessage, useIntl } from "react-intl";
 import { ConfigurationContext } from "../../layout/Layout";
 import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 
-let breadcrumbs = [{ label: "home.label", link: "/" }];
+let breadcrumbs = [
+  { label: "home.label", link: "/" },
+  { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "sidenav.label.admin.labNumber",
+    link: "/MasterListsPage#labNumber",
+  },
+];
 function LabNumberManagement() {
   const intl = useIntl();
 
diff --git a/frontend/src/components/admin/menu/BillingMenuManagement.js b/frontend/src/components/admin/menu/BillingMenuManagement.js
index 381f14a859..bdef818f90 100644
--- a/frontend/src/components/admin/menu/BillingMenuManagement.js
+++ b/frontend/src/components/admin/menu/BillingMenuManagement.js
@@ -25,6 +25,10 @@ import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 let breadcrumbs = [
   { label: "home.label", link: "/" },
   { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "Billing Menu Management",
+    link: "/MasterListsPage#billingMenuManagement",
+  },
 ];
 function BillingMenuManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
diff --git a/frontend/src/components/admin/menu/GlobalMenuManagement.js b/frontend/src/components/admin/menu/GlobalMenuManagement.js
index 5bd3fb7394..4bf54e0556 100644
--- a/frontend/src/components/admin/menu/GlobalMenuManagement.js
+++ b/frontend/src/components/admin/menu/GlobalMenuManagement.js
@@ -25,6 +25,10 @@ import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 let breadcrumbs = [
   { label: "home.label", link: "/" },
   { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "Global Menu Management",
+    link: "/MasterListsPage#globalMenuManagement",
+  },
 ];
 function GlobalMenuManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
diff --git a/frontend/src/components/admin/menu/NonConformityMenuManagement.js b/frontend/src/components/admin/menu/NonConformityMenuManagement.js
index 834d0c6771..0925a78b57 100644
--- a/frontend/src/components/admin/menu/NonConformityMenuManagement.js
+++ b/frontend/src/components/admin/menu/NonConformityMenuManagement.js
@@ -25,6 +25,10 @@ import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 let breadcrumbs = [
   { label: "home.label", link: "/" },
   { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "Non Conformity Menu Management",
+    link: "/MasterListsPage#nonConformityMenuManagement",
+  },
 ];
 function NonConformityMenuManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
diff --git a/frontend/src/components/admin/menu/PatientMenuManagement.js b/frontend/src/components/admin/menu/PatientMenuManagement.js
index c1668ede28..2b2508dbe9 100644
--- a/frontend/src/components/admin/menu/PatientMenuManagement.js
+++ b/frontend/src/components/admin/menu/PatientMenuManagement.js
@@ -26,6 +26,10 @@ import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 let breadcrumbs = [
   { label: "home.label", link: "/" },
   { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "sidenav.label.admin.menu.patient",
+    link: "/MasterListsPage#patientMenuManagement",
+  },
 ];
 function PatientMenuManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
diff --git a/frontend/src/components/admin/menu/StudyMenuManagement.js b/frontend/src/components/admin/menu/StudyMenuManagement.js
index 5204f5bd46..1b1993a742 100644
--- a/frontend/src/components/admin/menu/StudyMenuManagement.js
+++ b/frontend/src/components/admin/menu/StudyMenuManagement.js
@@ -25,6 +25,10 @@ import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 let breadcrumbs = [
   { label: "home.label", link: "/" },
   { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "sidenav.label.admin.menu.study",
+    link: "/MasterListsPage#studyMenuManagement",
+  },
 ];
 
 function StudyMenuManagement() {
diff --git a/frontend/src/components/admin/program/ProgramManagement.js b/frontend/src/components/admin/program/ProgramManagement.js
index c71b86ecaf..8c6aa596e9 100644
--- a/frontend/src/components/admin/program/ProgramManagement.js
+++ b/frontend/src/components/admin/program/ProgramManagement.js
@@ -27,7 +27,14 @@ import {
 import { FormattedMessage, useIntl } from "react-intl";
 import PageBreadCrumb from "../../common/PageBreadCrumb.js";
 
-let breadcrumbs = [{ label: "home.label", link: "/" }];
+let breadcrumbs = [
+  { label: "home.label", link: "/" },
+  { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "sidenav.label.admin.program",
+    link: "/MasterListsPage#program",
+  },
+];
 function ProgramManagement() {
   const { notificationVisible, setNotificationVisible, addNotification } =
     useContext(NotificationContext);
diff --git a/frontend/src/components/admin/reflexTests/ReflexTestManagement.js b/frontend/src/components/admin/reflexTests/ReflexTestManagement.js
index ef94912f8b..24b4b4b36c 100644
--- a/frontend/src/components/admin/reflexTests/ReflexTestManagement.js
+++ b/frontend/src/components/admin/reflexTests/ReflexTestManagement.js
@@ -5,7 +5,14 @@ import { Grid, Column, Section, Heading } from "@carbon/react";
 import { FormattedMessage } from "react-intl";
 import PageBreadCrumb from "../../common/PageBreadCrumb";
 
-const breadcrumbs = [{ label: "home.label", link: "/" }];
+const breadcrumbs = [
+  { label: "home.label", link: "/" },
+  { label: "breadcrums.admin.managment", link: "/MasterListsPage" },
+  {
+    label: "sidenav.label.admin.testmgt.reflex",
+    link: "/MasterListsPage#reflex",
+  },
+];
 
 function ReflexTestManagement() {
   return (

From cac01b3248fdb47a3e58dbb3740384ef91b4daca Mon Sep 17 00:00:00 2001
From: Herman Muhereza <hermanmuhereza22@gmail.com>
Date: Sun, 24 Nov 2024 23:32:48 +0300
Subject: [PATCH 3/3] go back to using Settings icon

---
 .../testNotificationConfigMenu/TestNotificationConfigMenu.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/admin/testNotificationConfigMenu/TestNotificationConfigMenu.js b/frontend/src/components/admin/testNotificationConfigMenu/TestNotificationConfigMenu.js
index ccd841d021..9f3515d3b6 100644
--- a/frontend/src/components/admin/testNotificationConfigMenu/TestNotificationConfigMenu.js
+++ b/frontend/src/components/admin/testNotificationConfigMenu/TestNotificationConfigMenu.js
@@ -38,7 +38,7 @@ import {
 } from "../../common/CustomNotification.js";
 import { FormattedMessage, injectIntl, useIntl } from "react-intl";
 import PageBreadCrumb from "../../common/PageBreadCrumb.js";
-import { Edit } from "@carbon/icons-react";
+import { Settings } from "@carbon/icons-react";
 import ActionPaginationButtonType from "../../common/ActionPaginationButtonType.js";
 
 let breadcrumbs = [
@@ -248,7 +248,7 @@ function TestNotificationConfigMenu() {
               id: "testnotification.testdefault.editIcon",
             })}
             onClick={() => handleEditButtonClick(row.cells[0].value)}
-            renderIcon={Edit}
+            renderIcon={Settings}
             kind="tertiary"
           />
         </TableCell>