From 018fefabddbdb44851ea06b9cc413863bae5419f Mon Sep 17 00:00:00 2001
From: musa-mets <mwanjemusa@gmail.com>
Date: Tue, 21 Nov 2023 13:26:05 +0300
Subject: [PATCH] resolve backend dependence

---
 packages/esm-care-panel-app/README.md                     | 3 +--
 packages/esm-care-panel-app/src/hooks/useCarePrograms.tsx | 2 +-
 .../esm-care-panel-app/src/hooks/useEnrollmentHistory.ts  | 2 +-
 .../esm-care-panel-app/src/hooks/useNonStandardRegimen.ts | 2 +-
 .../esm-care-panel-app/src/hooks/usePatientSummary.ts     | 2 +-
 .../esm-care-panel-app/src/hooks/useProgramSummary.ts     | 2 +-
 .../esm-care-panel-app/src/hooks/useRegimenEncounter.ts   | 2 +-
 .../esm-care-panel-app/src/hooks/useRegimenHistory.ts     | 2 +-
 packages/esm-care-panel-app/src/hooks/useRegimenReason.ts | 2 +-
 .../esm-care-panel-app/src/hooks/useStandardRegimen.ts    | 2 +-
 packages/esm-care-panel-app/src/index.ts                  | 2 +-
 .../src/regimen-editor/delete-regimen-modal.component.tsx | 8 ++++----
 .../src/regimen-editor/regimen-form.component.tsx         | 8 ++++----
 packages/esm-care-panel-app/src/routes.json               | 4 ++--
 packages/esm-patient-queues-app/src/config-schema.ts      | 2 +-
 15 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/packages/esm-care-panel-app/README.md b/packages/esm-care-panel-app/README.md
