Merge branch 'develop' into primary-lucene

I-TECH-UW · Aug 16, 2024 · 49f8ae8 · 49f8ae8
2 parents 9b6a1d5 + 95b9bbe
commit 49f8ae8
Show file tree

Hide file tree

Showing 25 changed files with 2,140 additions and 1,038 deletions.
diff --git a/frontend/cypress/e2e/batchOrderEntry.cy.js b/frontend/cypress/e2e/batchOrderEntry.cy.js
@@ -51,9 +51,15 @@ describe("Batch Order Entry On Demand", function () {
 
   it("Should Validate Fields And Generate BarCode", function () {
     cy.fixture("BatchOrder").then((batchOrderData) => {
-      batchOrder.validateField("#tag-54", batchOrderData.sampleType);
-      batchOrder.validateField("#tag-56", batchOrderData.panel);
-      batchOrder.validateField("#tag-58", batchOrderData.facility);
+      batchOrder.validateField(
+        ":nth-child(1) > .cds--subgrid > :nth-child(8)",
+        batchOrderData.sampleType,
+      );
+      batchOrder.validateField(".cds--lg\\:col-span-12", batchOrderData.panel);
+      batchOrder.validateField(
+        ":nth-child(1) > .cds--subgrid > :nth-child(13)",
+        batchOrderData.facility,
+      );
       batchOrder.checkNextLabel().should("be.disabled");
       batchOrder.clickGenerateAndSaveBarcode();
       batchOrder.checkNextLabel().should("be.visible");
@@ -95,9 +101,15 @@ describe("Batch Order Entry Pre Printed", function () {
 
   it("Should Validate Fields", function () {
     cy.fixture("BatchOrder").then((batchOrderData) => {
-      batchOrder.validateField("#tag-58", batchOrderData.sampleType);
-      batchOrder.validateField("#tag-60", batchOrderData.panel);
-      batchOrder.validateField("#tag-62", batchOrderData.facility);
+      batchOrder.validateField(
+        ":nth-child(1) > .cds--subgrid > :nth-child(8)",
+        batchOrderData.sampleType,
+      );
+      batchOrder.validateField(".cds--lg\\:col-span-12", batchOrderData.panel);
+      batchOrder.validateField(
+        ":nth-child(1) > .cds--subgrid > :nth-child(13)",
+        batchOrderData.facility,
+      );
     });
   });
 

diff --git a/frontend/cypress/pages/HomePage.js b/frontend/cypress/pages/HomePage.js
@@ -19,8 +19,8 @@ class HomePage {
 
   goToOrderPage() {
     this.openNavigationMenu();
-    cy.get("#menu_sample").click();
-    cy.get("#menu_sample_add").click();
+    cy.get("#menu_sample_dropdown").click();
+    cy.get("#menu_sample_add_nav").click();
     return new OrderEntityPage();
   }
 
@@ -32,69 +32,69 @@ class HomePage {
 
   goToBatchOrderEntry() {
     this.openNavigationMenu();
-    cy.get("#menu_sample").click();
-    cy.get("#menu_sample_batch_entry").click();
+    cy.get("#menu_sample_dropdown").click();
+    cy.get("#menu_sample_batch_entry_nav").click();
     return new BatchOrderEntry();
   }
 
   goToPatientEntry() {
     this.openNavigationMenu();
-    cy.get("#menu_patient").click();
-    cy.get("#menu_patient_add_or_edit").click();
+    cy.get("#menu_patient_dropdown").click();
+    cy.get("#menu_patient_add_or_edit_nav").click();
     return new PatientEntryPage();
   }
 
   goToModifyOrderPage() {
     this.openNavigationMenu();
-    cy.get("#menu_sample").click();
-    cy.get("#menu_sample_edit").click();
+    cy.get("#menu_sample_dropdown").click();
+    cy.get("#menu_sample_edit_nav").click();
     return new ModifyOrderPage();
   }
   goToWorkPlanPlanByTest() {
     this.openNavigationMenu();
-    cy.get("#menu_workplan").click();
-    cy.get("#menu_workplan_test").click();
+    cy.get("#menu_workplan_dropdown").click();
+    cy.get("#menu_workplan_test_nav").click();
     return new WorkPlan();
   }
 
   goToWorkPlanPlanByPanel() {
     this.openNavigationMenu();
-    cy.get("#menu_workplan").click();
-    cy.get("#menu_workplan_panel").click();
+    cy.get("#menu_workplan_dropdown").click();
+    cy.get("#menu_workplan_panel_nav").click();
     return new WorkPlan();
   }
 
   goToWorkPlanPlanByUnit() {
     this.openNavigationMenu();
-    cy.get("#menu_workplan").click();
-    cy.get("#menu_workplan_bench").click();
+    cy.get("#menu_workplan_dropdown").click();
+    cy.get("#menu_workplan_bench_nav").click();
     return new WorkPlan();
   }
 
   goToWorkPlanPlanByPriority() {
     this.openNavigationMenu();
-    cy.get("#menu_workplan").click();
-    cy.get("#menu_workplan_priority").click();
+    cy.get("#menu_workplan_dropdown").click();
+    cy.get("#menu_workplan_priority_nav").click();
     return new WorkPlan();
   }
 
   goToReportNCE() {
     this.openNavigationMenu();
-    cy.get("#menu_nonconformity").click();
-    cy.get("#menu_non_conforming_report").click();
+    cy.get("#menu_nonconformity_dropdown").click();
+    cy.get("#menu_non_conforming_report_nav").click();
     return new NonConform();
   }
 
   goToViewNCE() {
     this.openNavigationMenu();
-    cy.get("#menu_nonconformity").click();
-    cy.get("#menu_non_conforming_view").click();
+    cy.get("#menu_nonconformity_dropdown").click();
+    cy.get("#menu_non_conforming_view_nav").click();
     return new NonConform();
   }
   goToCorrectiveActions() {
     this.openNavigationMenu();
-    cy.get("#menu_nonconformity").click();
-    cy.get("#menu_non_conforming_corrective_actions").click();
+    cy.get("#menu_nonconformity_dropdown").click();
+    cy.get("#menu_non_conforming_corrective_actions_nav").click();
     return new NonConform();
   }
 }

diff --git a/frontend/src/components/Style.css b/frontend/src/components/Style.css
@@ -498,13 +498,18 @@ button {
   padding-left: 1rem !important;
 }
 
-.cds--side-nav__link:hover {
+.top-level-menu-item > a {
+  pointer-events: auto !important;
+  text-decoration: none !important;
+}
+
+.top-level-menu-item > a:hover {
   background-color: var(--cds-background-hover, #072655);
 }
 
-/* .cds--side-nav__link {
+#mainHeader .cds--side-nav__link {
   pointer-events: none
-} */
+}
 
 @media screen and (max-width: 792px) {
   .banner h5 {

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>