@bahmni/appointments-app 0.0.1-dev.401 → 0.0.1-dev.404

package/dist/{Observations-DGEkuYFv-Cz4I1O7m.js → Observations-BgGdEmnb-CHIJBLfB.js}

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

package/dist/{YPM2AS64-PInLdgeX.js → YPM2AS64-Dk_8XxS-.js}

@@ -1,4 +1,4 @@
-import { aq as we, ar as z, as as xt, at as B, ao as q, ap as y, au as Ro, av as ye, aw as R, ax as _, ay as k, az as N, aA as A, aB as bs, aC as ir, aD as $e, aE as U, aF as Hn, aG as Vn, aH as dt, aI as D, aJ as xs, aK as cn, aL as Be, aM as ws, aN as qt, aO as zt, aP as $s, aQ as Cs, aR as $n, aS as Ss, aT as Nr, aU as Bt, aV as zo, aW as ks, aX as Es, aY as j, aZ as Ur, a_ as Ms, a$ as Ds, b0 as sr, b1 as As, b2 as Ts, b3 as zn, b4 as Fs, b5 as Is, b6 as Z, b7 as Ps, b8 as Ls } from "./index-BtK4jcwc.js";
+import { aq as we, ar as z, as as xt, at as B, ao as q, ap as y, au as Ro, av as ye, aw as R, ax as _, ay as k, az as N, aA as A, aB as bs, aC as ir, aD as $e, aE as U, aF as Hn, aG as Vn, aH as dt, aI as D, aJ as xs, aK as cn, aL as Be, aM as ws, aN as qt, aO as zt, aP as $s, aQ as Cs, aR as $n, aS as Ss, aT as Nr, aU as Bt, aV as zo, aW as ks, aX as Es, aY as j, aZ as Ur, a_ as Ms, a$ as Ds, b0 as sr, b1 as As, b2 as Ts, b3 as zn, b4 as Fs, b5 as Is, b6 as Z, b7 as Ps, b8 as Ls } from "./index-CvkiQs0R.js";
 var Os = (e) => e != null, qs = (e) => e.filter(Os);
 function _s(e) {
   return (...t) => {

package/dist/{index-DiUwH_qI.js → index-BHn9qZhR.js}

@@ -1,14 +1,14 @@
 import { jsx as r, jsxs as p } from "react/jsx-runtime";
-import { _ as f, a0 as O, a1 as P, a2 as V, a3 as Z, a4 as ee, a5 as te, a6 as ie, M as ae, a7 as ne, u as j, a8 as R, a9 as le, aa as re, ab as se, ac as E, ad as C, ae as F, af as Y, ag as x, ah as k, ai as $, a as oe, C as de, L as q, aj as ce, O as me, ak as Ae, al as Ie, am as ue, R as _e, S as Te, T as Le } from "./index-BtK4jcwc.js";
+import { $ as f, a0 as B, a1 as P, a2 as V, a3 as Z, a4 as ee, a5 as te, a6 as ie, O as ae, a7 as ne, u as Q, a8 as R, a9 as le, aa as re, ab as se, ac as E, ad as F, ae as C, af as Y, ag as x, ah as k, ai as $, a as oe, z as de, N as q, aj as ce, Q as me, ak as Ae, al as Ie, am as ue, S as _e, T as Te, U as Le } from "./index-CvkiQs0R.js";
 import { useState as g, useMemo as N, useEffect as S, useRef as ve, useCallback as U } from "react";
 import { useQuery as D, useQueryClient as Ne } from "@tanstack/react-query";
-const be = "Available for appointments", G = "Get Appointment Unavailability", pe = "Add Appointment Unavailability", w = "Appointment Location", Me = () => {
+const be = "Available for appointments", G = "Get Appointment Unavailability", pe = "Add Appointment Unavailability", H = "Appointment Location", Me = () => {
   try {
     return Z().uuid;
   } catch {
     return "";
   }
-}, H = (e) => ({
+}, w = (e) => ({
   id: "",
   text: e
 }), ye = (e) => ({
@@ -47,9 +47,9 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
 }), ge = (e, a) => {
   const n = {}, t = a("ADMIN_UNAVAILABILITY_FORM_REQUIRED");
   if (e.locationUuid || (n.location = t), e.startDate || (n.startDate = t), e.startTime || (n.startTime = t), e.endDate || (n.endDate = t), e.endTime || (n.endTime = t), e.startDate && e.startTime && e.endDate && e.endTime && e.startDate.toDateString() === e.endDate.toDateString()) {
-    const o = O(
+    const o = B(
       `${e.startTime} ${e.startTimePeriod}`
-    ), c = O(
+    ), c = B(
       `${e.endTime} ${e.endTimePeriod}`
     );
     o !== null && c !== null && c <= o && (n.dateTime = a("ADMIN_UNAVAILABILITY_DATETIME_ERROR_MESSAGE"));
@@ -106,12 +106,12 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
       );
       if (I.length === 0) {
         const u = await ie(
-          w
+          H
         );
         return Se(u);
       }
       return I.filter(
-        (u) => u.tags?.some((v) => v.display === w)
+        (u) => u.tags?.some((v) => v.display === H)
       );
     },
     enabled: !!e?.uuid
@@ -137,13 +137,13 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
     isLoading: a || o || L || s,
     isError: n || c || m || _
   };
-}, Be = "UnavailabilityForm-module_formContent__WmNHR", Oe = "UnavailabilityForm-module_formField__8he7o", Pe = "UnavailabilityForm-module_loading__IDEY6", Ve = "UnavailabilityForm-module_error__jDeOm", Ce = "UnavailabilityForm-module_grid__t6NKR", Fe = "UnavailabilityForm-module_column__QFdnQ", Ye = "UnavailabilityForm-module_dateTimeColumn__6bi0F", xe = "UnavailabilityForm-module_datePicker__6HgbO", ke = "UnavailabilityForm-module_timePicker__DHNpK", d = {
-  formContent: Be,
-  formField: Oe,
+}, Oe = "UnavailabilityForm-module_formContent__WmNHR", Be = "UnavailabilityForm-module_formField__8he7o", Pe = "UnavailabilityForm-module_loading__IDEY6", Ve = "UnavailabilityForm-module_error__jDeOm", Fe = "UnavailabilityForm-module_grid__t6NKR", Ce = "UnavailabilityForm-module_column__QFdnQ", Ye = "UnavailabilityForm-module_dateTimeColumn__6bi0F", xe = "UnavailabilityForm-module_datePicker__6HgbO", ke = "UnavailabilityForm-module_timePicker__DHNpK", d = {
+  formContent: Oe,
+  formField: Be,
   loading: Pe,
   error: Ve,
-  grid: Ce,
-  column: Fe,
+  grid: Fe,
+  column: Ce,
   dateTimeColumn: Ye,
   datePicker: xe,
   timePicker: ke
@@ -152,7 +152,7 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
   formDataRef: a,
   onClearErrors: n
 }) => {
-  const { t } = j(), { loginLocations: o, services: c, providers: A, isLoading: L, isError: m } = he(), [l, s] = g({
+  const { t } = Q(), { loginLocations: o, services: c, providers: A, isLoading: L, isError: m } = he(), [l, s] = g({
     locationUuid: "",
     selectedServiceItems: [],
     selectedProviderItems: [],
@@ -187,7 +187,7 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
         _,
         t("ADMIN_UNAVAILABILITY_FORM_ALL_SERVICES")
       ),
-      H,
+      w,
       {
         loading: "",
         error: "",
@@ -203,7 +203,7 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
         I,
         t("ADMIN_UNAVAILABILITY_FORM_ALL_PROVIDERS")
       ),
-      H,
+      w,
       {
         loading: "",
         error: "",
@@ -301,10 +301,10 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
                   className: `${d.column} ${d.dateTimeColumn}`,
                   children: [
                     /* @__PURE__ */ r(
-                      C,
+                      F,
                       {
                         datePickerType: "single",
-                        minDate: F(),
+                        minDate: C(),
                         value: l.startDate ?? void 0,
                         onChange: (i) => {
                           i[0] && (n(["startDate", "dateTime"]), s({
@@ -376,10 +376,10 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
                   className: `${d.column} ${d.dateTimeColumn}`,
                   children: [
                     /* @__PURE__ */ r(
-                      C,
+                      F,
                       {
                         datePickerType: "single",
-                        minDate: l.startDate ?? F(),
+                        minDate: l.startDate ?? C(),
                         value: l.endDate ?? void 0,
                         onChange: (i) => {
                           i[0] && (n(["endDate", "dateTime"]), s({
@@ -503,8 +503,8 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
   );
 }, qe = "index-module_page__s2h2y", Ge = {
   page: qe
-}, Qe = () => {
-  const { t: e } = j(), a = Ne(), { userPrivileges: n } = oe(), { addNotification: t } = de(), [o, c] = g(!1), [A, L] = g(!1), m = ve(null), [l, s] = g({}), _ = q(
+}, je = () => {
+  const { t: e } = Q(), a = Ne(), { userPrivileges: n } = oe(), { addNotification: t } = de(), [o, c] = g(!1), [A, L] = g(!1), m = ve(null), [l, s] = g({}), _ = q(
     n,
     G
   ), I = q(n, [
@@ -560,15 +560,15 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
       }
     },
     [t, a, e]
-  ), Q = U(async () => {
+  ), j = U(async () => {
     if (!m.current) return;
     const T = ge(m.current, e);
     s(T), !(Object.keys(T).length > 0) && await h(Re(m.current, e));
   }, [e, h]), W = U(
     (T) => {
       s((J) => {
-        const B = { ...J };
-        return T.forEach((X) => delete B[X]), B;
+        const O = { ...J };
+        return T.forEach((X) => delete O[X]), O;
       });
     },
     []
@@ -616,7 +616,7 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
           "aria-label": "appointment-unavailability-form-panel-aria-label",
           title: e("ADMIN_UNAVAILABILITY_FORM_TITLE"),
           primaryButtonText: e("ADMIN_UNAVAILABILITY_FORM_ADD"),
-          onPrimaryButtonClick: Q,
+          onPrimaryButtonClick: j,
           isPrimaryButtonDisabled: A,
           secondaryButtonText: e("ADMIN_UNAVAILABILITY_FORM_CANCEL"),
           onSecondaryButtonClick: z,
@@ -636,5 +636,5 @@ const be = "Available for appointments", G = "Get Appointment Unavailability", p
   );
 };
 export {
-  Qe as default
+  je as default
 };

package/dist/{index-Cg1sZ8wQ.js → index-CibunQfT.js}

@@ -1,18 +1,18 @@
 import { jsx as i, jsxs as y } from "react/jsx-runtime";
-import { z as V, A as O, u as I, D as P, H as h, C as B, a as x, L, M as G, O as U, Q as q, R as F, S as k, T as H, U as Q, W, X as $ } from "./index-BtK4jcwc.js";
-import { useState as C, useMemo as c } from "react";
+import { H as V, I as O, u as C, L as P, M as h, z as x, a as B, N as L, O as G, Q as U, R as q, S as F, T as k, U as H, W as Q, X as W, Z as $ } from "./index-CvkiQs0R.js";
+import { useState as I, useMemo as c } from "react";
 import { useQueryClient as j, useQuery as w } from "@tanstack/react-query";
-const K = V(
+const z = V(
   O,
   "useAppointmentsConfig",
   "AppointmentsConfigProvider"
-), z = ({
+), K = ({
   serviceName: e,
   isDeleting: a,
   onConfirm: t,
   onCancel: s
 }) => {
-  const { t: n } = I();
+  const { t: n } = C();
   return /* @__PURE__ */ i(
     P,
     {
@@ -36,8 +36,8 @@ const K = V(
   "speciality",
   "durationMins",
   "description"
-], Y = "app:appointments:manageServices", X = "app:appointments:adminTab", Z = "index-module_page__Gsfbu", J = "index-module_noPrivilegeContainer__Pu5WZ", ee = "index-module_table__GAPmb", d = {
-  page: Z,
+], Y = "app:appointments:manageServices", Z = "app:appointments:adminTab", X = "index-module_page__Gsfbu", J = "index-module_noPrivilegeContainer__Pu5WZ", ee = "index-module_table__GAPmb", d = {
+  page: X,
   noPrivilegeContainer: J,
   table: ee
 };
@@ -75,26 +75,26 @@ function ie(e, a) {
   }));
 }
 const oe = () => {
-  const { t: e } = I(), a = j(), { addNotification: t } = B(), { userPrivileges: s } = x(), { appointmentsConfig: n } = K(), [E, _] = C(null), [M, p] = C(!1), l = n?.serviceTableFields ?? [
+  const { t: e } = C(), a = j(), { addNotification: t } = x(), { userPrivileges: s } = B(), { appointmentsConfig: n } = z(), [E, _] = I(null), [M, m] = I(!1), l = n?.serviceTableFields ?? [
     ...u
-  ], m = L(s, X), b = L(
+  ], p = L(s, Z), b = L(
     s,
     Y
   ), S = c(
     () => te(l),
     [l]
-  ), { data: A, isLoading: v, isError: D } = w({
+  ), { data: A, isLoading: v, isError: R } = w({
     queryKey: ["allAppointmentServices"],
     queryFn: G,
-    enabled: m
-  }), R = c(
+    enabled: p
+  }), D = c(
     () => ae(l, e),
     [l]
   ), N = c(
     () => ie(A ?? [], S),
     [A, S]
   ), g = async () => {
-    p(!0);
+    m(!0);
     try {
       await $(E.id), t({
         title: e("ADMIN_ALL_SERVICES_DELETE_SUCCESS_TITLE"),
@@ -109,7 +109,7 @@ const oe = () => {
         type: "error"
       });
     } finally {
-      p(!1);
+      m(!1);
     }
   }, T = (r, o) => o === "actions" ? /* @__PURE__ */ i(
     Q,
@@ -131,7 +131,7 @@ const oe = () => {
     q,
     {
       header: /* @__PURE__ */ i(k, { breadcrumbItems: f, userMenu: /* @__PURE__ */ i(H, {}) }),
-      main: m ? /* @__PURE__ */ y(
+      main: p ? /* @__PURE__ */ y(
         "div",
         {
           id: "all-appointment-service-page",
@@ -144,18 +144,18 @@ const oe = () => {
               {
                 id: "all-services",
                 title: e("ADMIN_ALL_SERVICES_TITLE"),
-                headers: R,
+                headers: D,
                 rows: N,
                 ariaLabel: "all-services-table",
                 loading: v,
-                errorStateMessage: D ? e("ADMIN_ALL_SERVICES_ERROR_MESSAGE") : null,
+                errorStateMessage: R ? e("ADMIN_ALL_SERVICES_ERROR_MESSAGE") : null,
                 emptyStateMessage: e("ADMIN_ALL_SERVICES_EMPTY_MESSAGE"),
                 renderCell: T,
                 className: d.table
               }
             ),
             E && /* @__PURE__ */ i(
-              z,
+              K,
               {
                 serviceName: E.name,
                 isDeleting: M,