Merge branch 'develop' of github.com:I-TECH-UW/OpenELIS-Global-2 into…

… develop

.github/workflows/frontend-qa.yml

@@ -5,7 +5,42 @@ on:
   pull_request:
     branches: [develop]
   workflow_dispatch:
+
+env:
+  DOCKER_NAME: ${{ vars.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}-frontend
+
 jobs:
+
+  build-prod-frontend-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.DOCKER_NAME }}
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./frontend
+          file: ./frontend/Dockerfile.prod
+          push: false    
+
+
   build-and-run-qa-tests:
     runs-on: ubuntu-latest
     steps:

.github/workflows/publish-and-test.yml

@@ -194,6 +194,10 @@ jobs:
       [build-and-push-test-image-backend, build-and-push-test-image-frontend]
     runs-on: ubuntu-latest
     steps:
+      - name: Sleep for 2 minutes
+        run: sleep 2m
+        shell: bash
+
       - name: Checkout OpenELIS-Global2
         uses: actions/checkout@v4
         with:

.gitignore

@@ -29,3 +29,4 @@ src/main/resources/adminPassword.txt
 /bin/
 /.apt_generated/
 */plugins/*.jar
+Patient/*

dev.docker-compose.yml

@@ -37,7 +37,7 @@ services:
 
     oe.openelis.org:
         container_name: openelisglobal-webapp 
-        image: itechuw/openelis-global-2:develop 
+        image: itechuw/openelis-global-2-dev:develop 
         depends_on:
             - database
             - certs

frontend/cypress/.eslintrc.json

@@ -1,5 +1,3 @@
 {
-    "extends": [
-      "plugin:cypress/recommended"
-    ]
-  }
+  "extends": ["plugin:cypress/recommended"]
+}

frontend/cypress/e2e/orderEntity.cy.js

@@ -53,7 +53,10 @@ describe("Order Entity", function () {
     orderEntityPage.clickNextButton();
   });
 
-  it("Should click generate Lab Order Number and store it in a fixture", function () {
+  it("Should do a validation check for labNo and then click generate Lab Order Number and store it in a fixture", function () {
+    cy.fixture("Order").then((order) => {
+      orderEntityPage.validateAcessionNumber(order.invalidLabNo);
+    });
     orderEntityPage.generateLabOrderNumber();
     cy.get("#labNo").then(($input) => {
       const generatedOrderNumber = $input.val();

frontend/cypress/e2e/patientEntry.cy.js

@@ -119,6 +119,24 @@ describe("Patient Search", function () {
     cy.wait(200).reload();
   });
 
+  it("should search patient By Lab Number", function () {
+    cy.fixture("Patient").then((patient) => {
+      patientPage.searchPatientBylabNo(patient.labNo);
+      cy.intercept(
+        "GET",
+        `**/rest/patient-search-results?*labNumber=${patient.labNo}*`,
+      ).as("getPatientSearch");
+      patientPage.clickSearchPatientButton();
+      cy.wait("@getPatientSearch").then((interception) => {
+        const responseBody = interception.response.body;
+        console.log(responseBody);
+        expect(responseBody.patientSearchResults).to.be.an("array").that.is
+          .empty;
+      });
+    });
+    cy.wait(200).reload();
+  });
+
   it("should search patient By PatientId", function () {
     cy.wait(1000);
     cy.fixture("Patient").then((patient) => {

frontend/cypress/fixtures/Order.json

@@ -9,5 +9,6 @@
     "firstName": "Optimus",
     "lastName": "Prime"
   },
-  "labNo": ""
+  "labNo": "",
+  "invalidLabNo": "DEV0124000000000000"
 }

frontend/cypress/fixtures/Patient.json

@@ -5,5 +5,6 @@
   "subjectNumber": "001202782410",
   "nationalId": "UG-23SLHD7DBD",
   "DOB": "12/05/2001",
-  "gender": "Male"
+  "gender": "Male",
+  "labNo": "DEV01240000000000001"
 }

frontend/cypress/pages/OrderEntityPage.js

@@ -31,6 +31,18 @@ class OrderEntityPage {
     ).click();
   }
 
+  validateAcessionNumber(order) {
+    cy.intercept("GET", `**/rest/SampleEntryAccessionNumberValidation**`).as(
+      "accessionNoValidation",
+    );
+    cy.get("#labNo").type(order, { delay: 300 });
+
+    cy.wait("@accessionNoValidation").then((interception) => {
+      const responseBody = interception.response.body;
+      console.log(responseBody);
+      expect(responseBody.status).to.be.false;
+    });
+  }
   enterSiteName(siteName) {
     cy.enterText("input#siteName", siteName);
   }

frontend/cypress/pages/PatientEntryPage.js

@@ -8,6 +8,7 @@ class PatientEntryPage {
   personContactPrimaryPhone = "input#patientContact\\.person\\.primaryPhone";
   personContactEmail = "input#patientContact\\.person\\.email";
   patientIdSelector = "input#patientId";
+  labNoSelector = "#labNumber";
   city = "input#city";
   primaryPhone = "input#primaryPhone";
   dateOfBirth = "input#date-picker-default-id";
@@ -92,6 +93,10 @@ class PatientEntryPage {
     cy.enterText(this.patientIdSelector, PID);
   }
 
+  searchPatientBylabNo(labNo) {
+    cy.enterText(this.labNoSelector, labNo);
+  }
+
   getPatientSearchResultsTable() {
     return cy.getElement(
       ".cds--data-table.cds--data-table--lg.cds--data-table--sort > tbody",

frontend/src/App.js

@@ -40,7 +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";
+import ReferredOutTests from "./components/resultPage/resultsReferredOut/ReferredOutTests.js";
 
 export default function App() {
   let i18nConfig = {
@@ -410,6 +410,12 @@ export default function App() {
                   component={() => <ResultSearch />}
                   role="Results"
                 />
+                <SecureRoute
+                  path="/ReferredOutTests"
+                  exact
+                  component={() => <ReferredOutTests />}
+                  role="Results"
+                />
                 <SecureRoute
                   path="/RoutineReports"
                   exact

frontend/src/components/admin/Admin.js

@@ -24,6 +24,8 @@ import {
   CicsSystemGroup,
   QrCode,
   ContainerSoftware,
+  BootVolumeAlt,
+  Report,
 } from "@carbon/icons-react";
 import PathRoute from "../utils/PathRoute";
 import CalculatedValue from "./calculatedValue/CalculatedValueForm";
@@ -40,6 +42,9 @@ import ProviderMenu from "./ProviderMenu/ProviderMenu";
 import BarcodeConfiguration from "./barcodeConfiguration/BarcodeConfiguration";
 import OrganizationManagament from "./OrganizationManagement/OrganizationManagement";
 import OrganizationAddModify from "./OrganizationManagement/OrganizationAddModify.js";
+import AnalyzerTestName from "./analyzerTestName/AnalyzerTestName.js";
+import PluginList from "./pluginFile/PluginFile.js";
+import ResultReportingConfiguration from "./ResultReportingConfiguration/ResultReportingConfiguration.js";
 
 function Admin() {
   const intl = useIntl();
@@ -75,6 +80,9 @@ function Admin() {
               <FormattedMessage id="sidenav.label.admin.testmgt.calculated" />
             </SideNavMenuItem>
           </SideNavMenu>
+          <SideNavLink href="#AnalyzerTestName" renderIcon={ListDropdown}>
+            <FormattedMessage id="sidenav.label.admin.analyzerTest" />
+          </SideNavLink>
           <SideNavLink href="#labNumber" renderIcon={CharacterWholeNumber}>
             <FormattedMessage id="sidenav.label.admin.labNumber" />
           </SideNavLink>
@@ -87,12 +95,18 @@ function Admin() {
           <SideNavLink renderIcon={QrCode} href="#barcodeConfiguration">
             <FormattedMessage id="sidenav.label.admin.barcodeconfiguration" />
           </SideNavLink>
+          <SideNavLink href="#PluginFile" renderIcon={BootVolumeAlt}>
+            <FormattedMessage id="sidenav.label.admin.Listplugin" />
+          </SideNavLink>
           <SideNavLink
             renderIcon={ContainerSoftware}
             href="#organizationManagement"
           >
             <FormattedMessage id="organization.main.title" />
           </SideNavLink>
+          <SideNavLink renderIcon={Report} href="#resultReportingConfiguration">
+            <FormattedMessage id="resultreporting.browse.title" />
+          </SideNavLink>
           <SideNavMenu
             title={intl.formatMessage({ id: "sidenav.label.admin.menu" })}
             renderIcon={TableOfContents}
@@ -166,6 +180,9 @@ function Admin() {
       <PathRoute path="#calculatedValue">
         <CalculatedValue />
       </PathRoute>
+      <PathRoute path="#AnalyzerTestName">
+        <AnalyzerTestName />
+      </PathRoute>
       <PathRoute path="#labNumber">
         <LabNumberManagement />
       </PathRoute>
@@ -184,6 +201,9 @@ function Admin() {
       <PathRoute path="#organizationEdit">
         <OrganizationAddModify />
       </PathRoute>
+      <PathRoute path="#resultReportingConfiguration">
+        <ResultReportingConfiguration />
+      </PathRoute>
       <PathRoute path="#globalMenuManagement">
         <GlobalMenuManagement />
       </PathRoute>
@@ -248,6 +268,9 @@ function Admin() {
       <PathRoute path="#DictionaryMenu">
         <DictionaryManagement />
       </PathRoute>
+      <PathRoute path="#PluginFile">
+        <PluginList />
+      </PathRoute>
     </>
   );
 }