Merge branch 'develop' into issues/ohcnetwork#9788/Alignment-of-plots…

…-and-overflowing

.env

@@ -15,5 +15,3 @@ CARE_CDN_URL="https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3
 REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"
 
 REACT_ENABLED_APPS=""
-
-REACT_KERALA_GEO_ID=b04b9efa-5972-419a-892d-26169c1eac8a

.example.env

@@ -10,12 +10,6 @@ REACT_GITHUB_URL=
 # OHCN URL (default: https://ohc.network?ref=care)
 REACT_OHCN_URL=
 
-# Plausible site domain (default: care.ohc.network)
-REACT_PLAUSIBLE_SITE_DOMAIN=
-
-# Plausible server URL (default: https://plausible.ohc.network)
-REACT_PLAUSIBLE_SERVER_URL=
-
 # Care Apps. repo@branch seperated by commas
 REACT_ENABLED_APPS="ohcnetwork/care_livekit_fe@main,ohcnetwork/care_scribe"
 
@@ -73,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",
 
@@ -82,12 +87,6 @@ const careConfig = {
   minEncounterDate: new Date(env.REACT_MIN_ENCOUNTER_DATE || "2020-01-01"),
 
   // Plugins related configs...
-
-  plausible: {
-    server: env.REACT_PLAUSIBLE_SERVER_URL || "https://plausible.ohc.network",
-    domain: env.REACT_PLAUSIBLE_SITE_DOMAIN || "care.ohc.network",
-  },
-
   sentry: {
     dsn:
       env.REACT_SENTRY_DSN ||
@@ -120,7 +119,6 @@ const careConfig = {
 
   plotsConfigUrl:
     env.REACT_OBSERVATION_PLOTS_CONFIG_URL || "/config/plots.json",
-  keralaGeoId: env.REACT_KERALA_GEO_ID || "",
 } as const;
 
 export default careConfig;

index.html

@@ -76,12 +76,5 @@
       </div>
     </div>
     <script type="module" src="/src/index.tsx"></script>
-    <script nonce="f51b9742">
-      window.plausible =
-        window.plausible ||
-        function () {
-          (window.plausible.q = window.plausible.q || []).push(arguments);
-        };
-    </script>
   </body>
 </html>

netlify.toml

@@ -19,9 +19,7 @@ X-Frame-Options = "DENY"
 X-Content-Type-Options = "nosniff"
 Content-Security-Policy-Report-Only = '''
       default-src 'self';
-      script-src 'self' 'nonce-f51b9742' https://plausible.ohc.network;
       style-src 'self' 'unsafe-inline';
-      connect-src 'self' https://plausible.ohc.network;
       img-src 'self' https://cdn.ohc.network https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
       object-src 'self' https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
       report-uri https://csp-logger.ohc.network/

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",

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",
@@ -224,6 +225,19 @@
   "SPO2_LEVEL_MODERATE_HYPOXEMIA": "Moderate Hypoxemia",
   "SPO2_LEVEL_NORMAL": "Normal",
   "SPO2_LEVEL_SEVERE_HYPOXEMIA": "Severe Hypoxemia",
+  "SYSTEM__govt_org_type__block_panchayat": "Block Panchayat",
+  "SYSTEM__govt_org_type__corporation": "Corporation",
+  "SYSTEM__govt_org_type__default": "State",
+  "SYSTEM__govt_org_type__district": "District",
+  "SYSTEM__govt_org_type__grama_panchayat": "Grama Panchayat",
+  "SYSTEM__govt_org_type__local_body": "Local Body",
+  "SYSTEM__govt_org_type__municipality": "Municipality",
+  "SYSTEM__govt_org_type__state": "State",
+  "SYSTEM__govt_org_type__ward": "Ward",
+  "SYSTEM__org_type__default": "Organization",
+  "SYSTEM__org_type__govt": "Government",
+  "SYSTEM__org_type__role": "Role",
+  "SYSTEM__org_type__team": "Team",
   "Submit": "Submit",
   "TELEMEDICINE": "Telemedicine",
   "TRANSPORTATION TO BE ARRANGED": "Transportation",
@@ -315,6 +329,7 @@
   "add_new_patient": "Add New Patient",
   "add_new_user": "Add New User",
   "add_notes": "Add notes",
+  "add_patient_updates": "Add Patient Updates",
   "add_policy": "Add Insurance Policy",
   "add_prescription_medication": "Add Prescription Medication",
   "add_prescription_to_consultation_note": "Add a new prescription to this consultation.",
@@ -376,6 +391,7 @@
   "are_you_still_watching": "Are you still watching?",
   "are_you_sure_want_to_delete": "Are you sure you want to delete {{name}}?",
   "are_you_sure_want_to_delete_this_record": "Are you sure want to delete this record?",
+  "are_you_sure_want_to_remove": "Are you sure you want to remove {{name}} from the patient? This action cannot be undone",
   "ari": "ARI - Acute Respiratory illness",
   "arrived": "Arrived",
   "asset_class": "Asset Class",
@@ -388,7 +404,10 @@
   "assign": "Assign",
   "assign_a_volunteer_to": "Assign a volunteer to {{name}}",
   "assign_bed": "Assign Bed",
+  "assign_to_patient": "Assign to Patient",
   "assign_to_volunteer": "Assign to a Volunteer",
+  "assign_user": "Assign User",
+  "assign_user_to_patient": "Assign User to Patient",
   "assigned_doctor": "Assigned Doctor",
   "assigned_facility": "Facility assigned",
   "assigned_to": "Assigned to",
@@ -641,6 +660,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",
@@ -808,6 +828,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",
@@ -887,9 +924,10 @@
   "facility_linked_success": "Facility linked successfully",
   "facility_name": "Facility Name",
   "facility_not_found": "Facility Not Found",
+  "facility_organizations": "Facility Organizations",
   "facility_preference": "Facility preference",
   "facility_search_placeholder": "Search by Facility / District Name",
-  "facility_search_placeholder_pincode": "Search by Facility / District / Pincode",
+  "facility_search_placeholder_text": "Search by Facility name",
   "facility_type": "Facility Type",
   "failed_to_create_appointment": "Failed to create an appointment",
   "failed_to_link_abha_number": "Failed to link ABHA Number. Please try again later.",
@@ -1110,6 +1148,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",
@@ -1239,6 +1278,7 @@
   "no_staff": "No staff found",
   "no_tests_taken": "No tests taken",
   "no_treating_physicians_available": "This facility does not have any home facility doctors. Please contact your admin.",
+  "no_user_assigned": "No User Assigned to this patient",
   "no_users_found": "No Users Found",
   "no_vitals_present": "No Vitals Monitor present in this location or facility",
   "none": "None",
@@ -1277,7 +1317,11 @@
   "oral_issue_for_non_oral_nutrition_route_error": "Can be specified only if nutrition route is set to Oral",
   "ordering": "Ordering",
   "organization": "Organization",
+  "organization_access_help": "Organizations help you manage facilities, users, and resources efficiently. Contact your administrator to get access.",
   "organization_for_care_support": "Organization for Care Support",
+  "organization_forbidden": "You don't have access to any organizations yet.",
+  "organization_not_found": "No Organizations Found",
+  "organizations": "Organizations",
   "origin_facility": "Current facility",
   "other_details": "Other details",
   "otp_verification_error": "Failed to verify OTP. Please try again later.",
@@ -1322,6 +1366,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",
@@ -1448,6 +1493,9 @@
   "quantity_approved": "Quantity Approved",
   "quantity_requested": "Quantity Requested",
   "quantity_required": "Quantity Required",
+  "questionnaire": "Questionnaire",
+  "questionnaire_error_loading": "Error loading questionnaire",
+  "questionnaire_not_exist": "The questionnaire you tried to access does not exist.",
   "raise_consent_request": "Raise a consent request to fetch patient records over ABDM",
   "ration_card__APL": "APL",
   "ration_card__BPL": "BPL",
@@ -1482,6 +1530,7 @@
   "rejected": "Rejected",
   "reload": "Reload",
   "remove": "Remove",
+  "remove_user": "Remove User",
   "rename": "Rename",
   "replace_home_facility": "Replace Home Facility",
   "replace_home_facility_confirm": "Are you sure you want to replace",
@@ -1570,6 +1619,8 @@
   "search_medication": "Search Medication",
   "search_patients": "Search Patients",
   "search_resource": "Search Resource",
+  "search_user": "Search User",
+  "search_user_description": "Search for a user and assign a role to add them to the patient.",
   "searching": "Searching...",
   "see_attachments": "See Attachments",
   "select": "Select",
@@ -1588,6 +1639,7 @@
   "select_policy_to_add_items": "Select a Policy to Add Items",
   "select_practitioner": "Select Practicioner",
   "select_register_patient": "Select/Register Patient",
+  "select_role": "Select Role",
   "select_seven_day_period": "Select a seven day period",
   "select_skills": "Select and add some skills",
   "select_time": "Select time",
@@ -1631,7 +1683,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>
@@ -55,7 +55,6 @@ const App = () => {
 
               {/* Integrations */}
               <Integrations.Sentry disabled={!import.meta.env.PROD} />
-              <Integrations.Plausible />
             </HistoryAPIProvider>
             <Sonner
               position="top-right"