@bahmni/reports-app 0.0.1-dev.424 → 0.0.1-dev.425

package/dist/{DocumentsTable-UkcrH_C6-zRHXTTTR.js → DocumentsTable-Dbzg_SOZ-CBCxlBWf.js}

@@ -1,5 +1,5 @@
 import { jsx as r, jsxs as p, Fragment as Y } from "react/jsx-runtime";
-import { g as x, u as G, z as W, H as J, q as X, w as Z, Y as ee, p as te } from "./index-DzhWhDfi.js";
+import { g as x, u as G, z as W, U as J, K as X, w as Z, Y as ee, p as te } from "./index-Drn6hy5Z.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 = {
@@ -38,13 +38,13 @@ const Te = [
     null
   ), [$, O] = l(
     /* @__PURE__ */ new Set()
-  ), E = x(), { t: n } = G(), { addNotification: L } = W(), k = Number(a?.pageSize) || 5, [f, C] = l(1), [u, H] = l(k), [V, A] = l(void 0), M = h((e) => {
+  ), E = x(), { t: n } = G(), { addNotification: L } = W(), 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);
-  }, []), q = h(() => {
+  }, []), H = h(() => {
     w(!1), U(null), O(/* @__PURE__ */ new Set());
   }, []), v = h((e) => {
     O((t) => new Set(t).add(e));
-  }, []), { data: i, isLoading: F, isError: y, error: b } = ae({
+  }, []), { data: i, isLoading: q, isError: y, error: b } = ae({
     queryKey: [
       "documents",
       E,
@@ -91,13 +91,13 @@ const Te = [
   }, [s, o]);
   const z = h(
     (e, t) => {
-      t !== u ? (H(t), C(1), A(void 0)) : C(e);
+      t !== u ? (V(t), C(1), A(void 0)) : C(e);
     },
     [u]
   ), N = _(
     () => a?.fields ?? Te,
     [a?.fields]
-  ), j = _(() => [...i?.documents ?? []].sort((e, t) => !e.uploadedOn && !t.uploadedOn ? 0 : e.uploadedOn ? t.uploadedOn ? new Date(t.uploadedOn).getTime() - new Date(e.uploadedOn).getTime() : -1 : 1), [i]), P = _(() => ie(N, n), [N, n]), K = _(
+  ), K = _(() => [...i?.documents ?? []].sort((e, t) => !e.uploadedOn && !t.uploadedOn ? 0 : e.uploadedOn ? t.uploadedOn ? new Date(t.uploadedOn).getTime() - new Date(e.uploadedOn).getTime() : -1 : 1), [i]), j = _(() => ie(N, n), [N, n]), P = _(
     () => N.map((e) => ({
       key: e,
       sortable: e !== "attachments"
@@ -141,18 +141,18 @@ const Te = [
     /* @__PURE__ */ r("div", { "data-testid": "documents-table", children: /* @__PURE__ */ r(
       ee,
       {
-        headers: P,
+        headers: j,
         ariaLabel: n("DOCUMENTS_TABLE_HEADING"),
-        rows: j,
-        loading: F,
+        rows: K,
+        loading: q,
         errorStateMessage: y ? b?.message : null,
-        sortable: K,
+        sortable: P,
         emptyStateMessage: n("DOCUMENTS_NO_RECORDS"),
         renderCell: Q,
         className: d.documentsTableBody,
         dataTestId: "documents-table",
         pageSize: u,
-        totalItems: V,
+        totalItems: F,
         page: f,
         onPageChange: z
       }
@@ -163,7 +163,7 @@ const Te = [
         id: "modalIdForActionAreaLayout",
         portalId: "main-display-area",
         open: s,
-        onRequestClose: q,
+        onRequestClose: H,
         modalHeading: o.documentIdentifier,
         passiveModal: !0,
         size: "lg",

package/dist/{FormsTable-DLTsXZ-p-D0mnsZiI.js → FormsTable-BMa68g2K-ulhZCvD6.js}

@@ -1,50 +1,50 @@
-import { jsx as n, jsxs as P, Fragment as ge } from "react/jsx-runtime";
-import { u as he, g as Te, s as Ne, e as Oe, v as be, V as Ie, X as Ae, A as Ee, h as _e, m as Fe, a as Me, b as ve, M as Be, S as $, w as Se, _ as K, c as j, q as Ce, Y as z, P as De, F as Le, p as Ue, d as Re, Z as qe } from "./index-DzhWhDfi.js";
-import { useQueryClient as we, useQuery as N } from "@tanstack/react-query";
+import { jsx as n, jsxs as K, Fragment as ge } from "react/jsx-runtime";
+import { u as he, g as Oe, h as Te, Z as Ne, y as be, j as Ie, e as Ee, O as Ae, a as _e, m as Fe, f as ve, $ as Me, S as Ce, b as x, w as Se, C as G, H as z, K as Be, Y as P, F as De, c as Le, p as Ue, v as Re, l as ke } from "./index-Drn6hy5Z.js";
+import { useQueryClient as we, useQuery as T } from "@tanstack/react-query";
 import { useState as Q, useMemo as i, useCallback as d } from "react";
-const Ve = "FormsTable-module_formsTableBody__SvGha", ke = "FormsTable-module_modalHeading__wnTmA", He = "FormsTable-module_customAccordianItem__isszs", O = {
-  formsTableBody: Ve,
-  modalHeading: ke,
-  customAccordianItem: He
-}, xe = "startConsultation", je = ({
-  episodeOfCareUuids: M,
+const qe = "FormsTable-module_formsTableBody__SvGha", He = "FormsTable-module_modalHeading__wnTmA", Ve = "FormsTable-module_customAccordianItem__isszs", N = {
+  formsTableBody: qe,
+  modalHeading: He,
+  customAccordianItem: Ve
+}, $e = "startConsultation", ze = ({
+  episodeOfCareUuids: v,
   encounterUuids: l,
-  config: Z,
-  disableActions: X = !1,
+  config: Y,
+  disableActions: Z = !1,
   activeEncounterUuid: y = null
 }) => {
-  const { t } = he(), m = Te(), [p, v] = Q(!1), [o, B] = Q(null), {
-    numberOfVisits: Y,
+  const { t } = he(), m = Oe(), [p, M] = Q(!1), [o, C] = Q(null), {
+    numberOfVisits: X,
     hideThumbnail: J = !1,
     forms: g
-  } = Z ?? {}, W = Ne(
-    qe.EDIT_OBSERVATIONS
-  ), { userPrivileges: h } = Oe(), b = W && !X && !!y, S = be(
-    M,
+  } = Y ?? {}, W = Te(
+    ke.EDIT_OBSERVATIONS
+  ), { userPrivileges: h } = Ne(), b = W && !Z && !!y, S = be(
+    v,
     l
   ), ee = we(), {
-    data: C = [],
+    data: B = [],
     isLoading: D,
     isError: L,
     error: re,
     refetch: ae
-  } = N({
-    queryKey: ["forms", m, M],
-    queryFn: () => Ie(m, void 0, Y),
+  } = T({
+    queryKey: ["forms", m, v],
+    queryFn: () => Ie(m, void 0, X),
     enabled: !!m && !S
   }), U = i(() => {
-    let e = C;
+    let e = B;
     return l && l.length > 0 && (e = e.filter(
       (r) => l.includes(r.encounterUuid)
     )), Array.isArray(g) && g.length > 0 && (e = e.filter(
       (r) => g.some((a) => a.toLowerCase() === r.formName.toLowerCase())
     )), e;
-  }, [C, l, g]), { data: T = [] } = N({
+  }, [B, l, g]), { data: O = [] } = T({
     queryKey: ["observationForms"],
-    queryFn: () => Ae()
+    queryFn: () => Ee()
   }), R = d(
     (e) => {
-      const r = T.find((s) => s.name === e);
+      const r = O.find((s) => s.name === e);
       if (!r?.privileges || r.privileges.length === 0) return !0;
       if (!h || h.length === 0) return !1;
       const a = new Set(h.map((s) => s.name));
@@ -52,31 +52,31 @@ const Ve = "FormsTable-module_formsTableBody__SvGha", ke = "FormsTable-module_mo
         (s) => a.has(s.privilegeName) && s.editable
       );
     },
-    [T, h]
+    [O, h]
   ), u = d(
     (e) => !y || e.encounterUuid !== y ? !1 : R(e.formName),
     [y, R]
-  ), q = d(
-    (e) => T.find((r) => r.name === e)?.uuid,
-    [T]
+  ), k = d(
+    (e) => O.find((r) => r.name === e)?.uuid,
+    [O]
   ), I = i(() => {
     if (o)
-      return q(o.formName);
-  }, [o, q]), {
+      return k(o.formName);
+  }, [o, k]), {
     data: w,
     isLoading: oe,
     isError: te,
-    error: A
-  } = N({
+    error: E
+  } = T({
     queryKey: ["formMetadata", I],
-    queryFn: () => Ee(I),
+    queryFn: () => Ae(I),
     enabled: !!I && p
   }), {
-    data: E,
+    data: A,
     isLoading: se,
     isError: ne,
     error: _
-  } = N({
+  } = T({
     queryKey: ["formsEncounterFHIR", o?.encounterUuid],
     queryFn: () => _e(o.encounterUuid),
     enabled: !!o?.encounterUuid && p
@@ -87,33 +87,33 @@ const Ve = "FormsTable-module_formsTableBody__SvGha", ke = "FormsTable-module_mo
     },
     [m]
   );
-  const ie = i(() => !E?.entry || !o?.formName ? [] : E.entry.filter((e) => e.resource?.resourceType === "Observation").map((e) => e.resource).filter((e) => Me(e) ? ve(e)?.toLowerCase() === o.formName.toLowerCase() : !0), [E, o?.formName]), { controlOrder: de, sectionMap: le, conceptDatatypeMap: me } = i(
-    () => Be(w?.schema),
+  const ie = i(() => !A?.entry || !o?.formName ? [] : A.entry.filter((e) => e.resource?.resourceType === "Observation").map((e) => e.resource).filter((e) => ve(e) ? Me(e)?.toLowerCase() === o.formName.toLowerCase() : !0), [A, o?.formName]), { controlOrder: de, sectionMap: le, conceptDatatypeMap: me } = i(
+    () => Ce(w?.schema),
     [w]
   ), ue = i(() => {
-    if (A)
-      return $(A).message;
+    if (E)
+      return x(E).message;
     if (_)
-      return $(_).message;
-  }, [A, _]), c = i(
+      return x(_).message;
+  }, [E, _]), c = i(
     () => [
       { key: "recordedOn", header: t("RECORDED_ON") },
       { key: "recordedBy", header: t("RECORDED_BY") }
     ],
     [t]
-  ), V = i(
+  ), q = i(
     () => [...c, { key: "actions", header: t("ACTIONS") }],
     [c, t]
   ), ce = d(
-    (e) => b && e.some((r) => u(r)) ? V : c,
-    [b, u, V, c]
+    (e) => b && e.some((r) => u(r)) ? q : c,
+    [b, u, q, c]
   ), fe = c, ye = i(
     () => [
       { key: "recordedOn", sortable: !0 },
       { key: "recordedBy", sortable: !0 }
     ],
     []
-  ), k = i(() => {
+  ), H = i(() => {
     const e = U.reduce(
       (r, a) => {
         const s = a.formName;
@@ -138,13 +138,13 @@ const Ve = "FormsTable-module_formsTableBody__SvGha", ke = "FormsTable-module_mo
         )
       })
     ).sort((r, a) => r.formName.localeCompare(a.formName));
-  }, [U, t]), H = d((e) => {
-    B(e), v(!0);
-  }, []), x = d(() => {
-    v(!1), B(null);
+  }, [U, t]), V = d((e) => {
+    C(e), M(!0);
+  }, []), $ = d(() => {
+    M(!1), C(null);
   }, []), F = d((e) => {
     globalThis.dispatchEvent(
-      new CustomEvent(xe, {
+      new CustomEvent($e, {
         detail: {
           editOnly: "observationForms",
           editTitle: "EDIT_OBSERVATION_FORM_TITLE",
@@ -154,34 +154,34 @@ const Ve = "FormsTable-module_formsTableBody__SvGha", ke = "FormsTable-module_mo
         }
       })
     );
-  }, []), G = d(
+  }, []), j = d(
     (e, r) => {
       switch (r) {
         case "recordedOn":
-          return /* @__PURE__ */ n(Ce, { onClick: () => H(e), children: e.recordedOn });
+          return /* @__PURE__ */ n(Be, { onClick: () => V(e), children: e.recordedOn });
         case "recordedBy":
           return e.recordedBy;
         case "actions":
           return u(e) ? /* @__PURE__ */ n(
-            K,
+            G,
             {
               label: t("EDIT_OBSERVATION_FORM"),
               kind: "ghost",
               size: "sm",
               testId: `edit-form-${e.encounterUuid}`,
               onClick: () => F(e),
-              children: /* @__PURE__ */ n(j, {})
+              children: /* @__PURE__ */ n(z, {})
             }
           ) : null;
         default:
           return null;
       }
     },
-    [H, F, u, t]
+    [V, F, u, t]
   );
-  return /* @__PURE__ */ P(ge, { children: [
-    /* @__PURE__ */ n("div", { id: "forms-table", "data-testid": "forms-table", children: D || L || k.length === 0 || S ? /* @__PURE__ */ n(
-      z,
+  return /* @__PURE__ */ K(ge, { children: [
+    /* @__PURE__ */ n("div", { id: "forms-table", "data-testid": "forms-table", children: D || L || H.length === 0 || S ? /* @__PURE__ */ n(
+      P,
       {
         headers: fe,
         ariaLabel: t("FORMS_HEADING"),
@@ -189,21 +189,21 @@ const Ve = "FormsTable-module_formsTableBody__SvGha", ke = "FormsTable-module_mo
         loading: D,
         errorStateMessage: L ? re?.message : void 0,
         emptyStateMessage: t("FORMS_UNAVAILABLE"),
-        renderCell: G,
-        className: O.formsTableBody,
+        renderCell: j,
+        className: N.formsTableBody,
         dataTestId: "forms-table"
       }
-    ) : /* @__PURE__ */ n(De, { align: "start", children: k.map((e, r) => {
+    ) : /* @__PURE__ */ n(De, { align: "start", children: H.map((e, r) => {
       const { formName: a, records: s } = e, f = ce(s);
       return /* @__PURE__ */ n(
         Le,
         {
           title: a,
-          className: O.customAccordianItem,
+          className: N.customAccordianItem,
           testId: `accordian-title-${a}`,
           open: r === 0,
           children: /* @__PURE__ */ n(
-            z,
+            P,
             {
               headers: f,
               ariaLabel: t("FORMS_HEADING"),
@@ -212,8 +212,8 @@ const Ve = "FormsTable-module_formsTableBody__SvGha", ke = "FormsTable-module_mo
               errorStateMessage: "",
               sortable: ye,
               emptyStateMessage: t("FORMS_UNAVAILABLE"),
-              renderCell: G,
-              className: O.formsTableBody,
+              renderCell: j,
+              className: N.formsTableBody,
               dataTestId: `forms-table-${a}`
             }
           )
@@ -227,20 +227,20 @@ const Ve = "FormsTable-module_formsTableBody__SvGha", ke = "FormsTable-module_mo
         id: "modalIdForActionAreaLayout",
         portalId: "main-display-area",
         open: p,
-        onRequestClose: x,
-        modalHeading: /* @__PURE__ */ P("div", { className: O.modalHeading, children: [
+        onRequestClose: $,
+        modalHeading: /* @__PURE__ */ K("div", { className: N.modalHeading, children: [
           /* @__PURE__ */ n("span", { children: o.formName }),
           b && u(o) && /* @__PURE__ */ n(
-            K,
+            G,
             {
               label: t("EDIT_OBSERVATION_FORM"),
               kind: "ghost",
               size: "sm",
               testId: `edit-form-modal-${o.encounterUuid}`,
               onClick: () => {
-                x(), F(o);
+                $(), F(o);
               },
-              children: /* @__PURE__ */ n(j, {})
+              children: /* @__PURE__ */ n(z, {})
             }
           )
         ] }),
@@ -268,5 +268,5 @@ const Ve = "FormsTable-module_formsTableBody__SvGha", ke = "FormsTable-module_mo
   ] });
 };
 export {
-  je as default
+  ze as default
 };

package/dist/{LNWAZHJI-Cxi_5FDX.js → LNWAZHJI-DXtKGI34.js}

@@ -1,5 +1,5 @@
-import { c, T as l, P as m, a as u, D as v, Q as i } from "./YPM2AS64-B3xeYlPj.js";
-import { W as d, a0 as f, a1 as e } from "./index-DzhWhDfi.js";
+import { c, T as l, P as m, a as u, D as v, Q as i } from "./YPM2AS64-9u-qHMWS.js";
+import { _ as d, a0 as f, a1 as e } from "./index-Drn6hy5Z.js";
 var p = (a) => {
   const [r, t] = c({
     prefix: "TanstackQueryDevtools"

package/dist/{MWZ6AO7Z-CacP6p_H.js → MWZ6AO7Z-B9WXpsWU.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-B3xeYlPj.js";
-import { W as v, a0 as C, a1 as e } from "./index-DzhWhDfi.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-9u-qHMWS.js";
+import { _ as v, a0 as C, a1 as e } from "./index-Drn6hy5Z.js";
 var h = (t) => {
   const [r, o] = s({
     prefix: "TanstackQueryDevtools"

package/dist/{Observations-DLpjVw7J-D6qxEqW6.js → Observations-DxmGTSMO-DQ_1fZxL.js}

@@ -1,12 +1,12 @@
-import { jsxs as I, jsx as n } from "react/jsx-runtime";
-import { g as M, z as j, u as B, f as x, v as G, y as H, E as Y, m as J, i as P, L as W, T as X, O as Z, j as ee, Y as ae, k as se, Q as U, C as re, B as te, w as ie, D as oe, l as ne, R as de, n as le } from "./index-DzhWhDfi.js";
+import { jsxs as S, jsx as n } from "react/jsx-runtime";
+import { g as H, z as M, u as B, B as x, y as G, d as J, P, m as Y, Q as j, r as W, i as X, t as Z, k as ee, Y as ae, J as se, n as U, X as re, W as te, w as ie, o as oe, R as ne, q as de, D as le } from "./index-Drn6hy5Z.js";
 import { useQueries as ue, useQuery as ce } from "@tanstack/react-query";
-import { useRef as me, useEffect as A, useMemo as g } from "react";
-const pe = "Observations-module_observations__RKSyo", be = "Observations-module_title__TJL3z", ve = "Observations-module_wrapper__muk2L", he = "Observations-module_secondary__14nuS", O = {
+import { useRef as me, useEffect as L, useMemo as E } from "react";
+const pe = "Observations-module_observations__RKSyo", be = "Observations-module_title__TJL3z", he = "Observations-module_wrapper__muk2L", ve = "Observations-module_secondary__14nuS", R = {
   observations: pe,
   title: be,
-  wrapper: ve,
-  secondary: he
+  wrapper: he,
+  secondary: ve
 }, V = (s, l, o, d, c, r) => {
   const t = re(s, l, c), e = t.value, m = te(e);
   let i = e;
@@ -26,24 +26,24 @@ const pe = "Observations-module_observations__RKSyo", be = "Observations-module_
       hideThumbnail: r
     }
   )), m === "PDF" && (i = /* @__PURE__ */ n(le, { id: `${e}-pdf`, src: e }));
-  const p = /* @__PURE__ */ I("div", { className: O.wrapper, children: [
+  const p = /* @__PURE__ */ S("div", { className: R.wrapper, children: [
     /* @__PURE__ */ n("span", { children: t.header.display }),
-    t.header.referenceRange && /* @__PURE__ */ n("span", { className: O.secondary, children: t.header.referenceRange })
+    t.header.referenceRange && /* @__PURE__ */ n("span", { className: R.secondary, children: t.header.referenceRange })
   ] }), u = c("OBSERVATIONS_RECORDED_BY", {
     provider: t.provider
-  }), b = s.effectiveDateTime ? ie(s.effectiveDateTime, c, !0).formattedResult : void 0, f = /* @__PURE__ */ I("div", { className: O.wrapper, children: [
+  }), b = s.effectiveDateTime ? ie(s.effectiveDateTime, c, !0).formattedResult : void 0, f = /* @__PURE__ */ S("div", { className: R.wrapper, children: [
     /* @__PURE__ */ n("span", { children: u }),
-    b && /* @__PURE__ */ n("span", { className: O.secondary, children: b })
-  ] }), v = s.display, h = s.observationValue?.isAbnormal ? "abnormal-obs" : "obs", R = d ? `${d}-${h}-${v}-${o}-${l}` : `${h}-${v}-${o}-${l}`;
+    b && /* @__PURE__ */ n("span", { className: R.secondary, children: b })
+  ] }), h = s.display, v = s.observationValue?.isAbnormal ? "abnormal-obs" : "obs", O = d ? `${d}-${v}-${h}-${o}-${l}` : `${v}-${h}-${o}-${l}`;
   return /* @__PURE__ */ n(
     oe,
     {
       header: p,
       value: i,
       info: f,
-      id: R,
-      testId: R,
-      ariaLabel: R
+      id: O,
+      testId: O,
+      ariaLabel: O
     },
     `obs-${s.id}`
   );
@@ -65,14 +65,14 @@ const pe = "Observations-module_observations__RKSyo", be = "Observations-module_
     )
   },
   `grouped-obs-${s.id}`
-), Oe = ({
+), Re = ({
   groupedData: s,
   title: l = "",
   hideThumbnail: o
 }) => {
   const { t: d } = B(), c = (r, t, e) => {
     const m = se(r.encounterDetails, d);
-    return /* @__PURE__ */ I(
+    return /* @__PURE__ */ S(
       U,
       {
         title: m,
@@ -116,13 +116,13 @@ const pe = "Observations-module_observations__RKSyo", be = "Observations-module_
       )
     }
   );
-}, Re = (s) => ["conceptUuid", s], Te = (s, l, o, d) => [
+}, Oe = (s) => ["conceptUuid", s], _e = (s, l, o, d) => [
   "observations",
   s,
   ...l,
   o,
   d
-], Ie = ({
+], Se = ({
   config: s,
   episodeOfCareUuids: l,
   encounterUuids: o
@@ -132,14 +132,14 @@ const pe = "Observations-module_observations__RKSyo", be = "Observations-module_
     conceptUuid: r = [],
     hideThumbnail: t = !1,
     scope: e = "all"
-  } = d, m = me(/* @__PURE__ */ new Set()), i = M(), { addNotification: p } = j(), { t: u } = B(), b = ue({
+  } = d, m = me(/* @__PURE__ */ new Set()), i = H(), { addNotification: p } = M(), { t: u } = B(), b = ue({
     queries: c.map((a) => ({
-      queryKey: Re(a),
+      queryKey: Oe(a),
       queryFn: () => x(a),
       enabled: !!a
     }))
   });
-  A(() => {
+  L(() => {
     const a = b.some((z) => z.isError), y = m.current.size > 0;
     a && !y ? (p({
       title: u("ERROR_DEFAULT_TITLE"),
@@ -147,91 +147,91 @@ const pe = "Observations-module_observations__RKSyo", be = "Observations-module_
       type: "error"
     }), m.current.add(0)) : !a && y && m.current.clear();
   }, [b, p, u]);
-  const f = g(() => b.map((a) => a.data?.uuid).filter((a) => !!a), [b]), v = g(() => [.../* @__PURE__ */ new Set([...f, ...r])], [f, r]), h = g(() => c.length === 0 ? !0 : b.every((a) => !a.isLoading), [b, c.length]), R = e === "latest" || e === "latest-encounter", w = G(
+  const f = E(() => b.map((a) => a.data?.uuid).filter((a) => !!a), [b]), h = E(() => [.../* @__PURE__ */ new Set([...f, ...r])], [f, r]), v = E(() => c.length === 0 ? !0 : b.every((a) => !a.isLoading), [b, c.length]), O = e === "latest" || e === "latest-encounter", F = G(
     l,
     o
   ), {
-    data: T,
-    isLoading: C,
-    isError: S,
+    data: _,
+    isLoading: w,
+    isError: I,
     refetch: N
   } = ce({
-    queryKey: Te(
+    queryKey: _e(
       i,
-      v,
+      h,
       o,
       e
     ),
-    queryFn: () => R ? H(
+    queryFn: () => O ? J(
       i,
-      v,
+      h,
       o
-    ) : Y(
+    ) : P(
       i,
-      v,
+      h,
       o
     ),
-    enabled: !!i && v.length > 0 && h && !w
+    enabled: !!i && h.length > 0 && v && !F
   });
-  J(
+  Y(
     (a) => {
       a.patientUUID === i && a.updatedConcepts.size > 0 && [...a.updatedConcepts.keys()].some(
-        (y) => v.includes(y)
+        (y) => h.includes(y)
       ) && N();
     },
     [i, N]
-  ), A(() => {
-    S && p({
+  ), L(() => {
+    I && p({
       title: u("ERROR_DEFAULT_TITLE"),
       message: u("ERROR_FETCHING_OBSERVATIONS"),
       type: "error"
     });
-  }, [S]);
-  const $ = g(() => {
-    if (!T) return [];
-    let a = P(T);
+  }, [I]);
+  const $ = E(() => {
+    if (!_) return [];
+    let a = j(_);
     e === "latest-encounter" && (a = W(a));
     const y = X(a);
     return Z(y);
-  }, [T, e]), F = [
+  }, [_, e]), k = [
     { key: "name", header: "name" },
     { key: "value", header: "value" },
     { key: "form", header: "form" }
-  ], L = C || !h, D = S && h, k = (!T || T.entry?.length === 0 || v.length === 0) && h, K = D ? u("ERROR_FETCHING_OBSERVATIONS") : null, Q = k ? u("NO_OBSERVATIONS_FOUND") : void 0, q = $.length > 0 && !L && !D, E = d.titleTranslationKey, _ = E ? u(E) : "";
-  return /* @__PURE__ */ I(
+  ], D = w || !v, A = I && v, q = (!_ || _.entry?.length === 0 || h.length === 0) && v, C = A ? u("ERROR_FETCHING_OBSERVATIONS") : null, K = q ? u("NO_OBSERVATIONS_FOUND") : void 0, Q = $.length > 0 && !D && !A, g = d.titleTranslationKey, T = g ? u(g) : "";
+  return /* @__PURE__ */ S(
     "div",
     {
       id: "observations",
-      "data-testid": E ? `observations-${_}` : "observations",
+      "data-testid": g ? `observations-${T}` : "observations",
       "aria-label": "observations-aria-label",
-      className: O.observations,
+      className: R.observations,
       children: [
         /* @__PURE__ */ n(
           ee,
           {
             id: "observations-title",
-            testId: E ? `observations-title-${_}` : "observations-title",
-            title: _,
-            className: O.title,
-            children: /* @__PURE__ */ n("p", { children: _ })
+            testId: g ? `observations-title-${T}` : "observations-title",
+            title: T,
+            className: R.title,
+            children: /* @__PURE__ */ n("p", { children: T })
           }
         ),
-        q ? /* @__PURE__ */ n(
-          Oe,
+        Q ? /* @__PURE__ */ n(
+          Re,
           {
             groupedData: $,
-            title: _,
+            title: T,
             hideThumbnail: t
           }
         ) : /* @__PURE__ */ n(
           ae,
           {
-            headers: F,
+            headers: k,
             rows: [],
             ariaLabel: u("OBSERVATIONS"),
-            loading: L,
-            errorStateMessage: K,
-            emptyStateMessage: Q ?? u("NO_OBSERVATIONS_AVAILABLE"),
+            loading: D,
+            errorStateMessage: C,
+            emptyStateMessage: K ?? u("NO_OBSERVATIONS_AVAILABLE"),
             dataTestId: "observations-table"
           }
         )
@@ -240,7 +240,7 @@ const pe = "Observations-module_observations__RKSyo", be = "Observations-module_
   );
 };
 export {
-  Re as conceptUuidQueryKeys,
-  Ie as default,
-  Te as observationsQueryKeys
+  Oe as conceptUuidQueryKeys,
+  Se as default,
+  _e as observationsQueryKeys
 };