Merge pull request #1204 from adityadeshlahre/fix-rewriting-TestNotif…

…icationConfigMenu-page

Fixing rewriting test notification config menu page

frontend/cypress/e2e/result.cy.js

@@ -209,7 +209,7 @@ describe("Result By Referred Out Tests", function () {
     //   );
     // });
   });
-//commented due to UI changes
+  //commented due to UI changes
   // it("should select the respecting referred test and print the selected patient reports", function () {
   //   result.selectRefferedTest();
   //   result.printReport();

frontend/cypress/e2e/validation.cy.js

@@ -67,6 +67,6 @@ describe("Validation By Range Of Order", function () {
   });
 
   it("Should Save the results", function () {
-    validation.saveResults('Test Note');
+    validation.saveResults("Test Note");
   });
 });

frontend/cypress/pages/HomePage.js

@@ -105,7 +105,6 @@ class HomePage {
     return new NonConform();
   }
 
-
   goToResultsByUnit() {
     this.openNavigationMenu();
     cy.get("#menu_results").click();
@@ -150,22 +149,22 @@ class HomePage {
 
   goToValidationByRoutine() {
     this.openNavigationMenu();
-    cy.get('#menu_resultvalidation').click();
-    cy.get('#menu_resultvalidation_routine ').click();
+    cy.get("#menu_resultvalidation").click();
+    cy.get("#menu_resultvalidation_routine ").click();
     return new Validation();
   }
   goToValidationByOrder() {
     this.openNavigationMenu();
     cy.get("#menu_resultvalidation").click();
-    cy.get('#menu_accession_validation ').click();
+    cy.get("#menu_accession_validation ").click();
     return new Validation();
   }
   goToValidationByRangeOrder() {
     this.openNavigationMenu();
     cy.get("#menu_resultvalidation").click();
-    cy.get('#menu_accession_validation_range ').click();
+    cy.get("#menu_accession_validation_range ").click();
     return new Validation();
-  }  
+  }
 
   goToRoutineReports() {
     this.openNavigationMenu();

frontend/cypress/pages/ResultsPage.js

@@ -38,8 +38,14 @@ class Result {
   }
 
   validatePatientResult(patient) {
-    cy.get('tbody > :nth-child(1) > :nth-child(2)').should("contain.text", patient.lastName);
-    cy.get('tbody > :nth-child(1) > :nth-child(3)').should("contain.text", patient.firstName);
+    cy.get("tbody > :nth-child(1) > :nth-child(2)").should(
+      "contain.text",
+      patient.lastName,
+    );
+    cy.get("tbody > :nth-child(1) > :nth-child(3)").should(
+      "contain.text",
+      patient.firstName,
+    );
   }
 
   referSample(index = 0, reason, institute) {

frontend/cypress/pages/Validation.js

@@ -1,28 +1,27 @@
 class Validation {
-    checkForHeading() {
-      cy.get('section > h3').should("contain.text", "Validation");
-    }
-
-    selectTestUnit(unitType) {
-      cy.get('#unitType').select(unitType);
-    }
+  checkForHeading() {
+    cy.get("section > h3").should("contain.text", "Validation");
+  }
+
+  selectTestUnit(unitType) {
+    cy.get("#unitType").select(unitType);
+  }
+
+  validateTestUnit(unitType) {
+    cy.get("#cell-testName-0 > .sampleInfo").should("contain.text", unitType);
+  }
+
+  enterLabNumberAndSearch(labNo) {
+    cy.get("#accessionNumber").type(labNo);
+    cy.get(".cds--sm\\:col-span-4.cds--lg\\:col-span-16 > #submit").click();
+    cy.get("#cell-sampleInfo-0 > .sampleInfo").should("contain.text", labNo);
+  }
 
-    validateTestUnit(unitType) {
-      cy.get('#cell-testName-0 > .sampleInfo').should("contain.text", unitType);
-    }
-
-    enterLabNumberAndSearch(labNo) {
-      cy.get('#accessionNumber').type(labNo);
-      cy.get('.cds--sm\\:col-span-4.cds--lg\\:col-span-16 > #submit').click();
-      cy.get('#cell-sampleInfo-0 > .sampleInfo').should("contain.text", labNo);
-    }
-
-    saveResults(note) {
-      cy.get('#cell-save-0 > .cds--form-item > .cds--checkbox-label').click();
-      cy.get('#resultList0\\.note').type(note);
-      cy.get(':nth-child(3) > #submit').click();
-    }
+  saveResults(note) {
+    cy.get("#cell-save-0 > .cds--form-item > .cds--checkbox-label").click();
+    cy.get("#resultList0\\.note").type(note);
+    cy.get(":nth-child(3) > #submit").click();
   }
-  
-  export default Validation;
-  
+}
+
+export default Validation;

frontend/src/components/admin/Admin.js

@@ -29,6 +29,7 @@ import {
   Bullhorn,
   User,
   BatchJob,
+  Popup,
 } from "@carbon/icons-react";
 import PathRoute from "../utils/PathRoute";
 import CalculatedValue from "./calculatedValue/CalculatedValueForm";
@@ -54,6 +55,8 @@ import UserManagement from "./userManagement/UserManagement";
 import UserAddModify from "./userManagement/UserAddModify";
 import ManageMethod from "./testManagement/ManageMethod.js";
 import BatchTestReassignmentAndCancelation from "./BatchTestReassignmentAndCancellation/BatchTestReassignmentAndCancelation.js";
+import TestNotificationConfigMenu from "./testNotificationConfigMenu/TestNotificationConfigMenu.js";
+import TestNotificationConfigEdit from "./testNotificationConfigMenu/TestNotificationConfigEdit.js";
 
 function Admin() {
   const intl = useIntl();
@@ -188,6 +191,9 @@ function Admin() {
               defaultMessage={"Common Properties"}
             />
           </SideNavLink>
+          <SideNavLink href="#testNotificationConfigMenu" renderIcon={Popup}>
+            <FormattedMessage id="testnotificationconfig.browse.title" />
+          </SideNavLink>
           <SideNavLink href="#DictionaryMenu" renderIcon={CharacterWholeNumber}>
             <FormattedMessage id="dictionary.label.modify" />
           </SideNavLink>
@@ -325,6 +331,12 @@ function Admin() {
           id="sidenav.label.admin.formEntry.PrintedReportsconfig"
         />
       </PathRoute>
+      <PathRoute path="#testNotificationConfigMenu">
+        <TestNotificationConfigMenu />
+      </PathRoute>
+      <PathRoute path="#testNotificationConfig">
+        <TestNotificationConfigEdit />
+      </PathRoute>
       <PathRoute path="#DictionaryMenu">
         <DictionaryManagement />
       </PathRoute>