@kenyaemr/esm-care-panel-app 5.4.2 → 5.4.3-pre.2919

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false},{"name":"dispensing-patient-vitals","component":"dispensingPaentientVitals","slot":"dispensing-condition-and-diagnoses","order":1,"online":true,"offline":true},{"name":"patient-discharge-side-rail-icon","component":"patientDischargeSideRailIcon","slot":"action-menu-ward-patient-items-slot"}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"},{"name":"patient-care-discharge-workspace","title":"Patient Discharge","component":"patientDischargeWorkspace","type":"workspace","canMaximize":true,"canHide":true,"width":"extra-wide","groups":["ward-patient"]},{"name":"mch-program-form-workspace","component":"mchProgramForm","title":"Program Form","type":"workspace"},{"name":"kvp-peer-linkage-form-workspace","component":"kvpPeerLinkageForm","title":"Program Form","type":"workspace"}],"version":"5.4.2"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false},{"name":"dispensing-patient-vitals","component":"dispensingPaentientVitals","slot":"dispensing-condition-and-diagnoses","order":1,"online":true,"offline":true},{"name":"patient-discharge-side-rail-icon","component":"patientDischargeSideRailIcon","slot":"action-menu-ward-patient-items-slot"}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"},{"name":"patient-care-discharge-workspace","title":"Patient Discharge","component":"patientDischargeWorkspace","type":"workspace","canMaximize":true,"canHide":true,"width":"extra-wide","groups":["ward-patient"]},{"name":"mch-program-form-workspace","component":"mchProgramForm","title":"Program Form","type":"workspace"},{"name":"kvp-peer-linkage-form-workspace","component":"kvpPeerLinkageForm","title":"Program Form","type":"workspace"}],"version":"5.4.3-pre.2919"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-care-panel-app",
-  "version": "5.4.2",
+  "version": "5.4.3-pre.2919",
   "description": "Patient care panels microfrontend for the OpenMRS SPA",
   "keywords": [
     "openmrs"
@@ -47,5 +47,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "stableVersion": "5.4.2"
 }

package/src/care-programs/care-program.resource.ts

@@ -6,6 +6,7 @@ import {
   restBaseUrl,
   showModal,
   useConfig,
+  Visit,
 } from '@openmrs/esm-framework';
 import dayjs from 'dayjs';
 import useSWR, { mutate } from 'swr';
