Merge branch 'develop' into add-search-for-users

Mahendar0701 · Feb 17, 2025 · 37a3c59 · 37a3c59
2 parents c87fc40 + 1c070db
commit 37a3c59
Show file tree

Hide file tree

Showing 50 changed files with 309 additions and 3,881 deletions.
diff --git a/.example.env b/.example.env
@@ -35,9 +35,6 @@ REACT_CUSTOM_DESCRIPTION=
 # Google Maps API key
 REACT_GMAPS_API_KEY=
 
-# Government data API key
-REACT_GOV_DATA_API_KEY=
-
 # reCAPTCHA site key
 REACT_RECAPTCHA_SITE_KEY=
 
@@ -47,16 +44,9 @@ REACT_SENTRY_DSN=
 # Sentry environment (default: staging)
 REACT_SENTRY_ENVIRONMENT=
 
-# Camera feed, still watching idle timeout (in seconds; default: 180)
-REACT_STILL_WATCHING_IDLE_TIMEOUT=
-
-# Camera feed, still watching prompt duration (in seconds; default: 30)
-REACT_STILL_WATCHING_PROMPT_DURATION=
-
 # Feature flags
 REACT_ENABLE_HCX=true
 REACT_ENABLE_ABDM=true
-REACT_WARTIME_SHIFTING=true
 
 # JWT token refresh interval (in milliseconds) (default: 5 minutes)
 REACT_JWT_TOKEN_REFRESH_INTERVAL=

diff --git a/care.config.ts b/care.config.ts
@@ -58,22 +58,8 @@ const careConfig = {
   gmapsApiKey:
     env.REACT_GMAPS_API_KEY || "AIzaSyDsBAc3y7deI5ZO3NtK5GuzKwtUzQNJNUk",
 
-  govDataApiKey:
-    env.REACT_GOV_DATA_API_KEY ||
-    "579b464db66ec23bdd000001cdd3946e44ce4aad7209ff7b23ac571b",
   reCaptchaSiteKey: env.REACT_RECAPTCHA_SITE_KEY,
 
-  wartimeShifting: boolean("REACT_WARTIME_SHIFTING"),
-
-  stillWatching: {
-    idleTimeout: env.REACT_STILL_WATCHING_IDLE_TIMEOUT
-      ? parseInt(env.REACT_STILL_WATCHING_IDLE_TIMEOUT)
-      : 3 * 60,
-    promptDuration: env.REACT_STILL_WATCHING_PROMPT_DURATION
-      ? parseInt(env.REACT_STILL_WATCHING_PROMPT_DURATION)
-      : 30,
-  },
-
   auth: {
     tokenRefreshInterval: env.REACT_JWT_TOKEN_REFRESH_INTERVAL
       ? parseInt(env.REACT_JWT_TOKEN_REFRESH_INTERVAL)

diff --git a/cypress/e2e/patient_spec/patient_creation.cy.ts b/cypress/e2e/patient_spec/patient_creation.cy.ts
@@ -106,7 +106,7 @@ describe("Patient Management", () => {
 
   patientTestCases.forEach(({ description, data }) => {
     it(`creates a new ${description} and verifies registration`, () => {
-      facilityCreation.selectFacility("GHC Trikaripur");
+      facilityCreation.selectFacility("GHC payyanur");
       patientCreation
         .clickSearchPatients()
         .clickCreateNewPatient()
@@ -134,7 +134,7 @@ describe("Patient Management", () => {
   });
 
   it("Search patient with phone number and create a new encounter", () => {
-    facilityCreation.selectFacility("GHC Trikaripur");
+    facilityCreation.selectFacility("GHC payyanur");
     patientCreation
       .clickSearchPatients()
       .searchPatient(TEST_PHONE)
@@ -167,7 +167,7 @@ describe("Patient Management", () => {
       address: generateAddress(true),
     };
 
-    facilityCreation.selectFacility("GHC Trikaripur");
+    facilityCreation.selectFacility("GHC payyanur");
     patientEncounter
       .navigateToEncounters()
       .openFirstEncounterDetails()

diff --git a/cypress/e2e/patient_spec/patient_details.cy.ts b/cypress/e2e/patient_spec/patient_details.cy.ts
@@ -15,7 +15,7 @@ describe("Patient Management", () => {
   it("Assign users to a patient", () => {
     const userName = "nihal-nurse";
     const userRole = "Nurse";
-    facilityCreation.selectFacility("GHC Trikaripur");
+    facilityCreation.selectFacility("GHC payyanur");
     patientEncounter
       .navigateToEncounters()
       .openFirstEncounterDetails()

diff --git a/cypress/e2e/patient_spec/patient_encounter.cy.ts b/cypress/e2e/patient_spec/patient_encounter.cy.ts
@@ -15,7 +15,7 @@ describe("Patient Encounter Questionnaire", () => {
       pco2: "120",
       po2: "80",
     };
-    facilityCreation.selectFacility("GHC Trikaripur");
+    facilityCreation.selectFacility("GHC payyanur");
 
     // Chain the methods instead of multiple separate calls
     patientEncounter

diff --git a/cypress/pageObject/Users/UserCreation.ts b/cypress/pageObject/Users/UserCreation.ts
@@ -72,7 +72,7 @@ export class UserCreation {
       { label: "Confirm Password", message: "Required" },
       {
         label: "Phone Number",
-        message: "Invalid input",
+        message: "This field is required",
       },
       { label: "State", message: "Required" },
     ]);

diff --git a/cypress/pageObject/facility/FacilityCreation.ts b/cypress/pageObject/facility/FacilityCreation.ts
@@ -94,7 +94,7 @@ export class FacilityCreation {
       { label: "Address", message: "Address is required" },
       {
         label: "Phone Number",
-        message: "Invalid input",
+        message: "This field is required",
       },
       { label: "Pincode", message: "Invalid Pincode" },
     ]);