[ENG-570] adds support for extending encounter/patient files tab via plug / remove drawings support.

package.json

@@ -56,7 +56,6 @@
   },
   "dependencies": {
     "@dmitryrechkin/json-schema-to-zod": "^1.0.1",
-    "@excalidraw/excalidraw": "^0.18.0-a18b139",
     "@fontsource/figtree": "^5.1.1",
     "@fontsource/libre-barcode-128-text": "^5.2.5",
     "@hookform/resolvers": "^5.0.1",

public/locale/en.json

@@ -69,7 +69,6 @@
   "ENCOUNTER_TAB__consents": "Consents",
   "ENCOUNTER_TAB__devices": "Devices",
   "ENCOUNTER_TAB__diagnostic_reports": "Diagnostic Reports",
-  "ENCOUNTER_TAB__drawings": "Drawings",
   "ENCOUNTER_TAB__feed": "Feed",
   "ENCOUNTER_TAB__files": "Files",
   "ENCOUNTER_TAB__medicines": "Medicines",
@@ -433,7 +432,6 @@
   "add_diagnosis_other": "Add another Diagnosis",
   "add_discount": "Add Discount",
   "add_dosage_step": "Add Dosage Step",
-  "add_drawings": "Add Drawings",
   "add_edit_interpretation": "Add/Edit Interpretation",
   "add_element": "Add element",
   "add_encounter": "Add Encounter",
@@ -1879,7 +1877,6 @@
   "disc": "Disc.",
   "discard": "Discard",
   "discard_and_switch": "Discard & Switch",
-  "discard_changes": "Discard Changes",
   "discard_damaged_item": "Discard Damaged Item",
   "discarding": "Discarding...",
   "discharge": "Discharge",
@@ -2043,7 +2040,6 @@
   "drag_drop_image_to_upload": "Drag & drop image to upload",
   "draw": "Draw",
   "drawing_saved_successfully": "Drawing saved successfully",
-  "drawings": "Drawings",
   "drop_file_here": "Drop file here",
   "drug": "Drug",
   "drug_chart": "Drug Chart",
@@ -2314,7 +2310,6 @@
   "enter_discharge_summary_advice": "Enter the discharge summary advice",
   "enter_display_name": "Enter display name",
   "enter_dosage_instructions": "Enter Dosage Instructions",
-  "enter_drawing_name": "Enter name for the drawing",
   "enter_facility_name": "Enter Facility Name",
   "enter_file_name": "Enter File Name",
   "enter_identifier": "Enter device identifier",
@@ -3690,7 +3685,6 @@
   "no_dispenses_found_description": "No medication dispenses has been made in this location! You'll see them here once dispensed.",
   "no_doctors_found": "No Doctors Found",
   "no_dosage_instrctions_available": "No dosage instructions available",
-  "no_drawings_so_far": "No drawings so far",
   "no_duplicate_facility": "You should not create duplicate facilities",
   "no_duration_found": "Type a number for suggestions",
   "no_encounter_associated": "No encounter associated",
@@ -5129,7 +5123,6 @@
   "save_and_complete": "Save & Complete",
   "save_and_continue": "Save and Continue",
   "save_and_exit": "Save & Exit",
-  "save_and_go_back": "Save & Go Back",
   "save_as_draft": "Save as Draft",
   "save_as_received": "Save as Received",
   "save_as_template": "Save as Template",
@@ -5237,7 +5230,6 @@
   "search_departments_and_practitioners": "Search departments and practitioners",
   "search_departments_placeholder": "Search departments...",
   "search_devices": "Search devices...",
-  "search_drawings": "Search drawings...",
   "search_encounter_command": "Type a command or search",
   "search_encounters": "Search Encounters",
   "search_existing_consent": "Search existing consent",
@@ -6631,10 +6623,17 @@
   "yesterday": "Yesterday",
   "yet_to_be_decided": "Yet to be decided",
   "you_cannot_change_once_submitted": "You cannot change once submitted.",
-  "you_have_unsaved_changes_what_would_you_like_to_do": "You have unsaved changes. What would you like to do?",
   "you_need_at_least_a_location_to_create_an_assest": "You need at least a location to create an assest.",
   "your_request_order_list": "Your Request Order List",
   "zoom_in": "Zoom In",
   "zoom_out": "Zoom Out",
-  "℞": "℞"
+  "℞": "℞",
+  "drawings": "Drawings",
+  "saved": "Saved",
+  "you_have_unsaved_changes_what_would_you_like_to_do": "You have unsaved changes. What would you like to do?",
+  "discard_changes": "Discard Changes",
+  "save_and_go_back": "Save & Go Back",
+  "enter_drawing_name": "Enter name for the drawing",
+  "no_drawings_so_far": "No drawings so far",
+  "unsupported_drawing_application": "Application '{{ application }}' is not supported"
 }

