Merge branch 'develop' into issues/9776-patient-files

.example.env

@@ -67,5 +67,8 @@ REACT_JWT_TOKEN_REFRESH_INTERVAL=
 # Minimum encounter date (default: 2020-01-01)
 REACT_MIN_ENCOUNTER_DATE=
 
+# Default Encounter Type (default: "hh" - Home Health)
+REACT_DEFAULT_ENCOUNTER_TYPE=
+
 # Available languages to switch between (2 Digit language code seperated by comas. See src->Locale->config.ts for available codes)
 REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"

.github/workflows/deploy.yaml

@@ -61,7 +61,7 @@ jobs:
 
   build:
     needs: test
-    if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/staging' || startsWith(github.event.ref, 'refs/tags/v')
+    if: github.ref == 'refs/heads/develop' || startsWith(github.event.ref, 'refs/tags/v')
     name: Build & Push to container registries
     runs-on: ubuntu-latest
     steps:
@@ -139,18 +139,3 @@ jobs:
         run: |
           echo "Release ${{ github.sha }} is ready to be deployed to production"
 
-  deploy-staging-gcp:
-    needs: build
-    if: github.ref == 'refs/heads/staging'
-    name: Deploy to staging GCP cluster
-    runs-on: ubuntu-latest
-    environment:
-      name: Staging-GCP
-      url: https://care-staging.ohc.network/
-    steps:
-      - name: Trigger deploy
-        run: |
-          COMMIT_SHA=${{ github.sha }}
-          JSON='{ "substitutions": { "care_be_tag":"", "care_fe_tag": "'"$COMMIT_SHA"'", "metabase_tag": "" } }'
-          curl --location "${{ secrets.STAGING_GCP_DEPLOY_URL }}" \
-            --header 'Content-Type: application/json' --data "$JSON"

care.config.ts

