Merge branch 'develop' into consistent-dropdown-behavior

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/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();
@@ -180,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,
@@ -201,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();
@@ -239,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

cypress/pageobject/Patient/PatientInsurance.ts

@@ -9,6 +9,34 @@ class PatientInsurance {
     });
   }
 
+  selectInsurer(insurer: string) {
+    cy.intercept("GET", "**/api/v1/hcx/payors/**", {
+      statusCode: 200,
+      body: [
+        {
+          name: "test payor 2",
+          code: "testpayor2.swasthmock@swasth-hcx-staging",
+        },
+        {
+          name: "Care Payor",
+          code: "khavinshankar.gmail@swasth-hcx-staging",
+        },
+        {
+          name: "Alliance",
+          code: "hcxdemo.yopmail@swasth-hcx-staging",
+        },
+      ],
+    }).as("getInsurer");
+    cy.get("[name='insurer']")
+      .last()
+      .click()
+      .type(insurer)
+      .then(() => {
+        cy.wait("@getInsurer");
+        cy.get("[role='option']").contains(insurer).click();
+      });
+  }
+
   clickPatientInsuranceViewDetail() {
     cy.get("#insurance-view-details").scrollIntoView();
     cy.get("#insurance-view-details").click();
@@ -18,13 +46,21 @@ class PatientInsurance {
     cy.get("[data-testid=add-insurance-button]").click();
   }
 
-  verifyPatientPolicyDetails(subscriberId, policyId, insurerId, insurerName) {
+  verifyPatientPolicyDetails(
+    subscriberId,
+    policyId,
+    insurerId,
+    insurerName,
+    isHcxEnabled,
+  ) {
     cy.get("[data-testid=patient-details]").then(($dashboard) => {
       cy.url().should("include", "/facility/");
       expect($dashboard).to.contain(subscriberId);
       expect($dashboard).to.contain(policyId);
-      expect($dashboard).to.contain(insurerId);
-      expect($dashboard).to.contain(insurerName);
+      if (!isHcxEnabled) {
+        expect($dashboard).to.contain(insurerId);
+        expect($dashboard).to.contain(insurerName);
+      }
     });
   }
 }

cypress/pageobject/Users/ManageUserPage.ts

@@ -142,8 +142,14 @@ export class ManageUserPage {
   }
 
   assertDoctorConnectVisibility(realName) {
-    cy.get("#doctor-connect-home-doctor").should("contain.text", realName);
-    cy.get("#doctor-connect-remote-doctor").should("contain.text", realName);
+    cy.get('*[id="doctor-connect-home-doctor"]').should(
+      "contain.text",
+      realName,
+    );
+    cy.get('*[id="doctor-connect-remote-doctor"]').should(
+      "contain.text",
+      realName,
+    );
   }
 
   assertVideoConnectLink(docName: string, link: string) {

src/CAREUI/icons/CareIcon.tsx

@@ -1,8 +1,7 @@
+import iconData from "./UniconPaths.json";
 import { transformIcons } from "./icon";
 import { useEffect } from "react";
 
-import iconData from "./UniconPaths.json";
-
 export type IconName = keyof typeof iconData;
 
 export interface CareIconProps {