Merge Develop to Staging v24.40.0

.github/runner-files/jwks.b64.txt

@@ -0,0 +1 @@
+eyJrZXlzIjogW3sibiI6ICJ4X21fNGNKQ3NHTHN4WkFIa2VCbFZQa2ZqNFNSckdHN3UySERFM3VLX3dFNERhTWhHQ2lxTXFsaTFDM2pxSE5JTVhuWV9ab1M5R3pHbnJpdGg1UUZGVDlLMGtBdF9YaXBJNnV1djcwOWtOV2FFNXZrYks4VlFRcFd2UFp4NUJSeTBGay0wU2lxZG1xOTNJRXdUTnNTLUpETnRXQm5VX0F1cjU0UXptQmI3SmhfOGttRDAtaHhROVZVejRpSUU3QTlySU5vQXNHSHhfdGtuNXd6YmpPR3F2Q3JqRi1RWXo0OGJXVkZzVVliNkFqUlFrZER2RWVwQlpNSHZsNVUxQlZxOVdRTTJGTmRUR0tJb3ZYeDRuTDFybUVONHpxbEpqWmc2bEZiODVuOUhkc01VblFiSXhkUjVlVl8wWmNVaHBrQWc0NldrejRZWkxMNm5NaGR0RmFTMXciLCAiZSI6ICJBUUFCIiwgImQiOiAiRXo4T3dDZ2xxZnREWlhwSXVEbjhGck1KWGhNNHZfb0NDdlZNUko1QjBPd3BuR3BrWDRKZWF4VFJYYkZ5OVQzdkowX2VXZjRQcl9XZUloMk5HZnpkaGw5NmtJUzd5R2JxQkhSY0U3a2ZhVWFkbHlDTVdnZDV5TEk1aWVOQUw5N2w4X1o2N0w5NHRIX3VlUF80Q1pXV0hGVTNieXJ4bHVzSld6NmZ5SFVPczlVSDFxV284V1RNOVp0RndqV0cxOWpkUXZ1RkQ0Z0x4UEJYZEk5ZV9zdTNwbmZHR0ZkN0xfMDFwcEFkQ2Y5eHhNTWFEel8wZ0xXM0NENFhnWU1rS2d3eDdKWlVlN0VaWFhyU0lETzFZN202MmF4NEpZRU5pSDFiaVlwQk15dmVfM3FzdnRQOWR4eVg2VkFROGZFNVdnOTBCcThsd1F0NzROWmgzMHhDY0dDNHFRIiwgInAiOiAiOXhXeXNjbVExT1FRcEptWmkzZDR5Tk5qT29Ja3lQVDRyZVRBNlJJdW5PSjVDUVFiVE1BVlpzUmsxa05rQ2R1cGVQU1ZnNWVXNktpOXZIV1M3b2NnclVEYzJTRkw0RWtNY21UR2lHRnh1YVIzNHRMTXpUQlJEVVFxZnR6WGxraGRJWmdKenJCT2h4NEEyZ1FQTnRrNkNVSEJWRGRncng0RmR3c21SaElSOU9rIiwgInEiOiAienpEb2FvclpqZ2ZPeDVHckFJZ3R3SGVhM29vQTlqbkFSeDdvM1V2bHprY3p1eC1DY1JORGppS3duaGxzVEROWFFWRTBXUlpWa0ZTQ0JVU3JSS1dLd0JGcnFVQzhlMkxwQVpBb0ZTQ0dqdllIMi1hdGUxeEhxc0NGY09OVlVYM1JXcFd4OFQ4RGhSNGpfaTRKN3g0d2VHc1hkRHRpelY2eHlZMmNHSjltY2I4IiwgImRwIjogInpUV3FLZHA4ZlRQRlZzOXpKTV9lOHZ3TnA2UTdKT1BBUGJ5Rk00MjBSUHdiQmdfeEZIZGJ6dlJCdzJwSkJaNzRTOHJtLWxuR0xna25QQVJ5T2NUa3NMXzBMQ2xwT1NleVBMZlI0NmI2cXZJYjE3aTMtNXFyVmxkTTZfeEMyVF9VaVhnYWZSMFV1MGVCOFlfNWl0WXpTMGpmWmpCd0RrRGl6UkhuZ2I2MFJ6RSIsICJkcSI6ICJYZHdoSGNyaV9ZV3A5aHlXWV9wTkI2am5Qck16OWxkNU5IN2JMUTBxQVFXZWVNR3dmUHNtR21pNnJCU0dUQXJpRjFQckxBU0RKSXcwRHFEcUdZSUkxalBPR3ZHWnNTZkF1SldPb3V1R0taTnBRZ1JCU09Zb0RVR0Q4Zno2ZEoxVHp2NkxpdWRwOTg4TXJTUThHZGdLU3pMd2dCWTdEeUE3MkR2UG9CUHQtODgiLCAicWkiOiAiSlF0UUJERXdnQVVMcWJFRWoybmdyXy02aV9pUmdRWmJTQ0hXNGdpZG5fdHlwdUJWS2R0ZW1jT3J6M3NnTnk0ekZrZElTbUZfbmdnbFlJb080TjNza1NNUXdGY1B0S1kzWUVlT2ZGNzMzRDZaTVJtSTFTby12QU54YVBDUkREbnUwTWk1TnUzbS02SkhGSFF5RDU2ZTFsQUlwUS1lakpuTWR6MXQ0aUplbEFzIiwgImt0eSI6ICJSU0EiLCAia2lkIjogIlhjckcyVS0tR3B4SVhORXpKOWNWREdRaEUzeXlIamREMDN1aDZmYXpRX2siLCAiYWxnIjogIlJTMjU2In1dfQ==

