fix merge conflicts

.env

@@ -1,7 +1,7 @@
 # Whitelabelling envs
 
 REACT_APP_TITLE=CARE
-REACT_APP_META_DESCRIPTION=CoronaSafe Network is an open-source public utility designed by a multi-disciplinary team of innovators and volunteers. CoronaSafe Care is a Digital Public Good recognised by United Nations.
+REACT_APP_META_DESCRIPTION=Revolutionizing EMR with AI: Open Healthcare Network develops free, open-source tools to enhance efficiency in global healthcare delivery. Our EMR system is recognized as a Digital Public Good by the United Nations.
 REACT_APP_COVER_IMAGE=https://cdn.coronasafe.network/care_logo.svg
 REACT_APP_COVER_IMAGE_ALT=https://cdn.coronasafe.network/care_logo.svg
 REACT_PUBLIC_URL=https://care.coronasafe.in

.eslintrc.json

@@ -12,11 +12,10 @@
   "extends": [
     "eslint:recommended",
     "plugin:react-hooks/recommended",
-    "plugin:prettier/recommended",
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:i18next/recommended",
-    "plugin:tailwindcss/recommended",
+    "plugin:prettier/recommended",
     "plugin:storybook/recommended"
   ],
   "overrides": [
@@ -47,10 +46,6 @@
     "i18next"
   ],
   "rules": {
-    "quotes": [
-      "error",
-      "double"
-    ],
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": [
       "error",
@@ -60,6 +55,7 @@
         "caughtErrorsIgnorePattern": "^_"
       }
     ],
+    "@typescript-eslint/no-explicit-any": "warn",
     "react/react-in-jsx-scope": "off",
     "i18next/no-literal-string": [
       "warn",
@@ -82,12 +78,7 @@
           ]
         }
       }
