Merge branch 'develop' into massindexer

I-TECH-UW · Aug 12, 2024 · f5f1658 · f5f1658
2 parents b4acd8e + fe8c185
commit f5f1658
Show file tree

Hide file tree

Showing 7 changed files with 1,543 additions and 2 deletions.
diff --git a/frontend/src/components/admin/Admin.js b/frontend/src/components/admin/Admin.js
@@ -28,6 +28,7 @@ import {
   Report,
   Bullhorn,
   User,
+  BatchJob,
 } from "@carbon/icons-react";
 import PathRoute from "../utils/PathRoute";
 import CalculatedValue from "./calculatedValue/CalculatedValueForm";
@@ -52,6 +53,7 @@ import OrganizationAddModify from "./OrganizationManagement/OrganizationAddModif
 import UserManagement from "./userManagement/UserManagement";
 import UserAddModify from "./userManagement/UserAddModify";
 import ManageMethod from "./testManagement/ManageMethod.js";
+import BatchTestReassignmentAndCancelation from "./BatchTestReassignmentAndCancellation/BatchTestReassignmentAndCancelation.js";
 
 function Admin() {
   const intl = useIntl();
@@ -123,6 +125,9 @@ function Admin() {
           <SideNavLink renderIcon={User} href="#userManagement">
             <FormattedMessage id="unifiedSystemUser.browser.title" />
           </SideNavLink>
+          <SideNavLink renderIcon={BatchJob} href="#batchTestReassignment">
+            <FormattedMessage id="configuration.batch.test.reassignment" />
+          </SideNavLink>
           <SideNavMenu
             title={intl.formatMessage({ id: "sidenav.label.admin.menu" })}
             renderIcon={TableOfContents}
@@ -241,6 +246,9 @@ function Admin() {
       <PathRoute path="#userManagement">
         <UserManagement />
       </PathRoute>
+      <PathRoute path="#batchTestReassignment">
+        <BatchTestReassignmentAndCancelation />
+      </PathRoute>
       <PathRoute path="#userEdit">
         <UserAddModify />
       </PathRoute>