Merge pull request #1040 from adityadeshlahre/fix-1005-organization-management-page

fix(#1005): Rewritten organization management page from JSP to React JS

Author: mozzy11

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 = {
@@ -220,6 +221,12 @@ export default function App() {
                   component={() => <Admin />}
                   role="Global Administrator"
                 />
+                <SecureRoute
+                  path="/Organization"
+                  exact
+                  component={() => <OrganizationAddEdit />}
+                  role="Global Administrator"
+                />
                 <SecureRoute
                   path="/MasterListsPage"
                   exact

frontend/src/components/admin/Admin.js

@@ -23,6 +23,7 @@ import {
   ListDropdown,
   CicsSystemGroup,
   QrCode,
+  ContainerSoftware,
 } from "@carbon/icons-react";
 import PathRoute from "../utils/PathRoute";
 import CalculatedValue from "./calculatedValue/CalculatedValueForm";
@@ -37,6 +38,7 @@ 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";
 
 function Admin() {
   const intl = useIntl();
@@ -84,6 +86,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}
@@ -169,6 +177,9 @@ function Admin() {
       <PathRoute path="#barcodeConfiguration">
         <BarcodeConfiguration />
       </PathRoute>
+      <PathRoute path="#organizationManagement">
+        <OrganizationManagament />
+      </PathRoute>
       <PathRoute path="#globalMenuManagement">
         <GlobalMenuManagement />
       </PathRoute>