.github/workflows/cypress.yaml

@@ -45,9 +45,12 @@ jobs:
           cd care
           echo DISABLE_RATELIMIT=True >> docker/.prebuilt.env
           echo "CORS_ALLOWED_ORIGINS=\"[\\\"http://localhost:4000\\\"]\"" >> docker/.prebuilt.env
+          echo JWKS_BASE64=\"$(cat ../.github/runner-files/jwks.b64.txt)\" >> docker/.prebuilt.env
           make docker_config_file=docker-compose.pre-built.yaml up 
           make docker_config_file=docker-compose.pre-built.yaml load-dummy-data
           cd ..
+        env:
+          JWKS_BASE64: ${{ secrets.JWKS_BASE64 }}
 
       - name: Wait for care to be up ♻
         uses: nick-fields/retry@v2

cypress.config.ts

@@ -34,5 +34,6 @@ export default defineConfig({
   },
   env: {
     API_URL: process.env.REACT_CARE_API_URL ?? "http://localhost:9000",
+    ENABLE_HCX: process.env.REACT_ENABLE_HCX ?? false,
   },
 });

cypress/e2e/assets_spec/AssetHomepage.cy.ts

@@ -98,6 +98,7 @@ describe("Asset Tab", () => {
 
   it("Export asset", () => {
     assetPage.selectassetimportbutton();
+    cy.wait(2000);
     assetPage.selectjsonexportbutton();
     assetPage.selectassetimportbutton();
     assetPage.selectcsvexportbutton();

cypress/e2e/facility_spec/FacilityCreation.cy.ts

@@ -142,7 +142,7 @@ describe("Facility Creation", () => {
     facilityPage.submitForm();
     cy.closeNotification();
     // create multiple bed capacity and verify card reflection
-    facilityPage.selectBedType("Oxygen beds");
+    facilityPage.selectBedType("Oxygen Supported Bed");
     facilityPage.fillTotalCapacity(bedCapacity);
     facilityPage.fillCurrentlyOccupied(bedOccupancy);
     facilityPage.clickbedcapcityaddmore();
@@ -216,7 +216,7 @@ describe("Facility Creation", () => {
     facilityPage.fillPhoneNumber(facilityNumber);
     facilityPage.submitForm();
     // add the bed capacity
-    facilityPage.selectBedType("Oxygen beds");
+    facilityPage.selectBedType("Oxygen Supported Bed");
     facilityPage.fillTotalCapacity(oxygenCapacity);
     facilityPage.fillCurrentlyOccupied(oxygenExpected);
     facilityPage.saveAndExitBedCapacityForm();

cypress/e2e/facility_spec/FacilityHomepage.cy.ts

@@ -15,7 +15,6 @@ describe("Facility Homepage Function", () => {
   const userPage = new UserPage();
   const assetPagination = new AssetPagination();
   const facilitiesAlias = "downloadFacilitiesCSV";
-  const capacitiesAlias = "downloadCapacitiesCSV";
   const doctorsAlias = "downloadDoctorsCSV";
   const triagesAlias = "downloadTriagesCSV";
   const facilityName = "Dummy Facility 40";
@@ -91,30 +90,26 @@ describe("Facility Homepage Function", () => {
   });
 
   it("Verify Facility Export Functionality", () => {
-    // Download the Facilities CSV
+    // Verify Facility Export
     facilityHome.csvDownloadIntercept(facilitiesAlias, "");
     facilityHome.clickExportButton();
     facilityHome.clickMenuItem("Facilities");
     facilityHome.verifyDownload(facilitiesAlias);
-    facilityHome.clickSearchButton(); // to avoid flaky test, as sometimes, the test is unable to focus on the object
-    // Download the Capacities CSV
-    facilityHome.csvDownloadIntercept(capacitiesAlias, "&capacity");
-    facilityHome.clickExportButton();
-    facilityHome.clickMenuItem("Capacities");
-    facilityHome.verifyDownload(capacitiesAlias);
-    facilityHome.clickSearchButton();
-    // Download the Doctors CSV
+    // Verify Doctor Export
     facilityHome.csvDownloadIntercept(doctorsAlias, "&doctors");
     facilityHome.clickExportButton();
     facilityHome.clickMenuItem("Doctors");
     facilityHome.verifyDownload(doctorsAlias);
-    facilityHome.clickSearchButton();
-    // Download the Triages CSV
+    // Verify Triage Export
     facilityHome.csvDownloadIntercept(triagesAlias, "&triage");
     facilityHome.clickExportButton();
     facilityHome.clickMenuItem("Triages");
     facilityHome.verifyDownload(triagesAlias);
-    facilityHome.clickSearchButton();
+  });
+
+  it("Verify Capacity Export Functionality", () => {
+    facilityHome.clickExportButton();
+    facilityHome.clickMenuItem("Capacities");
   });
 
   it("Verify Facility Detail page redirection to CNS and Live Minitoring  ", () => {

cypress/e2e/facility_spec/FacilityManage.cy.ts

@@ -138,7 +138,7 @@ describe("Facility Manage Functions", () => {
   it("Modify bed capacity in Facility detail page", () => {
     // add multiple new bed capacity
     facilityManage.clickFacilityAddBedTypeButton();
-    facilityPage.selectBedType("Oxygen beds");
+    facilityPage.selectBedType("Isolation Bed");
     facilityPage.fillTotalCapacity(totalCapacity);
     facilityPage.fillCurrentlyOccupied(currentOccupied);
     facilityPage.saveAndExitBedCapacityForm();

cypress/e2e/patient_spec/PatientBedManagement.cy.ts

@@ -0,0 +1,56 @@
+import LoginPage from "../../pageobject/Login/LoginPage";
+import { PatientPage } from "../../pageobject/Patient/PatientCreation";
+import PatientLogupdate from "../../pageobject/Patient/PatientLogupdate";
+import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
+
+describe("Patient swtich bed functionality", () => {
+  const loginPage = new LoginPage();
+  const patientPage = new PatientPage();
+  const patientLogupdate = new PatientLogupdate();
+  const patientConsultationPage = new PatientConsultationPage();
+  const switchBedOne = "Dummy Bed 4";
+  const switchBedTwo = "Dummy Bed 1";
+  const switchBedThree = "Dummy Bed 3";
+  const switchPatientOne = "Dummy Patient 6";
+  const switchPatientTwo = "Dummy Patient 7";
+
+  before(() => {
+    loginPage.loginAsDisctrictAdmin();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.clearLocalStorage(/filters--.+/);
+    cy.awaitUrl("/patients");
+  });
+
+  it("Assign a bed for a admitted patient from update consultation page", () => {
+    // Open the update consultation page and assign a bed
+    patientPage.visitPatient(switchPatientTwo);
+    patientConsultationPage.clickEditConsultationButton();
+    patientLogupdate.selectBed(switchBedThree);
+    // verify the notification
+    cy.verifyNotification("Bed allocated successfully");
+  });
+
+  it("Assign a bed for a admitted patient from patient dashboard", () => {
+    // Assign a bed to a patient
+    patientPage.visitPatient(switchPatientOne);
+    patientLogupdate.clickSwitchBed();
+    patientLogupdate.selectBed(switchBedOne);
+    cy.verifyNotification("Bed allocated successfully");
+    // Clear the bed and reassign
+    patientLogupdate.clickSwitchBed();
+    cy.get("#clear-button").click();
+    patientLogupdate.selectBed(switchBedTwo);
+    cy.verifyNotification("Bed allocated successfully");
+    // verify the card is reflected
+    patientLogupdate.clickSwitchBed();
+    cy.verifyContentPresence("#previousbed-list", [switchBedOne, switchBedTwo]);
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});

cypress/e2e/patient_spec/PatientHomepage.cy.ts

@@ -0,0 +1,42 @@
+import LoginPage from "../../pageobject/Login/LoginPage";
+import PatientHome from "../../pageobject/Patient/PatientHome";
+
+describe("Patient Homepage present functionalities", () => {
+  const loginPage = new LoginPage();
+  const patientHome = new PatientHome();
+
+  before(() => {
+    loginPage.loginAsDisctrictAdmin();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.clearLocalStorage(/filters--.+/);
+    cy.awaitUrl("/patients");
+  });
+
+  it("Verify the functionality of the patient tab pagination", () => {
+    let firstPatientPageOne: string;
+    cy.get('[data-cy="patient"]')
+      .first()
+      .invoke("text")
+      .then((patientOne: string) => {
+        firstPatientPageOne = patientOne.trim();
+        patientHome.clickNextPage();
+        patientHome.verifySecondPageUrl();
+        cy.get('[data-cy="patient"]')
+          .first()
+          .invoke("text")
+          .then((patientTwo: string) => {
+            const firstPatientPageTwo = patientTwo.trim();
+            expect(firstPatientPageOne).not.to.eq(firstPatientPageTwo);
+            patientHome.clickPreviousPage();
+          });
+      });
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});