@kosdev-code/kos-ddk-models 0.1.0-dev.5092 → 0.1.0-dev.5096

package/index.mjs

@@ -1,38 +1,38 @@
-var Kr = Object.defineProperty;
-var Yr = (e, t, r) => t in e ? Kr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var s = (e, t, r) => (Yr(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { resolveServiceUrl as h, ServiceFactory as f, KosLog as g, kosTopicHandler as ke, kosModel as l, kosAction as P, Kos as u, isKosModel as d, createPropKey as lt, kosStateProp as Ie, KosModelRegistrationFactory as Re, kosDependency as m, KosModelContainer as ct, resolveContainerDeltas as Ot, kosChild as Fe, Device as qr, kosConfigProperty as c, kosFuture as v, kosModelEffect as ut, MultipleFutureHandler as Gr, FutureEndState as b, TroubleServices as Ae, Troubles as Mt, SingletonKosModelRegistrationFactory as xe, FetchError as je, FutureManager as T, FutureHandler as me, getKosCompanionModel as dt, kosParentAware as Qr, kosLoggerAware as pt, StorageDeviceContainer as Xr, kosFutureAware as Jr, KosDataContainer as Zr, TroubleContainer as gt, troubleByTypeReducer as eo, registerExtensionPoint as to, ExtensionManager as Ue, kosConfigBean as ro, kosStateBean as oo, ObservableData as io, kosAutoEffect as so } from "@kosdev-code/kos-ui-sdk";
-import { AGITATION_REQUIRED_TROUBLE as It, CartridgeAgitatorEvents as Rt, FreestyleHolder as ao } from "@kosdev-code/kos-freestyle-sdk";
-import { Assembly as Ve, HolderContainer as no, IngredientContainer as lo } from "@kosdev-code/kos-dispense-sdk";
-const St = "PurgeTrouble", co = "PrimeTrouble", { URL: ht } = h("AUTH_SERVICE"), { getOne: uo, postModel: po } = f.build({
-  basePath: `${ht}/api/auth`
-}), Ft = g.createLogger({ name: "auth-service", group: "Services" }), At = async () => (Ft.debug("sending GET for auth"), await uo({
-  urlOverride: `${ht}/api/app/kosdev.ddk/auth/role`
-})), xt = async (e) => (Ft.debug("sending POST for auth"), await po({
-  urlOverride: `${ht}/api/app/kosdev.ddk/auth/pincode/${e}`,
+var yo = Object.defineProperty;
+var fo = (e, t, o) => t in e ? yo(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o;
+var i = (e, t, o) => (fo(e, typeof t != "symbol" ? t + "" : t, o), o);
+import { resolveServiceUrl as h, ServiceFactory as y, KosLog as g, kosTopicHandler as Te, kosModel as l, kosAction as v, Kos as c, isKosModel as u, createPropKey as ut, kosStateProp as vo, KosModelRegistrationFactory as mo, kosDependency as p, KosModelContainer as Ve, resolveContainerDeltas as ot, kosChild as $e, Device as bo, kosConfigProperty as d, kosFuture as P, kosModelEffect as He, MultipleFutureHandler as _o, FutureEndState as T, TroubleServices as Me, Troubles as rt, SingletonKosModelRegistrationFactory as Pe, getKosCompanionModel as Be, FetchError as pt, StorageDeviceContainer as To, kosFutureAware as $o, kosLoggerAware as gt, KosDataContainer as Mo, TroubleContainer as Ke, FutureHandler as Ye, troubleByTypeReducer as Po, registerExtensionPoint as Oo, ExtensionManager as Oe, kosConfigBean as So, kosStateBean as wo, ObservableData as Eo, kosAutoEffect as Lo } from "@kosdev-code/kos-ui-sdk";
+import { AGITATION_REQUIRED_TROUBLE as ht, CartridgeAgitatorEvents as yt, FcmPump as ft, FreestyleHolder as Co } from "@kosdev-code/kos-freestyle-sdk";
+import { Assembly as Se, HolderContainer as ko, IngredientContainer as Do } from "@kosdev-code/kos-dispense-sdk";
+const st = "PurgeTrouble", Io = "PrimeTrouble", { URL: Ge } = h("AUTH_SERVICE"), { getOne: Ro, postModel: Ao } = y.build({
+  basePath: `${Ge}/api/auth`
+}), vt = g.createLogger({ name: "auth-service", group: "Services" }), mt = async () => (vt.debug("sending GET for auth"), await Ro({
+  urlOverride: `${Ge}/api/app/kosdev.ddk/auth/role`
+})), bt = async (e) => (vt.debug("sending POST for auth"), await Ao({
+  urlOverride: `${Ge}/api/app/kosdev.ddk/auth/pincode/${e}`,
   model: {}
-})), xs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), Hs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getCurrentRole: At,
-  sendPinCode: xt
+  getCurrentRole: mt,
+  sendPinCode: bt
 }, Symbol.toStringTag, { value: "Module" }));
-var go = Object.defineProperty, ho = Object.getOwnPropertyDescriptor, jt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ho(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && go(t, r, o), o;
-};
-const K = "auth-model", Ct = (e) => e.toLowerCase();
-let Te = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "currentRole");
-    this.id = e, this.logger = r.logger, this.currentRole = "crew";
+var Fo = Object.defineProperty, xo = Object.getOwnPropertyDescriptor, _t = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? xo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Fo(t, o, r), r;
+};
+const F = "auth-model", it = (e) => e.toLowerCase();
+let pe = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "currentRole");
+    this.id = e, this.logger = o.logger, this.currentRole = "crew";
   }
   async authorize(e) {
     if (!e)
       return !1;
-    const t = await xt(e);
+    const t = await bt(e);
     return (t == null ? void 0 : t.status) === 200 ? t.data : !1;
   }
   // -------------------LIFECYCLE----------------------------
@@ -41,51 +41,51 @@ let Te = class {
   }
   async load() {
     this.logger.debug(`loading auth ${this.id}`);
-    const e = await At();
-    (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), P(() => {
-      this.currentRole = Ct(e.data);
+    const e = await mt();
+    (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), v(() => {
+      this.currentRole = it(e.data);
     }));
   }
   handleRoleChange(e) {
-    this.currentRole = Ct(e);
+    this.currentRole = it(e);
   }
   forceRole(e) {
     this.currentRole = e;
   }
 };
-jt([
-  ke({
+_t([
+  Te({
     topic: "/app/kosdev.ddk/auth/role",
     websocket: !0
   })
-], Te.prototype, "handleRoleChange", 1);
-Te = jt([
-  l(K)
-], Te);
-const ft = {
+], pe.prototype, "handleRoleChange", 1);
+pe = _t([
+  l(F)
+], pe);
+const qe = {
   registration: {
-    [K]: {
-      class: Te,
+    [F]: {
+      class: pe,
       singleton: !1
     }
   },
-  type: K,
-  predicate: d(K),
-  factory: u.Factory.create(K)
-};
-var fo = Object.defineProperty, mo = Object.getOwnPropertyDescriptor, Ut = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? mo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && fo(t, r, o), o;
-};
-const Vt = "door-model", yo = lt("doorPath");
-let Oe = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "doorPath");
-    s(this, "open");
-    this.id = e, this.logger = r.logger, this.doorPath = t.doorPath;
+  type: F,
+  predicate: u(F),
+  factory: c.Factory.create(F)
+};
+var jo = Object.defineProperty, Uo = Object.getOwnPropertyDescriptor, Tt = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Uo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && jo(t, o, r), r;
+};
+const $t = "door-model", Wo = ut("doorPath");
+let ge = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "doorPath");
+    i(this, "open");
+    this.id = e, this.logger = o.logger, this.doorPath = t.doorPath;
   }
   get currentState() {
     return this.open.value === void 0 ? "UNKNOWN" : this.open.value ? "OPEN" : "CLOSED";
@@ -94,46 +94,46 @@ let Oe = class {
     return this.open.value === void 0 ? !0 : this.open.value;
   }
 };
-Ut([
-  Ie({ path: yo, attribute: "state" })
-], Oe.prototype, "open", 2);
-Oe = Ut([
-  l(Vt)
-], Oe);
-const bo = new Re({
-  class: Oe,
-  type: Vt
-}), { URL: mt } = h("SETUP-STEP_SERVICE"), { getAll: vo, postModel: _o } = f.build({
-  basePath: `${mt}/api/setup-step`
-}), Wt = g.createLogger({
+Tt([
+  vo({ path: Wo, attribute: "state" })
+], ge.prototype, "open", 2);
+ge = Tt([
+  l($t)
+], ge);
+const No = new mo({
+  class: ge,
+  type: $t
+}), { URL: Qe } = h("SETUP-STEP_SERVICE"), { getAll: zo, postModel: Vo } = y.build({
+  basePath: `${Qe}/api/setup-step`
+}), Mt = g.createLogger({
   name: "setup-step-service",
   group: "Services"
-}), zt = async () => (Wt.debug("sending GET for setup-step"), await vo({
-  urlOverride: `${mt}/api/app/kosdev.ddk/setup/steps`
-})), Ht = async (e) => (Wt.debug("sending POST for setup-step"), await _o({
-  urlOverride: `${mt}/api/app/kosdev.ddk/setup/complete/${e}`,
+}), Pt = async () => (Mt.debug("sending GET for setup-step"), await zo({
+  urlOverride: `${Qe}/api/app/kosdev.ddk/setup/steps`
+})), Ot = async (e) => (Mt.debug("sending POST for setup-step"), await Vo({
+  urlOverride: `${Qe}/api/app/kosdev.ddk/setup/complete/${e}`,
   model: {}
-})), js = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getSetupSteps: zt,
-  markStepComplete: Ht
+  getSetupSteps: Pt,
+  markStepComplete: Ot
 }, Symbol.toStringTag, { value: "Module" }));