@@ -1,3 +1,5 @@
+import { EncounterClass } from "@/types/emr/encounter";
+
 const env = import.meta.env;
 
 interface ILogo {
@@ -48,6 +50,9 @@ const careConfig = {
     .split(",")
     .map((l) => l.trim()),
 
+  defaultEncounterType: (env.REACT_DEFAULT_ENCOUNTER_TYPE ||
+    "hh") as EncounterClass,
+
   gmapsApiKey:
     env.REACT_GMAPS_API_KEY || "AIzaSyDsBAc3y7deI5ZO3NtK5GuzKwtUzQNJNUk",
 

cypress/e2e/patient_spec/patient_search.cy.ts

@@ -17,7 +17,7 @@ describe("Patient Search", () => {
 
   it("search patient with phone number and verifies details", () => {
     patientSearch
-      .selectFacility("PHC Kakkanad -1")
+      .selectFacility("Arike")
       .clickSearchPatients()
       .searchPatient(TEST_PHONE)
       .verifySearchResults(PATIENT_DETAILS);

package.json

@@ -78,7 +78,7 @@
     "@radix-ui/react-tooltip": "^1.1.6",
     "@sentry/browser": "^8.47.0",
     "@tanstack/react-query": "^5.62.8",
-    "@tanstack/react-query-devtools": "^5.62.7",
+    "@tanstack/react-query-devtools": "^5.62.15",
     "@vitejs/plugin-react": "^4.3.4",
     "@yudiel/react-qr-scanner": "^2.1.0",
     "bowser": "^2.11.0",
@@ -97,10 +97,10 @@
     "events": "^3.3.0",
     "hi-profiles": "^1.1.0",
     "html2canvas": "^1.4.1",
-    "i18next": "^24.2.0",
+    "i18next": "^24.2.1",
     "i18next-browser-languagedetector": "^8.0.2",
     "i18next-http-backend": "^3.0.1",
-    "input-otp": "^1.4.1",
+    "input-otp": "^1.4.2",
     "lodash-es": "^4.17.21",
     "lucide-react": "^0.469.0",
     "markdown-it": "^14.1.0",

public/locale/en.json

@@ -53,6 +53,7 @@
   "ENCOUNTER_TAB__files": "Files",
   "ENCOUNTER_TAB__medicines": "Medicines",
   "ENCOUNTER_TAB__neurological_monitoring": "Neuro",
+  "ENCOUNTER_TAB__notes": "Notes",
   "ENCOUNTER_TAB__nursing": "Nursing",
   "ENCOUNTER_TAB__plots": "Plots",
   "ENCOUNTER_TAB__pressure_sore": "Pressure Sore",
@@ -125,8 +126,8 @@
   "NURSING_CARE_PROCEDURE__positioning": "Positioning",
   "NURSING_CARE_PROCEDURE__pre_enema": "P.R.E. Enema",
   "NURSING_CARE_PROCEDURE__restrain": "Restrain",
-  "NURSING_CARE_PROCEDURE__ryles_tube_care": "Ryle’s Tube Care",
-  "NURSING_CARE_PROCEDURE__ryles_tube_change": "Ryle’s Tube Change",
+  "NURSING_CARE_PROCEDURE__ryles_tube_care": "Ryle's Tube Care",
+  "NURSING_CARE_PROCEDURE__ryles_tube_change": "Ryle's Tube Change",
   "NURSING_CARE_PROCEDURE__skin_care": "Skin Care",
   "NURSING_CARE_PROCEDURE__stoma_care": "Stoma Care",
   "NURSING_CARE_PROCEDURE__suctioning": "Suctioning",
@@ -665,6 +666,7 @@
   "cylinders": "Cylinders",
   "cylinders_per_day": "Cylinders/day",
   "daily_rounds": "Daily Rounds",
+  "dashboard": "Dashboard",
   "date": "Date",
   "date_and_time": "Date and Time",
   "date_declared_positive": "Date of declaring positive",
@@ -740,6 +742,7 @@
   "domestic_international_travel": "Domestic/international Travel (within last 28 days)",
   "done": "Done",
   "dosage": "Dosage",
+  "dosage_instructions": "Dosage Instructions",
   "down": "Down",
   "download": "Download",
   "download_discharge_summary": "Download discharge summary",
@@ -833,6 +836,23 @@
   "encounter_discharge_disposition__snf": "Skilled nursing facility",
   "encounter_duration_confirmation": "The duration of this encounter would be",
   "encounter_id": "Encounter ID",
+  "encounter_notes__all_discussions": "All Discussions",
+  "encounter_notes__be_first_to_send": "Be the first to send a message",
+  "encounter_notes__choose_template": "Choose a template or enter a custom title",
+  "encounter_notes__create_discussion": "Create a new discussion thread to organize your conversation topics.",
+  "encounter_notes__discussions": "Discussions",
+  "encounter_notes__enter_discussion_title": "Enter discussion title...",
+  "encounter_notes__failed_create_thread": "Failed to create thread",
+  "encounter_notes__failed_send_message": "Failed to send message",
+  "encounter_notes__new": "New",
+  "encounter_notes__no_discussions": "No discussions yet",
+  "encounter_notes__select_create_thread": "Select or create a thread to start messaging",
+  "encounter_notes__start_conversation": "Start the Conversation",
+  "encounter_notes__start_new_discussion": "Start New Discussion",
+  "encounter_notes__thread_created": "Thread created successfully",
+  "encounter_notes__type_message": "Type your message...",
+  "encounter_notes__welcome": "Welcome to Discussions",
+  "encounter_notes__welcome_description": "Start a new discussion or select an existing thread to begin messaging",
   "encounter_priority__ASAP": "ASAP",
   "encounter_priority__as_needed": "As needed",
   "encounter_priority__asap": "ASAP",
@@ -1137,6 +1157,7 @@
   "log_report": "Log Report",
   "log_update": "Log Update",
   "log_updates": "Log Updates",
+  "logged_in_as": "Logged in as",
   "login": "Login",
   "logout": "Log Out",
   "longitude_invalid": "Longitude must be between -180 and 180",
@@ -1356,6 +1377,7 @@
   "patient_consultation__treatment__summary__spo2": "SpO2",
   "patient_consultation__treatment__summary__temperature": "Temperature",
   "patient_created": "Patient Created",
+  "patient_dashboard": "Patient Dashboard",
   "patient_details": "Patient Details",
   "patient_details_incomplete": "Patient Details Incomplete",
   "patient_face": "Patient Face",
@@ -1678,7 +1700,8 @@
   "show_default_presets": "Show Default Presets",
   "show_patient_presets": "Show Patient Presets",
   "show_unread_notifications": "Show Unread",
-  "sign_out": "Sign Out",
+  "sign_in": "Sign in",
+  "sign_out": "Sign out",
   "skill_add_error": "Error while adding skill",
   "skill_added_successfully": "Skill added successfully",
   "skills": "Skills",

src/App.tsx

@@ -45,7 +45,7 @@ const App = () => {
           <PluginEngine>
             <HistoryAPIProvider>
               <AuthUserProvider
-                unauthorized={<Routers.SessionRouter />}
+                unauthorized={<Routers.PublicRouter />}
                 otpAuthorized={<Routers.PatientRouter />}
               >
                 <FeatureFlagsProvider>