public/locale/ml.json

@@ -2688,11 +2688,9 @@
   "yesterday": "ഇന്നലെ/കഴിഞ്ഞ ദിവസം",
   "2FA_backup_code": "2FA ബാക്കപ്പ് കോഡ്",
   "ENCOUNTER_TAB__devices": "ഉപകരണങ്ങൾ",
-  "ENCOUNTER_TAB__drawings": "രേഖാചിത്രങ്ങൾ",
   "SYSTEM__govt_org_type__district_panchayat": "ജില്ലാ പഞ്ചായത്ത്",
   "add_another": "മറ്റൊന്ന് ചേർക്കുക",
   "add_condition": "കണ്ടീഷനനുസരിച്  ചേർക്കുക",
-  "add_drawings": "രേഖാചിത്രങ്ങൾ ചേർക്കുക",
   "add_option": "ഓപ്ഷൻ ചേർക്കുക",
   "add_question": "ചോദ്യം ചേർക്കുക",
   "add_sub_question": "ഉപചോദ്യം ചേർക്കുക",
@@ -2747,19 +2745,16 @@
   "device_location_history": "ഉപകരണ സ്ഥാനം ചരിത്രം",
   "disable_2fa_confirmation": "2FA അപ്രാപ്തമാക്കുന്നത് നിങ്ങളുടെ അക്കൗണ്ടിലേക്ക് അനധികൃതമായ പ്രവേശനം തടയാൻ സഹായിക്കുന്ന അധിക സുരക്ഷാ പാളി നീക്കം ചെയ്യും.",
   "disable_two_factor_authentication": "രണ്ടാം ഘട്ട ഓതന്റിക്കേഷൻ അപ്രാപ്തമാക്കുക",
-  "discard_changes": "മാറ്റങ്ങൾ ഉപേക്ഷിക്കുക",
   "dont_share_code": "ഈ സ്ഥിരീകരണ കോഡ് മറ്റാർക്കും പങ്കുവെക്കരുത്!",
   "draw": "ചിത്രീകരിക്കുക",
   "drawing_saved_successfully": "ചിത്രം വിജയകരമായി സംരക്ഷിച്ചു",
-  "drawings": "ചിത്രങ്ങൾ",
   "duplicate_contact_values_not_allowed": "വ്യത്യസ്ത കോൺടാക്റ്റ് തരം കൂടിയുള്ള ഡുപ്ലിക്കേറ്റ് കോൺടാക്റ്റ് മൂല്യങ്ങൾ അനുവദിക്കില്ല",
   "edit_bed_names": "{{count}} കിടക്ക പേരു തിരുത്തുക",
   "edit_form": "ഫോം തിരുത്തുക",
   "empty_drawing": "ശൂന്യമായ ചിത്രം",
   "encounter_locations": "എൻകൗണ്ടർ സ്ഥലങ്ങൾ",
   "enter_2fa_code": "നിങ്ങളുടെ 2FA ആപ്പ് ജനറേറ്റ് ചെയ്ത കോഡ് നൽകുക",
   "enter_address": "സമ്പൂർണ്ണ വിലാസം നൽകുക",
-  "enter_drawing_name": "ചിത്രത്തിന് പേരു നൽകുക",
   "enter_facility_name": "സൗകര്യത്തിന്റെ പേര് നൽകുക",
   "enter_latitude": "അക്ഷാംശം നൽകുക",
   "enter_longitude": "രേഖാംശം നൽകുക",
