Merge branch 'ohcnetwork:develop' into fixes#8299

.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

README.md

@@ -35,12 +35,6 @@
 ```sh
 npm install
 ```
-#### Run the following command to generate the `supportedBrowsers.ts` file:
-
-```bash
-npm run supported-browsers
-```
-This script just generates regex expression for matching the list of compatible browsers, so that we can show a warning notification for unsupported browsers.
 
 #### 🏃 Run the app in development mode
 

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/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/PatientPrescription.cy.ts

@@ -113,6 +113,7 @@ describe("Patient Medicine Administration", () => {
     cy.closeNotification();
     // Administer the medicine in edit form
     patientPrescription.clickAdministerButton();
+    cy.wait(2000);
     patientPrescription.enterAdministerDosage(medicineBaseDosage);
     patientPrescription.enterAdministerNotes(medicineAdministerNote);
     cy.submitButton("Administer Medicine");

cypress/e2e/patient_spec/PatientRegistration.cy.ts

@@ -8,6 +8,7 @@ import PatientInsurance from "../../pageobject/Patient/PatientInsurance";
 import PatientMedicalHistory from "../../pageobject/Patient/PatientMedicalHistory";
 
 const yearOfBirth = "2001";
+const isHCXEnabled = Cypress.env("ENABLE_HCX");
 
 const calculateAge = () => {
   const currentYear = new Date().getFullYear();
@@ -101,6 +102,8 @@ describe("Patient Creation with consultation", () => {
     facilityPage.selectLocalBody(patientOneLocalbody);
     facilityPage.selectWard(patientOneWard);
     patientPage.selectPatientOccupation(patientOccupation);
+    patientPage.selectSocioeconomicStatus("MIDDLE_CLASS");
+    patientPage.selectDomesticHealthcareSupport("FAMILY_MEMBER");
     // Patient Medical History
     patientMedicalHistory.typePatientPresentHealth(patientOnePresentHealth);
     patientMedicalHistory.typePatientOngoingMedication(
@@ -130,6 +133,8 @@ describe("Patient Creation with consultation", () => {
       yearOfBirth,
       patientOneBloodGroup,
       patientOccupation,
+      "Middle Class",
+      "Family member",
     );
     patientMedicalHistory.verifyPatientMedicalDetails(
       patientOnePresentHealth,
@@ -176,16 +181,21 @@ describe("Patient Creation with consultation", () => {
       "policy_id",
       patientOneFirstPolicyId,
     );
-    patientInsurance.typePatientInsuranceDetail(
-      patientOneFirstInsuranceId,
-      "insurer_id",
-      patientOneFirstInsurerId,
-    );
-    patientInsurance.typePatientInsuranceDetail(
-      patientOneFirstInsuranceId,
-      "insurer_name",
-      patientOneFirstInsurerName,
-    );
+    if (isHCXEnabled) {
+      patientInsurance.selectInsurer("test");
+    } else {
+      patientInsurance.typePatientInsuranceDetail(
+        patientOneFirstInsuranceId,
+        "insurer_id",
+        patientOneFirstInsurerId,
+      );
+      patientInsurance.typePatientInsuranceDetail(
+        patientOneFirstInsuranceId,
+        "insurer_name",
+        patientOneFirstInsurerName,
+      );
+    }
+
     patientInsurance.clickAddInsruanceDetails();
     patientInsurance.typePatientInsuranceDetail(
       patientOneSecondInsuranceId,
@@ -197,16 +207,21 @@ describe("Patient Creation with consultation", () => {
       "policy_id",
       patientOneSecondPolicyId,
     );
-    patientInsurance.typePatientInsuranceDetail(
-      patientOneSecondInsuranceId,
-      "insurer_id",
-      patientOneSecondInsurerId,
-    );
-    patientInsurance.typePatientInsuranceDetail(
-      patientOneSecondInsuranceId,
-      "insurer_name",
-      patientOneSecondInsurerName,
-    );
+    if (isHCXEnabled) {
+      patientInsurance.selectInsurer("Care");
+    } else {
+      patientInsurance.typePatientInsuranceDetail(
+        patientOneSecondInsuranceId,
+        "insurer_id",
+        patientOneSecondInsurerId,
+      );
+      patientInsurance.typePatientInsuranceDetail(
+        patientOneSecondInsuranceId,
+        "insurer_name",
+        patientOneSecondInsurerName,
+      );
+    }
+
     patientPage.clickUpdatePatient();
     cy.wait(3000);
     patientPage.verifyPatientUpdated();
@@ -235,20 +250,24 @@ describe("Patient Creation with consultation", () => {
       patientOneFirstPolicyId,
       patientOneFirstInsurerId,
       patientOneFirstInsurerName,
+      isHCXEnabled,
     );
+
     patientInsurance.clickPatientInsuranceViewDetail();
     cy.wait(3000);
     patientInsurance.verifyPatientPolicyDetails(
       patientOneFirstSubscriberId,
       patientOneFirstPolicyId,
       patientOneFirstInsurerId,
       patientOneFirstInsurerName,
+      isHCXEnabled,
     );
     patientInsurance.verifyPatientPolicyDetails(
       patientOneSecondSubscriberId,
       patientOneSecondPolicyId,
       patientOneSecondInsurerId,
       patientOneSecondInsurerName,
+      isHCXEnabled,
     );
   });
 

cypress/e2e/users_spec/UsersCreation.cy.ts

@@ -183,6 +183,7 @@ describe("User Creation", () => {
   it("create new user form throwing mandatory field error", () => {
     userCreationPage.clickElementById("addUserButton");
     userCreationPage.clickElementById("submit");
+    cy.wait(2000);
     userCreationPage.verifyErrorMessages(EXPECTED_ERROR_MESSAGES);
   });
 

cypress/e2e/users_spec/UsersManage.cy.ts

@@ -132,7 +132,6 @@ describe("Manage User", () => {
     manageUserPage.clickLinkFacility();
     manageUserPage.clickUnlinkFacilityButton();
     manageUserPage.clickSubmit();
-    manageUserPage.assertnotLinkedFacility;
     manageUserPage.linkedfacilitylistnotvisible();
     manageUserPage.clickCloseSlideOver();
     //  Go to particular facility doctor connect and all user-id are reflected based on there access