@@ -74,7 +75,9 @@ export const usePatientEnrolledPrograms = (patientUuid: string) => {
   const { data, error, isLoading, mutate } = useSWR<FetchResponse<{ results: Array<Enrollement> }>>(url, openmrsFetch);
   const enrollments = useMemo(() => {
     const allEnrollments = data?.data?.results ?? [];
-    return allEnrollments.filter((enrollment) => !excludedCarePrograms.includes(enrollment.program.uuid));
+    return allEnrollments.filter(
+      (enrollment) => !excludedCarePrograms.includes(enrollment.program.uuid) && !enrollment.dateCompleted,
+    );
   }, [data, excludedCarePrograms]);
   return {
     isLoading,
@@ -110,14 +113,23 @@ type FormEncounter = {
   };
 };
 
-export const usePatientFormEncounter = (patientUuid: string, formUuid: string) => {
+type UsePatientFormEncountersOptions = { scope: 'all-visits' } | { scope: 'current-visit'; currentVisit?: Visit };
+
+export const usePatientFormEncounter = (
+  patientUuid: string,
+  formUuid: string,
+  options: UsePatientFormEncountersOptions = { scope: 'all-visits' },
+) => {
   const url = `${restBaseUrl}/kenyaemr/encountersByPatientAndForm?patientUuid=${patientUuid}&formUuid=${formUuid}`;
   const { data, error, isLoading, mutate } = useSWR<FetchResponse<{ results: Array<FormEncounter> }>>(
-    url,
+    options?.scope === 'current-visit' ? null : url,
     openmrsFetch,
   );
-  return {
-    formEncounters: (data?.data?.results ?? [])
+  const formEncounters = useMemo(() => {
+    if (options.scope !== 'all-visits') {
+      return [];
+    }
+    return (data?.data?.results ?? [])
       .map((data) => ({
         ...data,
         encounter: {
@@ -125,7 +137,32 @@ export const usePatientFormEncounter = (patientUuid: string, formUuid: string) =
           encounterDatetime: parseDate(data.encounter.encounterDatetime),
         },
       }))
-      .sort((a, b) => dayjs(b.encounter.encounterDatetime).diff(dayjs(a.encounter.encounterDatetime))),
+      .sort((a, b) => dayjs(b.encounter.encounterDatetime).diff(dayjs(a.encounter.encounterDatetime)));
+  }, [data, options]);
+  const formEncountersInCurrentVisit = useMemo(() => {
+    if (options.scope !== 'current-visit') {
+      return [];
+    }
+    return (options.currentVisit?.encounters ?? [])
+      .filter((encounter) => encounter.form?.uuid === formUuid)
+      .map((encounter) => ({
+        encounter: {
+          encounterDatetime: parseDate(encounter.encounterDatetime),
+          uuid: encounter.uuid!,
+          id: encounter.id!,
+          encounterType: encounter.encounterType!.uuid,
+          dateCreated: encounter.dateCreated!,
+        },
+        form: {
+          uuid: encounter.form!.uuid,
+          name: encounter.form!.name,
+        },
+      }))
+      .sort((a, b) => dayjs(b.encounter.encounterDatetime).diff(dayjs(a.encounter.encounterDatetime)));
+  }, [options, formUuid]);
+
+  return {
+    formEncounters: options.scope === 'all-visits' ? formEncounters : formEncountersInCurrentVisit,
     error,
     isLoading,
     mutate,
@@ -133,23 +170,26 @@ export const usePatientFormEncounter = (patientUuid: string, formUuid: string) =
 };
 
 export const useFormsFilled = (patientUuid: string, formUuids: Array<string> = []) => {
-  const url = `${restBaseUrl}/kenyaemr/encountersByPatientAndForm?patientUuid=${patientUuid}&formUuid=${formUuids.join(
-    ',',
-  )}`;
-
-  const { data, error, mutate, isLoading } = useSWR(url, async (uri) => {
-    const tasks = await Promise.allSettled(
-      formUuids.map((formUuid) =>
-        openmrsFetch<{ results: Array<FormEncounter> }>(
-          `${restBaseUrl}/kenyaemr/encountersByPatientAndForm?patientUuid=${patientUuid}&formUuid=${formUuid}`,
+  const shouldFetch = patientUuid && formUuids.length > 0;
+
+  const { data, error, mutate, isLoading } = useSWR<boolean>(
+    shouldFetch ? ['forms-filled', patientUuid, formUuids] : null,
+    async () => {
+      const tasks = await Promise.allSettled(
+        formUuids.map((formUuid) =>
+          openmrsFetch<{ results: Array<FormEncounter> }>(
+            `${restBaseUrl}/kenyaemr/encountersByPatientAndForm?patientUuid=${patientUuid}&formUuid=${formUuid}`,
+          ),
         ),
-      ),
-    );
-    // Return true if all tasks are fullfilled and have related encounter (visit doesnt matter)
-    return tasks.every((task) => task.status === 'fulfilled' && task.value.data?.results?.length);
-  });
+      );
+
+      // true only if ALL forms have at least one encounter
+      return tasks.every((task) => task.status === 'fulfilled' && task.value.data?.results?.length > 0);
+    },
+  );
+
   return {
-    formsFilled: data,
+    formsFilled: data ?? false,
     isLoading,
     mutate,
     error,

package/src/care-programs/care-programs.component.tsx

@@ -93,7 +93,8 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
   const rows = useMemo(
     () => [
       ...enrollments.map((enrollment) => {
-        const forms = getProgramForms(enrollment.program.uuid).filter((form) => !form.isEnrollment);
+        const forms = getProgramForms(enrollment.program.uuid).filter((form) => !form.tags.includes('enrollment'));
+
         return {
           id: enrollment.program.uuid,
           programName: enrollment.program.name,

package/src/care-programs/program-form-overflow-menu-item.component.tsx

@@ -25,7 +25,10 @@ const ProgramFormOverflowMenuItem: FC<ProgramFormOverflowMenuItemProps> = ({
     error,
     isLoading,
     mutate: mutateFormEncounters,
-  } = usePatientFormEncounter(patientUuid, form.formUuId);
+  } = usePatientFormEncounter(patientUuid, form.formUuId, {
+    scope: form.tags.includes('bound-to-current-visit') ? 'current-visit' : 'all-visits',
+    currentVisit: currentVisit,
+  });
   const { hideFilledProgramForm, peerCalendarOutreactForm } = useConfig<CarePanelConfig>();
   const { t } = useTranslation();
   const {

package/src/care-programs/useCareProgramForms.ts

@@ -18,7 +18,7 @@ const useCareProgramForms = () => {
   const getProgramEnrollmentForm = useCallback(
     (programUuid: string) => {
       const forms = getProgramForms(programUuid);
-      return forms.find((form) => form.isEnrollment);
+      return forms.find((form) => form.tags.includes('enrollment'));
     },
     [getProgramForms],
   );