@@ -2788,7 +2783,6 @@
   "no_child_locations": "ചിലിടങ്ങൾ ഇല്ല",
   "no_contact_points_added": "കോൺടാക്റ്റ് പോയിന്റുകൾ ചേർത്തിട്ടില്ല",
   "no_description": "വിവരണം ഇല്ല",
-  "no_drawings_so_far": "ഇതുവരെ ചിത്രങ്ങൾ ഇല്ല",
   "no_locations": "സ്ഥലങ്ങൾ ഇല്ല",
   "no_requested_questionnaires_found": "അഭ്യർഥിച്ച പ്രശ്നാവലി കണ്ടെത്താനായില്ല.",
   "no_valuesets_found": "വാല്യൂസെറ്റുകൾ കണ്ടെത്താനായില്ല",
@@ -2821,10 +2815,8 @@
   "repeatable": "പുനരാവൃതമായത്",
   "resend_otp_timer": "{{time}} സെക്കൻഡിനുള്ളിൽ OTP വീണ്ടും അയയ്ക്കുക",
   "reset_to_default": "ഡീഫാൾട്ടിലേക്ക് റീസെറ്റ് ചെയ്യുക",
-  "save_and_go_back": "സേവ് ചെയ്ത് തിരികെ പോവുക",
   "scan_qr": "QR കോഡ് സ്കാൻ ചെയ്യുക",
   "scroll_to_question": "ചോദ്യത്തിലേക്ക് സ്ക്രോൾ ചെയ്യുക",
-  "search_drawings": "ചിത്രങ്ങൾ തിരയുക...",
   "search_for_location": "ഒരു സ്ഥലത്തിനായി തിരയുക",
   "search_locations": "സ്ഥലങ്ങൾ തിരയുക",
   "search_valuesets": "വാല്യൂസെറ്റുകൾ തിരയുക",
@@ -2864,6 +2856,5 @@
   "verify_code": "കോഡ് സ്ഥിരീകരിക്കുക",
   "verifying": "സ്ഥിരീകരിക്കുന്നു",
   "view_associated_encounter": "ബന്ധിച്ച എൻകൗണ്ടർ കാണുക",
-  "view_facility_details": "സൗകര്യ വിശദാംശങ്ങൾ കാണുക",
-  "you_have_unsaved_changes_what_would_you_like_to_do": "നിങ്ങൾ സംരക്ഷിക്കാത്ത മാറ്റങ്ങൾ ഉണ്ട്. എന്ത് ചെയ്യാൻ ആഗ്രഹിക്കുന്നു?"
+  "view_facility_details": "സൗകര്യ വിശദാംശങ്ങൾ കാണുക"
 }

src/Routers/routes/ConsultationRoutes.tsx

@@ -1,22 +1,16 @@
-import { Suspense, lazy } from "react";
-
-import Loading from "@/components/Common/Loading";
 import { PrintAllQuestionnaireResponses } from "@/components/Facility/ConsultationDetails/PrintAllQuestionnaireResponses";
 import { PrintQuestionnaireResponse } from "@/components/Facility/ConsultationDetails/PrintQuestionnaireResponse";
 import QuestionnaireResponseView from "@/components/Facility/ConsultationDetails/QuestionnaireResponseView";
 import { PrintMedicationAdministration } from "@/components/Medicine/MedicationAdministration/PrintMedicationAdministration";
 import EncounterQuestionnaire from "@/components/Patient/EncounterQuestionnaire";
 
 import { AppRoutes } from "@/Routers/AppRouter";
+import { DrawingEditor } from "@/components/Files/Drawings/DrawingEditor";
 import { EncounterShow } from "@/pages/Encounters/EncounterShow";
 import { PrintPrescription } from "@/pages/Encounters/PrintPrescription";
 import ReportViewer from "@/pages/Encounters/ReportViewer";
 import { EncounterProvider } from "@/pages/Encounters/utils/EncounterProvider";
 
