@kenyaemr/esm-patient-clinical-view-app 5.4.1-pre.2075 → 5.4.1-pre.2083

package/src/family-partner-history/family-history.component.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   DataTable,
@@ -38,12 +38,15 @@ interface FamilyHistoryProps {
 const FamilyHistory: React.FC<FamilyHistoryProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
   const config = useConfig<ConfigObject>();
-  const { concepts, familyRelationshipsTypeList } = config;
+  const { concepts } = config;
   const layout = useLayoutType();
   const [pageSize, setPageSize] = useState(10);
   const { relationships, error, isLoading, isValidating } = usePatientRelationships(patientUuid);
-
-  const familyRelationshipTypeUUIDs = new Set(familyRelationshipsTypeList.map((type) => type.uuid));
+  const familyRelationshipTypes = useMemo(
+    () => config.relationshipTypesList.filter((rl) => rl.category.some((c) => c === 'family')),
+    [config],
+  );
+  const familyRelationshipTypeUUIDs = new Set(familyRelationshipTypes.map((type) => type.uuid));
   const familyRelationships = relationships.filter((r) => familyRelationshipTypeUUIDs.has(r.relationshipTypeUUID));
 
   const headerTitle = t('familyContacts', 'Family contacts');

package/src/family-partner-history/family-relationship.workspace.tsx

@@ -1,7 +1,7 @@
 import { Button, ButtonSet, Column, ComboBox, DatePicker, DatePickerInput, Form, Stack, TextArea } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useConfig, useSession } from '@openmrs/esm-framework';
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Controller, FormProvider, SubmitHandler, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
@@ -36,8 +36,11 @@ const FamilyRelationshipForm: React.FC<RelationshipFormProps> = ({ closeWorkspac
   const { t } = useTranslation();
   const { data: mappedRelationshipTypes } = useMappedRelationshipTypes();
   const config = useConfig<ConfigObject>();
-  const { familyRelationshipsTypeList } = config;
-  const familyRelationshipTypesUUIDs = new Set(familyRelationshipsTypeList.map((r) => r.uuid));
+  const familyRelationships = useMemo(
+    () => config.relationshipTypesList.filter((rl) => rl.category.some((c) => c === 'family')),
+    [config],
+  );
+  const familyRelationshipTypesUUIDs = new Set(familyRelationships.map((r) => r.uuid));
   const familyRelationshipTypes = mappedRelationshipTypes.filter((type) => familyRelationshipTypesUUIDs.has(type.uuid));
   const session = useSession();
 

package/src/hooks/useContacts.ts

@@ -109,17 +109,21 @@ const useContacts = (patientUuid: string) => {
     url,
     openmrsFetch,
   );
+  const pnsRelationships = useMemo(
+    () => config.relationshipTypesList.filter((rl) => rl.category.some((c) => c === 'pns')),
+    [config],
+  );
   const relationships = useMemo(() => {
     return data?.data?.results?.length
       ? extractContactData(
           patientUuid,
           data?.data?.results.filter((rel) =>
-            config.pnsRelationships.some((famRel) => famRel.uuid === rel.relationshipType.uuid),
+            pnsRelationships.some((famRel) => famRel.uuid === rel.relationshipType.uuid),
           ),
           config,
         )
       : [];
-  }, [data?.data?.results, patientUuid, config]);
+  }, [data?.data?.results, patientUuid, config, pnsRelationships]);
   return {
     contacts: relationships,
     error,

package/src/hooks/useEncounters.ts

@@ -3,8 +3,14 @@ import useSWR from 'swr';
 import { Encounter } from '../types';
 import pickBy from 'lodash/pickBy';
 
-const useEncounters = (patientUuid: string, encounterTypeUuid: string, fromdate?: string, todate?: string) => {
-  const customeRepresntation = 'custom:(uuid,display,encounterDatetime,obs:(uuid,display,value:(uuid,display)))';
+const useEncounters = (
+  patientUuid: string,
+  encounterTypeUuid: string,
+  fromdate?: string,
+  todate?: string,
+  v?: string,
+) => {
+  const customeRepresntation = v ?? 'custom:(uuid,display,encounterDatetime,obs:(uuid,display,value:(uuid,display)))';
 
   const params = new URLSearchParams(
     pickBy(

package/src/other-relationships/other-relationships.component.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   DataTable,
@@ -39,11 +39,14 @@ export const OtherRelationships: React.FC<OtherRelationshipsProps> = ({ patientU
   const { t } = useTranslation();
   const config = useConfig<ConfigObject>();
   const layout = useLayoutType();
-  const { concepts, familyRelationshipsTypeList } = config;
+  const { concepts } = config;
   const [pageSize, setPageSize] = useState(10);
-
+  const familyRelationships = useMemo(
+    () => config.relationshipTypesList.filter((rl) => rl.category.some((c) => c === 'family')),
+    [config],
+  );
   const { relationships, error, isLoading, isValidating } = usePatientRelationships(patientUuid);
-  const familyRelationshipTypeUUIDs = new Set(familyRelationshipsTypeList.map((type) => type.uuid));
+  const familyRelationshipTypeUUIDs = new Set(familyRelationships.map((type) => type.uuid));
   const nonFamilyRelationships = relationships.filter((r) => !familyRelationshipTypeUUIDs.has(r.relationshipTypeUUID));
 
   const headerTitle = t('otherRelationships', 'Other Relationships');

package/src/other-relationships/other-relationships.workspace.tsx

@@ -1,7 +1,7 @@
 import { Button, ButtonSet, Column, ComboBox, DatePicker, DatePickerInput, Form, Stack, TextArea } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useConfig, useSession } from '@openmrs/esm-framework';
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Controller, FormProvider, SubmitHandler, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
@@ -36,8 +36,11 @@ export const OtherRelationshipsForm: React.FC<OtherRelationshipsFormProps> = ({
   const { t } = useTranslation();
   const { data: mappedRelationshipTypes } = useMappedRelationshipTypes();
   const config = useConfig<ConfigObject>();
-  const { familyRelationshipsTypeList } = config;
-  const familyRelationshipTypesUUIDs = new Set(familyRelationshipsTypeList.map((r) => r.uuid));
+  const familyRelationships = useMemo(
+    () => config.relationshipTypesList.filter((rl) => rl.category.some((c) => c === 'family')),
+    [config],
+  );
+  const familyRelationshipTypesUUIDs = new Set(familyRelationships.map((r) => r.uuid));
   const otherRelationshipTypes = mappedRelationshipTypes.filter((type) => !familyRelationshipTypesUUIDs.has(type.uuid));
   const session = useSession();
   const relationshipTypes = otherRelationshipTypes.map((relationship) => ({

package/src/peer-calendar/table/peer-calendar-actions.component.tsx

@@ -34,7 +34,7 @@ const PeerCalendarActions: React.FC<PeerCalendarActionsProps> = ({ peer: { patie
   const to = dayjs(firstDay).add(1, 'month').format('YYYY-MM-DD');
 
   const handleLauchPeerOutreachForm = (encounterUuid?: string) => {
-    launchWorkspace('peer-calendar-form', {
+    launchWorkspace('kenyaemr-cusom-form-entry-workspace', {
       formUuid,
       patientUuid,
       encounterUuid: encounterUuid ?? '',

package/src/routes.json

@@ -347,7 +347,7 @@
       "type": "form"
     },
     {
-      "name": "peer-calendar-form",
+      "name": "kenyaemr-cusom-form-entry-workspace",
       "component": "peerCalendarFormEntry",
       "title": "KVP Peer Educator Outreach Calendar",
       "type": "form",

package/translations/en.json

@@ -43,6 +43,7 @@
   "contactCreated": "Contact created",
   "contacted": "Contacted",
   "contactList": "Contact list",
+  "contactType": "Contact Type",
   "customViews": "In this section, you'll find custom clinical views tailored to patients' conditions and enrolled care programs.",
   "date": "Date",
   "dateDate": "Date & time",
@@ -65,6 +66,7 @@
   "editEncounter": "Edit",
   "editForm": "Edit Form",
   "editThisEncounter": "Edit this encounter",
+  "editTracing": "Edit tracing",
   "encounterDate": "Date",
   "encounterDeleted": "Encounter deleted",
   "encounterDetails": "Encounter details",
@@ -78,6 +80,7 @@
   "error": "Error",
   "errorFetchingbedInformation": "Error fetching bed information",
   "facility": "Facility",
+  "facilityLinkedTo": "Facility Linked To",
   "failedDeleting": "couldn't be deleted",
   "familyContacts": "Family contacts",
   "feedingOrders": "Feeding Orders",
@@ -148,6 +151,7 @@
   "primaryDiagnosis": "Primary Diagnosis",
   "priorityOfAdmission": "Priority Of Admission",
   "provider": "Provider",
+  "reasonNotContacted": "Reason Not Contacted",
   "recommendedProcedure": "Recommended Procedure",
   "recordLabourDetails": "Record labour details",
   "referrals": "Referrals",
@@ -155,6 +159,7 @@
   "relationshipConfirmationText": "This will end the relationship. Are you sure you want to proceed?",
   "relationshipError": "Relationship Error",
   "relationshipErrorMessage": "Request Failed",
+  "remarks": "Remarks",
   "reportingMonth": "Month",
   "reportingYear": "Year",
   "save": "Save",
@@ -163,6 +168,7 @@
   "smoking": "Smoking",
   "smokingDuration": "Smoking Duration",
   "socialHistory": "Social History",
+  "status": "Status",
   "statusAtDischarge": "Status at Discharge",
   "successfullyDeleted": "successfully deleted",
   "surgicalHistory": "Surgical History",
@@ -179,6 +185,8 @@
   "timeRecorded": "Time Recorded",
   "total": "Total",
   "totalPeers": "Total Peers",
+  "traceContact": "Trace Contact",
+  "traceHistory": "Trace History",
   "tracingNumber": "Tracing No.",
   "tracingType": "Tracing Type",
   "typeOfSurgery": "Type of Surgery",