-var Po = Object.getOwnPropertyDescriptor, $o = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Po(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var Ho = Object.getOwnPropertyDescriptor, Bo = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Ho(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const Y = "setup-step-model";
-let Ze = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "idx");
-    s(this, "name");
-    s(this, "complete");
-    s(this, "preStep");
-    s(this, "exclusive");
-    s(this, "logger");
-    this.id = e, this.idx = t.idx, this.logger = r.logger, this.name = t.name, this.complete = t.complete, this.preStep = t.preStep, this.exclusive = t.exclusive;
+const x = "setup-step-model";
+let Ae = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "idx");
+    i(this, "name");
+    i(this, "complete");
+    i(this, "preStep");
+    i(this, "exclusive");
+    i(this, "logger");
+    this.id = e, this.idx = t.idx, this.logger = o.logger, this.name = t.name, this.complete = t.complete, this.preStep = t.preStep, this.exclusive = t.exclusive;
   }
   updateModel(e) {
     this.name = e.name, this.idx = e.idx, this.complete = e.complete, this.preStep = e.preStep, this.exclusive = e.exclusive;
@@ -145,8 +145,8 @@ let Ze = class {
     return `setup.${this.name}.body`;
   }
   async completeStep() {
-    const e = await Ht(this.name);
-    (e == null ? void 0 : e.status) === 200 && P(() => {
+    const e = await Ot(this.name);
+    (e == null ? void 0 : e.status) === 200 && v(() => {
       this.complete = !0;
     });
   }
@@ -158,45 +158,45 @@ let Ze = class {
     this.logger.debug(`loading setup-step ${this.id}`);
   }
 };
-Ze = $o([
-  l(Y)
-], Ze);
-const Nt = {
+Ae = Bo([
+  l(x)
+], Ae);
+const St = {
   registration: {
-    [Y]: {
-      class: Ze,
+    [x]: {
+      class: Ae,
       singleton: !1
     }
   },
-  type: Y,
-  predicate: d(Y),
-  factory: u.Factory.create(Y)
+  type: x,
+  predicate: u(x),
+  factory: c.Factory.create(x)
 };
-var To = Object.defineProperty, Oo = Object.getOwnPropertyDescriptor, We = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Oo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && To(t, r, o), o;
+var Ko = Object.defineProperty, Yo = Object.getOwnPropertyDescriptor, we = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Yo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Ko(t, o, r), r;
 };
-const q = "setup-step-container-model";
-function wt(e) {
+const j = "setup-step-container-model";
+function nt(e) {
   return (t) => {
-    const r = Nt.factory(t.id)(t);
-    r.updateModel(t), e.addModel(r);
+    const o = St.factory(t.id)(t);
+    o.updateModel(t), e.addModel(o);
   };
 }
-function Et(e) {
+function at(e) {
   return (t) => {
     e.removeModel(t);
   };
 }
-let F = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "_currentStep");
-    s(this, "logger");
-    s(this, "models");
-    s(this, "authModel");
-    this.id = e, this.logger = r.logger, this._currentStep = void 0, this.models = new ct({
+let E = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "_currentStep");
+    i(this, "logger");
+    i(this, "models");
+    i(this, "authModel");
+    this.id = e, this.logger = o.logger, this._currentStep = void 0, this.models = new Ve({
       parentId: e,
       sortKey: "idx"
     });
@@ -212,7 +212,7 @@ let F = class {
     if (!this._currentStep)
       this._currentStep = this.firstIncompleteStep;
     else {
-      const e = this._currentStep.idx, t = this.models.data.find((r) => r.idx > e);
+      const e = this._currentStep.idx, t = this.models.data.find((o) => o.idx > e);
       t && (this._currentStep = t);
     }
   }
@@ -247,124 +247,124 @@ let F = class {
   }
   async load() {
     this.logger.debug(`loading setup-step-container container ${this.id}`);
-    const e = await zt();
+    const e = await Pt();
     if (e != null && e.data) {
       const t = e.data.map(
-        (r, i) => ({
-          ...r,
-          idx: i,
-          id: `setup-${r.name}`
+        (o, s) => ({
+          ...o,
+          idx: s,
+          id: `setup-${o.name}`
         })
       );
-      Ot({
+      ot({
         container: this.models,
-        onAddItem: wt(this),
-        onRemoveItem: Et(this)
+        onAddItem: nt(this),
+        onRemoveItem: at(this)
       })(t);
     }
     this.nextStep();
   }
   handleStepChanges(e) {
-    const t = e.map((r, i) => ({
-      ...r,
-      idx: i,
-      id: `setup-${r.name}`
+    const t = e.map((o, s) => ({
+      ...o,
+      idx: s,
+      id: `setup-${o.name}`
     }));
-    Ot({
+    ot({
       container: this.models,
-      onAddItem: wt(this),
-      onRemoveItem: Et(this)
+      onAddItem: nt(this),
+      onRemoveItem: at(this)
     })(t);
   }
 };
-We([
-  Fe
-], F.prototype, "models", 2);
-We([
-  m({ modelType: ft.type })
-], F.prototype, "authModel", 2);
-We([
-  ke({
+we([
+  $e
+], E.prototype, "models", 2);
+we([
+  p({ modelType: qe.type })
+], E.prototype, "authModel", 2);
+we([
+  Te({
     topic: "/app/kosdev.ddk/setup/steps",
     websocket: !0
   })
-], F.prototype, "handleStepChanges", 1);
-F = We([
-  l(q)
-], F);
-const Bt = {
+], E.prototype, "handleStepChanges", 1);
+E = we([
+  l(j)
+], E);
+const wt = {
   registration: {
-    [q]: {
-      class: F,
+    [j]: {
+      class: E,
       singleton: !0
     },
-    ...Nt.registration
+    ...St.registration
   },
-  type: q,
-  predicate: d(q),
-  factory: u.Singleton.create(q)
-}, { URL: k } = h("AUTH_SERVICE"), { getOne: Kt, getAll: Pe } = f.build({
-  basePath: `${k}/api/app/kosdev.ddk/ncui/`
-}), pe = g.createLogger({ name: "auth-service", group: "Services" }), Mo = async () => {
-  pe.debug("sending GET for cuis");
-  const e = await Pe({
-    urlOverride: `${k}/api/app/kosdev.ddk/cui`
+  type: j,
+  predicate: u(j),
+  factory: c.Singleton.create(j)
+}, { URL: S } = h("AUTH_SERVICE"), { getOne: Et, getAll: ce } = y.build({
+  basePath: `${S}/api/app/kosdev.ddk/ncui/`
+}), oe = g.createLogger({ name: "auth-service", group: "Services" }), Go = async () => {
+  oe.debug("sending GET for cuis");
+  const e = await ce({
+    urlOverride: `${S}/api/app/kosdev.ddk/cui`
   });
   if ((e == null ? void 0 : e.status) !== 200)
     throw new Error("Failed to retrieve cuis");
   return e.data;
-}, So = async () => {
-  pe.debug("sending GET for navigation");
+}, qo = async () => {
+  oe.debug("sending GET for navigation");
   try {
-    const e = await Pe({
-      urlOverride: `${k}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.navigations`
+    const e = await ce({
+      urlOverride: `${S}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.navigations`
     });
     if ((e == null ? void 0 : e.status) !== 200) {
-      pe.info("no extensions found, using base data");
-      const t = await Pe({
-        urlOverride: `${k}/api/kos/descriptor/system:app/kondra.ncui.navigations`
+      oe.info("no extensions found, using base data");
+      const t = await ce({
+        urlOverride: `${S}/api/kos/descriptor/system:app/kondra.ncui.navigations`
       });
       return (t == null ? void 0 : t.data) ?? [];
     }
     return (e == null ? void 0 : e.data) ?? [];
   } catch {
-    const t = await Pe({
-      urlOverride: `${k}/api/kos/descriptor/system:app/kondra.ncui.navigations`
+    const t = await ce({
+      urlOverride: `${S}/api/kos/descriptor/system:app/kondra.ncui.navigations`
     });
     return (t == null ? void 0 : t.data) ?? [];
   }
-}, Co = async () => (pe.debug("navigating to CUI"), await Kt({
-  urlOverride: `${k}/api/app/kosdev.ddk/cui/open`
-})), wo = async () => (pe.debug("navigating to NCUI"), await Kt({
-  urlOverride: `${k}/api/app/kosdev.ddk/ncui/open`
+}, Qo = async () => (oe.debug("navigating to CUI"), await Et({
+  urlOverride: `${S}/api/app/kosdev.ddk/cui/open`
+})), Xo = async () => (oe.debug("navigating to NCUI"), await Et({
+  urlOverride: `${S}/api/app/kosdev.ddk/ncui/open`
 }));
-var Eo = Object.defineProperty, Lo = Object.getOwnPropertyDescriptor, L = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Lo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Eo(t, r, o), o;
-};
-const G = "application-model", Yt = (e, t = "") => e.reduce((r, i) => {
-  const o = t ? `${t}.${i.name}` : i.name;
-  if (r[o] = { ...i, root: !t }, i.children) {
-    const n = Yt(i.children, o);
+var Jo = Object.defineProperty, Zo = Object.getOwnPropertyDescriptor, O = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Zo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Jo(t, o, r), r;
+};
+const U = "application-model", Lt = (e, t = "") => e.reduce((o, s) => {
+  const r = t ? `${t}.${s.name}` : s.name;
+  if (o[r] = { ...s, root: !t }, s.children) {
+    const n = Lt(s.children, r);
     Object.keys(n).forEach((a) => {
-      r[a] = n[a];
+      o[a] = n[a];
     });
   }
-  return r;
+  return o;
 }, {});
-let S = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "device");
-    s(this, "authModel");
-    s(this, "setupStepContainer");
-    s(this, "door");
-    s(this, "ncuiLanguage");
-    s(this, "activeCui");
-    s(this, "fallbackCui");
-    s(this, "_cuis", []);
-    s(this, "_navigationItems", []);
+let b = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "device");
+    i(this, "authModel");
+    i(this, "setupStepContainer");
+    i(this, "door");
+    i(this, "ncuiLanguage");
+    i(this, "activeCui");
+    i(this, "fallbackCui");
+    i(this, "_cuis", []);
+    i(this, "_navigationItems", []);
     // @kosConfigProperty({
     //   path: 'somewhere.enable.dial.animation',
     //   attribute: 'enableDialAnimation',
@@ -380,9 +380,9 @@ let S = class {
     //   attribute: 'enableSidebarAnimation',
     // })
     // enableSidebarAnimation!: KosConfigProperty<boolean>;
-    s(this, "languages");
-    s(this, "logger");
-    this.id = e, this.languages = [], this._cuis = [], this.logger = r.logger, this.door = bo.instance("app:kosdev.ddk:service:door:door").options({
+    i(this, "languages");
+    i(this, "logger");
+    this.id = e, this.languages = [], this._cuis = [], this.logger = o.logger, this.door = No.instance("app:kosdev.ddk:service:door:door").options({
       doorPath: "app:kosdev.ddk:service:door:door"
     }).build();
   }
@@ -396,7 +396,7 @@ let S = class {
     return this._cuis.reduce((e, t) => (e[t.appId] = t, e), {});
   }
   get navigationItems() {
-    return Yt(this._navigationItems);
+    return Lt(this._navigationItems);
   }
   get hasCuiDefined() {
     return !!this.activeCui.value || !!this.fallbackCui.value;
@@ -405,19 +405,19 @@ let S = class {
     return this.door.isOpen;
   }
   async enter() {
-    this.logger.info("navigating to NCUI"), await wo();
+    this.logger.info("navigating to NCUI"), await Xo();
   }
   async exit() {
-    this.logger.info("navigating to CUI"), await Co();
+    this.logger.info("navigating to CUI"), await Qo();
   }
   // -------------------LIFECYCLE----------------------------
   async load() {
-    var r, i;
+    var o, s;
     this.logger.debug(`loading application ${this.id}`);
-    const e = await So();
+    const e = await qo();
     this._navigationItems = e;
-    const t = await Mo();
-    this._cuis = t, (r = this.setupStepContainer) != null && r.hasIncompletePreSteps && ((i = this.authModel) == null || i.forceRole("technician")), this.languages = [
+    const t = await Go();
+    this._cuis = t, (o = this.setupStepContainer) != null && o.hasIncompletePreSteps && ((s = this.authModel) == null || s.forceRole("technician")), this.languages = [
       {
         name: "English",
         locale: "en"
@@ -425,87 +425,87 @@ let S = class {
     ];
   }
 };
-L([
-  m({ modelType: qr.type })
-], S.prototype, "device", 2);
-L([
-  m({ modelType: ft.type })
-], S.prototype, "authModel", 2);
-L([
-  m({ modelType: Bt.type })
-], S.prototype, "setupStepContainer", 2);
-L([
-  Fe
-], S.prototype, "door", 2);
-L([
-  c({
+O([
+  p({ modelType: bo.type })
+], b.prototype, "device", 2);
+O([
+  p({ modelType: qe.type })
+], b.prototype, "authModel", 2);
+O([
+  p({ modelType: wt.type })
+], b.prototype, "setupStepContainer", 2);
+O([
+  $e
+], b.prototype, "door", 2);
+O([
+  d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
     //updated attribute for language config property
   })
-], S.prototype, "ncuiLanguage", 2);
-L([
-  c({
+], b.prototype, "ncuiLanguage", 2);
+O([
+  d({
     path: "app:kosdev.ddk:service:cui",
     attribute: "activeCui"
   })
-], S.prototype, "activeCui", 2);
-L([
-  c({
+], b.prototype, "activeCui", 2);
+O([
+  d({
     path: "app:kosdev.ddk:service:cui",
     attribute: "fallbackCui"
   })
-], S.prototype, "fallbackCui", 2);
-S = L([
-  l(G)
-], S);
-const yt = {
+], b.prototype, "fallbackCui", 2);
+b = O([
+  l(U)
+], b);
+const Xe = {
   registration: {
-    [G]: {
-      class: S,
+    [U]: {
+      class: b,
       singleton: !0
     }
   },
-  type: G,
-  predicate: d(G),
-  factory: u.Singleton.create(
-    G
+  type: U,
+  predicate: u(U),
+  factory: c.Singleton.create(
+    U
   )
-}, _e = {
+}, de = {
   none: 999,
   crew: 0,
   technician: 1,
   manager: 2
-}, qt = (e) => (t) => {
-  if (t.type === It)
+}, Ct = (e) => (t) => {
+  if (t.type === ht)
     return !1;
-  const r = (t == null ? void 0 : t.role) || "technician";
-  if (e && r) {
-    const i = _e[e.toLowerCase()] ?? _e.crew, o = _e[r.toLowerCase()] ?? _e.crew;
-    return i >= o;
+  const o = (t == null ? void 0 : t.role) || "technician";
+  if (e && o) {
+    const s = de[e.toLowerCase()] ?? de.crew, r = de[o.toLowerCase()] ?? de.crew;
+    return s >= r;
   }
   return !1;
 };
-var Do = Object.defineProperty, ko = Object.getOwnPropertyDescriptor, W = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ko(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Do(t, r, o), o;
-};
-const Gt = "agitation-control-model", et = "resolve", Io = "agitate";
-let w = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "futureHandler");
-    s(this, "logger");
-    s(this, "troubleContainer");
-    s(this, "_agitationFutureId");
-    s(this, "_canExit", !0);
-    s(this, "_exiting", !1);
-    s(this, "_isFailed", !1);
-    s(this, "disposer");
-    s(this, "application");
-    s(this, "inProgress", []);
-    this.id = e, this.logger = r.logger, this.troubleContainer = t.companionParent, this.futureHandler = new Gr(this, et);
+var er = Object.defineProperty, tr = Object.getOwnPropertyDescriptor, D = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? tr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && er(t, o, r), r;
+};
+const kt = "agitation-control-model", Fe = "resolve", or = "agitate";
+let $ = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "futureHandler");
+    i(this, "logger");
+    i(this, "troubleContainer");
+    i(this, "_agitationFutureId");
+    i(this, "_canExit", !0);
+    i(this, "_exiting", !1);
+    i(this, "_isFailed", !1);
+    i(this, "disposer");
+    i(this, "application");
+    i(this, "inProgress", []);
+    this.id = e, this.logger = o.logger, this.troubleContainer = t.companionParent, this.futureHandler = new _o(this, Fe);
   }
   set isFailed(e) {
     this._isFailed = e;
@@ -534,23 +534,23 @@ let w = class {
     });
   }
   get readyToResolve() {
-    const e = this.queuedTroubles.length, t = this.queuedTroubles.filter((i) => i.shouldDefer), r = e > 0 && t.length === 0;
-    return this.isDoorClosed && r && this.exiting;
+    const e = this.queuedTroubles.length, t = this.queuedTroubles.filter((s) => s.shouldDefer), o = e > 0 && t.length === 0;
+    return this.isDoorClosed && o && this.exiting;
   }
   onFutureUpdate(e) {
-    e.endState === b.Success ? (this.logger.debug(
+    e.endState === T.Success ? (this.logger.debug(
       `Resolve deferred troubles future ${e.id} completed successfully`
     ), this.queuedTroubles.forEach((t) => {
       t.clearDefer();
-    }), P(() => {
+    }), v(() => {
       this._canExit = !0, this._isFailed = !1;
-    })) : (e.endState === b.Fail || e.endState === b.Canceled || e.endState === b.Aborted) && (this.logger.error(`Resolve deferred troubles future ${e.id} failed`), this.clearAll(), P(() => {
+    })) : (e.endState === T.Fail || e.endState === T.Canceled || e.endState === T.Aborted) && (this.logger.error(`Resolve deferred troubles future ${e.id} failed`), this.clearAll(), v(() => {
       this._canExit = !1, this._isFailed = !0;
     }));
   }
   async resolveDeferredTroubles(e) {
-    const t = this.queuedTroubles.filter((i) => !i.shouldDefer).map((i) => i.rawId).filter((i) => !this.inProgress.includes(i));
-    return this.inProgress.push(...t), t.length === 0 ? void 0 : await Ae.bulkResolveTroubles(
+    const t = this.queuedTroubles.filter((s) => !s.shouldDefer).map((s) => s.rawId).filter((s) => !this.inProgress.includes(s));
+    return this.inProgress.push(...t), t.length === 0 ? void 0 : await Me.bulkResolveTroubles(
       t,
       void 0,
       e
@@ -561,23 +561,23 @@ let w = class {
   }
   get queuedTroubles() {
     return this.troubleContainer.troubles.getIndexByKey(
-      Mt.INDEX_TROUBLES_BY_DEFERRED,
-      Mt.TROUBLES_DEFERRED
+      rt.INDEX_TROUBLES_BY_DEFERRED,
+      rt.TROUBLES_DEFERRED
     );
   }
   get visibleTroubles() {
     const e = this.application.currentRole;
-    return this.troubleContainer.troubles.data.filter(qt(e)).filter((t) => t.type !== It);
+    return this.troubleContainer.troubles.data.filter(Ct(e)).filter((t) => t.type !== ht);
   }
   // -------------------LIFECYCLE----------------------------
   get future() {
     return this.futureHandler.future;
   }
   get resolveFuture() {
-    return this.futureHandler.getFuture(et);
+    return this.futureHandler.getFuture(Fe);
   }
   get agitateFuture() {
-    return this.futureHandler.getFuture(Io);
+    return this.futureHandler.getFuture(or);
   }
   handleAgitationStarted(e) {
     this.logger.info(`Agitation started for ${e.path}`), this._agitationFutureId = String(e.futureId);
@@ -598,306 +598,109 @@ let w = class {
     this.logger.debug(`loading agitation-control ${this.id}`);
   }
 };
-W([
-  m({ modelType: yt.type })
-], w.prototype, "application", 2);
-W([
-  v({ alias: et })
-], w.prototype, "resolveDeferredTroubles", 1);
-W([
-  ke({ topic: Rt.TOPIC_AGITATION_STARTED })
-], w.prototype, "handleAgitationStarted", 1);
-W([
-  ke({ topic: Rt.TOPIC_AGITATION_ENDED })
-], w.prototype, "handleAgitationEnded", 1);
-W([
-  ut({
+D([
+  p({ modelType: Xe.type })
+], $.prototype, "application", 2);
+D([
+  P({ alias: Fe })
+], $.prototype, "resolveDeferredTroubles", 1);
+D([
+  Te({ topic: yt.TOPIC_AGITATION_STARTED })
+], $.prototype, "handleAgitationStarted", 1);
+D([
+  Te({ topic: yt.TOPIC_AGITATION_ENDED })
+], $.prototype, "handleAgitationEnded", 1);
+D([
+  He({
     dependencies: (e) => [e.readyToResolve, e._agitationFutureId]
   })
-], w.prototype, "handleReadyToResolve", 1);
-w = W([
-  l(Gt)
-], w);
-const Us = new xe({
-  class: w,
-  type: Gt
+], $.prototype, "handleReadyToResolve", 1);
+$ = D([
+  l(kt)
+], $);
+const Ks = new Pe({
+  class: $,
+  type: kt
 });
-var Ro = Object.defineProperty, Fo = Object.getOwnPropertyDescriptor, ye = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Fo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Ro(t, r, o), o;
+var rr = Object.defineProperty, sr = Object.getOwnPropertyDescriptor, ne = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? sr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && rr(t, o, r), r;
 };
-const Q = "animation-model";
-let I = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "disableAll");
-    s(this, "enableDial");
-    s(this, "enableModal");
-    s(this, "enableSideBar");
-    this.id = e, this.logger = r.logger;
-  }
-};
-ye([
-  c({
+const W = "animation-model";
+let w = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "disableAll");
+    i(this, "enableDial");
+    i(this, "enableModal");
+    i(this, "enableSideBar");
+    this.id = e, this.logger = o.logger;
+  }
+};
+ne([
+  d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.disableAll"
   })
-], I.prototype, "disableAll", 2);
-ye([
-  c({
+], w.prototype, "disableAll", 2);
+ne([
+  d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableDial"
   })
-], I.prototype, "enableDial", 2);
-ye([
-  c({
+], w.prototype, "enableDial", 2);
+ne([
+  d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableModal"
   })
-], I.prototype, "enableModal", 2);
-ye([
-  c({
+], w.prototype, "enableModal", 2);
+ne([
+  d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableSideBar"
   })
-], I.prototype, "enableSideBar", 2);
-I = ye([
-  l(Q)
-], I);
-const Ao = {
+], w.prototype, "enableSideBar", 2);
+w = ne([
+  l(W)
+], w);
+const ir = {
   registration: {
-    [Q]: {
-      class: I,
+    [W]: {
+      class: w,
       singleton: !0
     }
   },
-  type: Q,
-  predicate: d(Q),
-  factory: u.Singleton.create(Q)
-}, { URL: xo } = h("ANIMATION_SERVICE"), { getAll: jo } = f.build({
-  basePath: `${xo}/api/animation`
-}), Uo = g.createLogger({
+  type: W,
+  predicate: u(W),
+  factory: c.Singleton.create(W)
+}, { URL: nr } = h("ANIMATION_SERVICE"), { getAll: ar } = y.build({
+  basePath: `${nr}/api/animation`
+}), lr = g.createLogger({
   name: "animation-service",
   group: "Services"
-}), Vo = async () => (Uo.debug("sending GET for animation"), await jo({})), Vs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), dr = async () => (lr.debug("sending GET for animation"), await ar({})), Ys = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getAnimations: Vo
-}, Symbol.toStringTag, { value: "Module" })), { URL: z } = h("FCM-PUMP_SERVICE"), { postModel: be } = f.build({
-  basePath: `${z}/api/fcm-pump`
-}), y = g.createLogger({
-  name: "fcm-pump-service",
-  group: "Services"
-}), Qt = async (e) => {
-  var t, r, i, o, n;
-  y.debug(
-    `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
-  );
-  try {
-    const a = await be({
-      model: {},
-      urlOverride: `${z}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
-    });
-    return y.debug("performElectricalTest - response:", a), ((a == null ? void 0 : a.status) === 200 || (a == null ? void 0 : a.status) === 499) && ((t = a.data) != null && t.error) ? [a.data.error || "unknownError", a.data] : [void 0, a == null ? void 0 : a.data];
-  } catch (a) {
-    if (y.error(
-      `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`,
-      a
-    ), a instanceof je) {
-      const M = ((i = (r = a.payload) == null ? void 0 : r.data) == null ? void 0 : i.error) || ((o = a.payload) == null ? void 0 : o.error) || "unknownError";
-      return [M, ((n = a.payload) == null ? void 0 : n.data) || { error: M }];
-    }
-  }
-  return ["unknownError", { error: "unknownError" }];
-}, Xt = async (e, t) => {
-  y.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`
-  );
-  try {
-    const r = await be({
-      model: {},
-      urlOverride: `${z}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
-      tracker: t
-    });
-    return y.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
-  } catch (r) {
-    y.error(
-      `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
-      r
-    );
-    const i = {
-      id: t || "",
-      endState: b.Fail,
-      tracker: t,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(i), i;
-  }
-}, Jt = async (e, t) => {
-  y.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`
-  );
-  try {
-    const r = await be({
-      model: {},
-      urlOverride: `${z}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
-      tracker: t
-    });
-    return y.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
-  } catch (r) {
-    y.error(
-      `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`,
-      r
-    );
-    const i = {
-      id: t || "",
-      endState: b.Fail,
-      tracker: t,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(i), i;
-  }
-}, Zt = async (e, t, r) => {
-  y.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`
-  );
-  try {
-    const i = await be({
-      model: {},
-      urlOverride: `${z}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
-      tracker: r
-    });
-    return y.debug("performVerify - response:", i), i != null && i.data && T.initiateFuture(i.data), i == null ? void 0 : i.data;
-  } catch (i) {
-    y.error(
-      `performVerify - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
-      i
-    );
-    const o = {
-      id: r || "",
-      endState: b.Fail,
-      tracker: r,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(o), o;
-  }
-}, Wo = (e) => e ? e.data === "success" || !e.data ? "success" : e.data : "error", er = async (e, t, r) => {
-  y.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
-  );
-  try {
-    const i = await be({
-      model: {},
-      urlOverride: `${z}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
-    });
-    return y.debug("performPreCalibrate - response:", i), Wo(i == null ? void 0 : i.data);
-  } catch (i) {
-    y.error(
-      `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`,
-      i
-    );
-    return;
-  }
-}, Ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  performCalibrate: Jt,
-  performComplete: er,
-  performElectricalTest: Qt,
-  performPreCalibrate: Xt,
-  performVerify: Zt
+  getAnimations: dr
 }, Symbol.toStringTag, { value: "Module" }));
-var zo = Object.defineProperty, Ho = Object.getOwnPropertyDescriptor, ze = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ho(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && zo(t, r, o), o;
-};
-const tr = "fcm-pump-model", No = g.createLogger({ name: "fcm-pump-model" });
-let A = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "pumpModel");
-    s(this, "futureHandler");
-    this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent, this.futureHandler = new me(this);
-  }
-  get future() {
-    return this.futureHandler.future;
-  }
-  get name() {
-    return this.pumpModel.name;
-  }
-  get canPour() {
-    return this.pumpModel.canPour;
-  }
-  get isPouring() {
-    return this.pumpModel.isPouring;
-  }
-  async cancelPour() {
-    return this.pumpModel.cancelPour();
-  }
-  performIntent(e) {
-    return this.pumpModel.performIntent(e);
-  }
-  async performElectricalTest() {
-    const [e, t] = await Qt(this.pumpModel.path);
-    return e && No.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
-  }
-  getChildren() {
-    return [...this.futureHandler.allFutures];
-  }
-  async performPreCalibrate(e) {
-    return Xt(this.pumpModel.path, e);
-  }
-  async performCalibrate(e) {
-    return Jt(this.pumpModel.path, e);
-  }
-  async performVerify(e, t) {
-    return Zt(this.pumpModel.path, e, t);
-  }
-  async performComplete(e, t) {
-    return er(this.pumpModel.path, e, t);
-  }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing fcm-pump ${this.id}`);
-  }
-  async load() {
-    this.logger.debug(`loading fcm-pump ${this.id}`);
-  }
-};
-ze([
-  v()
-], A.prototype, "performPreCalibrate", 1);
-ze([
-  v()
-], A.prototype, "performCalibrate", 1);
-ze([
-  v()
-], A.prototype, "performVerify", 1);
-A = ze([
-  l(tr)
-], A);
-const rr = new Re({
-  class: A,
-  type: tr
-});
-var Bo = Object.defineProperty, Ko = Object.getOwnPropertyDescriptor, or = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ko(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Bo(t, r, o), o;
+var cr = Object.defineProperty, ur = Object.getOwnPropertyDescriptor, Dt = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? ur(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && cr(t, o, r), r;
 };
-const X = "carb-water-model";
-let Me = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "assemblyModel");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+const N = "carb-water-model";
+let he = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "assemblyModel");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger;
   }
   getPump() {
     const t = this.assemblyModel.getHoldersByGroup("carb")[0].pumps.data[0];
-    return dt(t, rr.type);
+    return Be(t, ft.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -907,149 +710,102 @@ let Me = class {
     this.logger.debug(`loading carb-water ${this.id}`);
   }
 };
-or([
-  m({ modelType: Ve.type })
-], Me.prototype, "assemblyModel", 2);
-Me = or([
-  l(X)
-], Me);
-const Yo = {
+Dt([
+  p({ modelType: Se.type })
+], he.prototype, "assemblyModel", 2);
+he = Dt([
+  l(N)
+], he);
+const pr = {
   registration: {
-    [X]: {
-      class: Me,
+    [N]: {
+      class: he,
       singleton: !1
     }
   },
-  type: X,
-  predicate: d(X),
-  factory: u.Factory.create(X)
-};
-var ir = Object.defineProperty, qo = Object.getOwnPropertyDescriptor, Go = (e, t, r) => t in e ? ir(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, He = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? qo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && ir(t, r, o), o;
-}, Qo = (e, t, r) => (Go(e, t + "", r), r);
-const Xo = "cgp-pump-model", bt = lt("statePath");
-let R = class {
-  constructor(e, t) {
-    s(this, "highProbeWet");
-    s(this, "lowProbeWet");
-    s(this, "filling");
-    s(this, "id");
-    s(this, "state");
-    // Composition pattern - explicit parent access
-    s(this, "parent");
-    var r;
-    this.id = e, this.parent = t.companionParent, this.state = ((r = t.data) == null ? void 0 : r.state) ?? { name: "unknown", path: "" };
-  }
-  get statePath() {
-    return this.state.path;
-  }
-};
-Qo(R, "Registration");
-He([
-  Ie({
-    path: bt,
-    attribute: "highProbeWet"
-  })
-], R.prototype, "highProbeWet", 2);
-He([
-  Ie({
-    path: bt,
-    attribute: "lowProbeWet"
-  })
-], R.prototype, "lowProbeWet", 2);
-He([
-  Ie({
-    path: bt,
-    attribute: "filling"
-  })
-], R.prototype, "filling", 2);
-R = He([
-  l({ modelTypeId: Xo, singleton: !1 }),
-  Qr(),
-  pt()
-], R);
-const zs = R.Registration, { URL: H } = h("COPY-LOGS_SERVICE"), { getAll: Jo, getOne: Zo, postModel: sr, deleteModel: ei } = f.build({
-  basePath: `${H}/api/copy-logs`
-}), Se = g.createLogger({
+  type: N,
+  predicate: u(N),
+  factory: c.Factory.create(N)
+}, { URL: I } = h("COPY-LOGS_SERVICE"), { getAll: gr, getOne: hr, postModel: It, deleteModel: yr } = y.build({
+  basePath: `${I}/api/copy-logs`
+}), ye = g.createLogger({
   name: "copy-logs-service",
   group: "Services"
-}), ar = async (e, t) => {
-  const r = await ei({
+}), Rt = async (e, t) => {
+  const o = await yr({
     tracker: t,
     id: e,
-    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
+    urlOverride: `${I}/api/app/kosdev.ddk/copyLogs/${e}`
   });
-  if (!(r != null && r.data))
+  if (!(o != null && o.data))
     throw new Error("No response from server");
-  return r.data;
-}, nr = async (e, t) => {
-  const r = await sr({
+  return o.data;
+}, At = async (e, t) => {
+  const o = await It({
     model: {},
     tracker: t,
-    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${e}`
+    urlOverride: `${I}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${e}`
   });
-  if (!(r != null && r.data))
+  if (!(o != null && o.data))
     throw new Error("No response from server");
-  return r.data;
-}, lr = async (e, t) => {
-  const r = await sr({
+  return o.data;
+}, Ft = async (e, t) => {
+  const o = await It({
     model: {},
     tracker: t,
-    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
+    urlOverride: `${I}/api/app/kosdev.ddk/copyLogs/${e}`
   });
-  if (!(r != null && r.data))
+  if (!(o != null && o.data))
     throw new Error("No response from server");
-  return r.data;
-}, cr = async () => {
-  Se.debug("sending GET for copy-logs");
+  return o.data;
+}, xt = async () => {
+  ye.debug("sending GET for copy-logs");
   try {
-    const e = await Jo({
-      urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/volumes/size`
+    const e = await gr({
+      urlOverride: `${I}/api/app/kosdev.ddk/copyLogs/volumes/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof je)
-      return Se.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof pt)
+      return ye.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, ur = async () => {
-  Se.debug("sending GET for log file size");
+}, jt = async () => {
+  ye.debug("sending GET for log file size");
   try {
-    const e = await Zo({
-      urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/files/size`
+    const e = await hr({
+      urlOverride: `${I}/api/app/kosdev.ddk/copyLogs/files/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof je)
-      return Se.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof pt)
+      return ye.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, Hs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Gs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  copyLogFromVolume: lr,
-  eraseAndCopyLogsToVolume: nr,
-  eraseVolume: ar,
-  getLogFileSize: ur,
-  getVolumes: cr
+  copyLogFromVolume: Ft,
+  eraseAndCopyLogsToVolume: At,
+  eraseVolume: Rt,
+  getLogFileSize: jt,
+  getVolumes: xt
 }, Symbol.toStringTag, { value: "Module" }));
-var dr = Object.defineProperty, ti = Object.getOwnPropertyDescriptor, ri = (e, t, r) => t in e ? dr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, N = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ti(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && dr(t, r, o), o;
-}, oi = (e, t, r) => (ri(e, t + "", r), r);
-const ii = "copy-logs-model";
-let C = class {
+var Ut = Object.defineProperty, fr = Object.getOwnPropertyDescriptor, vr = (e, t, o) => t in e ? Ut(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o, R = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? fr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Ut(t, o, r), r;
+}, mr = (e, t, o) => (vr(e, t + "", o), o);
+const br = "copy-logs-model";
+let _ = class {
   constructor(e) {
-    s(this, "id");
-    s(this, "_volumes");
-    s(this, "storageDeviceContainer");
-    s(this, "_activeVolume");
-    s(this, "_logFileSize", 0);
-    s(this, "_actionState", "idle");
-    s(this, "copyProgress");
-    this.id = e, this._volumes = new Zr(), this._activeVolume = void 0, this.copyProgress = {
+    i(this, "id");
+    i(this, "_volumes");
+    i(this, "storageDeviceContainer");
+    i(this, "_activeVolume");
+    i(this, "_logFileSize", 0);
+    i(this, "_actionState", "idle");
+    i(this, "copyProgress");
+    this.id = e, this._volumes = new Mo(), this._activeVolume = void 0, this.copyProgress = {
       bytesCopied: 0,
       bytesToCopy: 0,
       filesCopied: 0,
@@ -1089,19 +845,19 @@ let C = class {
   }
   get diskFull() {
     var e;
-    return ((e = this.future) == null ? void 0 : e.status) === b.Success && this.copyProgress.filesSkipped > 0;
+    return ((e = this.future) == null ? void 0 : e.status) === T.Success && this.copyProgress.filesSkipped > 0;
   }
   onFutureUpdate(e) {
-    this.logger.info(`Future update: ${e.status}`), e.status === b.Success && (this.logger.info(`Future success: ${e.status}`), this.diskFull && P(() => {
-      e.endState = b.Fail, e.reason = "errDiskFull";
-    })), e.status === b.Fail && this.logger.error(`Future failed: ${e.status}`), e.note === "copy" ? P(() => {
+    this.logger.info(`Future update: ${e.status}`), e.status === T.Success && (this.logger.info(`Future success: ${e.status}`), this.diskFull && v(() => {
+      e.endState = T.Fail, e.reason = "errDiskFull";
+    })), e.status === T.Fail && this.logger.error(`Future failed: ${e.status}`), e.note === "copy" ? v(() => {
       this._actionState = "copying", this.copyProgress = e.clientData || {
         bytesCopied: 0,
         bytesToCopy: 0,
         filesCopied: 0,
         filesSkipped: 0
       };
-    }) : (this._actionState = "erasing", P(() => {
+    }) : (this._actionState = "erasing", v(() => {
       this.copyProgress = {
         bytesCopied: 0,
         bytesToCopy: 0,
@@ -1114,31 +870,31 @@ let C = class {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (P(() => {
+    if (v(() => {
       this._actionState = "erasing";
     }), !this._activeVolume)
       throw this.logger.error("No active volume selected"), new Error("No active volume selected");
-    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), nr(this._activeVolume.id, e);
+    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), At(this._activeVolume.id, e);
   }
   async eraseVolume(e) {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (P(() => {
+    if (v(() => {
       this._actionState = "erasing";
     }), !this._activeVolume)
       throw this.logger.error("No active volume selected"), new Error("No active volume selected");
-    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), ar(this._activeVolume.id, e);
+    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), Rt(this._activeVolume.id, e);
   }
   async copyLogs(e) {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (P(() => {
+    if (v(() => {
       this._actionState = "copying";
     }), !this._activeVolume)
       throw this.logger.error("No active volume selected"), new Error("No active volume selected");
-    return this.logger.info(`Copying logs to ${(t = this._activeVolume) == null ? void 0 : t.name}`), lr(this._activeVolume.id, e);
+    return this.logger.info(`Copying logs to ${(t = this._activeVolume) == null ? void 0 : t.name}`), Ft(this._activeVolume.id, e);
   }
   handleInsertion() {
     this.inserted ? this.syncVolumes() : (this._volumes.clear(), this.clearActiveVolume());
@@ -1147,27 +903,27 @@ let C = class {
     this.logger.debug(`initializing copy-logs ${this.id}`);
   }
   async syncVolumes() {
-    const [e, t] = await cr(), [r, i] = await ur();
-    if (r) {
-      this.logger.error(`Error fetching log file size: ${r}`);
+    const [e, t] = await xt(), [o, s] = await jt();
+    if (o) {
+      this.logger.error(`Error fetching log file size: ${o}`);
       return;
     }
     if (e) {
       this.logger.error(`Error fetching volumes: ${e}`);
       return;
     }
-    t && (t.forEach((o) => {
-      const n = this.storageDeviceContainer.getModel(o.id);
+    t && (t.forEach((r) => {
+      const n = this.storageDeviceContainer.getModel(r.id);
       if (n) {
         const a = {
-          id: o.id,
+          id: r.id,
           name: n.label,
-          freeBytes: o.info.freeBytes,
-          totalBytes: o.info.totalBytes
+          freeBytes: r.info.freeBytes,
+          totalBytes: r.info.totalBytes
         };
         this._volumes.addModel(a);
       }
-    }), t.length === 1 ? this.updateActiveVolume(this._volumes.data[0]) : this.clearActiveVolume()), i && (this.logger.info(`Log file size: ${i}`), this.updateLogFileSize(parseInt(i, 10)));
+    }), t.length === 1 ? this.updateActiveVolume(this._volumes.data[0]) : this.clearActiveVolume()), s && (this.logger.info(`Log file size: ${s}`), this.updateLogFileSize(parseInt(s, 10)));
   }
   async activate() {
     this.logger.debug(`activating copy-logs ${this.id}`), await this.syncVolumes();
@@ -1176,82 +932,82 @@ let C = class {
     this.logger.debug(`loading copy-logs ${this.id}`);
   }
 };
-oi(C, "Registration");
-N([
-  m({ modelType: Xr.type })
-], C.prototype, "storageDeviceContainer", 2);
-N([
-  v()
-], C.prototype, "eraseAndCopyVolume", 1);
-N([
-  v()
-], C.prototype, "eraseVolume", 1);
-N([
-  v()
-], C.prototype, "copyLogs", 1);
-N([
-  ut({
+mr(_, "Registration");
+R([
+  p({ modelType: To.type })
+], _.prototype, "storageDeviceContainer", 2);
+R([
+  P()
+], _.prototype, "eraseAndCopyVolume", 1);
+R([
+  P()
+], _.prototype, "eraseVolume", 1);
+R([
+  P()
+], _.prototype, "copyLogs", 1);
+R([
+  He({
     dependencies: (e) => [e.inserted]
   })
-], C.prototype, "handleInsertion", 1);
-C = N([
-  l({ modelTypeId: ii, singleton: !0 }),
-  Jr(),
-  pt()
-], C);
-const Ns = C.Registration, pr = g.createLogger({
+], _.prototype, "handleInsertion", 1);
+_ = R([
+  l({ modelTypeId: br, singleton: !0 }),
+  $o(),
+  gt()
+], _);
+const qs = _.Registration, Wt = g.createLogger({
   name: "dashboard-operations-service",
   group: "Services"
-}), gr = async (e, t) => (pr.debug("resolveAll"), await Ae.bulkResolveTroubles(
+}), Nt = async (e, t) => (Wt.debug("resolveAll"), await Me.bulkResolveTroubles(
   e,
   void 0,
   t
-)), hr = async (e, t) => (pr.debug("resolveTrouble"), await Ae.resolveTrouble(
+)), zt = async (e, t) => (Wt.debug("resolveTrouble"), await Me.resolveTrouble(
   e,
   void 0,
   t
-)), Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+)), Qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  resolveAll: gr,
-  resolveTrouble: hr
+  resolveAll: Nt,
+  resolveTrouble: zt
 }, Symbol.toStringTag, { value: "Module" }));
-var si = Object.defineProperty, ai = Object.getOwnPropertyDescriptor, Ne = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ai(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && si(t, r, o), o;
+var _r = Object.defineProperty, Tr = Object.getOwnPropertyDescriptor, Ee = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Tr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && _r(t, o, r), r;
 };
-const J = "dashboard-operations-model";
-function Lt(e) {
+const z = "dashboard-operations-model";
+function lt(e) {
   return !e.deferred;
 }
-function Dt(e) {
+function dt(e) {
   return e.deferred;
 }
-let x = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "troubles");
-    s(this, "futureHandler");
-    s(this, "logger");
-    this.id = e, this.futureHandler = new me(this), this.logger = r.logger;
+let L = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "troubles");
+    i(this, "futureHandler");
+    i(this, "logger");
+    this.id = e, this.futureHandler = new Ye(this), this.logger = o.logger;
   }
   get troublesByType() {
     return this.troubles.troubles.data.reduce(
-      eo,
+      Po,
       {}
     );
   }
   get queuedPurgeTroubles() {
-    return this.purgeTroubles.filter(Dt);
+    return this.purgeTroubles.filter(dt);
   }
   get queuedPrimeTroubles() {
-    return this.primeTroubles.filter(Dt);
+    return this.primeTroubles.filter(dt);
   }
   get resolvablePrimeTroubles() {
-    return this.primeTroubles.filter(Lt);
+    return this.primeTroubles.filter(lt);
   }
   get resolvablePurgeTroubles() {
-    return this.purgeTroubles.filter(Lt);
+    return this.purgeTroubles.filter(lt);
   }
   get hasResolvablePurgeTroubles() {
     return this.resolvablePurgeTroubles.length > 0;
@@ -1266,10 +1022,10 @@ let x = class {
     return this.primeTroubles.length > 0;
   }
   get purgeTroubles() {
-    return this.troublesByType[St] || [];
+    return this.troublesByType[st] || [];
   }
   get primeTroubles() {
-    return this.troublesByType[co] || [];
+    return this.troublesByType[Io] || [];
   }
   get future() {
     return this.futureHandler.getFuture();
@@ -1277,17 +1033,17 @@ let x = class {
   async resolveAllTroubles(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const r = e === St ? this.purgeTroubles : this.primeTroubles;
-    r.filter((a) => a.shouldDefer).forEach((a) => {
+    const o = e === st ? this.purgeTroubles : this.primeTroubles;
+    o.filter((a) => a.shouldDefer).forEach((a) => {
       this.logger.info(`Deferring trouble ${a.rawId}`), a.defer();
     });
-    const o = r.filter((a) => !a.shouldDefer).map((a) => a.rawId);
-    return o.length === 0 ? void 0 : await gr(o, t);
+    const r = o.filter((a) => !a.shouldDefer).map((a) => a.rawId);
+    return r.length === 0 ? void 0 : await Nt(r, t);
   }
   async resolveTrouble(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    return await hr(e, t);
+    return await zt(e, t);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1297,40 +1053,40 @@ let x = class {
     this.logger.debug(`loading dashboard-operations ${this.id}`);
   }
 };
-Ne([
-  m({ modelType: gt.type })
-], x.prototype, "troubles", 2);
-Ne([
-  v()
-], x.prototype, "resolveAllTroubles", 1);
-Ne([
-  v()
-], x.prototype, "resolveTrouble", 1);
-x = Ne([
-  l(J)
-], x);
-const vt = {
+Ee([
+  p({ modelType: Ke.type })
+], L.prototype, "troubles", 2);
+Ee([
+  P()
+], L.prototype, "resolveAllTroubles", 1);
+Ee([
+  P()
+], L.prototype, "resolveTrouble", 1);
+L = Ee([
+  l(z)
+], L);
+const Je = {
   registration: {
-    [J]: {
-      class: x,
+    [z]: {
+      class: L,
       singleton: !0
     }
   },
-  type: J,
-  predicate: d(J),
-  factory: u.Singleton.create(J)
+  type: z,
+  predicate: u(z),
+  factory: c.Singleton.create(z)
 };
-var ni = Object.getOwnPropertyDescriptor, li = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ni(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var $r = Object.getOwnPropertyDescriptor, Mr = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? $r(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const Z = "dispenser-model";
-let tt = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+const V = "dispenser-model";
+let xe = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger;
   }
   updateModel() {
   }
@@ -1342,40 +1098,40 @@ let tt = class {
     this.logger.debug(`loading dispenser ${this.id}`);
   }
 };
-tt = li([
-  l(Z)
-], tt);
-const ci = {
+xe = Mr([
+  l(V)
+], xe);
+const Pr = {
   registration: {
-    [Z]: {
-      class: tt,
+    [V]: {
+      class: xe,
       singleton: !0
     }
   },
-  type: Z,
-  predicate: d(Z),
-  factory: u.Singleton.create(Z)
-}, { URL: ui } = h("DISPENSER_SERVICE"), { getAll: di } = f.build({
-  basePath: `${ui}/api/dispenser`
-}), pi = g.createLogger({
+  type: V,
+  predicate: u(V),
+  factory: c.Singleton.create(V)
+}, { URL: Or } = h("DISPENSER_SERVICE"), { getAll: Sr } = y.build({
+  basePath: `${Or}/api/dispenser`
+}), wr = g.createLogger({
   name: "dispenser-service",
   group: "Services"
-}), gi = async () => (pi.debug("sending GET for dispenser"), await di({})), Ks = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Er = async () => (wr.debug("sending GET for dispenser"), await Sr({})), Xs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispensers: gi
+  getDispensers: Er
 }, Symbol.toStringTag, { value: "Module" }));
-var hi = Object.defineProperty, fi = Object.getOwnPropertyDescriptor, fr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? fi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && hi(t, r, o), o;
+var Lr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, Vt = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Cr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Lr(t, o, r), r;
 };
-const ee = "dispenser-info-model";
-let Ce = class {
-  constructor(e, t, r) {
-    s(this, "logger");
-    s(this, "id");
-    s(this, "name");
-    this.id = e, this.logger = r.logger;
+const H = "dispenser-info-model";
+let fe = class {
+  constructor(e, t, o) {
+    i(this, "logger");
+    i(this, "id");
+    i(this, "name");
+    this.id = e, this.logger = o.logger;
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1385,48 +1141,48 @@ let Ce = class {
     this.logger.debug(`loading dispenser-info ${this.id}`);
   }
 };
-fr([
-  c({
+Vt([
+  d({
     path: "kos:device",
     attribute: "name"
   })
-], Ce.prototype, "name", 2);
-Ce = fr([
-  l(ee)
-], Ce);
-const mi = {
+], fe.prototype, "name", 2);
+fe = Vt([
+  l(H)
+], fe);
+const kr = {
   registration: {
-    [ee]: {
-      class: Ce,
+    [H]: {
+      class: fe,
       singleton: !1
     }
   },
-  type: ee,
-  predicate: d(ee),
-  factory: u.Factory.create(
-    ee
+  type: H,
+  predicate: u(H),
+  factory: c.Factory.create(
+    H
   )
-}, { URL: yi } = h("DISPENSER-INFO_SERVICE"), { getAll: bi } = f.build({
-  basePath: `${yi}/api/dispenser-info`
-}), vi = g.createLogger({
+}, { URL: Dr } = h("DISPENSER-INFO_SERVICE"), { getAll: Ir } = y.build({
+  basePath: `${Dr}/api/dispenser-info`
+}), Rr = g.createLogger({
   name: "dispenser-info-service",
   group: "Services"
-}), _i = async () => (vi.debug("sending GET for dispenser-info"), await bi({})), Ys = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ar = async () => (Rr.debug("sending GET for dispenser-info"), await Ir({})), Js = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispenserInfos: _i
+  getDispenserInfos: Ar
 }, Symbol.toStringTag, { value: "Module" }));
-var Pi = Object.getOwnPropertyDescriptor, $i = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Pi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var Fr = Object.getOwnPropertyDescriptor, xr = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Fr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const te = "enrollment-model";
-let rt = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "enrolled");
-    this.id = e, this.logger = r.logger, this.enrolled = !1;
+const B = "enrollment-model";
+let je = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "enrolled");
+    this.id = e, this.logger = o.logger, this.enrolled = !1;
   }
   updateModel(e) {
     console.log("updateModel:", e);
@@ -1439,77 +1195,77 @@ let rt = class {
     this.logger.debug(`loading enrollment ${this.id}`);
   }
 };
-rt = $i([
-  l(te)
-], rt);
-const Ti = {
+je = xr([
+  l(B)
+], je);
+const jr = {
   registration: {
-    [te]: {
-      class: rt,
+    [B]: {
+      class: je,
       singleton: !0
     }
   },
-  type: te,
-  predicate: d(te),
-  factory: u.Singleton.create(te)
-}, { URL: Oi } = h("ENROLLMENT_SERVICE"), { getAll: Mi } = f.build({
-  basePath: `${Oi}/api/enrollment`
-}), Si = g.createLogger({
+  type: B,
+  predicate: u(B),
+  factory: c.Singleton.create(B)
+}, { URL: Ur } = h("ENROLLMENT_SERVICE"), { getAll: Wr } = y.build({
+  basePath: `${Ur}/api/enrollment`
+}), Nr = g.createLogger({
   name: "enrollment-service",
   group: "Services"
-}), Ci = async () => (Si.debug("sending GET for enrollment"), await Mi({})), qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), zr = async () => (Nr.debug("sending GET for enrollment"), await Wr({})), Zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getEnrollments: Ci
-}, Symbol.toStringTag, { value: "Module" })), Gs = (e) => e.toLowerCase().includes("micros"), Qs = (e) => !e.toLowerCase().includes("micros"), Xs = (e) => (t) => {
-  const r = e == null ? void 0 : e.getHoldersByGroup(t);
-  return r ? r.map((i) => ({ id: i.id, name: i.ingredientName, path: i.path })) : null;
-}, Js = ["water", "carb", "ns", "nss"], ge = "dashboardKeyFactory", Qe = [];
-to(ge, {
+  getEnrollments: zr
+}, Symbol.toStringTag, { value: "Module" })), ei = (e) => e.toLowerCase().includes("micros"), ti = (e) => !e.toLowerCase().includes("micros"), oi = (e) => (t) => {
+  const o = e == null ? void 0 : e.getHoldersByGroup(t);
+  return o ? o.map((s) => ({ id: s.id, name: s.ingredientName, path: s.path })) : null;
+}, ri = ["water", "carb", "ns", "nss"], re = "dashboardKeyFactory", De = [];
+Oo(re, {
   register: (e, t) => {
-    Qe.includes(t) || Qe.push(t);
+    De.includes(t) || De.push(t);
   },
   execute: (e, t) => {
-    const r = Qe.sort((i, o) => i.rank - o.rank);
-    for (const i of r) {
-      const o = i.factory(t);
-      if (o)
-        return o;
+    const o = De.sort((s, r) => s.rank - r.rank);
+    for (const s of o) {
+      const r = s.factory(t);
+      if (r)
+        return r;
     }
   }
 });
-const wi = (e) => {
-  Ue[ge].register(
-    ge,
+const Vr = (e) => {
+  Oe[re].register(
+    re,
     e
   );
-}, Ei = (e) => Ue[ge].execute(
-  ge,
+}, Hr = (e) => Oe[re].execute(
+  re,
   e
 );
-Ue.registerDashboardKeyFactory = wi;
-Ue.executeDashboardKeyFactory = Ei;
-const ot = 3600, mr = 60, Zs = (e) => {
-  const t = Math.floor(e / ot), r = Math.floor(e % ot / mr);
-  return { hours: t, minutes: r };
-}, ea = (e, t) => e * ot + t * mr, Li = (e) => {
-  const r = (/* @__PURE__ */ new Date()).valueOf() - e.valueOf(), i = Math.floor(r / (1e3 * 60)), o = Math.floor(i / 60), n = Math.floor(o / 24), a = i % 60, M = o % 24;
-  let D = "";
-  return n > 0 && (D += `${n} day${n > 1 ? "s" : ""} `), M > 0 && (D += `${M} hour${M > 1 ? "s" : ""} `), (a > 0 || n === 0 && M === 0) && (D += `${a} minute${a > 1 ? "s" : ""} `), D;
-};
-var Di = Object.defineProperty, ki = Object.getOwnPropertyDescriptor, Be = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ki(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Di(t, r, o), o;
-};
-const re = "ingredient-summary-model";
-let j = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "assemblyModel");
-    s(this, "dashboardOperationModel");
-    s(this, "appModel");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger, this.dashboardOperationModel = vt.factory({});
+Oe.registerDashboardKeyFactory = Vr;
+Oe.executeDashboardKeyFactory = Hr;
+const Ue = 3600, Ht = 60, si = (e) => {
+  const t = Math.floor(e / Ue), o = Math.floor(e % Ue / Ht);
+  return { hours: t, minutes: o };
+}, ii = (e, t) => e * Ue + t * Ht, Br = (e) => {
+  const o = (/* @__PURE__ */ new Date()).valueOf() - e.valueOf(), s = Math.floor(o / (1e3 * 60)), r = Math.floor(s / 60), n = Math.floor(r / 24), a = s % 60, ae = r % 24;
+  let le = "";
+  return n > 0 && (le += `${n} day${n > 1 ? "s" : ""} `), ae > 0 && (le += `${ae} hour${ae > 1 ? "s" : ""} `), (a > 0 || n === 0 && ae === 0) && (le += `${a} minute${a > 1 ? "s" : ""} `), le;
+};
+var Kr = Object.defineProperty, Yr = Object.getOwnPropertyDescriptor, Le = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Yr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Kr(t, o, r), r;
+};
+const K = "ingredient-summary-model";
+let C = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "assemblyModel");
+    i(this, "dashboardOperationModel");
+    i(this, "appModel");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger, this.dashboardOperationModel = Je.factory({});
   }
   get highPriorityHolders() {
     return this.assemblyModel.allHolders.filter(
@@ -1517,16 +1273,16 @@ let j = class {
     );
   }
   get actionRequiredHolders() {
-    const e = this.appModel.currentRole, t = qt(e);
-    return this.assemblyModel.allHolders.filter((r) => {
-      const i = dt(
-        r,
-        ao.type
+    const e = this.appModel.currentRole, t = Ct(e);
+    return this.assemblyModel.allHolders.filter((o) => {
+      const s = Be(
+        o,
+        Co.type
       );
-      if (i != null && i.isRemote)
+      if (s != null && s.isRemote)
         return !1;
-      const o = r.troubles.filter(t);
-      return o.length > 0 && o.find((n) => n.resolvable);
+      const r = o.troubles.filter(t);
+      return r.length > 0 && r.find((n) => n.resolvable);
     });
   }
   get lowLevelHolders() {
@@ -1543,104 +1299,53 @@ let j = class {
     this.logger.debug(`loading ingredient-summary ${this.id}`);
   }
 };
-Be([
-  m({ modelType: Ve.type })
-], j.prototype, "assemblyModel", 2);
-Be([
-  m({ modelType: vt.type })
-], j.prototype, "dashboardOperationModel", 2);
-Be([
-  m({ modelType: yt.type })
-], j.prototype, "appModel", 2);
-j = Be([
-  l(re)
-], j);
-const Ii = {
+Le([
+  p({ modelType: Se.type })
+], C.prototype, "assemblyModel", 2);
+Le([
+  p({ modelType: Je.type })
+], C.prototype, "dashboardOperationModel", 2);
+Le([
+  p({ modelType: Xe.type })
+], C.prototype, "appModel", 2);
+C = Le([
+  l(K)
+], C);
+const Gr = {
   registration: {
-    [re]: {
-      class: j,
+    [K]: {
+      class: C,
       singleton: !1
     }
   },
-  type: re,
-  predicate: d(re),
-  factory: u.Factory.create(
-    re
+  type: K,
+  predicate: u(K),
+  factory: c.Factory.create(
+    K
   )
-};
-var Ri = Object.getOwnPropertyDescriptor, Fi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ri(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
-};
-const yr = "lfcv-pump-model";
-let it = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "pumpModel");
-    this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent;
-  }
-  get name() {
-    return this.pumpModel.name;
-  }
-  get canPour() {
-    return this.pumpModel.canPour;
-  }
-  get isPouring() {
-    return this.pumpModel.isPouring;
-  }
-  async cancelPour() {
-    return this.pumpModel.cancelPour();
-  }
-  performIntent(e) {
-    return this.pumpModel.performIntent(e);
-  }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing lfcv-pump ${this.id}`);
-  }
-  async load() {
-    this.logger.debug(`loading lfcv-pump ${this.id}`);
-  }
-};
-it = Fi([
-  l(yr)
-], it);
-const ta = new Re({
-  class: it,
-  type: yr
-}), { URL: Ai } = h("LFCV-PUMP_SERVICE"), { getAll: xi } = f.build({
-  basePath: `${Ai}/api/lfcv-pump`
-}), ji = g.createLogger({
-  name: "lfcv-pump-service",
-  group: "Services"
-}), Ui = async () => (ji.debug("sending GET for lfcv-pump"), await xi({})), ra = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  getLfcvPumps: Ui
-}, Symbol.toStringTag, { value: "Module" })), { URL: _t } = h("LOCKOUT_SERVICE"), { postModel: br } = f.build({
-  basePath: `${_t}/api/app/kosdev.ddk/lockout`
-}), vr = g.createLogger({ name: "lockout-service", group: "Services" }), Vi = async () => (vr.info("lock"), await br({
+}, { URL: Ze } = h("LOCKOUT_SERVICE"), { postModel: Bt } = y.build({
+  basePath: `${Ze}/api/app/kosdev.ddk/lockout`
+}), Kt = g.createLogger({ name: "lockout-service", group: "Services" }), qr = async () => (Kt.info("lock"), await Bt({
   model: {},
-  urlOverride: `${_t}/api/app/kosdev.ddk/lockout/lockNow`
-})), _r = async (e) => {
-  vr.info("unlock");
-  const t = await br({
+  urlOverride: `${Ze}/api/app/kosdev.ddk/lockout/lockNow`
+})), Yt = async (e) => {
+  Kt.info("unlock");
+  const t = await Bt({
     model: {},
-    urlOverride: `${_t}/api/app/kosdev.ddk/lockout/unlock/${e}`
+    urlOverride: `${Ze}/api/app/kosdev.ddk/lockout/unlock/${e}`
   });
   return t == null ? void 0 : t.data;
-}, oa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, ni = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  lock: Vi,
-  unlock: _r
+  lock: qr,
+  unlock: Yt
 }, Symbol.toStringTag, { value: "Module" }));
-var Wi = Object.defineProperty, zi = Object.getOwnPropertyDescriptor, B = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? zi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Wi(t, r, o), o;
+var Qr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, A = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Xr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Qr(t, o, r), r;
 };
-const Pr = "lockout-model", Hi = [
+const Gt = "lockout-model", Jr = [
   { day: "monday", lock: "dayWiseLockConfigMap.Mon.enabled", open: "dayWiseLockConfigMap.Mon.unlockTime", close: "dayWiseLockConfigMap.Mon.lockTime" },
   { day: "tuesday", lock: "dayWiseLockConfigMap.Tue.enabled", open: "dayWiseLockConfigMap.Tue.unlockTime", close: "dayWiseLockConfigMap.Tue.lockTime" },
   { day: "wednesday", lock: "dayWiseLockConfigMap.Wed.enabled", open: "dayWiseLockConfigMap.Wed.unlockTime", close: "dayWiseLockConfigMap.Wed.lockTime" },
@@ -1649,11 +1354,11 @@ const Pr = "lockout-model", Hi = [
   { day: "saturday", lock: "dayWiseLockConfigMap.Sat.enabled", open: "dayWiseLockConfigMap.Sat.unlockTime", close: "dayWiseLockConfigMap.Sat.lockTime" },
   { day: "sunday", lock: "dayWiseLockConfigMap.Sun.enabled", open: "dayWiseLockConfigMap.Sun.unlockTime", close: "dayWiseLockConfigMap.Sun.lockTime" }
 ];
-let E = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "dayEnabledList", [
+let M = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "dayEnabledList", [
       "dayWiseLockConfigMap.Sun.enabled",
       "dayWiseLockConfigMap.Mon.enabled",
       "dayWiseLockConfigMap.Tue.enabled",
@@ -1662,7 +1367,7 @@ let E = class {
       "dayWiseLockConfigMap.Fri.enabled",
       "dayWiseLockConfigMap.Sat.enabled"
     ]);
-    s(this, "dayOpenAtList", [
+    i(this, "dayOpenAtList", [
       "dayWiseLockConfigMap.Sun.unlockTime",
       "dayWiseLockConfigMap.Mon.unlockTime",
       "dayWiseLockConfigMap.Tue.unlockTime",
@@ -1671,7 +1376,7 @@ let E = class {
       "dayWiseLockConfigMap.Fri.unlockTime",
       "dayWiseLockConfigMap.Sat.unlockTime"
     ]);
-    s(this, "dayCloseAtList", [
+    i(this, "dayCloseAtList", [
       "dayWiseLockConfigMap.Sun.lockTime",
       "dayWiseLockConfigMap.Mon.lockTime",
       "dayWiseLockConfigMap.Tue.lockTime",
@@ -1680,22 +1385,22 @@ let E = class {
       "dayWiseLockConfigMap.Fri.lockTime",
       "dayWiseLockConfigMap.Sat.lockTime"
     ]);
-    s(this, "saveMap");
-    s(this, "pin");
-    s(this, "nextLockSkipped");
-    s(this, "nextLockTime");
-    s(this, "nextUnLockTime");
-    s(this, "cuiLockout");
-    this.id = e, this.logger = r.logger, this.saveMap = /* @__PURE__ */ new Map();
+    i(this, "saveMap");
+    i(this, "pin");
+    i(this, "nextLockSkipped");
+    i(this, "nextLockTime");
+    i(this, "nextUnLockTime");
+    i(this, "cuiLockout");
+    this.id = e, this.logger = o.logger, this.saveMap = /* @__PURE__ */ new Map();
   }
   get enabled() {
     const e = this.getProp(
       "oneTimeLockConfig.lockTime"
-    ), t = e !== void 0 && e !== "", r = this.getProp("lockScheduleEnabled");
-    return t || r;
+    ), t = e !== void 0 && e !== "", o = this.getProp("lockScheduleEnabled");
+    return t || o;
   }
   get schedule() {
-    return Hi;
+    return Jr;
   }
   getProp(e) {
     return this.saveMap.get(e);
@@ -1712,7 +1417,7 @@ let E = class {
       this.nextLockSkipped.updateProperty("0");
   }
   async unlock(e) {
-    return await _r(e);
+    return await Yt(e);
   }
   async save() {
     return this.saveMap.forEach((e, t) => {
@@ -1734,61 +1439,61 @@ let E = class {
     this.logger.debug(`loading lockout ${this.id}`);
   }
 };
-B([
-  c({
+A([
+  d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "pin"
   })
-], E.prototype, "pin", 2);
-B([
-  c({
+], M.prototype, "pin", 2);
+A([
+  d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockSkipped"
   })
-], E.prototype, "nextLockSkipped", 2);
-B([
-  c({
+], M.prototype, "nextLockSkipped", 2);
+A([
+  d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockTime"
   })
-], E.prototype, "nextLockTime", 2);
-B([
-  c({
+], M.prototype, "nextLockTime", 2);
+A([
+  d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextUnLockTime"
   })
-], E.prototype, "nextUnLockTime", 2);
-B([
-  ro({ path: "app:kosdev.ddk:service:cuiLockout" })
-], E.prototype, "cuiLockout", 2);
-E = B([
-  l(Pr)
-], E);
-const ia = new xe({
-  class: E,
-  type: Pr
-}), Ni = async (e, t) => await Ae.bulkResolveTroubles(
+], M.prototype, "nextUnLockTime", 2);
+A([
+  So({ path: "app:kosdev.ddk:service:cuiLockout" })
+], M.prototype, "cuiLockout", 2);
+M = A([
+  l(Gt)
+], M);
+const ai = new Pe({
+  class: M,
+  type: Gt
+}), Zr = async (e, t) => await Me.bulkResolveTroubles(
   e,
   void 0,
   t
 );
-var Bi = Object.defineProperty, Ki = Object.getOwnPropertyDescriptor, Ke = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ki(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Bi(t, r, o), o;
-};
-const oe = "macro-assignment-model", kt = "PurgeTrouble", Yi = "PrimeTrouble";
-let U = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
+var es = Object.defineProperty, ts = Object.getOwnPropertyDescriptor, Ce = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? ts(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && es(t, o, r), r;
+};
+const Y = "macro-assignment-model", ct = "PurgeTrouble", os = "PrimeTrouble";
+let k = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
     /**
      * futureHandler is used to handle async operations
      */
-    s(this, "futureHandler");
-    s(this, "holders");
-    s(this, "ingredients");
-    this.id = e, this.futureHandler = new me(), this.logger = r.logger;
+    i(this, "futureHandler");
+    i(this, "holders");
+    i(this, "ingredients");
+    this.id = e, this.futureHandler = new Ye(), this.logger = o.logger;
   }
   /**
    * shortcut to the current running future
@@ -1817,15 +1522,15 @@ let U = class {
    * Relying on the indexing of troubles by type to find the purge troubles.
    */
   get holderPurgeTroubles() {
-    return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[kt] || [];
-      return t = [...t, ...i], t;
+    return this.macroHolders.reduce((t, o) => {
+      const s = o.troublesByType[ct] || [];
+      return t = [...t, ...s], t;
     }, []);
   }
   get holderPrimeTroubles() {
-    return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[Yi] || [];
-      return t = [...t, ...i], t;
+    return this.macroHolders.reduce((t, o) => {
+      const s = o.troublesByType[os] || [];
+      return t = [...t, ...s], t;
     }, []);
   }
   /**
@@ -1860,53 +1565,53 @@ let U = class {
   async resolveAll(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const i = (e === kt ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
-    return await Ni(i, t);
-  }
-};
-Ke([
-  m({ modelType: no.type })
-], U.prototype, "holders", 2);
-Ke([
-  m({ modelType: lo.type })
-], U.prototype, "ingredients", 2);
-Ke([
-  v()
-], U.prototype, "resolveAll", 1);
-U = Ke([
-  l(oe)
-], U);
-const qi = {
+    const s = (e === ct ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
+    return await Zr(s, t);
+  }
+};
+Ce([
+  p({ modelType: ko.type })
+], k.prototype, "holders", 2);
+Ce([
+  p({ modelType: Do.type })
+], k.prototype, "ingredients", 2);
+Ce([
+  P()
+], k.prototype, "resolveAll", 1);
+k = Ce([
+  l(Y)
+], k);
+const rs = {
   registration: {
-    [oe]: {
-      class: U,
+    [Y]: {
+      class: k,
       singleton: !0
     }
   },
-  type: oe,
-  predicate: d(oe),
-  factory: u.Singleton.create(
-    oe
+  type: Y,
+  predicate: u(Y),
+  factory: c.Singleton.create(
+    Y
   )
 };
-var Gi = Object.getOwnPropertyDescriptor, Qi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Gi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var ss = Object.getOwnPropertyDescriptor, is = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? ss(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const ie = "network-test-model";
-let st = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "group");
-    s(this, "passed");
-    s(this, "inProgress");
-    s(this, "failureTime");
-    s(this, "timestamp");
-    s(this, "name");
-    s(this, "results");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger, this.group = t.group, this.passed = !1, this.inProgress = !1, this.name = t.name, this.results = [];
+const G = "network-test-model";
+let We = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "group");
+    i(this, "passed");
+    i(this, "inProgress");
+    i(this, "failureTime");
+    i(this, "timestamp");
+    i(this, "name");
+    i(this, "results");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger, this.group = t.group, this.passed = !1, this.inProgress = !1, this.name = t.name, this.results = [];
   }
   updateModel(e) {
     this.group = e.group, this.name = e.name, this.passed = e.passed, this.failureTime = e.failureTime, this.inProgress = e.inProgress, this.timestamp = e.timestamp, this.results = e.results;
@@ -1919,58 +1624,58 @@ let st = class {
     this.logger.debug(`loading network-test ${this.id}`);
   }
 };
-st = Qi([
-  l(ie)
-], st);
-const $r = {
+We = is([
+  l(G)
+], We);
+const qt = {
   registration: {
-    [ie]: {
-      class: st,
+    [G]: {
+      class: We,
       singleton: !1
     }
   },
-  type: ie,
-  predicate: d(ie),
-  factory: u.Factory.create(ie)
-}, { URL: Ye } = h("NETWORK-TEST_SERVICE"), { getAll: Xi, getOne: Tr } = f.build({
-  basePath: `${Ye}/api/app/ncui/network/tests`
-}), Ji = g.createLogger({
+  type: G,
+  predicate: u(G),
+  factory: c.Factory.create(G)
+}, { URL: ke } = h("NETWORK-TEST_SERVICE"), { getAll: ns, getOne: Qt } = y.build({
+  basePath: `${ke}/api/app/ncui/network/tests`
+}), as = g.createLogger({
   name: "network-test-service",
   group: "Services"
-}), Or = async () => {
-  Ji.debug("sending GET for network-test");
-  const e = await Xi({
-    urlOverride: `${Ye}/api/app/kosdev.ddk/network/tests`
+}), Xt = async () => {
+  as.debug("sending GET for network-test");
+  const e = await ns({
+    urlOverride: `${ke}/api/app/kosdev.ddk/network/tests`
   });
   return e == null ? void 0 : e.data;
-}, Mr = async () => {
-  const e = await Tr({
-    urlOverride: `${Ye}/api/app/kosdev.ddk/network/reports`
+}, Jt = async () => {
+  const e = await Qt({
+    urlOverride: `${ke}/api/app/kosdev.ddk/network/reports`
   });
   return e == null ? void 0 : e.data;
-}, Sr = async (e, t) => await Tr({
-  urlOverride: `${Ye}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
+}, Zt = async (e, t) => await Qt({
+  urlOverride: `${ke}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
   tracker: t
-}), sa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), li = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNetworkTests: Or,
-  getTestsReports: Mr,
-  performGroupTest: Sr
+  getNetworkTests: Xt,
+  getTestsReports: Jt,
+  performGroupTest: Zt
 }, Symbol.toStringTag, { value: "Module" }));
-var Zi = Object.defineProperty, es = Object.getOwnPropertyDescriptor, Pt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? es(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Zi(t, r, o), o;
-};
-const se = "network-test-container-model";
-let he = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "lastTested");
-    s(this, "futureHandler");
-    s(this, "models");
-    this.id = e, this.logger = r.logger, this.futureHandler = new me(this), this.models = new ct({
+var ls = Object.defineProperty, ds = Object.getOwnPropertyDescriptor, et = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? ds(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && ls(t, o, r), r;
+};
+const q = "network-test-container-model";
+let se = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "lastTested");
+    i(this, "futureHandler");
+    i(this, "models");
+    this.id = e, this.logger = o.logger, this.futureHandler = new Ye(this), this.models = new Ve({
       parentId: e,
       indexMap: {
         group: "group"
@@ -1996,28 +1701,28 @@ let he = class {
     );
   }
   getLastTested(e) {
-    const t = this.models.getIndexByKey("group", e).map((i) => i.timestamp && new Date(i.timestamp)), r = Math.max(
-      ...t.map((i) => i ? i.getTime() : 0)
+    const t = this.models.getIndexByKey("group", e).map((s) => s.timestamp && new Date(s.timestamp)), o = Math.max(
+      ...t.map((s) => s ? s.getTime() : 0)
     );
-    return r ? Li(new Date(r)) : "";
+    return o ? Br(new Date(o)) : "";
   }
   async load() {
     this.logger.debug(`loading network-test-container container ${this.id}`);
-    const e = await Or(), t = await Mr();
-    e && e.forEach((r) => {
-      const i = $r.factory(r.id)(r);
-      this.addModel(i);
-    }), e && t && e.forEach((r) => {
-      const i = t == null ? void 0 : t[r.group], o = i == null ? void 0 : i[r.id], n = this.getModel(r.id);
-      if (n && o) {
+    const e = await Xt(), t = await Jt();
+    e && e.forEach((o) => {
+      const s = qt.factory(o.id)(o);
+      this.addModel(s);
+    }), e && t && e.forEach((o) => {
+      const s = t == null ? void 0 : t[o.group], r = s == null ? void 0 : s[o.id], n = this.getModel(o.id);
+      if (n && r) {
         const a = {
-          group: o.group,
-          name: o.name,
-          passed: o.passed,
-          failureTime: o.failureTime ? new Date(o.failureTime) : void 0,
-          inProgress: o.inProgress,
-          timestamp: new Date(o.timestamp),
-          results: o.results
+          group: r.group,
+          name: r.name,
+          passed: r.passed,
+          failureTime: r.failureTime ? new Date(r.failureTime) : void 0,
+          inProgress: r.inProgress,
+          timestamp: new Date(r.timestamp),
+          results: r.results
         };
         n.updateModel(a);
       }
@@ -2026,64 +1731,64 @@ let he = class {
   async performTest(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const r = await Sr(e, t);
-    return r == null ? void 0 : r.data;
+    const o = await Zt(e, t);
+    return o == null ? void 0 : o.data;
   }
   onFutureUpdate(e) {
     const { clientData: t } = e;
-    t && t.forEach((r) => {
-      const i = this.getModel(r.id);
-      if (P(() => {
-        this.lastTested = this.lastTested > new Date(r.timestamp) ? this.lastTested : new Date(r.timestamp);
-      }), i) {
-        const o = {
-          group: r.group,
-          name: r.name,
-          passed: r.passed,
-          failureTime: r.failureTime ? new Date(r.failureTime) : void 0,
-          inProgress: r.inProgress,
-          timestamp: new Date(r.timestamp),
-          results: r.results
+    t && t.forEach((o) => {
+      const s = this.getModel(o.id);
+      if (v(() => {
+        this.lastTested = this.lastTested > new Date(o.timestamp) ? this.lastTested : new Date(o.timestamp);
+      }), s) {
+        const r = {
+          group: o.group,
+          name: o.name,
+          passed: o.passed,
+          failureTime: o.failureTime ? new Date(o.failureTime) : void 0,
+          inProgress: o.inProgress,
+          timestamp: new Date(o.timestamp),
+          results: o.results
         };
-        P(() => {
-          i.updateModel(o);
+        v(() => {
+          s.updateModel(r);
         });
       }
     });
   }
 };
-Pt([
-  Fe
-], he.prototype, "models", 2);
-Pt([
-  v()
-], he.prototype, "performTest", 1);
-he = Pt([
-  l(se)
-], he);
-const ts = {
+et([
+  $e
+], se.prototype, "models", 2);
+et([
+  P()
+], se.prototype, "performTest", 1);
+se = et([
+  l(q)
+], se);
+const cs = {
   registration: {
-    [se]: {
-      class: he,
+    [q]: {
+      class: se,
       singleton: !0
     },
-    ...$r.registration
+    ...qt.registration
   },
-  type: se,
-  predicate: d(se),
-  factory: u.Singleton.create(se)
+  type: q,
+  predicate: u(q),
+  factory: c.Singleton.create(q)
 };
-var rs = Object.defineProperty, os = Object.getOwnPropertyDescriptor, $t = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? os(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && rs(t, r, o), o;
+var us = Object.defineProperty, ps = Object.getOwnPropertyDescriptor, tt = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? ps(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && us(t, o, r), r;
 };
-const ae = "nutritive-sweetener-model", is = lt("statePath");
-let fe = class {
+const Q = "nutritive-sweetener-model", gs = ut("statePath");
+let ie = class {
   constructor(e, t) {
-    s(this, "id");
-    s(this, "assemblyModel");
-    s(this, "pumpState");
+    i(this, "id");
+    i(this, "assemblyModel");
+    i(this, "pumpState");
     this.id = e;
   }
   get holder() {
@@ -2102,49 +1807,49 @@ let fe = class {
     return this.pump;
   }
 };
-$t([
-  m({ modelType: Ve.type })
-], fe.prototype, "assemblyModel", 2);
-$t([
-  oo({
-    path: is
+tt([
+  p({ modelType: Se.type })
+], ie.prototype, "assemblyModel", 2);
+tt([
+  wo({
+    path: gs
   })
-], fe.prototype, "pumpState", 2);
-fe = $t([
-  l(ae),
-  pt()
-], fe);
-const ss = {
+], ie.prototype, "pumpState", 2);
+ie = tt([
+  l(Q),
+  gt()
+], ie);
+const hs = {
   registration: {
-    [ae]: {
-      class: fe,
+    [Q]: {
+      class: ie,
       singleton: !1
     }
   },
-  type: ae,
-  predicate: d(ae),
-  factory: u.Factory.create(ae)
-};
-var as = Object.defineProperty, ns = Object.getOwnPropertyDescriptor, Cr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ns(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && as(t, r, o), o;
-};
-const ne = "plain-water-model";
-let we = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "assemblyModel");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+  type: Q,
+  predicate: u(Q),
+  factory: c.Factory.create(Q)
+};
+var ys = Object.defineProperty, fs = Object.getOwnPropertyDescriptor, eo = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? fs(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && ys(t, o, r), r;
+};
+const X = "plain-water-model";
+let ve = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "assemblyModel");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger;
   }
   getHolder() {
     return this.assemblyModel.getHoldersByGroup("water")[0];
   }
   getPump() {
-    var i, o;
-    const e = this.getHolder(), t = (o = (i = e == null ? void 0 : e.pumps) == null ? void 0 : i.data) == null ? void 0 : o[0];
-    return dt(t, rr.type);
+    var s, r;
+    const e = this.getHolder(), t = (r = (s = e == null ? void 0 : e.pumps) == null ? void 0 : s.data) == null ? void 0 : r[0];
+    return Be(t, ft.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2154,45 +1859,45 @@ let we = class {
     this.logger.debug(`loading plain-water ${this.id}`);
   }
 };
-Cr([
-  m({ modelType: Ve.type })
-], we.prototype, "assemblyModel", 2);
-we = Cr([
-  l(ne)
-], we);
-const ls = {
+eo([
+  p({ modelType: Se.type })
+], ve.prototype, "assemblyModel", 2);
+ve = eo([
+  l(X)
+], ve);
+const vs = {
   registration: {
-    [ne]: {
-      class: we,
+    [X]: {
+      class: ve,
       singleton: !1
     }
   },
-  type: ne,
-  predicate: d(ne),
-  factory: u.Factory.create(ne)
-}, { URL: wr } = h("REBOOT_SERVICE"), { postModel: cs } = f.build({
-  basePath: `${wr}/api/reboot`
-}), us = g.createLogger({ name: "reboot-service", group: "Services" }), Er = async () => (us.debug("sending POST call for Reboot Dispenser"), await cs({
-  urlOverride: `${wr}/api/app/kosdev.ddk/ncui/reboot`,
+  type: X,
+  predicate: u(X),
+  factory: c.Factory.create(X)
+}, { URL: to } = h("REBOOT_SERVICE"), { postModel: ms } = y.build({
+  basePath: `${to}/api/reboot`
+}), bs = g.createLogger({ name: "reboot-service", group: "Services" }), oo = async () => (bs.debug("sending POST call for Reboot Dispenser"), await ms({
+  urlOverride: `${to}/api/app/kosdev.ddk/ncui/reboot`,
   model: {}
-})), aa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), di = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  rebootDispenser: Er
+  rebootDispenser: oo
 }, Symbol.toStringTag, { value: "Module" }));
-var ds = Object.getOwnPropertyDescriptor, ps = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ds(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var _s = Object.getOwnPropertyDescriptor, Ts = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? _s(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const le = "reboot-model";
-let at = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+const J = "reboot-model";
+let Ne = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger;
   }
   async completeReboot() {
-    await Er();
+    await oo();
   }
   updateModel() {
   }
@@ -2204,41 +1909,41 @@ let at = class {
     this.logger.debug(`loading reboot ${this.id}`);
   }
 };
-at = ps([
-  l(le)
-], at);
-const gs = {
+Ne = Ts([
+  l(J)
+], Ne);
+const $s = {
   registration: {
-    [le]: {
-      class: at,
+    [J]: {
+      class: Ne,
       singleton: !1
     }
   },
-  type: le,
-  predicate: d(le),
-  factory: u.Factory.create(le)
-};
-var hs = Object.defineProperty, fs = Object.getOwnPropertyDescriptor, O = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? fs(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && hs(t, r, o), o;
-};
-const ce = "settings-model";
-let _ = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "ncuiLanguageData");
-    s(this, "resolveDelaysMs");
-    s(this, "dateFormat");
-    s(this, "timeFormat");
-    s(this, "hidePlainWaterBev");
-    s(this, "hideCarbWaterBev");
-    s(this, "ncuiLanguage");
-    s(this, "name");
-    s(this, "activateAndRebootTime");
-    s(this, "horizontalMode");
-    this.id = e, this.logger = r.logger;
+  type: J,
+  predicate: u(J),
+  factory: c.Factory.create(J)
+};
+var Ms = Object.defineProperty, Ps = Object.getOwnPropertyDescriptor, m = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Ps(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Ms(t, o, r), r;
+};
+const Z = "settings-model";
+let f = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "ncuiLanguageData");
+    i(this, "resolveDelaysMs");
+    i(this, "dateFormat");
+    i(this, "timeFormat");
+    i(this, "hidePlainWaterBev");
+    i(this, "hideCarbWaterBev");
+    i(this, "ncuiLanguage");
+    i(this, "name");
+    i(this, "activateAndRebootTime");
+    i(this, "horizontalMode");
+    this.id = e, this.logger = o.logger;
   }
   // -------------------LIFECYCLE----------------------------
   async ready() {
@@ -2277,108 +1982,108 @@ let _ = class {
     this.horizontalMode.value ? document.body.setAttribute("data-dashboard-layout", "horizontal") : document.body.setAttribute("data-dashboard-layout", "vertical");
   }
 };
-O([
-  c({
+m([
+  d({
     path: "system:app",
     attribute: "resolveDelaysMs"
     // optionsExpander: () => [],
   })
-], _.prototype, "resolveDelaysMs", 2);
-O([
-  c({
+], f.prototype, "resolveDelaysMs", 2);
+m([
+  d({
     path: "system:app",
     attribute: "dateFormat"
     // optionsExpander: () => [],
   })
-], _.prototype, "dateFormat", 2);
-O([
-  c({
+], f.prototype, "dateFormat", 2);
+m([
+  d({
     path: "system:app",
     attribute: "timeFormat"
     // optionsExpander: () => [],
   })
-], _.prototype, "timeFormat", 2);
-O([
-  c({
+], f.prototype, "timeFormat", 2);
+m([
+  d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hidePlainWaterBev"
   })
-], _.prototype, "hidePlainWaterBev", 2);
-O([
-  c({
+], f.prototype, "hidePlainWaterBev", 2);
+m([
+  d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hideCarbWaterBev"
   })
-], _.prototype, "hideCarbWaterBev", 2);
-O([
-  c({
+], f.prototype, "hideCarbWaterBev", 2);
+m([
+  d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
   })
-], _.prototype, "ncuiLanguage", 2);
-O([
-  c({
+], f.prototype, "ncuiLanguage", 2);
+m([
+  d({
     path: "kos:device",
     attribute: "name"
   })
-], _.prototype, "name", 2);
-O([
-  c({
+], f.prototype, "name", 2);
+m([
+  d({
     path: "kos:service:OTA",
     attribute: "activateAndRebootTime"
   })
-], _.prototype, "activateAndRebootTime", 2);
-O([
-  c({
+], f.prototype, "activateAndRebootTime", 2);
+m([
+  d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.display.horizontalMode"
   })
-], _.prototype, "horizontalMode", 2);
-O([
-  ut({
+], f.prototype, "horizontalMode", 2);
+m([
+  He({
     dependencies: (e) => [e.horizontalMode.value]
   })
-], _.prototype, "handleUpdateDisplayMode", 1);
-_ = O([
-  l(ce)
-], _);
-const ms = {
+], f.prototype, "handleUpdateDisplayMode", 1);
+f = m([
+  l(Z)
+], f);
+const Os = {
   registration: {
-    [ce]: {
-      class: _,
+    [Z]: {
+      class: f,
       singleton: !0
     }
   },
-  type: ce,
-  predicate: d(ce),
-  factory: u.Singleton.create(ce)
-}, { URL: Lr } = h("SETTINGS_SERVICE"), { getAll: Dr } = f.build({
-  basePath: `${Lr}/api/settings`
-}), ys = g.createLogger({
+  type: Z,
+  predicate: u(Z),
+  factory: c.Singleton.create(Z)
+}, { URL: ro } = h("SETTINGS_SERVICE"), { getAll: so } = y.build({
+  basePath: `${ro}/api/settings`
+}), Ss = g.createLogger({
   name: "settings-service",
   group: "Services"
-}), bs = async () => (ys.debug("sending GET for settings"), await Dr({})), vs = async () => await Dr({
-  urlOverride: `${Lr}api/app/kosdev.ddk/ncui/languages`
-}), na = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), ws = async () => (Ss.debug("sending GET for settings"), await so({})), Es = async () => await so({
+  urlOverride: `${ro}api/app/kosdev.ddk/ncui/languages`
+}), ci = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNcuiLanguage: vs,
-  getSettings: bs
+  getNcuiLanguage: Es,
+  getSettings: ws
 }, Symbol.toStringTag, { value: "Module" }));
-var _s = Object.getOwnPropertyDescriptor, Ps = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? _s(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var Ls = Object.getOwnPropertyDescriptor, Cs = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Ls(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const ue = "utilities-model";
-let nt = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "name");
-    s(this, "options");
-    s(this, "roles");
-    s(this, "columnId");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger, this.name = t.name, this.options = t.options, this.roles = t == null ? void 0 : t.roles, this.columnId = t.columnId;
+const ee = "utilities-model";
+let ze = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "name");
+    i(this, "options");
+    i(this, "roles");
+    i(this, "columnId");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger, this.name = t.name, this.options = t.options, this.roles = t == null ? void 0 : t.roles, this.columnId = t.columnId;
   }
   updateModel(e) {
     this.name = e.name, this.options = e.options, this.roles = e == null ? void 0 : e.roles;
@@ -2397,61 +2102,61 @@ let nt = class {
     this.logger.debug(`loading utilities ${this.id}`);
   }
 };
-nt = Ps([
-  l(ue)
-], nt);
-const kr = {
+ze = Cs([
+  l(ee)
+], ze);
+const io = {
   registration: {
-    [ue]: {
-      class: nt,
+    [ee]: {
+      class: ze,
       singleton: !1
     }
   },
-  type: ue,
-  predicate: d(ue),
-  factory: u.Factory.create(ue)
-}, { URL: $e } = h("UTILITIES_SERVICE"), { getAll: Xe } = f.build({
-  basePath: `${$e}/api/utilities`
-}), Je = g.createLogger({
+  type: ee,
+  predicate: u(ee),
+  factory: c.Factory.create(ee)
+}, { URL: ue } = h("UTILITIES_SERVICE"), { getAll: Ie } = y.build({
+  basePath: `${ue}/api/utilities`
+}), Re = g.createLogger({
   name: "utilities-service",
   group: "Services"
-}), Ir = async () => {
-  Je.debug("sending GET for utilities");
+}), no = async () => {
+  Re.debug("sending GET for utilities");
   try {
-    const e = await Xe({
-      urlOverride: `${$e}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.utilities`
+    const e = await Ie({
+      urlOverride: `${ue}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.utilities`
     });
     if ((e == null ? void 0 : e.status) !== 200) {
-      Je.info("no extensions found, using base data");
-      const t = await Xe({
-        urlOverride: `${$e}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+      Re.info("no extensions found, using base data");
+      const t = await Ie({
+        urlOverride: `${ue}/api/kos/descriptor/system:app/kondra.ncui.utilities`
       });
       return (t == null ? void 0 : t.data) ?? [];
     }
     return (e == null ? void 0 : e.data) ?? [];
   } catch (e) {
-    Je.info(`error fetching utilities: ${e}. Using base data`);
-    const t = await Xe({
-      urlOverride: `${$e}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+    Re.info(`error fetching utilities: ${e}. Using base data`);
+    const t = await Ie({
+      urlOverride: `${ue}/api/kos/descriptor/system:app/kondra.ncui.utilities`
     });
     return (t == null ? void 0 : t.data) ?? [];
   }
-}, la = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, ui = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getUtilities: Ir
+  getUtilities: no
 }, Symbol.toStringTag, { value: "Module" }));
-var $s = Object.defineProperty, Ts = Object.getOwnPropertyDescriptor, Rr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ts(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && $s(t, r, o), o;
-};
-const de = "utilities-container-model";
-let Ee = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new ct({
+var ks = Object.defineProperty, Ds = Object.getOwnPropertyDescriptor, ao = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Ds(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && ks(t, o, r), r;
+};
+const te = "utilities-container-model";
+let me = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "_models");
+    this.id = e, this.logger = o.logger, this._models = new Ve({
       parentId: e,
       sortKey: "id",
       indexMap: {
@@ -2483,267 +2188,81 @@ let Ee = class {
   // -------------------LIFECYCLE----------------------------
   async load() {
     this.logger.debug(`loading utilities-container container ${this.id}`);
-    const e = await Ir();
-    e == null || e.forEach((t, r) => {
-      t.forEach((i) => {
-        const o = {
-          ...i,
-          columnId: String(r)
-        }, n = kr.factory(i.name)(
-          o
+    const e = await no();
+    e == null || e.forEach((t, o) => {
+      t.forEach((s) => {
+        const r = {
+          ...s,
+          columnId: String(o)
+        }, n = io.factory(s.name)(
+          r
         );
         this.addModel(n);
       });
     });
   }
 };
-Rr([
-  Fe
-], Ee.prototype, "_models", 2);
-Ee = Rr([
-  l(de)
-], Ee);
-const Os = {
+ao([
+  $e
+], me.prototype, "_models", 2);
+me = ao([
+  l(te)
+], me);
+const Is = {
   registration: {
-    [de]: {
-      class: Ee,
+    [te]: {
+      class: me,
       singleton: !0
     },
-    ...kr.registration
+    ...io.registration
   },
-  type: de,
-  predicate: d(de),
-  factory: u.Singleton.create(de)
-}, ca = {
-  ...Ao.registration,
-  ...yt.registration,
-  ...ft.registration,
-  ...Yo.registration,
-  ...vt.registration,
-  ...ci.registration,
-  ...mi.registration,
-  ...Ti.registration,
-  ...Ii.registration,
-  ...qi.registration,
-  ...ts.registration,
-  ...ss.registration,
-  ...ls.registration,
-  ...gs.registration,
-  ...ms.registration,
-  ...Bt.registration,
-  ...Os.registration
-}, { URL: ve } = h("SPM-PUMP_SERVICE"), { postModel: qe } = f.build({
-  basePath: `${ve}/api/spm-pump`
-}), $ = g.createLogger({
-  name: "spm-pump-service",
-  group: "Services"
-}), Fr = async (e, t) => {
-  $.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`
-  );
-  try {
-    const r = await qe({
-      model: {},
-      urlOverride: `${ve}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
-      tracker: t
-    });
-    return $.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
-  } catch (r) {
-    $.error(
-      `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
-      r
-    );
-    const i = {
-      id: t || "",
-      endState: b.Fail,
-      tracker: t,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(i), i;
-  }
-}, Ar = async (e, t) => {
-  $.debug(
-    `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`
-  );
-  try {
-    const r = await qe({
-      model: {},
-      urlOverride: `${ve}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
-      tracker: t
-    });
-    return $.debug("performCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
-  } catch (r) {
-    $.error(
-      `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
-      r
-    );
-    const i = {
-      id: t || "",
-      endState: b.Fail,
-      tracker: t,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(i), i;
-  }
-}, xr = async (e, t, r, i) => {
-  $.debug(
-    `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`
-  );
-  try {
-    const o = await qe({
-      model: {
-        ...r,
-        // commandedCalibrationVolume: 0,
-        measuredCalibrationVolume: t
-        // measuredVerificationVolume: 0,
-        // newCalibrationValue: 0,
-        // pouredCalibrationVolume: 0,
-      },
-      urlOverride: `${ve}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
-      tracker: i
-    });
-    return $.debug("performVerify - response:", o), o != null && o.data && T.initiateFuture(o.data), o == null ? void 0 : o.data;
-  } catch (o) {
-    $.error(
-      `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`,
-      o
-    );
-    const n = {
-      id: i || "",
-      endState: b.Fail,
-      tracker: i,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(n), n;
-  }
-}, jr = async (e, t, r, i) => {
-  var o, n, a, M, D;
-  $.debug(
-    `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`
-  );
-  try {
-    const p = await qe({
-      model: {
-        ...i,
-        // commandedCalibrationVolume: 0,
-        measuredCalibrationVolume: t,
-        measuredVerificationVolume: r
-        // newCalibrationValue: 0,
-        // pouredCalibrationVolume: 0,
-      },
-      urlOverride: `${ve}/api/ext/freestyle/microCalibration/pour/${e}/complete`
-    });
-    return $.debug("performComplete - response:", p), ((p == null ? void 0 : p.status) === 200 || (p == null ? void 0 : p.status) === 499) && ((o = p.data) != null && o.error) ? [p.data.error || "unknownError", p.data] : [void 0, p == null ? void 0 : p.data];
-  } catch (p) {
-    if ($.error(
-      `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`,
-      p
-    ), p instanceof je) {
-      const Tt = ((a = (n = p.payload) == null ? void 0 : n.data) == null ? void 0 : a.error) || ((M = p.payload) == null ? void 0 : M.error) || "unknownError";
-      return [Tt, ((D = p.payload) == null ? void 0 : D.data) || { error: Tt }];
-    }
-  }
-  return ["unknownError", { error: "unknownError" }];
-}, ua = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  performCalibrate: Ar,
-  performComplete: jr,
-  performPreCalibrate: Fr,
-  performVerify: xr
-}, Symbol.toStringTag, { value: "Module" }));
-var Ms = Object.defineProperty, Ss = Object.getOwnPropertyDescriptor, Ge = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ss(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Ms(t, r, o), o;
-};
-const Ur = "spm-pump-model";
-let V = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "pump");
-    s(this, "futureHandler");
-    this.id = e, this.logger = r.logger, this.pump = t.companionParent, this.futureHandler = new me(this);
-  }
-  get name() {
-    return this.pump.name;
-  }
-  get canPour() {
-    return this.pump.canPour;
-  }
-  get isPouring() {
-    return this.pump.isPouring;
-  }
-  async cancelPour() {
-    return this.pump.cancelPour();
-  }
-  performIntent(e) {
-    return this.pump.performIntent(e);
-  }
-  get future() {
-    return this.futureHandler.future;
-  }
-  async performPreCalibrate(e) {
-    return Fr(this.pump.path, e);
-  }
-  async performCalibrate(e) {
-    return Ar(this.pump.path, e);
-  }
-  async performVerify(e, t, r) {
-    return xr(this.pump.path, e, t, r);
-  }
-  async performComplete(e, t, r) {
-    return jr(this.pump.path, e, t, r);
-  }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing spm-pump ${this.id}`);
-  }
-  async load() {
-    this.logger.debug(`loading spm-pump ${this.id}`);
-  }
-};
-Ge([
-  v()
-], V.prototype, "performPreCalibrate", 1);
-Ge([
-  v()
-], V.prototype, "performCalibrate", 1);
-Ge([
-  v()
-], V.prototype, "performVerify", 1);
-V = Ge([
-  l(Ur)
-], V);
-const da = new Re({
-  class: V,
-  type: Ur
-});
-var Cs = Object.defineProperty, ws = Object.getOwnPropertyDescriptor, Vr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ws(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Cs(t, r, o), o;
-};
-const Wr = "trouble-action-model";
-let Le = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "troubleContainer");
-    s(this, "disposer");
-    s(this, "state");
-    s(this, "troubleActionData");
-    this.id = e, this.logger = r.logger, this.state = io(), this.troubleActionData = t.definitions.reduce((i, o) => (i[o.troubleType] = o, i), {});
+  type: te,
+  predicate: u(te),
+  factory: c.Singleton.create(te)
+}, pi = {
+  ...ir.registration,
+  ...Xe.registration,
+  ...qe.registration,
+  ...pr.registration,
+  ...Je.registration,
+  ...Pr.registration,
+  ...kr.registration,
+  ...jr.registration,
+  ...Gr.registration,
+  ...rs.registration,
+  ...cs.registration,
+  ...hs.registration,
+  ...vs.registration,
+  ...$s.registration,
+  ...Os.registration,
+  ...wt.registration,
+  ...Is.registration
+};
+var Rs = Object.defineProperty, As = Object.getOwnPropertyDescriptor, lo = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? As(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Rs(t, o, r), r;
+};
+const co = "trouble-action-model";
+let be = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "troubleContainer");
+    i(this, "disposer");
+    i(this, "state");
+    i(this, "troubleActionData");
+    this.id = e, this.logger = o.logger, this.state = Eo(), this.troubleActionData = t.definitions.reduce((s, r) => (s[r.troubleType] = r, s), {});
   }
   // -------------------LIFECYCLE----------------------------
   get activeTrouble() {
     const e = Object.keys(this.troubleActionData);
     if (e.length > 0) {
-      const t = e[0], r = this.troubleContainer.troubles.getIndexByKey(
+      const t = e[0], o = this.troubleContainer.troubles.getIndexByKey(
         "byType",
         t
       );
-      return r.length > 0 ? r[0] : void 0;
+      return o.length > 0 ? o[0] : void 0;
     }
   }
   get activeTroubleType() {
@@ -2751,19 +2270,19 @@ let Le = class {
     return (e = this.activeTrouble) == null ? void 0 : e.type;
   }
   async init() {
-    this.logger.debug(`initializing trouble-action ${this.id}`), this.disposer = so(() => {
-      const e = this.troubleContainer.troubles.data.reduce((t, r) => {
-        const i = r.type;
-        if (this.troubleActionData[i]) {
-          const o = this.troubleActionData[i].stateKey ?? i, n = this.troubleActionData[i].stateValue ?? i;
-          t[o] = n;
+    this.logger.debug(`initializing trouble-action ${this.id}`), this.disposer = Lo(() => {
+      const e = this.troubleContainer.troubles.data.reduce((t, o) => {
+        const s = o.type;
+        if (this.troubleActionData[s]) {
+          const r = this.troubleActionData[s].stateKey ?? s, n = this.troubleActionData[s].stateValue ?? s;
+          t[r] = n;
         }
         return t;
       }, {});
       this.state.setValues(e), Object.keys(this.troubleActionData).forEach((t) => {
         if (this.troubleContainer.troubles.getIndexByKey("byType", t).length === 0) {
-          const r = this.troubleActionData[t].stateKey ?? t;
-          this.state[r] = void 0;
+          const o = this.troubleActionData[t].stateKey ?? t;
+          this.state[o] = void 0;
         }
       });
     });
@@ -2776,35 +2295,35 @@ let Le = class {
     this.logger.debug(`loading trouble-action ${this.id}`);
   }
 };
-Vr([
-  m({ modelType: gt.type })
-], Le.prototype, "troubleContainer", 2);
-Le = Vr([
-  l(Wr)
-], Le);
-const pa = new xe({
-  class: Le,
-  type: Wr
-}), { URL: zr } = h("START_SERVICE"), { getOne: Es } = f.build({
-  basePath: `${zr}/api/start`
-}), Ls = g.createLogger({ name: "start-service", group: "Services" }), Hr = async () => (Ls.debug("navigating to NCUI"), await Es({
-  urlOverride: `${zr}/api/app/kosdev.ddk/ncui/open`
-})), ga = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+lo([
+  p({ modelType: Ke.type })
+], be.prototype, "troubleContainer", 2);
+be = lo([
+  l(co)
+], be);
+const gi = new Pe({
+  class: be,
+  type: co
+}), { URL: uo } = h("START_SERVICE"), { getOne: Fs } = y.build({
+  basePath: `${uo}/api/start`
+}), xs = g.createLogger({ name: "start-service", group: "Services" }), po = async () => (xs.debug("navigating to NCUI"), await Fs({
+  urlOverride: `${uo}/api/app/kosdev.ddk/ncui/open`
+})), hi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  navigateToNCui: Hr
+  navigateToNCui: po
 }, Symbol.toStringTag, { value: "Module" }));
-var Ds = Object.defineProperty, ks = Object.getOwnPropertyDescriptor, Nr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ks(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Ds(t, r, o), o;
-};
-const Br = "start-model";
-let De = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "troubles");
-    this.id = e, this.logger = r.logger;
+var js = Object.defineProperty, Us = Object.getOwnPropertyDescriptor, go = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Us(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && js(t, o, r), r;
+};
+const ho = "start-model";
+let _e = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "troubles");
+    this.id = e, this.logger = o.logger;
   }
   get firmwareFailed() {
     return this.troubles.troubles.getIndexByKey(
@@ -2819,7 +2338,7 @@ let De = class {
     ).length > 0;
   }
   async navigate() {
-    await Hr();
+    await po();
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2829,76 +2348,69 @@ let De = class {
     this.logger.debug(`loading start ${this.id}`);
   }
 };
-Nr([
-  m({ modelType: gt.type })
-], De.prototype, "troubles", 2);
-De = Nr([
-  l(Br)
-], De);
-const ha = new xe({
-  class: De,
-  type: Br
+go([
+  p({ modelType: Ke.type })
+], _e.prototype, "troubles", 2);
+_e = go([
+  l(ho)
+], _e);
+const yi = new Pe({
+  class: _e,
+  type: ho
 });
 export {
-  Us as AgitationControl,
-  Ao as Animation,
-  Vs as AnimationServices,
-  yt as Application,
-  ft as Auth,
-  xs as AuthServices,
-  Yo as CarbWater,
-  zs as CgpPump,
-  Ns as CopyLogs,
-  Hs as CopyLogsServices,
-  ca as DDKModels,
-  vt as DashboardOperations,
-  Bs as DashboardOperationsServices,
-  ci as Dispenser,
-  mi as DispenserInfo,
-  Ys as DispenserInfoServices,
-  Ks as DispenserServices,
-  bo as Door,
-  ge as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
-  Ti as Enrollment,
-  qs as EnrollmentServices,
-  rr as FcmPump,
-  Ws as FcmPumpServices,
-  Ii as IngredientSummary,
-  ta as LfcvPump,
-  ra as LfcvPumpServices,
-  ia as Lockout,
-  oa as LockoutServices,
-  Js as MACRO_KEYS,
-  qi as MacroAssignment,
-  $r as NetworkTest,
-  ts as NetworkTestContainer,
-  sa as NetworkTestServices,
-  ss as NutritiveSweetener,
-  ls as PlainWater,
-  gs as Reboot,
-  aa as RebootServices,
-  ms as Settings,
-  na as SettingsServices,
-  Nt as SetupStep,
-  Bt as SetupStepContainer,
-  js as SetupStepServices,
-  da as SpmPump,
-  ua as SpmPumpServices,
-  ha as Start,
-  ga as StartServices,
-  co as TROUBLE_TYPE_PRIME,
-  St as TROUBLE_TYPE_PURGE,
-  pa as TroubleActionManager,
-  kr as Utilities,
-  Os as UtilitiesContainer,
-  la as UtilitiesServices,
-  Li as calculateTimeDifference,
-  Ei as executeDashboardKeyFactory,
-  Qs as isMacroGroup,
-  Gs as isMicroGroup,
-  Xs as macroHolderMap,
-  wi as registerDashboardKeyFactory,
-  ea as toSeconds,
-  Zs as toTimeComponents,
-  qt as troubleVisibilityFilter
+  Ks as AgitationControl,
+  ir as Animation,
+  Ys as AnimationServices,
+  Xe as Application,
+  qe as Auth,
+  Hs as AuthServices,
+  pr as CarbWater,
+  qs as CopyLogs,
+  Gs as CopyLogsServices,
+  pi as DDKModels,
+  Je as DashboardOperations,
+  Qs as DashboardOperationsServices,
+  Pr as Dispenser,
+  kr as DispenserInfo,
+  Js as DispenserInfoServices,
+  Xs as DispenserServices,
+  No as Door,
+  re as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
+  jr as Enrollment,
+  Zs as EnrollmentServices,
+  Gr as IngredientSummary,
+  ai as Lockout,
+  ni as LockoutServices,
+  ri as MACRO_KEYS,
+  rs as MacroAssignment,
+  qt as NetworkTest,
+  cs as NetworkTestContainer,
+  li as NetworkTestServices,
+  hs as NutritiveSweetener,
+  vs as PlainWater,
+  $s as Reboot,
+  di as RebootServices,
+  Os as Settings,
+  ci as SettingsServices,
+  St as SetupStep,
+  wt as SetupStepContainer,
+  Bs as SetupStepServices,
+  yi as Start,
+  hi as StartServices,
+  Io as TROUBLE_TYPE_PRIME,
+  st as TROUBLE_TYPE_PURGE,
+  gi as TroubleActionManager,
+  io as Utilities,
+  Is as UtilitiesContainer,
+  ui as UtilitiesServices,
+  Br as calculateTimeDifference,
+  Hr as executeDashboardKeyFactory,
+  ti as isMacroGroup,
+  ei as isMicroGroup,
+  oi as macroHolderMap,
+  Vr as registerDashboardKeyFactory,
+  ii as toSeconds,
+  si as toTimeComponents,
+  Ct as troubleVisibilityFilter
 };