-const ExcalidrawEditor = lazy(
-  () => import("@/components/Common/Drawings/ExcalidrawEditor"),
-);
-
 const consultationRoutes: AppRoutes = {
   "/facility/:facilityId/patient/:patientId/prescription/:prescriptionId/print":
     ({ facilityId, patientId, prescriptionId }) => (
@@ -106,26 +100,8 @@ const consultationRoutes: AppRoutes = {
         subjectType="encounter"
       />
     ),
-  "/facility/:facilityId/patient/:patientId/encounter/:encounterId/drawings/new":
-    ({ encounterId }) => (
-      <Suspense fallback={<Loading />}>
-        <ExcalidrawEditor
-          associatingId={encounterId}
-          associating_type="encounter"
-        />
-      </Suspense>
-    ),
-
-  "/facility/:facilityId/patient/:patientId/encounter/:encounterId/drawings/:drawingId":
-    ({ encounterId, drawingId }) => (
-      <Suspense fallback={<Loading />}>
-        <ExcalidrawEditor
-          associatingId={encounterId}
-          associating_type="encounter"
-          drawingId={drawingId}
-        />
-      </Suspense>
-    ),
+  "/facility/:facilityId/patient/:patientId/encounter/:encounterId/drawings/:id":
+    ({ id }) => <DrawingEditor id={id} />,
 
   "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire/:slug":
     ({ facilityId, encounterId, slug, patientId }) => (

src/Routers/routes/PatientRoutes.tsx

@@ -1,12 +1,11 @@
 import { Redirect } from "raviger";
-import { Suspense, lazy } from "react";
 
-import Loading from "@/components/Common/Loading";
 import { patientTabs } from "@/components/Patient/PatientDetailsTab";
 import PatientIndex from "@/components/Patient/PatientIndex";
 import { PatientProfile } from "@/components/Patient/PatientProfile";
 
 import { AppRoutes } from "@/Routers/AppRouter";
+import { DrawingEditor } from "@/components/Files/Drawings/DrawingEditor";
 import { PatientRegistration } from "@/components/Patient/PatientRegistration";
 import { ConsentDetailPage } from "@/pages/Encounters/ConsentDetail";
 import EncountersOverview from "@/pages/Encounters/EncountersOverview";
@@ -15,10 +14,6 @@ import ClinicalHistoryPage from "@/pages/Patient/History";
 import PatientHome from "@/pages/Patient/PatientHome";
 import careConfig from "@careConfig";
 
-const ExcalidrawEditor = lazy(
-  () => import("@/components/Common/Drawings/ExcalidrawEditor"),
-);
-
 const PatientRoutes: AppRoutes = {
   "/facility/:facilityId/patients": ({ facilityId }) => (
     <PatientIndex facilityId={facilityId} />
@@ -103,48 +98,10 @@ const PatientRoutes: AppRoutes = {
   "/facility/:facilityId/patient/:id/update": ({ id }) => (
     <PatientRegistration patientId={id} />
   ),
-  "/facility/:facilityId/patient/:patientId/drawings/new": ({ patientId }) => {
-    return (
-      <Suspense fallback={<Loading />}>
-        <ExcalidrawEditor
-          associatingId={patientId}
-          associating_type="patient"
-        />
-      </Suspense>
-    );
-  },
-  "/facility/:facilityId/patient/:patientId/drawings/:drawingId": ({
-    patientId,
-    drawingId,
-  }) => (
-    <Suspense fallback={<Loading />}>
-      <ExcalidrawEditor
-        associatingId={patientId}
-        associating_type="patient"
-        drawingId={drawingId}
-      />
-    </Suspense>
-  ),
-
-  "/patient/:patientId/drawings/new": ({ patientId }) => {
-    return (
-      <Suspense fallback={<Loading />}>
-        <ExcalidrawEditor
-          associatingId={patientId}
-          associating_type="patient"
-        />
-      </Suspense>
-    );
-  },
-  "/patient/:patientId/drawings/:drawingId": ({ patientId, drawingId }) => (
-    <Suspense fallback={<Loading />}>
-      <ExcalidrawEditor
-        associatingId={patientId}
-        associating_type="patient"
-        drawingId={drawingId}
-      />
-    </Suspense>
+  "/facility/:facilityId/patient/:patientId/drawings/:id": ({ id }) => (
+    <DrawingEditor id={id} />
   ),
+  "/patient/:patientId/drawings/:id": ({ id }) => <DrawingEditor id={id} />,
   "/facility/:facilityId/patient/:patientId/history/:tab": ({
     facilityId,
     patientId,