index 321fbf1c..ee1fa12d 100644
--- a/packages/esm-care-panel-app/README.md
+++ b/packages/esm-care-panel-app/README.md
@@ -1,5 +1,4 @@
-![Node.js CI](https://github.com/palladiumkenya/kenyaemr-esm-3.x/workflows/Node.js%20CI/badge.svg)
 
 # ESM Care Panel App
 
-This repository provides a starting point for creating Kenyaemr patient care panels
+This repository provides a starting point for creating UgandaEMR patient care programs
diff --git a/packages/esm-care-panel-app/src/hooks/useCarePrograms.tsx b/packages/esm-care-panel-app/src/hooks/useCarePrograms.tsx
index 64ec847a..9e6fded9 100644
--- a/packages/esm-care-panel-app/src/hooks/useCarePrograms.tsx
+++ b/packages/esm-care-panel-app/src/hooks/useCarePrograms.tsx
@@ -11,7 +11,7 @@ export type PatientCarePrograms = {
 };
 
 export const useCarePrograms = (patientUuid: string) => {
-  const url = `/ws/rest/v1/kenyaemr/eligiblePrograms?patientUuid=${patientUuid}`;
+  const url = `/ws/rest/v1/eligiblePrograms?patientUuid=${patientUuid}`;
   const { data, error, isLoading, isValidating } = useSWR<{ data: Array<PatientCarePrograms> }>(url, openmrsFetch);
 
   return {
diff --git a/packages/esm-care-panel-app/src/hooks/useEnrollmentHistory.ts b/packages/esm-care-panel-app/src/hooks/useEnrollmentHistory.ts
index 297e9eb7..23a54bd0 100644
--- a/packages/esm-care-panel-app/src/hooks/useEnrollmentHistory.ts
+++ b/packages/esm-care-panel-app/src/hooks/useEnrollmentHistory.ts
@@ -3,7 +3,7 @@ import groupBy from 'lodash/groupBy';
 import { openmrsFetch } from '@openmrs/esm-framework';
 
 export const useEnrollmentHistory = (patientUuid: string) => {
-  const enrollmentHistoryUrl = `/ws/rest/v1/kenyaemr/patientHistoricalEnrollment?patientUuid=${patientUuid}`;
+  const enrollmentHistoryUrl = `/ws/rest/v1/patientHistoricalEnrollment?patientUuid=${patientUuid}`;
   const { data, isValidating, error, isLoading } = useSWR<{ data: Array<Record<string, any>> }>(
     enrollmentHistoryUrl,
     openmrsFetch,
diff --git a/packages/esm-care-panel-app/src/hooks/useNonStandardRegimen.ts b/packages/esm-care-panel-app/src/hooks/useNonStandardRegimen.ts
index a66a7559..f60c4a1b 100644
--- a/packages/esm-care-panel-app/src/hooks/useNonStandardRegimen.ts
+++ b/packages/esm-care-panel-app/src/hooks/useNonStandardRegimen.ts
@@ -7,7 +7,7 @@ interface nonStandardRegimen {
 }
 
 export const useNonStandardRegimen = () => {
-  const nonStandardRegimenUrl = `/ws/rest/v1/kenyaemr/arvDrugs`;
+  const nonStandardRegimenUrl = `/ws/rest/v1/arvDrugs`;
   const { data, mutate, error, isLoading } = useSWR<{ data: { results: Array<nonStandardRegimen> } }>(
     nonStandardRegimenUrl,
     openmrsFetch,
diff --git a/packages/esm-care-panel-app/src/hooks/usePatientSummary.ts b/packages/esm-care-panel-app/src/hooks/usePatientSummary.ts
index bc227bf1..b0fae26c 100644
--- a/packages/esm-care-panel-app/src/hooks/usePatientSummary.ts
+++ b/packages/esm-care-panel-app/src/hooks/usePatientSummary.ts
@@ -3,7 +3,7 @@ import useSWR from 'swr';
 import { PatientSummary } from '../types/index';
 
 export const usePatientSummary = (patientUuid: string) => {
-  const programSummaryUrl = `/ws/rest/v1/kenyaemr/patientSummary?patientUuid=${patientUuid}`;
+  const programSummaryUrl = `/ws/rest/v1/patientSummary?patientUuid=${patientUuid}`;
   const { data, mutate, error, isLoading } = useSWR<{ data: PatientSummary }>(programSummaryUrl, openmrsFetch);
 
   return {
diff --git a/packages/esm-care-panel-app/src/hooks/useProgramSummary.ts b/packages/esm-care-panel-app/src/hooks/useProgramSummary.ts
index ff43beb5..48e83455 100644
--- a/packages/esm-care-panel-app/src/hooks/useProgramSummary.ts
+++ b/packages/esm-care-panel-app/src/hooks/useProgramSummary.ts
@@ -3,7 +3,7 @@ import useSWR from 'swr';
 import { ProgramSummary } from '../types/index';
 
 export const useProgramSummary = (patientUuid: string) => {
-  const programSummaryUrl = `/ws/rest/v1/kenyaemr/currentProgramDetails?patientUuid=${patientUuid}`;
+  const programSummaryUrl = `/ws/rest/v1/currentProgramDetails?patientUuid=${patientUuid}`;
   const { data, mutate, error, isLoading } = useSWR<{ data: ProgramSummary }>(programSummaryUrl, openmrsFetch);
 
   return {
diff --git a/packages/esm-care-panel-app/src/hooks/useRegimenEncounter.ts b/packages/esm-care-panel-app/src/hooks/useRegimenEncounter.ts
index deb5857a..31eb0f2d 100644
--- a/packages/esm-care-panel-app/src/hooks/useRegimenEncounter.ts
+++ b/packages/esm-care-panel-app/src/hooks/useRegimenEncounter.ts
@@ -3,7 +3,7 @@ import useSWR from 'swr';
 import { RegimenEncounter } from '../types';
 
 export const useRegimenEncounter = (category: string, patientUuid: string) => {
-  const regimenEncounterUrl = `/ws/rest/v1/kenyaemr/lastRegimenEncounter?patientUuid=${patientUuid}&category=${category}`;
+  const regimenEncounterUrl = `/ws/rest/v1/lastRegimenEncounter?patientUuid=${patientUuid}&category=${category}`;
   const { data, mutate, error, isLoading } = useSWR<{ data: { results } }>(regimenEncounterUrl, openmrsFetch);
 
   const regimenEncounter = data?.data?.results ? data?.data?.results : '';
diff --git a/packages/esm-care-panel-app/src/hooks/useRegimenHistory.ts b/packages/esm-care-panel-app/src/hooks/useRegimenHistory.ts
index 426c01ae..e8fc1bb9 100644
--- a/packages/esm-care-panel-app/src/hooks/useRegimenHistory.ts
+++ b/packages/esm-care-panel-app/src/hooks/useRegimenHistory.ts
@@ -19,7 +19,7 @@ interface RegimenHistory {
 }
 
 export const useRegimenHistory = (patientUuid: string, category: string) => {
-  const regimenHistoryHistoryUrl = `/ws/rest/v1/kenyaemr/regimenHistory?patientUuid=${patientUuid}&category=${category}`;
+  const regimenHistoryHistoryUrl = `/ws/rest/v1/regimenHistory?patientUuid=${patientUuid}&category=${category}`;
   const { data, mutate, error, isLoading } = useSWR<{ data: { results: Array<RegimenHistory> } }>(
     regimenHistoryHistoryUrl,
     openmrsFetch,
diff --git a/packages/esm-care-panel-app/src/hooks/useRegimenReason.ts b/packages/esm-care-panel-app/src/hooks/useRegimenReason.ts
index f5e852a0..1645237c 100644
--- a/packages/esm-care-panel-app/src/hooks/useRegimenReason.ts
+++ b/packages/esm-care-panel-app/src/hooks/useRegimenReason.ts
@@ -11,7 +11,7 @@ interface Reason {
 }
 
 export const useRegimenReason = () => {
-  const regimenReasonUrl = `/ws/rest/v1/kenyaemr/regimenReason`;
+  const regimenReasonUrl = `/ws/rest/v1/regimenReason`;
   const { data, mutate, error, isLoading } = useSWR<{ data: { results: Array<RegimenReason> } }>(
     regimenReasonUrl,
     openmrsFetch,
diff --git a/packages/esm-care-panel-app/src/hooks/useStandardRegimen.ts b/packages/esm-care-panel-app/src/hooks/useStandardRegimen.ts
index 644dfe42..af10decb 100644
--- a/packages/esm-care-panel-app/src/hooks/useStandardRegimen.ts
+++ b/packages/esm-care-panel-app/src/hooks/useStandardRegimen.ts
@@ -18,7 +18,7 @@ interface Regimen {
 }
 
 export const useStandardRegimen = () => {
-  const standardRegimenUrl = `/ws/rest/v1/kenyaemr/standardRegimen`;
+  const standardRegimenUrl = `/ws/rest/v1/standardRegimen`;
   const { data, mutate, error, isLoading } = useSWR<{ data: { results: Array<StandardRegimen> } }>(
     standardRegimenUrl,
     openmrsFetch,
diff --git a/packages/esm-care-panel-app/src/index.ts b/packages/esm-care-panel-app/src/index.ts
index 09f218a4..6c6d6a77 100644
--- a/packages/esm-care-panel-app/src/index.ts
+++ b/packages/esm-care-panel-app/src/index.ts
@@ -3,7 +3,7 @@ import { configSchema } from './config-schema';
 import { dashboardMeta } from './dashboard.meta';
 import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
 
-const moduleName = '@kenyaemr/esm-care-panel-app';
+const moduleName = '@ugandaemr/esm-care-panel-app';
 
 const options = {
   featureName: 'patient-care-panels',
diff --git a/packages/esm-care-panel-app/src/regimen-editor/delete-regimen-modal.component.tsx b/packages/esm-care-panel-app/src/regimen-editor/delete-regimen-modal.component.tsx
index 58c4a410..89fd4f36 100644
--- a/packages/esm-care-panel-app/src/regimen-editor/delete-regimen-modal.component.tsx
+++ b/packages/esm-care-panel-app/src/regimen-editor/delete-regimen-modal.component.tsx
@@ -38,10 +38,10 @@ const DeleteRegimenModal: React.FC<DeleteRegimenModalProps> = ({
               description: t('regimenDeletedSuccessfully', 'Regimen successfully'),
               title: t('regimenDeleted', 'Regimen deleted'),
             });
-            mutate(`/ws/rest/v1/kenyaemr/regimenHistory?patientUuid=${patientUuid}&category=${category}`);
-            mutate(`/ws/rest/v1/kenyaemr/currentProgramDetails?patientUuid=${patientUuid}`);
-            mutate(`/ws/rest/v1/kenyaemr/patientSummary?patientUuid=${patientUuid}`);
-            mutate(`/ws/rest/v1/kenyaemr/lastRegimenEncounter?patientUuid=${patientUuid}&category=${category}`);
+            mutate(`/ws/rest/v1/regimenHistory?patientUuid=${patientUuid}&category=${category}`);
+            mutate(`/ws/rest/v1/currentProgramDetails?patientUuid=${patientUuid}`);
+            mutate(`/ws/rest/v1/patientSummary?patientUuid=${patientUuid}`);
+            mutate(`/ws/rest/v1/lastRegimenEncounter?patientUuid=${patientUuid}&category=${category}`);
             closeWorkspace?.();
           }
         })
diff --git a/packages/esm-care-panel-app/src/regimen-editor/regimen-form.component.tsx b/packages/esm-care-panel-app/src/regimen-editor/regimen-form.component.tsx
index bf2ada75..2c3b44f3 100644
--- a/packages/esm-care-panel-app/src/regimen-editor/regimen-form.component.tsx
+++ b/packages/esm-care-panel-app/src/regimen-editor/regimen-form.component.tsx
@@ -198,10 +198,10 @@ const RegimenForm: React.FC<RegimenFormProps> = ({
                 description: t('regimenUpdatedSuccessfully', `Regimen updated successfully.`),
               });
               setIsSubmitting(false);
-              mutate(`/ws/rest/v1/kenyaemr/currentProgramDetails?patientUuid=${patientUuid}`);
-              mutate(`/ws/rest/v1/kenyaemr/patientSummary?patientUuid=${patientUuid}`);
-              mutate(`/ws/rest/v1/kenyaemr/regimenHistory?patientUuid=${patientUuid}&category=${category}`);
-              mutate(`/ws/rest/v1/kenyaemr/lastRegimenEncounter?patientUuid=${patientUuid}&category=${category}`);
+              mutate(`/ws/rest/v1/currentProgramDetails?patientUuid=${patientUuid}`);
+              mutate(`/ws/rest/v1/patientSummary?patientUuid=${patientUuid}`);
+              mutate(`/ws/rest/v1/regimenHistory?patientUuid=${patientUuid}&category=${category}`);
+              mutate(`/ws/rest/v1/lastRegimenEncounter?patientUuid=${patientUuid}&category=${category}`);
 
               closeWorkspace();
             }
diff --git a/packages/esm-care-panel-app/src/routes.json b/packages/esm-care-panel-app/src/routes.json
index f16ae737..f59b2502 100644
--- a/packages/esm-care-panel-app/src/routes.json
+++ b/packages/esm-care-panel-app/src/routes.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
-    "kenyaemr": "^18.2.0"
+    "webservices.rest": "^2.24.0"
   },
   "pages": [],
   "extensions": [
@@ -41,4 +41,4 @@
       "component": "deleteRegimenConfirmationDialog"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/esm-patient-queues-app/src/config-schema.ts b/packages/esm-patient-queues-app/src/config-schema.ts
index e2f48954..638d8266 100644
--- a/packages/esm-patient-queues-app/src/config-schema.ts
+++ b/packages/esm-patient-queues-app/src/config-schema.ts
@@ -130,7 +130,7 @@ export const configSchema = {
   },
   defaultFacilityUrl: {
     _type: Type.String,
-    _default: '/ws/rest/v1/kenyaemr/default-facility',
+    _default: '/ws/rest/v1/default-facility',
     _description: 'Custom URL to load default facility if it is not in the session',
   },
   customPatientChartText: {