-    ],
-    "tailwindcss/no-custom-classname": "off",
-    "tailwindcss/migration-from-tailwind-2": "error",
-    "tailwindcss/classnames-order": "off",
-    "tailwindcss/enforces-shorthand": "off",
-    "tailwindcss/no-contradicting-classname": "error"
+    ]
   },
   "ignorePatterns": [
     "dist",

.github/workflows/cypress.yaml

@@ -22,11 +22,21 @@ jobs:
       - name: Checkout 📥
         uses: actions/checkout@v3
 
+      - name: Set backend branch
+        id: backend-branch
+        run: |
+          if [[ '${{ github.event.pull_request.base.ref }}' == 'staging' ]]; then
+            echo "branch=staging" >> $GITHUB_OUTPUT
+          else
+            echo "branch=develop" >> $GITHUB_OUTPUT
+          fi
+
       - name: Checkout care 📥
         uses: actions/checkout@v3
         with:
           repository: coronasafe/care
           path: care
+          ref: ${{ steps.backend-branch.outputs.branch }}
 
       - name: Start care docker containers 🐳
         run: |

.github/workflows/stale.yml

@@ -13,12 +13,9 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-label: "stale"
           stale-pr-label: "stale"
-          stale-issue-message: "Hi, @coronasafe/care-frontend-maintainers, This issue has been automatically marked as stale because it has not had any recent activity."
-          stale-pr-message: "Hi, This pr has been automatically marked as stale because it has not had any recent activity. It will be automatically closed if no further activity occurs for 7 more days. Thank you for your contributions."
-          close-pr-message: "Hi, @coronasafe/care-frontend-maintainers, This PR has been automatically closed due to inactivity. Thank you for your contributions. Feel free to re-open the PR."
-          exempt-issue-labels: "blocked,waiting for related PR,waiting for back end,help wanted,work-in-progress,In Progress,wishlist,EPIC"
-          exempt-pr-labels: "tested,needs testing,need Review,waiting for related PR,waiting for back end,help wanted,blocked,work-in-progress,In Progress"
+          exempt-issue-labels: "blocked,waiting for related PR,waiting for back end,help wanted,work-in-progress,In Progress,wishlist,EPIC,backlog"
+          exempt-pr-labels: "tested,needs testing,need Review,waiting for related PR,waiting for back end,help wanted,blocked,work-in-progress,In Progress,backlog"
           days-before-issue-stale: 14
           days-before-pr-stale: 7
           days-before-issue-close: -1
-          days-before-pr-close: 7
+          days-before-pr-close: -1

cypress/e2e/external_results_spec/filter.cy.ts

@@ -14,13 +14,10 @@ describe("External Results Filters", () => {
   });
 
   it("Advance Filter", () => {
+    cy.clickAndSelectOption("#local_bodies", "Aluva");
     cy.get("#local_bodies").click();
-    cy.get("[role='option']").should("be.visible");
-    cy.contains("[role='option']", "Aluva").click();
-    cy.get("#local_bodies").click();
+    cy.clickAndSelectOption("#wards", "4");
     cy.get("#wards").click();
-    cy.get("[role='option']").should("be.visible");
-    cy.contains("[role='option']", "4").click();
     cy.contains("Apply").click();
   });
 

cypress/e2e/facility_spec/facility_creation.cy.ts

@@ -58,12 +58,15 @@ describe("Facility Creation", () => {
     "Invalid Phone Number",
   ];
   const bedErrorMessage = [
-    "Field is required",
+    "This field is required",
     "Total capacity cannot be 0",
-    "Field is required",
+    "This field is required",
   ];
-  const doctorErrorMessage = ["Field is required", "Field is required"];
-  const triageErrorMessage = ["Field is required"];
+  const doctorErrorMessage = [
+    "This field is required",
+    "This field is required",
+  ];
+  const triageErrorMessage = ["This field is required"];
 
   before(() => {
     loginPage.loginAsDisctrictAdmin();
@@ -129,6 +132,7 @@ describe("Facility Creation", () => {
     facilityFeature.forEach((featureText) => {
       cy.get("[role='option']").contains(featureText).click();
     });
+    facilityPage.clickfacilityfeatureoption();
     facilityPage.fillPincode("682001");
     facilityPage.selectStateOnPincode("Kerala");
     facilityPage.selectDistrictOnPincode("Ernakulam");

cypress/e2e/patient_spec/patient_consultation.cy.ts

@@ -95,6 +95,7 @@ describe("Patient Consultation in multiple combination", () => {
     cy.submitButton("Create Consultation");
     // the above submit should fail as IP number is missing
     patientConsultationPage.typePatientNumber(patientIpNumber);
+    patientConsultationPage.selectBed("Dummy Bed 1");
     cy.submitButton("Create Consultation");
     cy.verifyNotification("Consultation created successfully");
     // Below code for the prescription module only present while creating a new consultation

cypress/e2e/patient_spec/patient_discharge.cy.ts

@@ -36,6 +36,7 @@ describe("Patient Discharge based on multiple reason", () => {
     patientDischarge.clickDischarge();
     patientDischarge.selectDischargeReason(patientDischargeReason4);
     cy.submitButton("Confirm Discharge");
+    cy.submitButton("Acknowledge & Submit");
     cy.verifyNotification("Patient Discharged Successfully");
     cy.closeNotification();
     // Verify the consultation dashboard reflection
@@ -53,6 +54,7 @@ describe("Patient Discharge based on multiple reason", () => {
     patientDischarge.typeDischargeNote(patientDeathCause);
     patientDischarge.typeDoctorName(doctorName);
     cy.submitButton("Confirm Discharge");
+    cy.submitButton("Acknowledge & Submit");
     cy.verifyNotification("Patient Discharged Successfully");
     cy.closeNotification();
     // Verify the consultation dashboard reflection
@@ -77,6 +79,7 @@ describe("Patient Discharge based on multiple reason", () => {
     patientDischarge.typeReferringFacility(referringFreetextFacility);
     cy.wait(2000);
     cy.submitButton("Confirm Discharge");
+    cy.submitButton("Acknowledge & Submit");
     cy.wait(2000);
     cy.verifyNotification("Patient Discharged Successfully");
     cy.closeNotification();
@@ -108,6 +111,7 @@ describe("Patient Discharge based on multiple reason", () => {
     cy.closeNotification();
     // submit the discharge pop-up
     cy.submitButton("Confirm Discharge");
+    cy.submitButton("Acknowledge & Submit");
     cy.wait(2000);
     cy.verifyNotification("Patient Discharged Successfully");
     cy.closeNotification();

cypress/e2e/patient_spec/patient_logupdate.cy.ts

@@ -47,7 +47,8 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typePhysicalExamination(physicalExamination);
     patientLogupdate.selectRoundType("Telemedicine");
     patientLogupdate.typeOtherDetails(otherExamination);
-    patientLogupdate.typeAdditionalSymptoms(additionalSymptoms);
+    patientLogupdate.selectSymptomsDate("01012024");
+    patientLogupdate.typeAndMultiSelectSymptoms("fe", ["Fever"]);
     patientLogupdate.selectPatientCategory(patientCategory);
     patientLogupdate.typeSystolic(patientSystolic);
     patientLogupdate.typeDiastolic(patientDiastolic);
@@ -57,7 +58,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typeSpo2(patientSpo2);
     patientLogupdate.selectRhythm(patientRhythmType);
     patientLogupdate.typeRhythm(patientRhythm);
-    cy.get("#consciousness_level-2").click();
+    cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
     cy.submitButton("Save");
     cy.verifyNotification("Telemedicine log created successfully");
   });
@@ -72,7 +73,8 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.clickLogupdate();
     patientLogupdate.typePhysicalExamination(physicalExamination);
     patientLogupdate.typeOtherDetails(otherExamination);
-    patientLogupdate.typeAdditionalSymptoms(additionalSymptoms);
+    patientLogupdate.selectSymptomsDate("01012024");
+    patientLogupdate.typeAndMultiSelectSymptoms("fe", ["Fever"]);
     patientLogupdate.selectPatientCategory(patientCategory);
     patientLogupdate.typeSystolic(patientSystolic);
     patientLogupdate.typeDiastolic(patientDiastolic);
@@ -82,7 +84,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typeSpo2(patientSpo2);
     patientLogupdate.selectRhythm(patientRhythmType);
     patientLogupdate.typeRhythm(patientRhythm);
-    cy.get("#consciousness_level-2").click();
+    cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
     cy.submitButton("Save");
     cy.verifyNotification("Brief Update log created successfully");
     cy.closeNotification();
@@ -137,7 +139,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typeSpo2(patientSpo2);
     patientLogupdate.selectRhythm(patientRhythmType);
     patientLogupdate.typeRhythm(patientRhythm);
-    cy.get("#consciousness_level-2").click();
+    cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
     cy.submitButton("Save");
     cy.wait(2000);
     cy.verifyNotification("Brief Update log created successfully");
@@ -161,7 +163,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typePulse(patientPulse);
     patientLogupdate.typeTemperature(patientTemperature);
     patientLogupdate.typeRespiratory(patientRespiratory);
-    cy.get("#consciousness_level-2").click();
+    cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
     cy.submitButton("Save");
     cy.verifyNotification("Brief Update log created successfully");
     cy.closeNotification();

cypress/e2e/patient_spec/patient_prescription.cy.ts

@@ -54,7 +54,7 @@ describe("Patient Medicine Administration", () => {
     cy.verifyAndClickElement("#0", medicineNameOne);
     cy.submitButton("Discontinue");
     patientPrescription.enterDiscontinueReason("Medicine is been discontinued");
-    cy.submitButton("Discontinue");
+    cy.submitButton("Confirm Discontinue");
     cy.verifyNotification("Prescription discontinued");
     cy.closeNotification();
     // verify the discontinue medicine view

cypress/e2e/patient_spec/patient_registration.cy.ts

@@ -254,7 +254,7 @@ describe("Patient Creation with consultation", () => {
   });
 
   it("Patient Registration using the transfer with no consultation", () => {
-    // transfer the patient and no consulation
+    // transfer the patient with no consulation and verify the transfer to a new facility
     patientPage.createPatient();
     patientPage.selectFacility(patientTransferFacility);
     patientPage.patientformvisibility();
@@ -264,9 +264,10 @@ describe("Patient Creation with consultation", () => {
     patientTransfer.clickTransferPatientNameList(patientTransferName);
     patientTransfer.clickTransferPatientYOB(yearOfBirth);
     patientTransfer.clickTransferSubmitButton();
-    patientTransfer.verifyFacilitySuccessfullMessage();
+    cy.verifyNotification(
+      "Patient Dummy Patient 10 (Male) transferred successfully",
+    );
     patientTransfer.clickConsultationCancelButton();
-    cy.wait(3000);
     // allow the transfer button of a patient
     patientTransfer.clickAllowPatientTransferButton();
     // Verify the patient error message for the same facility
@@ -280,7 +281,9 @@ describe("Patient Creation with consultation", () => {
     patientTransfer.clickTransferPatientNameList(patientTransferName);
     patientTransfer.clickTransferPatientYOB(yearOfBirth);
     patientTransfer.clickTransferSubmitButton();
-    patientTransfer.verifyFacilityErrorMessage();
+    cy.verifyNotification(
+      "Patient - Patient transfer cannot be completed because the patient has an active consultation in the same facility",
+    );
   });
 
   it("Patient Registration using External Result Import", () => {

cypress/e2e/users_spec/user_creation.cy.ts

@@ -50,8 +50,8 @@ describe("User Creation", () => {
   ];
 
   const EXPECTED_PROFILE_ERROR_MESSAGES = [
-    "Field is required",
-    "Field is required",
+    "This field is required",
+    "This field is required",
     "Please enter valid phone number",
   ];
 

cypress/pageobject/Asset/AssetCreation.ts

@@ -200,7 +200,7 @@ export class AssetPage {
   verifyEmptyStatusError() {
     cy.get("[data-testid=asset-working-status-input] span").should(
       "contain",
-      "Field is required",
+      "This field is required",
     );
   }
 

cypress/pageobject/Patient/PatientConsultation.ts

@@ -28,6 +28,10 @@ export class PatientConsultationPage {
     cy.searchAndSelectOption("#referred_to", referance);
   }
 
+  selectBed(bedNo: string) {
+    cy.searchAndSelectOption("#bed", bedNo);
+  }
+
   selectPatientWard(ward: string) {
     cy.searchAndSelectOption("#transferred_from_location", ward);
   }

cypress/pageobject/Patient/PatientCreation.ts

@@ -46,7 +46,7 @@ export class PatientPage {
   }
 
   checkPhoneNumberIsEmergencyNumber() {
-    cy.get("#emergency_contact_checkbox > div > input").click();
+    cy.get("#emergency_contact_checkbox").click();
   }
 
   typePatientDateOfBirth(dateOfBirth: string) {
@@ -93,11 +93,11 @@ export class PatientPage {
   }
 
   clickPatientAntenatalStatusYes() {
-    cy.get("#is_antenatal-0").click();
+    cy.get("#is_antenatal-option-true").click();
   }
 
   clickPatientPostPartumStatusYes() {
-    cy.get("#is_postpartum-0").click();
+    cy.get("#is_postpartum-option-true").click();
   }
 
   clickCancelButton() {

cypress/pageobject/Patient/PatientLogupdate.ts

@@ -16,7 +16,7 @@ class PatientLogupdate {
   }
 
   selectPatientCategory(category: string) {
-    cy.clickAndSelectOption("#patient_category", category);
+    cy.clickAndSelectOption("#patientCategory", category);
   }
 
   typePhysicalExamination(examination: string) {
@@ -28,10 +28,6 @@ class PatientLogupdate {
     cy.get("#other_details").click().type(details);
   }
 
-  typeAdditionalSymptoms(symptoms: string) {
-    cy.searchAndSelectOption("#additional_symptoms", symptoms);
-  }
-
   typeAndMultiSelectSymptoms(input, symptoms) {
     cy.typeAndMultiSelectOption("#additional_symptoms", input, symptoms);
   }

cypress/pageobject/Patient/PatientPrescription.ts

@@ -28,7 +28,7 @@ export class PatientPrescription {
   }
 
   clickAdministerButton() {
-    cy.get("#administer-medicine").should("be.visible");
+    cy.get("#administer-medicine").scrollIntoView().should("be.visible");
     cy.verifyAndClickElement("#administer-medicine", "Administer");
   }