Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 8 commits into from
Jun 17, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6513466
workFlow + UI done GET/POST & search working
adityadeshlahre May 11, 2024
63d2445
UI fixes + routes added + values rendering
adityadeshlahre May 12, 2024
1aa40f4
Adding/Deactivating ORGS working
adityadeshlahre May 18, 2024
e9cb32a
pagination + ui fix + RestController hot
adityadeshlahre Jun 7, 2024
7a5e91a
POST request & UI edge cases fixed + restController & form edit
adityadeshlahre Jun 13, 2024
a7104cb
minnor UI fixes
adityadeshlahre Jun 13, 2024
44e7034
minnor fixe 00
adityadeshlahre Jun 13, 2024
5c3367b
docker/npm run build fix
adityadeshlahre Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions frontend/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions frontend/src/components/admin/Admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
ListDropdown,
CicsSystemGroup,
QrCode,
ContainerSoftware,
} from "@carbon/icons-react";
import PathRoute from "../utils/PathRoute";
import CalculatedValue from "./calculatedValue/CalculatedValueForm";
Expand All @@ -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();
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -169,6 +177,9 @@ function Admin() {
<PathRoute path="#barcodeConfiguration">
<BarcodeConfiguration />
</PathRoute>
<PathRoute path="#organizationManagement">
<OrganizationManagament />
</PathRoute>
<PathRoute path="#globalMenuManagement">
<GlobalMenuManagement />
</PathRoute>
Expand Down
Loading
Loading