@bahmni/home-app 0.0.1-dev.382 → 0.0.1-dev.384

package/dist/{DocumentsTable-CRgjrXxQ-DpE51Mbx.js → DocumentsTable-SqxTcjQX-BOqV_jZ5.js}

@@ -1,5 +1,5 @@
 import { jsx as r, jsxs as p, Fragment as x } from "react/jsx-runtime";
-import { g as G, u as W, Z as Y, E as Z, m as J, a as X, K as ee, p as te } from "./index-DZzh-JFR.js";
+import { g as G, u as W, L as Y, A as J, a as X, b as Z, K as ee, p as te } from "./index-DVf8ALSI.js";
 import { useQuery as ae } from "@tanstack/react-query";
 import { useState as l, useCallback as h, useEffect as I, useMemo as _ } from "react";
 const ne = "DocumentsTable-module_documentsTableBody__6iR3w", oe = "DocumentsTable-module_viewAttachmentsLink__aQ1on", re = "DocumentsTable-module_documentViewerContainer__F5m8D", de = "DocumentsTable-module_attachmentItem__17KA7", se = "DocumentsTable-module_attachmentCounter__WFiI3", me = "DocumentsTable-module_attachmentError__RI4U2", ce = "DocumentsTable-module_documentIframe__ptq5I", le = "DocumentsTable-module_documentImage__KQVgS", d = {
@@ -34,14 +34,14 @@ const Te = [
   "uploadedOn",
   "uploadedBy"
 ], pe = /\.(jpg|jpeg|png|gif|webp|bmp|svg)$/i, B = (a) => a.attachments.length > 0 ? a.attachments : a.documentUrl ? [{ url: a.documentUrl, contentType: a.contentType }] : [], Ne = ({ config: a, encounterUuids: g }) => {
-  const [s, w] = l(!1), [o, U] = l(
+  const [s, w] = l(!1), [o, L] = l(
     null
   ), [$, O] = l(
     /* @__PURE__ */ new Set()
-  ), E = G(), { t: n } = W(), { addNotification: L } = Y(), k = Number(a?.pageSize) || 5, [f, C] = l(1), [u, V] = l(k), [F, A] = l(void 0), M = h((e) => {
-    U(e), w(!0);
+  ), E = G(), { t: n } = W(), { addNotification: U } = Y(), k = Number(a?.pageSize) || 5, [f, A] = l(1), [u, V] = l(k), [F, C] = l(void 0), M = h((e) => {
+    L(e), w(!0);
   }, []), H = h(() => {
-    w(!1), U(null), O(/* @__PURE__ */ new Set());
+    w(!1), L(null), O(/* @__PURE__ */ new Set());
   }, []), v = h((e) => {
     O((t) => new Set(t).add(e));
   }, []), { data: i, isLoading: q, isError: y, error: b } = ae({
@@ -53,7 +53,7 @@ const Te = [
       u
     ],
     enabled: !!E,
-    queryFn: () => Z(
+    queryFn: () => J(
       E,
       g,
       u,
@@ -61,16 +61,16 @@ const Te = [
     )
   });
   I(() => {
-    i && A(i.total);
+    i && C(i.total);
   }, [i]), I(() => {
-    C(1), A(void 0);
+    A(1), C(void 0);
   }, [E]), I(() => {
-    y && L({
+    y && U({
       title: n("ERROR_DEFAULT_TITLE"),
       message: b?.message ?? "",
       type: "error"
     });
-  }, [y, b, L, n]), I(() => {
+  }, [y, b, U, n]), I(() => {
     const e = new AbortController();
     return (async () => {
       if (!s || !o) return;
@@ -91,7 +91,7 @@ const Te = [
   }, [s, o]);
   const K = h(
     (e, t) => {
-      t !== u ? (V(t), C(1), A(void 0)) : C(e);
+      t !== u ? (V(t), A(1), C(void 0)) : A(e);
     },
     [u]
   ), N = _(
@@ -114,7 +114,7 @@ const Te = [
         case "documentType":
           return e.documentType ?? n("DOCUMENTS_NOT_AVAILABLE");
         case "uploadedOn":
-          return X(
+          return Z(
             e.uploadedOn,
             n,
             !0
@@ -123,7 +123,7 @@ const Te = [
           return e.uploadedBy ?? n("DOCUMENTS_NOT_AVAILABLE");
         case "attachments":
           return e.attachments.length > 0 || e.documentUrl ? /* @__PURE__ */ r(
-            J,
+            X,
             {
               onClick: () => M(e),
               className: d.viewAttachmentsLink,

package/dist/{FormsTable-D5ubXLMz-B0Wiee-U.js → FormsTable-fLpjpB_m-CD5BfMKk.js}

@@ -1,50 +1,50 @@
-import { jsx as i, jsxs as z, Fragment as ge } from "react/jsx-runtime";
-import { u as ye, g as be, b as Oe, J as Ne, c as Te, v as Ie, G as Ee, d as ve, L as Ae, f as _e, e as Fe, x as Se, s as G, a as Be, h as $, i as P, m as Le, K as Q, k as Me, B as Re, p as Ce, j as Ue, S as ke } from "./index-DZzh-JFR.js";
-import { useQueryClient as De, useQuery as N } from "@tanstack/react-query";
-import { useState as J, useMemo as d, useCallback as c } from "react";
+import { jsx as i, jsxs as K, Fragment as ge } from "react/jsx-runtime";
+import { u as pe, g as be, c as Ne, Q as Oe, w as Te, N as Ee, q as Ie, x as Ae, O as _e, m as ve, G as Fe, D as Be, Y as P, b as Se, d as $, E as G, a as De, K as Q, B as Re, P as Ce, p as Le, i as Ue, F as Me } from "./index-DVf8ALSI.js";
+import { useQueryClient as ke, useQuery as O } from "@tanstack/react-query";
+import { useState as Y, useMemo as d, useCallback as c } from "react";
 const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_modalHeading__wnTmA", He = "FormsTable-module_customAccordianItem__isszs", T = {
   formsTableBody: qe,
   modalHeading: we,
   customAccordianItem: He
-}, Ve = "startConsultation", Ge = ({
-  episodeOfCareUuids: B,
+}, Ve = "startConsultation", Pe = ({
+  episodeOfCareUuids: S,
   encounterUuids: m,
-  config: Y,
-  disableActions: Z = !1,
-  activeEncounterUuid: p = null
+  config: J,
+  disableActions: W = !1,
+  activeEncounterUuid: h = null
 }) => {
-  const { t: n } = ye(), u = be(), [g, L] = J(!1), [s, M] = J(null), {
-    numberOfVisits: W,
-    hideThumbnail: X = !1,
-    forms: y
-  } = Y ?? {}, ee = Oe(
-    ke.EDIT_OBSERVATIONS
-  ), { userPrivileges: b } = Ne(), I = ee && !Z && !!p, R = Te(
-    B,
+  const { t: n } = pe(), u = be(), [g, D] = Y(!1), [s, R] = Y(null), {
+    numberOfVisits: X,
+    hideThumbnail: Z = !1,
+    forms: p
+  } = J ?? {}, ee = Ne(
+    Me.EDIT_OBSERVATIONS
+  ), { userPrivileges: b } = Oe(), E = ee && !W && !!h, C = Te(
+    S,
     m
-  ), re = De(), {
-    data: C = [],
+  ), re = ke(), {
+    data: L = [],
     isLoading: U,
-    isError: k,
+    isError: M,
     error: oe,
     refetch: ae
-  } = N({
-    queryKey: ["forms", u, B],
-    queryFn: () => Ie(u, void 0, W),
-    enabled: !!u && !R
-  }), D = d(() => {
-    let e = C;
+  } = O({
+    queryKey: ["forms", u, S],
+    queryFn: () => Ee(u, void 0, X),
+    enabled: !!u && !C
+  }), k = d(() => {
+    let e = L;
     return m && m.length > 0 && (e = e.filter(
       (r) => m.includes(r.encounterUuid)
-    )), Array.isArray(y) && y.length > 0 && (e = e.filter(
-      (r) => y.some((o) => o.toLowerCase() === r.formName.toLowerCase())
+    )), Array.isArray(p) && p.length > 0 && (e = e.filter(
+      (r) => p.some((o) => o.toLowerCase() === r.formName.toLowerCase())
     )), e;
-  }, [C, m, y]), { data: O = [] } = N({
+  }, [L, m, p]), { data: N = [] } = O({
     queryKey: ["observationForms"],
-    queryFn: () => Ee()
+    queryFn: () => Ie()
   }), q = c(
     (e) => {
-      const r = O.find((t) => t.name === e);
+      const r = N.find((t) => t.name === e);
       if (!r?.privileges || r.privileges.length === 0) return !0;
       if (!b || b.length === 0) return !1;
       const o = new Set(b.map((t) => t.name));
@@ -52,42 +52,42 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
         (t) => o.has(t.privilegeName) && t.editable
       );
     },
-    [O, b]
+    [N, b]
   ), f = c(
-    (e) => !p || e.encounterUuid !== p ? !1 : q(e.formName),
-    [p, q]
+    (e) => !h || e.encounterUuid !== h ? !1 : q(e.formName),
+    [h, q]
   ), w = c(
-    (e) => O.find((r) => r.name === e)?.uuid,
-    [O]
-  ), E = d(() => {
+    (e) => N.find((r) => r.name === e)?.uuid,
+    [N]
+  ), I = d(() => {
     if (s)
       return w(s.formName);
   }, [s, w]), {
     data: l,
     isLoading: te,
     isError: se,
-    error: v
-  } = N({
-    queryKey: ["formMetadata", E],
-    queryFn: () => ve(E),
-    enabled: !!E && g
+    error: A
+  } = O({
+    queryKey: ["formMetadata", I],
+    queryFn: () => Ae(I),
+    enabled: !!I && g
   }), {
-    data: A,
+    data: _,
     isLoading: ne,
     isError: ie,
-    error: _
-  } = N({
+    error: v
+  } = O({
     queryKey: ["formsEncounterFHIR", s?.encounterUuid],
-    queryFn: () => Ae(s.encounterUuid),
+    queryFn: () => _e(s.encounterUuid),
     enabled: !!s?.encounterUuid && g
   });
-  _e(
+  ve(
     (e) => {
       e.patientUUID === u && (ae(), re.invalidateQueries({ queryKey: ["formsEncounterFHIR"] }));
     },
     [u]
   );
-  const de = d(() => !A?.entry || !s?.formName ? [] : A.entry.filter((e) => e.resource?.resourceType === "Observation").map((e) => e.resource).filter((e) => Fe(e) ? Se(e)?.toLowerCase() === s.formName.toLowerCase() : !0), [A, s?.formName]), le = d(() => {
+  const de = d(() => !_?.entry || !s?.formName ? [] : _.entry.filter((e) => e.resource?.resourceType === "Observation").map((e) => e.resource).filter((e) => Fe(e) ? Be(e)?.toLowerCase() === s.formName.toLowerCase() : !0), [_, s?.formName]), le = d(() => {
     if (!l?.schema) return;
     const e = [], r = (o) => {
       (o ?? []).forEach((t) => {
@@ -103,8 +103,8 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
     const e = {}, r = (o, t) => {
       for (const a of o)
         if (a.type === "section") {
-          const S = a.label?.value ?? "Section";
-          r(a.controls ?? [], S);
+          const B = a.label?.value ?? "Section";
+          r(a.controls ?? [], B);
         } else
           a.id != null && t && (e[String(a.id)] = t), a.controls && r(a.controls, t);
     };
@@ -124,38 +124,38 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
       l.schema.controls ?? []
     ), Object.keys(e).length > 0 ? e : void 0;
   }, [l]), ue = d(() => {
+    if (A)
+      return P(A).message;
     if (v)
-      return G(v).message;
-    if (_)
-      return G(_).message;
-  }, [v, _]), h = d(
+      return P(v).message;
+  }, [A, v]), y = d(
     () => [
       { key: "recordedOn", header: n("RECORDED_ON") },
       { key: "recordedBy", header: n("RECORDED_BY") }
     ],
     [n]
   ), H = d(
-    () => [...h, { key: "actions", header: n("ACTIONS") }],
-    [h, n]
+    () => [...y, { key: "actions", header: n("ACTIONS") }],
+    [y, n]
   ), fe = c(
-    (e) => I && e.some((r) => f(r)) ? H : h,
-    [I, f, H, h]
-  ), he = h, pe = d(
+    (e) => E && e.some((r) => f(r)) ? H : y,
+    [E, f, H, y]
+  ), ye = y, he = d(
     () => [
       { key: "recordedOn", sortable: !0 },
       { key: "recordedBy", sortable: !0 }
     ],
     []
   ), V = d(() => {
-    const e = D.reduce(
+    const e = k.reduce(
       (r, o) => {
         const t = o.formName;
         r[t] ??= [];
-        const a = o.providers.map((S) => S.providerName).filter(Boolean).join(", ");
+        const a = o.providers.map((B) => B.providerName).filter(Boolean).join(", ");
         return r[t].push({
           id: o.encounterUuid,
           formName: o.formName,
-          recordedOn: Be(o.encounterDateTime, n, !0).formattedResult,
+          recordedOn: Se(o.encounterDateTime, n, !0).formattedResult,
           recordedBy: a ?? "--",
           encounterDateTime: o.encounterDateTime,
           encounterUuid: o.encounterUuid
@@ -171,10 +171,10 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
         )
       })
     ).sort((r, o) => r.formName.localeCompare(o.formName));
-  }, [D, n]), j = c((e) => {
-    M(e), L(!0);
+  }, [k, n]), j = c((e) => {
+    R(e), D(!0);
   }, []), x = c(() => {
-    L(!1), M(null);
+    D(!1), R(null);
   }, []), F = c((e) => {
     globalThis.dispatchEvent(
       new CustomEvent(Ve, {
@@ -182,16 +182,16 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
           editOnly: "observationForms",
           editTitle: "EDIT_OBSERVATION_FORM_TITLE",
           editEncounterUuid: e.encounterUuid,
-          editFormName: e.formName,
+          formName: e.formName,
           directFormMode: !0
         }
       })
     );
-  }, []), K = c(
+  }, []), z = c(
     (e, r) => {
       switch (r) {
         case "recordedOn":
-          return /* @__PURE__ */ i(Le, { onClick: () => j(e), children: e.recordedOn });
+          return /* @__PURE__ */ i(De, { onClick: () => j(e), children: e.recordedOn });
         case "recordedBy":
           return e.recordedBy;
         case "actions":
@@ -203,7 +203,7 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
               size: "sm",
               testId: `edit-form-${e.encounterUuid}`,
               onClick: () => F(e),
-              children: /* @__PURE__ */ i(P, {})
+              children: /* @__PURE__ */ i(G, {})
             }
           ) : null;
         default:
@@ -212,24 +212,24 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
     },
     [j, F, f, n]
   );
-  return /* @__PURE__ */ z(ge, { children: [
-    /* @__PURE__ */ i("div", { id: "forms-table", "data-testid": "forms-table", children: U || k || V.length === 0 || R ? /* @__PURE__ */ i(
+  return /* @__PURE__ */ K(ge, { children: [
+    /* @__PURE__ */ i("div", { id: "forms-table", "data-testid": "forms-table", children: U || M || V.length === 0 || C ? /* @__PURE__ */ i(
       Q,
       {
-        headers: he,
+        headers: ye,
         ariaLabel: n("FORMS_HEADING"),
         rows: [],
         loading: U,
-        errorStateMessage: k ? oe?.message : void 0,
+        errorStateMessage: M ? oe?.message : void 0,
         emptyStateMessage: n("FORMS_UNAVAILABLE"),
-        renderCell: K,
+        renderCell: z,
         className: T.formsTableBody,
         dataTestId: "forms-table"
       }
-    ) : /* @__PURE__ */ i(Me, { align: "start", children: V.map((e, r) => {
+    ) : /* @__PURE__ */ i(Re, { align: "start", children: V.map((e, r) => {
       const { formName: o, records: t } = e, a = fe(t);
       return /* @__PURE__ */ i(
-        Re,
+        Ce,
         {
           title: o,
           className: T.customAccordianItem,
@@ -243,9 +243,9 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
               rows: t,
               loading: !1,
               errorStateMessage: "",
-              sortable: pe,
+              sortable: he,
               emptyStateMessage: n("FORMS_UNAVAILABLE"),
-              renderCell: K,
+              renderCell: z,
               className: T.formsTableBody,
               dataTestId: `forms-table-${o}`
             }
@@ -255,15 +255,15 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
       );
     }) }) }),
     g && s && /* @__PURE__ */ i(
-      Ce,
+      Le,
       {
         id: "modalIdForActionAreaLayout",
         portalId: "main-display-area",
         open: g,
         onRequestClose: x,
-        modalHeading: /* @__PURE__ */ z("div", { className: T.modalHeading, children: [
+        modalHeading: /* @__PURE__ */ K("div", { className: T.modalHeading, children: [
           /* @__PURE__ */ i("span", { children: s.formName }),
-          I && f(s) && /* @__PURE__ */ i(
+          E && f(s) && /* @__PURE__ */ i(
             $,
             {
               label: n("EDIT_OBSERVATION_FORM"),
@@ -273,7 +273,7 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
               onClick: () => {
                 x(), F(s);
               },
-              children: /* @__PURE__ */ i(P, {})
+              children: /* @__PURE__ */ i(G, {})
             }
           )
         ] }),
@@ -290,7 +290,7 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
             errorMessage: ue,
             emptyStateMessage: n("NO_FORM_DATA_AVAILABLE"),
             testIdPrefix: s.formName,
-            hideThumbnail: X,
+            hideThumbnail: Z,
             controlOrder: le,
             sectionMap: ce,
             conceptDatatypeMap: me
@@ -301,5 +301,5 @@ const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_mo
   ] });
 };
 export {
-  Ge as default
+  Pe as default
 };

package/dist/{LNWAZHJI-C08SKypy.js → LNWAZHJI-DoCJ4uPN.js}

@@ -1,5 +1,5 @@
-import { c, T as l, P as m, a as u, D as v, Q as i } from "./YPM2AS64-BRsDcr0T.js";
-import { T as d, U as f, W as e } from "./index-DZzh-JFR.js";
+import { c, T as l, P as m, a as u, D as v, Q as i } from "./YPM2AS64-CBsfuLr7.js";
+import { U as d, W as f, X as e } from "./index-DVf8ALSI.js";
 var p = (a) => {
   const [r, t] = c({
     prefix: "TanstackQueryDevtools"

package/dist/{MWZ6AO7Z-BeLF19B5.js → MWZ6AO7Z-gzTNDNc8.js}

@@ -1,5 +1,5 @@
-import { c as s, T as c, P as u, a as i, b as m, C as P, Q as d } from "./YPM2AS64-BRsDcr0T.js";
-import { T as v, U as C, W as e } from "./index-DZzh-JFR.js";
+import { c as s, T as c, P as u, a as i, b as m, C as P, Q as d } from "./YPM2AS64-CBsfuLr7.js";
+import { U as v, W as C, X as e } from "./index-DVf8ALSI.js";
 var h = (t) => {
   const [r, o] = s({
     prefix: "TanstackQueryDevtools"

package/dist/{Observations-Dv63uw5H-CwCC0ifr.js → Observations-c3MY7ts2-N08LGzeT.js}

@@ -1,12 +1,12 @@
-import { jsxs as N, jsx as u } from "react/jsx-runtime";
-import { g as q, Z as w, u as S, l as H, w as k, f as z, _ as Q, C as x, z as G, n as M, K as Y, N as j, Y as A, A as P, o as Z, q as J, y as W, H as X, V as ee } from "./index-DZzh-JFR.js";
+import { jsxs as S, jsx as u } from "react/jsx-runtime";
+import { g as k, L as q, u as N, M, e as w, m as z, f as Q, S as j, $ as x, l as G, K as H, h as P, o as L, R as J, z as Y, j as W, k as X, V as Z, y as ee } from "./index-DVf8ALSI.js";
 import { useQueries as ae, useQuery as te } from "@tanstack/react-query";
-import { useRef as se, useEffect as I, useMemo as g } from "react";
-const C = (a, n, d, l, b, r) => {
-  const t = P(a, n, b), s = t.value, o = Z(s);
+import { useRef as se, useEffect as I, useMemo as R } from "react";
+const D = (a, n, d, l, b, r) => {
+  const t = J(a, n, b), s = t.value, o = Y(s);
   let i = s;
   o === "Image" && (i = /* @__PURE__ */ u(
-    W,
+    X,
     {
       imageSrc: s,
       alt: s,
@@ -14,7 +14,7 @@ const C = (a, n, d, l, b, r) => {
       hideThumbnail: r
     }
   )), o === "Video" && (i = /* @__PURE__ */ u(
-    X,
+    Z,
     {
       id: `${s}-video`,
       videoSrc: s,
@@ -23,9 +23,9 @@ const C = (a, n, d, l, b, r) => {
   )), o === "PDF" && (i = /* @__PURE__ */ u(ee, { id: `${s}-pdf`, src: s }));
   const m = b("OBSERVATIONS_RECORDED_BY", {
     provider: t.provider
-  }), p = a.display, h = a.observationValue?.isAbnormal ? "abnormal-obs" : "obs", c = l ? `${l}-${h}-${p}-${d}-${n}` : `${h}-${p}-${d}-${n}`;
+  }), p = a.display, y = a.observationValue?.isAbnormal ? "abnormal-obs" : "obs", c = l ? `${l}-${y}-${p}-${d}-${n}` : `${y}-${p}-${d}-${n}`;
   return /* @__PURE__ */ u(
-    J,
+    W,
     {
       header: t.header,
       value: i,
@@ -37,13 +37,13 @@ const C = (a, n, d, l, b, r) => {
     `obs-${a.id}`
   );
 }, re = (a, n, d, l, b, r, t) => /* @__PURE__ */ u(
-  A,
+  L,
   {
     title: a.display,
     id: `grouped-obs-${a.display}-${l}`,
     open: d,
     children: a.members?.map(
-      (s, o) => C(
+      (s, o) => D(
         s,
         o,
         b,
@@ -59,17 +59,17 @@ const C = (a, n, d, l, b, r) => {
   title: n = "",
   hideThumbnail: d
 }) => {
-  const { t: l } = S(), b = (r, t, s) => {
-    const o = j(r.encounterDetails, l);
-    return /* @__PURE__ */ N(
-      A,
+  const { t: l } = N(), b = (r, t, s) => {
+    const o = P(r.encounterDetails, l);
+    return /* @__PURE__ */ S(
+      L,
       {
         title: o,
         id: `encounter-${r.encounterId}`,
         open: t,
         children: [
           r.observations.map(
-            (i, m) => C(
+            (i, m) => D(
               i,
               m,
               s,
@@ -105,7 +105,7 @@ const C = (a, n, d, l, b, r) => {
       )
     }
   );
-}, ie = "Observations-module_observations__RKSyo", ne = "Observations-module_title__TJL3z", $ = {
+}, ie = "Observations-module_observations__RKSyo", ne = "Observations-module_title__TJL3z", _ = {
   observations: ie,
   title: ne
 }, de = (a) => ["conceptUuid", a], le = (a, n) => ["observations", a, ...n], pe = ({ config: a }) => {
@@ -113,73 +113,73 @@ const C = (a, n, d, l, b, r) => {
     conceptNames: d = [],
     conceptUuid: l = [],
     hideThumbnail: b = !1
-  } = n, r = se(/* @__PURE__ */ new Set()), t = q(), { addNotification: s } = w(), { t: o } = S(), i = ae({
+  } = n, r = se(/* @__PURE__ */ new Set()), t = k(), { addNotification: s } = q(), { t: o } = N(), i = ae({
     queries: d.map((e) => ({
       queryKey: de(e),
-      queryFn: () => H(e),
+      queryFn: () => M(e),
       enabled: !!e
     }))
   });
   I(() => {
-    i.forEach((e, y) => {
-      if (e.isError && !r.current.has(y)) {
-        const B = d[y];
+    i.forEach((e, h) => {
+      if (e.isError && !r.current.has(h)) {
+        const B = d[h];
         s({
           title: o("ERROR_DEFAULT_TITLE"),
           message: o("ERROR_FETCHING_CONCEPT", { conceptName: B }),
           type: "error"
-        }), r.current.add(y);
-      } else e.isError || r.current.delete(y);
+        }), r.current.add(h);
+      } else e.isError || r.current.delete(h);
     });
   }, [i, d]);
-  const m = g(() => i.map((e) => e.data?.uuid).filter((e) => !!e), [i]), p = g(() => [.../* @__PURE__ */ new Set([...m, ...l])], [m, l]), h = g(() => d.length === 0 ? !0 : i.every((e) => !e.isLoading), [i, d.length]), {
+  const m = R(() => i.map((e) => e.data?.uuid).filter((e) => !!e), [i]), p = R(() => [.../* @__PURE__ */ new Set([...m, ...l])], [m, l]), y = R(() => d.length === 0 ? !0 : i.every((e) => !e.isLoading), [i, d.length]), {
     data: c,
-    isLoading: D,
-    isError: R,
+    isLoading: F,
+    isError: g,
     refetch: T
   } = te({
     queryKey: le(t, p),
-    queryFn: () => k(t, p),
-    enabled: !!t && p.length > 0 && h
+    queryFn: () => w(t, p),
+    enabled: !!t && p.length > 0 && y
   });
   z(
     (e) => {
       e.patientUUID === t && e.updatedConcepts.size > 0 && [...e.updatedConcepts.keys()].some(
-        (y) => p.includes(y)
+        (h) => p.includes(h)
       ) && T();
     },
     [t, T]
   ), I(() => {
-    R && s({
+    g && s({
       title: o("ERROR_DEFAULT_TITLE"),
       message: o("ERROR_FETCHING_OBSERVATIONS"),
       type: "error"
     });
-  }, [R]);
-  const f = g(() => {
+  }, [g]);
+  const f = R(() => {
     if (!c) return [];
-    const e = Q(c), y = x(e);
-    return G(y);
-  }, [c]), F = [
+    const e = Q(c), h = j(e);
+    return x(h);
+  }, [c]), A = [
     { key: "name", header: "name" },
     { key: "value", header: "value" },
     { key: "form", header: "form" }
-  ], O = D || !h, _ = R && h, L = (!c || c.entry?.length === 0 || p.length === 0) && h, K = _ ? o("ERROR_FETCHING_OBSERVATIONS") : null, V = L ? o("NO_OBSERVATIONS_FOUND") : void 0, U = f.length > 0 && !O && !_, E = n.titleTranslationKey, v = E ? o(E) : "";
-  return /* @__PURE__ */ N(
+  ], O = F || !y, $ = g && y, C = (!c || c.entry?.length === 0 || p.length === 0) && y, K = $ ? o("ERROR_FETCHING_OBSERVATIONS") : null, V = C ? o("NO_OBSERVATIONS_FOUND") : void 0, U = f.length > 0 && !O && !$, E = n.titleTranslationKey, v = E ? o(E) : "";
+  return /* @__PURE__ */ S(
     "div",
     {
       id: "observations",
       "data-testid": E ? `observations-${v}` : "observations",
       "aria-label": "observations-aria-label",
-      className: $.observations,
+      className: _.observations,
       children: [
         /* @__PURE__ */ u(
-          M,
+          G,
           {
             id: "observations-title",
             testId: E ? `observations-title-${v}` : "observations-title",
             title: v,
-            className: $.title,
+            className: _.title,
             children: /* @__PURE__ */ u("p", { children: v })
           }
         ),
@@ -191,9 +191,9 @@ const C = (a, n, d, l, b, r) => {
             hideThumbnail: b
           }
         ) : /* @__PURE__ */ u(
-          Y,
+          H,
           {
-            headers: F,
+            headers: A,
             rows: [],
             ariaLabel: o("OBSERVATIONS"),
             loading: O,