@openmrs/esm-generic-patient-widgets-app 11.3.1-patch.9064 → 11.3.1-patch.9310

package/src/resources/useObs.ts

@@ -2,11 +2,15 @@ import useSWR from 'swr';
 import { openmrsFetch, fhirBaseUrl, useConfig } from '@openmrs/esm-framework';
 import { type ConfigObjectSwitchable } from '../config-schema-obs-switchable';
 import { type ConfigObjectHorizontal } from '../config-schema-obs-horizontal';
+import { useConcepts } from './useConcepts';
 
 type CommonConfig = ConfigObjectSwitchable | ConfigObjectHorizontal;
 
 export interface UseObsResult {
-  data: Array<ObsResult>;
+  data: {
+    observations: Array<ObsResult>;
+    concepts: Array<{ uuid: string; display: string }>;
+  };
   error: Error;
   isLoading: boolean;
   isValidating: boolean;
@@ -27,10 +31,16 @@ export type ObsResult = fhir.Observation & {
 
 export const pageSize = 100;
 
-export function useObs(patientUuid: string, includeEncounters: boolean = false): UseObsResult {
+/**
+ * Fetches the observations for the concepts in the config for this widget.
+ * For any concept that has neither label nor obs, the concept is fetched to
+ * get the label.
+ */
+export function useObs(patientUuid: string): UseObsResult {
   const { encounterTypes, data, showEncounterType } = useConfig<CommonConfig>();
   const urlEncounterTypes: string = encounterTypes.length ? `&encounter.type=${encounterTypes.toString()}` : '';
 
+  // TODO: Make sorting respect oldestFirst/graphOldestFirst
   let url = `${fhirBaseUrl}/Observation?subject:Patient=${patientUuid}&code=${data
     .map((d) => d.concept)
     .join(',')}&_summary=data&_sort=-date&_count=${pageSize}${urlEncounterTypes}`;
@@ -41,11 +51,28 @@ export function useObs(patientUuid: string, includeEncounters: boolean = false):
 
   const { data: result, error, isLoading, isValidating } = useSWR<{ data: fhir.Bundle }, Error>(url, openmrsFetch);
 
+  const obsForConcept = Object.fromEntries(
+    data.map((d) => [
+      d.concept,
+      result?.data?.entry?.find((e) => (e.resource as fhir.Observation).code.coding.find((c) => d.concept === c.code)),
+    ]),
+  );
+
+  const conceptsNeedingLabel = data.filter((d) => result && !d.label && !obsForConcept[d.concept]);
+
+  const { concepts: conceptsForLabels } = useConcepts(conceptsNeedingLabel.map((d) => d.concept));
+  const concepts = data.map((d) => ({
+    uuid: d.concept,
+    display:
+      d.label ||
+      obsForConcept[d.concept]?.resource?.code?.text ||
+      conceptsForLabels.find((c) => c.uuid === d.concept)?.display,
+  }));
+
   const encounters = showEncounterType ? getEncountersByResources(result?.data?.entry) : [];
   const observations = filterAndMapObservations(result?.data?.entry, encounters);
-
   return {
-    data: observations,
+    data: { observations, concepts },
     error: error,
     isLoading,
     isValidating,

package/translations/am.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/ar.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "التاريخ والوقت",
   "encounterType": "نوع اللقاء"
 }

package/translations/ar_SY.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/bn.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/de.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/en.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/en_US.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/es.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Fecha y hora",
   "encounterType": "Tipo de encuentro"
 }

package/translations/es_MX.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/fr.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date et heure",
   "encounterType": "Type de consultation"
 }

package/translations/he.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "תאריך ושעה",
   "encounterType": "סוג הביקור"
 }

package/translations/hi.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/hi_IN.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/id.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Tanggal dan waktu",
   "encounterType": "Jenis pertemuan"
 }

package/translations/it.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Data e ora",
   "encounterType": "Tipo di incontro"
 }

package/translations/ka.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "თარიღი და დრო",
   "encounterType": "კონსულტაციის ტიპი"
 }

package/translations/km.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "កាលបរិច្ឆេទ និងម៉ោង",
   "encounterType": "ប្រភេទនៃការជួបប្រទះ"
 }

package/translations/ku.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/ky.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/lg.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/ne.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/pl.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/pt.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Data e hora",
   "encounterType": "Tipo de consulta"
 }

package/translations/pt_BR.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Data e hora",
   "encounterType": "Tipo de encontro"
 }

package/translations/qu.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/ro_RO.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Data si ora",
   "encounterType": "Tip intalnire"
 }

package/translations/ru_RU.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/si.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/sw.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/sw_KE.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/tr.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/tr_TR.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/uk.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/uz.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/uz@Latn.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/uz_UZ.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/vi.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Ngày và giờ",
   "encounterType": "Loại gặp gỡ"
 }

package/translations/zh.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "日期&时间",
   "encounterType": "问诊类型"
 }

package/translations/zh_CN.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "日期&时间",
   "encounterType": "问诊类型"
 }