Merge branch 'develop' into bidirectional

I-TECH-UW · Jun 17, 2024 · 7178622 · 7178622
2 parents e933dda + c87e283
commit 7178622
Show file tree

Hide file tree

Showing 27 changed files with 2,833 additions and 73 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -40,6 +40,7 @@ import PrintBarcode from "./components/printBarcode/Index";
 import NonConformIndex from "./components/nonconform/index";
 import SampleBatchEntrySetup from "./components/batchOrderEntry/SampleBatchEntrySetup.js";
 import AuditTrailReportIndex from "./components/reports/auditTrailReport/Index.js";
+import OrganizationAddEdit from "./components/admin/OrganizationManagement/OrganizationAddModify.js";
 
 export default function App() {
   let i18nConfig = {

diff --git a/frontend/src/components/admin/Admin.js b/frontend/src/components/admin/Admin.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState, useEffect } from "react";
 import config from "../../config.json";
 import { FormattedMessage, useIntl, injectIntl } from "react-intl";
 import "../Style.css";
@@ -23,6 +23,7 @@ import {
   ListDropdown,
   CicsSystemGroup,
   QrCode,
+  ContainerSoftware,
 } from "@carbon/icons-react";
 import PathRoute from "../utils/PathRoute";
 import CalculatedValue from "./calculatedValue/CalculatedValueForm";
@@ -35,15 +36,33 @@ import {
 } from "@carbon/react";
 import { CommonProperties } from "./menu/CommonProperties";
 import ConfigMenuDisplay from "./formEntry/common/ConfigMenuDisplay";
-
 import ProviderMenu from "./ProviderMenu/ProviderMenu";
 import BarcodeConfiguration from "./barcodeConfiguration/BarcodeConfiguration";
+import OrganizationManagament from "./OrganizationManagement/OrganizationManagement";
+import OrganizationAddModify from "./OrganizationManagement/OrganizationAddModify.js";
 
 function Admin() {
   const intl = useIntl();
+  const [isSmallScreen, setIsSmallScreen] = useState(false);
+
+  useEffect(() => {
+    const mediaQuery = window.matchMedia("(max-width: 1024px)"); //applicable for medium screen and below  for only small screen set max-width: 768px
+    const handleMediaQueryChange = () => setIsSmallScreen(mediaQuery.matches);
+
+    handleMediaQueryChange();
+    mediaQuery.addEventListener("change", handleMediaQueryChange);
+
+    return () =>
+      mediaQuery.removeEventListener("change", handleMediaQueryChange);
+  }, []);
+
   return (
     <>
-      <SideNav aria-label="Side navigation" expanded={true}>
+      <SideNav
+        aria-label="Side navigation"
+        defaultExpanded={true}
+        isRail={isSmallScreen}
+      >
         <SideNavItems className="adminSideNav">
           <SideNavMenu
             renderIcon={Microscope}
@@ -68,6 +87,12 @@ function Admin() {
           <SideNavLink renderIcon={QrCode} href="#barcodeConfiguration">
             <FormattedMessage id="sidenav.label.admin.barcodeconfiguration" />
           </SideNavLink>
+          <SideNavLink
+            renderIcon={ContainerSoftware}
+            href="#organizationManagement"
+          >
+            <FormattedMessage id="organization.main.title" />
+          </SideNavLink>
           <SideNavMenu
             title={intl.formatMessage({ id: "sidenav.label.admin.menu" })}
             renderIcon={TableOfContents}
@@ -153,6 +178,12 @@ function Admin() {
       <PathRoute path="#barcodeConfiguration">
         <BarcodeConfiguration />
       </PathRoute>
+      <PathRoute path="#organizationManagement">
+        <OrganizationManagament />
+      </PathRoute>
+      <PathRoute path="#organizationEdit">
+        <OrganizationAddModify />
+      </PathRoute>
       <PathRoute path="#globalMenuManagement">
         <GlobalMenuManagement />
       </PathRoute>