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

package/index.mjs

@@ -1,28 +1,28 @@
-var Ur = Object.defineProperty;
-var Vr = (e, t, r) => t in e ? Ur(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var s = (e, t, r) => (Vr(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { resolveServiceUrl as h, ServiceFactory as f, KosLog as g, kosTopicHandler as De, kosModel as l, kosAction as _, Kos as c, isKosModel as u, createPropKey as Hr, kosStateProp as Wr, KosModelRegistrationFactory as ke, kosDependency as m, KosModelContainer as st, resolveContainerDeltas as mt, kosChild as Ie, Device as Nr, kosConfigProperty as d, kosFuture as v, kosModelEffect as Mt, MultipleFutureHandler as zr, FutureEndState as b, TroubleServices as Re, Troubles as yt, SingletonKosModelRegistrationFactory as Fe, FetchError as Ae, FutureManager as T, FutureHandler as he, getKosCompanionModel as at, StorageDeviceContainer as Br, kosFutureAware as Kr, kosLoggerAware as Yr, KosDataContainer as qr, TroubleContainer as nt, troubleByTypeReducer as Gr, registerExtensionPoint as Qr, ExtensionManager as xe, kosConfigBean as Xr, ObservableData as Jr, kosAutoEffect as Zr } from "@kosdev-code/kos-ui-sdk";
-import { AGITATION_REQUIRED_TROUBLE as St, CartridgeAgitatorEvents as Ct, FreestyleHolder as eo } from "@kosdev-code/kos-freestyle-sdk";
-import { Assembly as je, HolderContainer as to, IngredientContainer as ro } from "@kosdev-code/kos-dispense-sdk";
-const bt = "PurgeTrouble", oo = "PrimeTrouble", { URL: lt } = h("AUTH_SERVICE"), { getOne: io, postModel: so } = f.build({
-  basePath: `${lt}/api/auth`
-}), wt = g.createLogger({ name: "auth-service", group: "Services" }), Et = async () => (wt.debug("sending GET for auth"), await io({
-  urlOverride: `${lt}/api/app/kosdev.ddk/auth/role`
-})), Lt = async (e) => (wt.debug("sending POST for auth"), await so({
-  urlOverride: `${lt}/api/app/kosdev.ddk/auth/pincode/${e}`,
+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}`,
   model: {}
-})), Ss = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), xs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getCurrentRole: Et,
-  sendPinCode: Lt
+  getCurrentRole: At,
+  sendPinCode: xt
 }, Symbol.toStringTag, { value: "Module" }));
-var ao = Object.defineProperty, no = Object.getOwnPropertyDescriptor, Dt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? no(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && ao(t, r, o), o;
+  return i && o && go(t, r, o), o;
 };
-const B = "auth-model", vt = (e) => e.toLowerCase();
-let $e = class {
+const K = "auth-model", Ct = (e) => e.toLowerCase();
+let Te = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -32,7 +32,7 @@ let $e = class {
   async authorize(e) {
     if (!e)
       return !1;
-    const t = await Lt(e);
+    const t = await xt(e);
     return (t == null ? void 0 : t.status) === 200 ? t.data : !1;
   }
   // -------------------LIFECYCLE----------------------------
@@ -41,45 +41,45 @@ let $e = class {
   }
   async load() {
     this.logger.debug(`loading auth ${this.id}`);
-    const e = await Et();
-    (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), _(() => {
-      this.currentRole = vt(e.data);
+    const e = await At();
+    (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), P(() => {
+      this.currentRole = Ct(e.data);
     }));
   }
   handleRoleChange(e) {
-    this.currentRole = vt(e);
+    this.currentRole = Ct(e);
   }
   forceRole(e) {
     this.currentRole = e;
   }
 };
-Dt([
-  De({
+jt([
+  ke({
     topic: "/app/kosdev.ddk/auth/role",
     websocket: !0
   })
-], $e.prototype, "handleRoleChange", 1);
-$e = Dt([
-  l(B)
-], $e);
-const ct = {
+], Te.prototype, "handleRoleChange", 1);
+Te = jt([
+  l(K)
+], Te);
+const ft = {
   registration: {
-    [B]: {
-      class: $e,
+    [K]: {
+      class: Te,
       singleton: !1
     }
   },
-  type: B,
-  predicate: u(B),
-  factory: c.Factory.create(B)
+  type: K,
+  predicate: d(K),
+  factory: u.Factory.create(K)
 };
-var lo = Object.defineProperty, co = Object.getOwnPropertyDescriptor, kt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? co(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && lo(t, r, o), o;
+  return i && o && fo(t, r, o), o;
 };
-const It = "door-model", uo = Hr("doorPath");
-let Te = class {
+const Vt = "door-model", yo = lt("doorPath");
+let Oe = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -94,37 +94,37 @@ let Te = class {
     return this.open.value === void 0 ? !0 : this.open.value;
   }
 };
-kt([
-  Wr({ path: uo, attribute: "state" })
-], Te.prototype, "open", 2);
-Te = kt([
-  l(It)
-], Te);
-const po = new ke({
-  class: Te,
-  type: It
-}), { URL: ut } = h("SETUP-STEP_SERVICE"), { getAll: go, postModel: ho } = f.build({
-  basePath: `${ut}/api/setup-step`
-}), Rt = g.createLogger({
+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({
   name: "setup-step-service",
   group: "Services"
-}), Ft = async () => (Rt.debug("sending GET for setup-step"), await go({
-  urlOverride: `${ut}/api/app/kosdev.ddk/setup/steps`
-})), At = async (e) => (Rt.debug("sending POST for setup-step"), await ho({
-  urlOverride: `${ut}/api/app/kosdev.ddk/setup/complete/${e}`,
+}), 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}`,
   model: {}
-})), Cs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), js = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getSetupSteps: Ft,
-  markStepComplete: At
+  getSetupSteps: zt,
+  markStepComplete: Ht
 }, Symbol.toStringTag, { value: "Module" }));
-var fo = Object.getOwnPropertyDescriptor, mo = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? fo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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;
 };
-const K = "setup-step-model";
-let Qe = class {
+const Y = "setup-step-model";
+let Ze = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "idx");
@@ -145,8 +145,8 @@ let Qe = class {
     return `setup.${this.name}.body`;
   }
   async completeStep() {
-    const e = await At(this.name);
-    (e == null ? void 0 : e.status) === 200 && _(() => {
+    const e = await Ht(this.name);
+    (e == null ? void 0 : e.status) === 200 && P(() => {
       this.complete = !0;
     });
   }
@@ -158,45 +158,45 @@ let Qe = class {
     this.logger.debug(`loading setup-step ${this.id}`);
   }
 };
-Qe = mo([
-  l(K)
-], Qe);
-const xt = {
+Ze = $o([
+  l(Y)
+], Ze);
+const Nt = {
   registration: {
-    [K]: {
-      class: Qe,
+    [Y]: {
+      class: Ze,
       singleton: !1
     }
   },
-  type: K,
-  predicate: u(K),
-  factory: c.Factory.create(K)
+  type: Y,
+  predicate: d(Y),
+  factory: u.Factory.create(Y)
 };
-var yo = Object.defineProperty, bo = Object.getOwnPropertyDescriptor, Ue = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? bo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && yo(t, r, o), o;
+  return i && o && To(t, r, o), o;
 };
-const Y = "setup-step-container-model";
-function _t(e) {
+const q = "setup-step-container-model";
+function wt(e) {
   return (t) => {
-    const r = xt.factory(t.id)(t);
+    const r = Nt.factory(t.id)(t);
     r.updateModel(t), e.addModel(r);
   };
 }
-function $t(e) {
+function Et(e) {
   return (t) => {
     e.removeModel(t);
   };
 }
-let R = class {
+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 st({
+    this.id = e, this.logger = r.logger, this._currentStep = void 0, this.models = new ct({
       parentId: e,
       sortKey: "idx"
     });
@@ -247,7 +247,7 @@ let R = class {
   }
   async load() {
     this.logger.debug(`loading setup-step-container container ${this.id}`);
-    const e = await Ft();
+    const e = await zt();
     if (e != null && e.data) {
       const t = e.data.map(
         (r, i) => ({
@@ -256,10 +256,10 @@ let R = class {
           id: `setup-${r.name}`
         })
       );
-      mt({
+      Ot({
         container: this.models,
-        onAddItem: _t(this),
-        onRemoveItem: $t(this)
+        onAddItem: wt(this),
+        onRemoveItem: Et(this)
       })(t);
     }
     this.nextStep();
@@ -270,90 +270,90 @@ let R = class {
       idx: i,
       id: `setup-${r.name}`
     }));
-    mt({
+    Ot({
       container: this.models,
-      onAddItem: _t(this),
-      onRemoveItem: $t(this)
+      onAddItem: wt(this),
+      onRemoveItem: Et(this)
     })(t);
   }
 };
-Ue([
-  Ie
-], R.prototype, "models", 2);
-Ue([
-  m({ modelType: ct.type })
-], R.prototype, "authModel", 2);
-Ue([
-  De({
+We([
+  Fe
+], F.prototype, "models", 2);
+We([
+  m({ modelType: ft.type })
+], F.prototype, "authModel", 2);
+We([
+  ke({
     topic: "/app/kosdev.ddk/setup/steps",
     websocket: !0
   })
-], R.prototype, "handleStepChanges", 1);
-R = Ue([
-  l(Y)
-], R);
-const jt = {
+], F.prototype, "handleStepChanges", 1);
+F = We([
+  l(q)
+], F);
+const Bt = {
   registration: {
-    [Y]: {
-      class: R,
+    [q]: {
+      class: F,
       singleton: !0
     },
-    ...xt.registration
+    ...Nt.registration
   },
-  type: Y,
-  predicate: u(Y),
-  factory: c.Singleton.create(Y)
-}, { URL: k } = h("AUTH_SERVICE"), { getOne: Ut, getAll: ve } = f.build({
+  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/`
-}), de = g.createLogger({ name: "auth-service", group: "Services" }), vo = async () => {
-  de.debug("sending GET for cuis");
-  const e = await ve({
+}), 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`
   });
   if ((e == null ? void 0 : e.status) !== 200)
     throw new Error("Failed to retrieve cuis");
   return e.data;
-}, _o = async () => {
-  de.debug("sending GET for navigation");
+}, So = async () => {
+  pe.debug("sending GET for navigation");
   try {
-    const e = await ve({
+    const e = await Pe({
       urlOverride: `${k}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.navigations`
     });
     if ((e == null ? void 0 : e.status) !== 200) {
-      de.info("no extensions found, using base data");
-      const t = await ve({
+      pe.info("no extensions found, using base data");
+      const t = await Pe({
         urlOverride: `${k}/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 ve({
+    const t = await Pe({
       urlOverride: `${k}/api/kos/descriptor/system:app/kondra.ncui.navigations`
     });
     return (t == null ? void 0 : t.data) ?? [];
   }
-}, $o = async () => (de.debug("navigating to CUI"), await Ut({
+}, Co = async () => (pe.debug("navigating to CUI"), await Kt({
   urlOverride: `${k}/api/app/kosdev.ddk/cui/open`
-})), To = async () => (de.debug("navigating to NCUI"), await Ut({
+})), wo = async () => (pe.debug("navigating to NCUI"), await Kt({
   urlOverride: `${k}/api/app/kosdev.ddk/ncui/open`
 }));
-var Po = Object.defineProperty, Oo = Object.getOwnPropertyDescriptor, L = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Oo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && Po(t, r, o), o;
+  return i && o && Eo(t, r, o), o;
 };
-const q = "application-model", Vt = (e, t = "") => e.reduce((r, i) => {
+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 = Vt(i.children, o);
+    const n = Yt(i.children, o);
     Object.keys(n).forEach((a) => {
       r[a] = n[a];
     });
   }
   return r;
 }, {});
-let M = class {
+let S = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "device");
@@ -382,7 +382,7 @@ let M = class {
     // enableSidebarAnimation!: KosConfigProperty<boolean>;
     s(this, "languages");
     s(this, "logger");
-    this.id = e, this.languages = [], this._cuis = [], this.logger = r.logger, this.door = po.instance("app:kosdev.ddk:service:door:door").options({
+    this.id = e, this.languages = [], this._cuis = [], this.logger = r.logger, this.door = bo.instance("app:kosdev.ddk:service:door:door").options({
       doorPath: "app:kosdev.ddk:service:door:door"
     }).build();
   }
@@ -396,7 +396,7 @@ let M = class {
     return this._cuis.reduce((e, t) => (e[t.appId] = t, e), {});
   }
   get navigationItems() {
-    return Vt(this._navigationItems);
+    return Yt(this._navigationItems);
   }
   get hasCuiDefined() {
     return !!this.activeCui.value || !!this.fallbackCui.value;
@@ -405,18 +405,18 @@ let M = class {
     return this.door.isOpen;
   }
   async enter() {
-    this.logger.info("navigating to NCUI"), await To();
+    this.logger.info("navigating to NCUI"), await wo();
   }
   async exit() {
-    this.logger.info("navigating to CUI"), await $o();
+    this.logger.info("navigating to CUI"), await Co();
   }
   // -------------------LIFECYCLE----------------------------
   async load() {
     var r, i;
     this.logger.debug(`loading application ${this.id}`);
-    const e = await _o();
+    const e = await So();
     this._navigationItems = e;
-    const t = await vo();
+    const t = await Mo();
     this._cuis = t, (r = this.setupStepContainer) != null && r.hasIncompletePreSteps && ((i = this.authModel) == null || i.forceRole("technician")), this.languages = [
       {
         name: "English",
@@ -426,72 +426,72 @@ let M = class {
   }
 };
 L([
-  m({ modelType: Nr.type })
-], M.prototype, "device", 2);
+  m({ modelType: qr.type })
+], S.prototype, "device", 2);
 L([
-  m({ modelType: ct.type })
-], M.prototype, "authModel", 2);
+  m({ modelType: ft.type })
+], S.prototype, "authModel", 2);
 L([
-  m({ modelType: jt.type })
-], M.prototype, "setupStepContainer", 2);
+  m({ modelType: Bt.type })
+], S.prototype, "setupStepContainer", 2);
 L([
-  Ie
-], M.prototype, "door", 2);
+  Fe
+], S.prototype, "door", 2);
 L([
-  d({
+  c({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
     //updated attribute for language config property
   })
-], M.prototype, "ncuiLanguage", 2);
+], S.prototype, "ncuiLanguage", 2);
 L([
-  d({
+  c({
     path: "app:kosdev.ddk:service:cui",
     attribute: "activeCui"
   })
-], M.prototype, "activeCui", 2);
+], S.prototype, "activeCui", 2);
 L([
-  d({
+  c({
     path: "app:kosdev.ddk:service:cui",
     attribute: "fallbackCui"
   })
-], M.prototype, "fallbackCui", 2);
-M = L([
-  l(q)
-], M);
-const dt = {
+], S.prototype, "fallbackCui", 2);
+S = L([
+  l(G)
+], S);
+const yt = {
   registration: {
-    [q]: {
-      class: M,
+    [G]: {
+      class: S,
       singleton: !0
     }
   },
-  type: q,
-  predicate: u(q),
-  factory: c.Singleton.create(
-    q
+  type: G,
+  predicate: d(G),
+  factory: u.Singleton.create(
+    G
   )
-}, be = {
+}, _e = {
   none: 999,
   crew: 0,
   technician: 1,
   manager: 2
-}, Ht = (e) => (t) => {
-  if (t.type === St)
+}, qt = (e) => (t) => {
+  if (t.type === It)
     return !1;
   const r = (t == null ? void 0 : t.role) || "technician";
   if (e && r) {
-    const i = be[e.toLowerCase()] ?? be.crew, o = be[r.toLowerCase()] ?? be.crew;
+    const i = _e[e.toLowerCase()] ?? _e.crew, o = _e[r.toLowerCase()] ?? _e.crew;
     return i >= o;
   }
   return !1;
 };
-var Mo = Object.defineProperty, So = Object.getOwnPropertyDescriptor, V = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? So(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && Mo(t, r, o), o;
+  return i && o && Do(t, r, o), o;
 };
-const Wt = "agitation-control-model", Xe = "resolve", Co = "agitate";
+const Gt = "agitation-control-model", et = "resolve", Io = "agitate";
 let w = class {
   constructor(e, t, r) {
     s(this, "id");
@@ -505,7 +505,7 @@ let w = class {
     s(this, "disposer");
     s(this, "application");
     s(this, "inProgress", []);
-    this.id = e, this.logger = r.logger, this.troubleContainer = t.companionParent, this.futureHandler = new zr(this, Xe);
+    this.id = e, this.logger = r.logger, this.troubleContainer = t.companionParent, this.futureHandler = new Gr(this, et);
   }
   set isFailed(e) {
     this._isFailed = e;
@@ -542,15 +542,15 @@ let w = class {
       `Resolve deferred troubles future ${e.id} completed successfully`
     ), this.queuedTroubles.forEach((t) => {
       t.clearDefer();
-    }), _(() => {
+    }), P(() => {
       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(), _(() => {
+    })) : (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(() => {
       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 Re.bulkResolveTroubles(
+    return this.inProgress.push(...t), t.length === 0 ? void 0 : await Ae.bulkResolveTroubles(
       t,
       void 0,
       e
@@ -561,23 +561,23 @@ let w = class {
   }
   get queuedTroubles() {
     return this.troubleContainer.troubles.getIndexByKey(
-      yt.INDEX_TROUBLES_BY_DEFERRED,
-      yt.TROUBLES_DEFERRED
+      Mt.INDEX_TROUBLES_BY_DEFERRED,
+      Mt.TROUBLES_DEFERRED
     );
   }
   get visibleTroubles() {
     const e = this.application.currentRole;
-    return this.troubleContainer.troubles.data.filter(Ht(e)).filter((t) => t.type !== St);
+    return this.troubleContainer.troubles.data.filter(qt(e)).filter((t) => t.type !== It);
   }
   // -------------------LIFECYCLE----------------------------
   get future() {
     return this.futureHandler.future;
   }
   get resolveFuture() {
-    return this.futureHandler.getFuture(Xe);
+    return this.futureHandler.getFuture(et);
   }
   get agitateFuture() {
-    return this.futureHandler.getFuture(Co);
+    return this.futureHandler.getFuture(Io);
   }
   handleAgitationStarted(e) {
     this.logger.info(`Agitation started for ${e.path}`), this._agitationFutureId = String(e.futureId);
@@ -598,36 +598,36 @@ let w = class {
     this.logger.debug(`loading agitation-control ${this.id}`);
   }
 };
-V([
-  m({ modelType: dt.type })
+W([
+  m({ modelType: yt.type })
 ], w.prototype, "application", 2);
-V([
-  v({ alias: Xe })
+W([
+  v({ alias: et })
 ], w.prototype, "resolveDeferredTroubles", 1);
-V([
-  De({ topic: Ct.TOPIC_AGITATION_STARTED })
+W([
+  ke({ topic: Rt.TOPIC_AGITATION_STARTED })
 ], w.prototype, "handleAgitationStarted", 1);
-V([
-  De({ topic: Ct.TOPIC_AGITATION_ENDED })
+W([
+  ke({ topic: Rt.TOPIC_AGITATION_ENDED })
 ], w.prototype, "handleAgitationEnded", 1);
-V([
-  Mt({
+W([
+  ut({
     dependencies: (e) => [e.readyToResolve, e._agitationFutureId]
   })
 ], w.prototype, "handleReadyToResolve", 1);
-w = V([
-  l(Wt)
+w = W([
+  l(Gt)
 ], w);
-const ws = new Fe({
+const Us = new xe({
   class: w,
-  type: Wt
+  type: Gt
 });
-var wo = Object.defineProperty, Eo = Object.getOwnPropertyDescriptor, fe = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Eo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && wo(t, r, o), o;
+  return i && o && Ro(t, r, o), o;
 };
-const G = "animation-model";
+const Q = "animation-model";
 let I = class {
   constructor(e, t, r) {
     s(this, "id");
@@ -639,85 +639,85 @@ let I = class {
     this.id = e, this.logger = r.logger;
   }
 };
-fe([
-  d({
+ye([
+  c({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.disableAll"
   })
 ], I.prototype, "disableAll", 2);
-fe([
-  d({
+ye([
+  c({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableDial"
   })
 ], I.prototype, "enableDial", 2);
-fe([
-  d({
+ye([
+  c({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableModal"
   })
 ], I.prototype, "enableModal", 2);
-fe([
-  d({
+ye([
+  c({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableSideBar"
   })
 ], I.prototype, "enableSideBar", 2);
-I = fe([
-  l(G)
+I = ye([
+  l(Q)
 ], I);
-const Lo = {
+const Ao = {
   registration: {
-    [G]: {
+    [Q]: {
       class: I,
       singleton: !0
     }
   },
-  type: G,
-  predicate: u(G),
-  factory: c.Singleton.create(G)
-}, { URL: Do } = h("ANIMATION_SERVICE"), { getAll: ko } = f.build({
-  basePath: `${Do}/api/animation`
-}), Io = g.createLogger({
+  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({
   name: "animation-service",
   group: "Services"
-}), Ro = async () => (Io.debug("sending GET for animation"), await ko({})), Es = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Vo = async () => (Uo.debug("sending GET for animation"), await jo({})), Vs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getAnimations: Ro
-}, Symbol.toStringTag, { value: "Module" })), { URL: H } = h("FCM-PUMP_SERVICE"), { postModel: me } = f.build({
-  basePath: `${H}/api/fcm-pump`
+  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"
-}), Nt = async (e) => {
+}), 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 me({
+    const a = await be({
       model: {},
-      urlOverride: `${H}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
+      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 Ae) {
-      const O = ((i = (r = a.payload) == null ? void 0 : r.data) == null ? void 0 : i.error) || ((o = a.payload) == null ? void 0 : o.error) || "unknownError";
-      return [O, ((n = a.payload) == null ? void 0 : n.data) || { error: O }];
+    ), 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" }];
-}, zt = async (e, t) => {
+}, Xt = async (e, t) => {
   y.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`
   );
   try {
-    const r = await me({
+    const r = await be({
       model: {},
-      urlOverride: `${H}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
+      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;
@@ -734,14 +734,14 @@ const Lo = {
     };
     return T.initiateFuture(i), i;
   }
-}, Bt = async (e, t) => {
+}, Jt = async (e, t) => {
   y.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`
   );
   try {
-    const r = await me({
+    const r = await be({
       model: {},
-      urlOverride: `${H}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
+      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;
@@ -758,14 +758,14 @@ const Lo = {
     };
     return T.initiateFuture(i), i;
   }
-}, Kt = async (e, t, r) => {
+}, Zt = async (e, t, r) => {
   y.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`
   );
   try {
-    const i = await me({
+    const i = await be({
       model: {},
-      urlOverride: `${H}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
+      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;
@@ -782,16 +782,16 @@ const Lo = {
     };
     return T.initiateFuture(o), o;
   }
-}, Fo = (e) => e ? e.data === "success" || !e.data ? "success" : e.data : "error", Yt = async (e, t, r) => {
+}, 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 me({
+    const i = await be({
       model: {},
-      urlOverride: `${H}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
+      urlOverride: `${z}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
     });
-    return y.debug("performPreCalibrate - response:", i), Fo(i == null ? void 0 : i.data);
+    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}`,
@@ -799,27 +799,27 @@ const Lo = {
     );
     return;
   }
-}, Ls = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  performCalibrate: Bt,
-  performComplete: Yt,
-  performElectricalTest: Nt,
-  performPreCalibrate: zt,
-  performVerify: Kt
+  performCalibrate: Jt,
+  performComplete: er,
+  performElectricalTest: Qt,
+  performPreCalibrate: Xt,
+  performVerify: Zt
 }, Symbol.toStringTag, { value: "Module" }));
-var Ao = Object.defineProperty, xo = Object.getOwnPropertyDescriptor, Ve = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? xo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && Ao(t, r, o), o;
+  return i && o && zo(t, r, o), o;
 };
-const qt = "fcm-pump-model", jo = g.createLogger({ name: "fcm-pump-model" });
-let F = class {
+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 he(this);
+    this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent, this.futureHandler = new me(this);
   }
   get future() {
     return this.futureHandler.future;
@@ -840,23 +840,23 @@ let F = class {
     return this.pumpModel.performIntent(e);
   }
   async performElectricalTest() {
-    const [e, t] = await Nt(this.pumpModel.path);
-    return e && jo.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
+    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 zt(this.pumpModel.path, e);
+    return Xt(this.pumpModel.path, e);
   }
   async performCalibrate(e) {
-    return Bt(this.pumpModel.path, e);
+    return Jt(this.pumpModel.path, e);
   }
   async performVerify(e, t) {
-    return Kt(this.pumpModel.path, e, t);
+    return Zt(this.pumpModel.path, e, t);
   }
   async performComplete(e, t) {
-    return Yt(this.pumpModel.path, e, t);
+    return er(this.pumpModel.path, e, t);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -866,29 +866,29 @@ let F = class {
     this.logger.debug(`loading fcm-pump ${this.id}`);
   }
 };
-Ve([
+ze([
   v()
-], F.prototype, "performPreCalibrate", 1);
-Ve([
+], A.prototype, "performPreCalibrate", 1);
+ze([
   v()
-], F.prototype, "performCalibrate", 1);
-Ve([
+], A.prototype, "performCalibrate", 1);
+ze([
   v()
-], F.prototype, "performVerify", 1);
-F = Ve([
-  l(qt)
-], F);
-const Gt = new ke({
-  class: F,
-  type: qt
+], A.prototype, "performVerify", 1);
+A = ze([
+  l(tr)
+], A);
+const rr = new Re({
+  class: A,
+  type: tr
 });
-var Uo = Object.defineProperty, Vo = Object.getOwnPropertyDescriptor, Qt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Vo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && Uo(t, r, o), o;
+  return i && o && Bo(t, r, o), o;
 };
-const Q = "carb-water-model";
-let Pe = class {
+const X = "carb-water-model";
+let Me = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "assemblyModel");
@@ -897,7 +897,7 @@ let Pe = class {
   }
   getPump() {
     const t = this.assemblyModel.getHoldersByGroup("carb")[0].pumps.data[0];
-    return at(t, Gt.type);
+    return dt(t, rr.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -907,93 +907,140 @@ let Pe = class {
     this.logger.debug(`loading carb-water ${this.id}`);
   }
 };
-Qt([
-  m({ modelType: je.type })
-], Pe.prototype, "assemblyModel", 2);
-Pe = Qt([
-  l(Q)
-], Pe);
-const Ho = {
+or([
+  m({ modelType: Ve.type })
+], Me.prototype, "assemblyModel", 2);
+Me = or([
+  l(X)
+], Me);
+const Yo = {
   registration: {
-    [Q]: {
-      class: Pe,
+    [X]: {
+      class: Me,
       singleton: !1
     }
   },
-  type: Q,
-  predicate: u(Q),
-  factory: c.Factory.create(Q)
-}, { URL: W } = h("COPY-LOGS_SERVICE"), { getAll: Wo, getOne: No, postModel: Xt, deleteModel: zo } = f.build({
-  basePath: `${W}/api/copy-logs`
-}), Oe = g.createLogger({
+  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({
   name: "copy-logs-service",
   group: "Services"
-}), Jt = async (e, t) => {
-  const r = await zo({
+}), ar = async (e, t) => {
+  const r = await ei({
     tracker: t,
     id: e,
-    urlOverride: `${W}/api/app/kosdev.ddk/copyLogs/${e}`
+    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
-}, Zt = async (e, t) => {
-  const r = await Xt({
+}, nr = async (e, t) => {
+  const r = await sr({
     model: {},
     tracker: t,
-    urlOverride: `${W}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${e}`
+    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${e}`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
-}, er = async (e, t) => {
-  const r = await Xt({
+}, lr = async (e, t) => {
+  const r = await sr({
     model: {},
     tracker: t,
-    urlOverride: `${W}/api/app/kosdev.ddk/copyLogs/${e}`
+    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
-}, tr = async () => {
-  Oe.debug("sending GET for copy-logs");
+}, cr = async () => {
+  Se.debug("sending GET for copy-logs");
   try {
-    const e = await Wo({
-      urlOverride: `${W}/api/app/kosdev.ddk/copyLogs/volumes/size`
+    const e = await Jo({
+      urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/volumes/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof Ae)
-      return Oe.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof je)
+      return Se.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, rr = async () => {
-  Oe.debug("sending GET for log file size");
+}, ur = async () => {
+  Se.debug("sending GET for log file size");
   try {
-    const e = await No({
-      urlOverride: `${W}/api/app/kosdev.ddk/copyLogs/files/size`
+    const e = await Zo({
+      urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/files/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof Ae)
-      return Oe.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof je)
+      return Se.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, Ds = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Hs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  copyLogFromVolume: er,
-  eraseAndCopyLogsToVolume: Zt,
-  eraseVolume: Jt,
-  getLogFileSize: rr,
-  getVolumes: tr
+  copyLogFromVolume: lr,
+  eraseAndCopyLogsToVolume: nr,
+  eraseVolume: ar,
+  getLogFileSize: ur,
+  getVolumes: cr
 }, Symbol.toStringTag, { value: "Module" }));
-var or = Object.defineProperty, Bo = Object.getOwnPropertyDescriptor, Ko = (e, t, r) => t in e ? or(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 ? Bo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && or(t, r, o), o;
-}, Yo = (e, t, r) => (Ko(e, t + "", r), r);
-const qo = "copy-logs-model";
-let S = class {
+  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 {
   constructor(e) {
     s(this, "id");
     s(this, "_volumes");
@@ -1002,7 +1049,7 @@ let S = class {
     s(this, "_logFileSize", 0);
     s(this, "_actionState", "idle");
     s(this, "copyProgress");
-    this.id = e, this._volumes = new qr(), this._activeVolume = void 0, this.copyProgress = {
+    this.id = e, this._volumes = new Zr(), this._activeVolume = void 0, this.copyProgress = {
       bytesCopied: 0,
       bytesToCopy: 0,
       filesCopied: 0,
@@ -1045,16 +1092,16 @@ let S = class {
     return ((e = this.future) == null ? void 0 : e.status) === b.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 && _(() => {
+    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" ? _(() => {
+    })), e.status === b.Fail && this.logger.error(`Future failed: ${e.status}`), e.note === "copy" ? P(() => {
       this._actionState = "copying", this.copyProgress = e.clientData || {
         bytesCopied: 0,
         bytesToCopy: 0,
         filesCopied: 0,
         filesSkipped: 0
       };
-    }) : (this._actionState = "erasing", _(() => {
+    }) : (this._actionState = "erasing", P(() => {
       this.copyProgress = {
         bytesCopied: 0,
         bytesToCopy: 0,
@@ -1067,31 +1114,31 @@ let S = class {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (_(() => {
+    if (P(() => {
       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}`), Zt(this._activeVolume.id, e);
+    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), nr(this._activeVolume.id, e);
   }
   async eraseVolume(e) {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (_(() => {
+    if (P(() => {
       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}`), Jt(this._activeVolume.id, e);
+    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), ar(this._activeVolume.id, e);
   }
   async copyLogs(e) {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (_(() => {
+    if (P(() => {
       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}`), er(this._activeVolume.id, e);
+    return this.logger.info(`Copying logs to ${(t = this._activeVolume) == null ? void 0 : t.name}`), lr(this._activeVolume.id, e);
   }
   handleInsertion() {
     this.inserted ? this.syncVolumes() : (this._volumes.clear(), this.clearActiveVolume());
@@ -1100,7 +1147,7 @@ let S = class {
     this.logger.debug(`initializing copy-logs ${this.id}`);
   }
   async syncVolumes() {
-    const [e, t] = await tr(), [r, i] = await rr();
+    const [e, t] = await cr(), [r, i] = await ur();
     if (r) {
       this.logger.error(`Error fetching log file size: ${r}`);
       return;
@@ -1129,82 +1176,82 @@ let S = class {
     this.logger.debug(`loading copy-logs ${this.id}`);
   }
 };
-Yo(S, "Registration");
+oi(C, "Registration");
 N([
-  m({ modelType: Br.type })
-], S.prototype, "storageDeviceContainer", 2);
+  m({ modelType: Xr.type })
+], C.prototype, "storageDeviceContainer", 2);
 N([
   v()
-], S.prototype, "eraseAndCopyVolume", 1);
+], C.prototype, "eraseAndCopyVolume", 1);
 N([
   v()
-], S.prototype, "eraseVolume", 1);
+], C.prototype, "eraseVolume", 1);
 N([
   v()
-], S.prototype, "copyLogs", 1);
+], C.prototype, "copyLogs", 1);
 N([
-  Mt({
+  ut({
     dependencies: (e) => [e.inserted]
   })
-], S.prototype, "handleInsertion", 1);
-S = N([
-  l({ modelTypeId: qo, singleton: !0 }),
-  Kr(),
-  Yr()
-], S);
-const ks = S.Registration, ir = g.createLogger({
+], C.prototype, "handleInsertion", 1);
+C = N([
+  l({ modelTypeId: ii, singleton: !0 }),
+  Jr(),
+  pt()
+], C);
+const Ns = C.Registration, pr = g.createLogger({
   name: "dashboard-operations-service",
   group: "Services"
-}), sr = async (e, t) => (ir.debug("resolveAll"), await Re.bulkResolveTroubles(
+}), gr = async (e, t) => (pr.debug("resolveAll"), await Ae.bulkResolveTroubles(
   e,
   void 0,
   t
-)), ar = async (e, t) => (ir.debug("resolveTrouble"), await Re.resolveTrouble(
+)), hr = async (e, t) => (pr.debug("resolveTrouble"), await Ae.resolveTrouble(
   e,
   void 0,
   t
-)), Is = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+)), Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  resolveAll: sr,
-  resolveTrouble: ar
+  resolveAll: gr,
+  resolveTrouble: hr
 }, Symbol.toStringTag, { value: "Module" }));
-var Go = Object.defineProperty, Qo = Object.getOwnPropertyDescriptor, 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--)
+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 && Go(t, r, o), o;
+  return i && o && si(t, r, o), o;
 };
-const X = "dashboard-operations-model";
-function Tt(e) {
+const J = "dashboard-operations-model";
+function Lt(e) {
   return !e.deferred;
 }
-function Pt(e) {
+function Dt(e) {
   return e.deferred;
 }
-let A = class {
+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 he(this), this.logger = r.logger;
+    this.id = e, this.futureHandler = new me(this), this.logger = r.logger;
   }
   get troublesByType() {
     return this.troubles.troubles.data.reduce(
-      Gr,
+      eo,
       {}
     );
   }
   get queuedPurgeTroubles() {
-    return this.purgeTroubles.filter(Pt);
+    return this.purgeTroubles.filter(Dt);
   }
   get queuedPrimeTroubles() {
-    return this.primeTroubles.filter(Pt);
+    return this.primeTroubles.filter(Dt);
   }
   get resolvablePrimeTroubles() {
-    return this.primeTroubles.filter(Tt);
+    return this.primeTroubles.filter(Lt);
   }
   get resolvablePurgeTroubles() {
-    return this.purgeTroubles.filter(Tt);
+    return this.purgeTroubles.filter(Lt);
   }
   get hasResolvablePurgeTroubles() {
     return this.resolvablePurgeTroubles.length > 0;
@@ -1219,10 +1266,10 @@ let A = class {
     return this.primeTroubles.length > 0;
   }
   get purgeTroubles() {
-    return this.troublesByType[bt] || [];
+    return this.troublesByType[St] || [];
   }
   get primeTroubles() {
-    return this.troublesByType[oo] || [];
+    return this.troublesByType[co] || [];
   }
   get future() {
     return this.futureHandler.getFuture();
@@ -1230,17 +1277,17 @@ let A = class {
   async resolveAllTroubles(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const r = e === bt ? this.purgeTroubles : this.primeTroubles;
+    const r = e === St ? this.purgeTroubles : this.primeTroubles;
     r.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 sr(o, t);
+    return o.length === 0 ? void 0 : await gr(o, t);
   }
   async resolveTrouble(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    return await ar(e, t);
+    return await hr(e, t);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1250,36 +1297,36 @@ let A = class {
     this.logger.debug(`loading dashboard-operations ${this.id}`);
   }
 };
-He([
-  m({ modelType: nt.type })
-], A.prototype, "troubles", 2);
-He([
+Ne([
+  m({ modelType: gt.type })
+], x.prototype, "troubles", 2);
+Ne([
   v()
-], A.prototype, "resolveAllTroubles", 1);
-He([
+], x.prototype, "resolveAllTroubles", 1);
+Ne([
   v()
-], A.prototype, "resolveTrouble", 1);
-A = He([
-  l(X)
-], A);
-const pt = {
+], x.prototype, "resolveTrouble", 1);
+x = Ne([
+  l(J)
+], x);
+const vt = {
   registration: {
-    [X]: {
-      class: A,
+    [J]: {
+      class: x,
       singleton: !0
     }
   },
-  type: X,
-  predicate: u(X),
-  factory: c.Singleton.create(X)
+  type: J,
+  predicate: d(J),
+  factory: u.Singleton.create(J)
 };
-var Xo = Object.getOwnPropertyDescriptor, Jo = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Xo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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;
 };
-const J = "dispenser-model";
-let Je = class {
+const Z = "dispenser-model";
+let tt = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -1295,35 +1342,35 @@ let Je = class {
     this.logger.debug(`loading dispenser ${this.id}`);
   }
 };
-Je = Jo([
-  l(J)
-], Je);
-const Zo = {
+tt = li([
+  l(Z)
+], tt);
+const ci = {
   registration: {
-    [J]: {
-      class: Je,
+    [Z]: {
+      class: tt,
       singleton: !0
     }
   },
-  type: J,
-  predicate: u(J),
-  factory: c.Singleton.create(J)
-}, { URL: ei } = h("DISPENSER_SERVICE"), { getAll: ti } = f.build({
-  basePath: `${ei}/api/dispenser`
-}), ri = g.createLogger({
+  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({
   name: "dispenser-service",
   group: "Services"
-}), oi = async () => (ri.debug("sending GET for dispenser"), await ti({})), Rs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), gi = async () => (pi.debug("sending GET for dispenser"), await di({})), Ks = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispensers: oi
+  getDispensers: gi
 }, Symbol.toStringTag, { value: "Module" }));
-var ii = Object.defineProperty, si = Object.getOwnPropertyDescriptor, nr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? si(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && ii(t, r, o), o;
+  return i && o && hi(t, r, o), o;
 };
-const Z = "dispenser-info-model";
-let Me = class {
+const ee = "dispenser-info-model";
+let Ce = class {
   constructor(e, t, r) {
     s(this, "logger");
     s(this, "id");
@@ -1338,43 +1385,43 @@ let Me = class {
     this.logger.debug(`loading dispenser-info ${this.id}`);
   }
 };
-nr([
-  d({
+fr([
+  c({
     path: "kos:device",
     attribute: "name"
   })
-], Me.prototype, "name", 2);
-Me = nr([
-  l(Z)
-], Me);
-const ai = {
+], Ce.prototype, "name", 2);
+Ce = fr([
+  l(ee)
+], Ce);
+const mi = {
   registration: {
-    [Z]: {
-      class: Me,
+    [ee]: {
+      class: Ce,
       singleton: !1
     }
   },
-  type: Z,
-  predicate: u(Z),
-  factory: c.Factory.create(
-    Z
+  type: ee,
+  predicate: d(ee),
+  factory: u.Factory.create(
+    ee
   )
-}, { URL: ni } = h("DISPENSER-INFO_SERVICE"), { getAll: li } = f.build({
-  basePath: `${ni}/api/dispenser-info`
-}), ci = g.createLogger({
+}, { URL: yi } = h("DISPENSER-INFO_SERVICE"), { getAll: bi } = f.build({
+  basePath: `${yi}/api/dispenser-info`
+}), vi = g.createLogger({
   name: "dispenser-info-service",
   group: "Services"
-}), ui = async () => (ci.debug("sending GET for dispenser-info"), await li({})), Fs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), _i = async () => (vi.debug("sending GET for dispenser-info"), await bi({})), Ys = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispenserInfos: ui
+  getDispenserInfos: _i
 }, Symbol.toStringTag, { value: "Module" }));
-var di = Object.getOwnPropertyDescriptor, pi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? di(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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;
 };
-const ee = "enrollment-model";
-let Ze = class {
+const te = "enrollment-model";
+let rt = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -1392,37 +1439,37 @@ let Ze = class {
     this.logger.debug(`loading enrollment ${this.id}`);
   }
 };
-Ze = pi([
-  l(ee)
-], Ze);
-const gi = {
+rt = $i([
+  l(te)
+], rt);
+const Ti = {
   registration: {
-    [ee]: {
-      class: Ze,
+    [te]: {
+      class: rt,
       singleton: !0
     }
   },
-  type: ee,
-  predicate: u(ee),
-  factory: c.Singleton.create(ee)
-}, { URL: hi } = h("ENROLLMENT_SERVICE"), { getAll: fi } = f.build({
-  basePath: `${hi}/api/enrollment`
-}), mi = g.createLogger({
+  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({
   name: "enrollment-service",
   group: "Services"
-}), yi = async () => (mi.debug("sending GET for enrollment"), await fi({})), As = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ci = async () => (Si.debug("sending GET for enrollment"), await Mi({})), qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getEnrollments: yi
-}, Symbol.toStringTag, { value: "Module" })), xs = (e) => e.toLowerCase().includes("micros"), js = (e) => !e.toLowerCase().includes("micros"), Us = (e) => (t) => {
+  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;
-}, Vs = ["water", "carb", "ns", "nss"], pe = "dashboardKeyFactory", Ye = [];
-Qr(pe, {
+}, Js = ["water", "carb", "ns", "nss"], ge = "dashboardKeyFactory", Qe = [];
+to(ge, {
   register: (e, t) => {
-    Ye.includes(t) || Ye.push(t);
+    Qe.includes(t) || Qe.push(t);
   },
   execute: (e, t) => {
-    const r = Ye.sort((i, o) => i.rank - o.rank);
+    const r = Qe.sort((i, o) => i.rank - o.rank);
     for (const i of r) {
       const o = i.factory(t);
       if (o)
@@ -1430,39 +1477,39 @@ Qr(pe, {
     }
   }
 });
-const bi = (e) => {
-  xe[pe].register(
-    pe,
+const wi = (e) => {
+  Ue[ge].register(
+    ge,
     e
   );
-}, vi = (e) => xe[pe].execute(
-  pe,
+}, Ei = (e) => Ue[ge].execute(
+  ge,
   e
 );
-xe.registerDashboardKeyFactory = bi;
-xe.executeDashboardKeyFactory = vi;
-const et = 3600, lr = 60, Hs = (e) => {
-  const t = Math.floor(e / et), r = Math.floor(e % et / lr);
+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 };
-}, Ws = (e, t) => e * et + t * lr, _i = (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, O = o % 24;
+}, 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" : ""} `), O > 0 && (D += `${O} hour${O > 1 ? "s" : ""} `), (a > 0 || n === 0 && O === 0) && (D += `${a} minute${a > 1 ? "s" : ""} `), 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 $i = Object.defineProperty, Ti = Object.getOwnPropertyDescriptor, We = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ti(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && $i(t, r, o), o;
+  return i && o && Di(t, r, o), o;
 };
-const te = "ingredient-summary-model";
-let x = class {
+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 = pt.factory({});
+    this.id = e, this.logger = r.logger, this.dashboardOperationModel = vt.factory({});
   }
   get highPriorityHolders() {
     return this.assemblyModel.allHolders.filter(
@@ -1470,11 +1517,11 @@ let x = class {
     );
   }
   get actionRequiredHolders() {
-    const e = this.appModel.currentRole, t = Ht(e);
+    const e = this.appModel.currentRole, t = qt(e);
     return this.assemblyModel.allHolders.filter((r) => {
-      const i = at(
+      const i = dt(
         r,
-        eo.type
+        ao.type
       );
       if (i != null && i.isRemote)
         return !1;
@@ -1496,38 +1543,38 @@ let x = class {
     this.logger.debug(`loading ingredient-summary ${this.id}`);
   }
 };
-We([
-  m({ modelType: je.type })
-], x.prototype, "assemblyModel", 2);
-We([
-  m({ modelType: pt.type })
-], x.prototype, "dashboardOperationModel", 2);
-We([
-  m({ modelType: dt.type })
-], x.prototype, "appModel", 2);
-x = We([
-  l(te)
-], x);
-const Pi = {
+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 = {
   registration: {
-    [te]: {
-      class: x,
+    [re]: {
+      class: j,
       singleton: !1
     }
   },
-  type: te,
-  predicate: u(te),
-  factory: c.Factory.create(
-    te
+  type: re,
+  predicate: d(re),
+  factory: u.Factory.create(
+    re
   )
 };
-var Oi = Object.getOwnPropertyDescriptor, Mi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Oi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 cr = "lfcv-pump-model";
-let tt = class {
+const yr = "lfcv-pump-model";
+let it = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -1557,43 +1604,43 @@ let tt = class {
     this.logger.debug(`loading lfcv-pump ${this.id}`);
   }
 };
-tt = Mi([
-  l(cr)
-], tt);
-const Ns = new ke({
-  class: tt,
-  type: cr
-}), { URL: Si } = h("LFCV-PUMP_SERVICE"), { getAll: Ci } = f.build({
-  basePath: `${Si}/api/lfcv-pump`
-}), wi = g.createLogger({
+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"
-}), Ei = async () => (wi.debug("sending GET for lfcv-pump"), await Ci({})), zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ui = async () => (ji.debug("sending GET for lfcv-pump"), await xi({})), ra = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getLfcvPumps: Ei
-}, Symbol.toStringTag, { value: "Module" })), { URL: gt } = h("LOCKOUT_SERVICE"), { postModel: ur } = f.build({
-  basePath: `${gt}/api/app/kosdev.ddk/lockout`
-}), dr = g.createLogger({ name: "lockout-service", group: "Services" }), Li = async () => (dr.info("lock"), await ur({
+  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({
   model: {},
-  urlOverride: `${gt}/api/app/kosdev.ddk/lockout/lockNow`
-})), pr = async (e) => {
-  dr.info("unlock");
-  const t = await ur({
+  urlOverride: `${_t}/api/app/kosdev.ddk/lockout/lockNow`
+})), _r = async (e) => {
+  vr.info("unlock");
+  const t = await br({
     model: {},
-    urlOverride: `${gt}/api/app/kosdev.ddk/lockout/unlock/${e}`
+    urlOverride: `${_t}/api/app/kosdev.ddk/lockout/unlock/${e}`
   });
   return t == null ? void 0 : t.data;
-}, Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, oa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  lock: Li,
-  unlock: pr
+  lock: Vi,
+  unlock: _r
 }, Symbol.toStringTag, { value: "Module" }));
-var Di = Object.defineProperty, ki = Object.getOwnPropertyDescriptor, z = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ki(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && Di(t, r, o), o;
+  return i && o && Wi(t, r, o), o;
 };
-const gr = "lockout-model", Ii = [
+const Pr = "lockout-model", Hi = [
   { 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" },
@@ -1648,7 +1695,7 @@ let E = class {
     return t || r;
   }
   get schedule() {
-    return Ii;
+    return Hi;
   }
   getProp(e) {
     return this.saveMap.get(e);
@@ -1665,7 +1712,7 @@ let E = class {
       this.nextLockSkipped.updateProperty("0");
   }
   async unlock(e) {
-    return await pr(e);
+    return await _r(e);
   }
   async save() {
     return this.saveMap.forEach((e, t) => {
@@ -1687,51 +1734,51 @@ let E = class {
     this.logger.debug(`loading lockout ${this.id}`);
   }
 };
-z([
-  d({
+B([
+  c({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "pin"
   })
 ], E.prototype, "pin", 2);
-z([
-  d({
+B([
+  c({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockSkipped"
   })
 ], E.prototype, "nextLockSkipped", 2);
-z([
-  d({
+B([
+  c({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockTime"
   })
 ], E.prototype, "nextLockTime", 2);
-z([
-  d({
+B([
+  c({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextUnLockTime"
   })
 ], E.prototype, "nextUnLockTime", 2);
-z([
-  Xr({ path: "app:kosdev.ddk:service:cuiLockout" })
+B([
+  ro({ path: "app:kosdev.ddk:service:cuiLockout" })
 ], E.prototype, "cuiLockout", 2);
-E = z([
-  l(gr)
+E = B([
+  l(Pr)
 ], E);
-const Ks = new Fe({
+const ia = new xe({
   class: E,
-  type: gr
-}), Ri = async (e, t) => await Re.bulkResolveTroubles(
+  type: Pr
+}), Ni = async (e, t) => await Ae.bulkResolveTroubles(
   e,
   void 0,
   t
 );
-var Fi = 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--)
+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 && Fi(t, r, o), o;
+  return i && o && Bi(t, r, o), o;
 };
-const re = "macro-assignment-model", Ot = "PurgeTrouble", xi = "PrimeTrouble";
-let j = class {
+const oe = "macro-assignment-model", kt = "PurgeTrouble", Yi = "PrimeTrouble";
+let U = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -1741,7 +1788,7 @@ let j = class {
     s(this, "futureHandler");
     s(this, "holders");
     s(this, "ingredients");
-    this.id = e, this.futureHandler = new he(), this.logger = r.logger;
+    this.id = e, this.futureHandler = new me(), this.logger = r.logger;
   }
   /**
    * shortcut to the current running future
@@ -1771,13 +1818,13 @@ let j = class {
    */
   get holderPurgeTroubles() {
     return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[Ot] || [];
+      const i = r.troublesByType[kt] || [];
       return t = [...t, ...i], t;
     }, []);
   }
   get holderPrimeTroubles() {
     return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[xi] || [];
+      const i = r.troublesByType[Yi] || [];
       return t = [...t, ...i], t;
     }, []);
   }
@@ -1813,42 +1860,42 @@ let j = class {
   async resolveAll(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const i = (e === Ot ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
-    return await Ri(i, t);
+    const i = (e === kt ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
+    return await Ni(i, t);
   }
 };
-Ne([
-  m({ modelType: to.type })
-], j.prototype, "holders", 2);
-Ne([
-  m({ modelType: ro.type })
-], j.prototype, "ingredients", 2);
-Ne([
+Ke([
+  m({ modelType: no.type })
+], U.prototype, "holders", 2);
+Ke([
+  m({ modelType: lo.type })
+], U.prototype, "ingredients", 2);
+Ke([
   v()
-], j.prototype, "resolveAll", 1);
-j = Ne([
-  l(re)
-], j);
-const ji = {
+], U.prototype, "resolveAll", 1);
+U = Ke([
+  l(oe)
+], U);
+const qi = {
   registration: {
-    [re]: {
-      class: j,
+    [oe]: {
+      class: U,
       singleton: !0
     }
   },
-  type: re,
-  predicate: u(re),
-  factory: c.Singleton.create(
-    re
+  type: oe,
+  predicate: d(oe),
+  factory: u.Singleton.create(
+    oe
   )
 };
-var Ui = Object.getOwnPropertyDescriptor, Vi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ui(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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;
 };
-const oe = "network-test-model";
-let rt = class {
+const ie = "network-test-model";
+let st = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "group");
@@ -1872,58 +1919,58 @@ let rt = class {
     this.logger.debug(`loading network-test ${this.id}`);
   }
 };
-rt = Vi([
-  l(oe)
-], rt);
-const hr = {
+st = Qi([
+  l(ie)
+], st);
+const $r = {
   registration: {
-    [oe]: {
-      class: rt,
+    [ie]: {
+      class: st,
       singleton: !1
     }
   },
-  type: oe,
-  predicate: u(oe),
-  factory: c.Factory.create(oe)
-}, { URL: ze } = h("NETWORK-TEST_SERVICE"), { getAll: Hi, getOne: fr } = f.build({
-  basePath: `${ze}/api/app/ncui/network/tests`
-}), Wi = g.createLogger({
+  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({
   name: "network-test-service",
   group: "Services"
-}), mr = async () => {
-  Wi.debug("sending GET for network-test");
-  const e = await Hi({
-    urlOverride: `${ze}/api/app/kosdev.ddk/network/tests`
+}), Or = async () => {
+  Ji.debug("sending GET for network-test");
+  const e = await Xi({
+    urlOverride: `${Ye}/api/app/kosdev.ddk/network/tests`
   });
   return e == null ? void 0 : e.data;
-}, yr = async () => {
-  const e = await fr({
-    urlOverride: `${ze}/api/app/kosdev.ddk/network/reports`
+}, Mr = async () => {
+  const e = await Tr({
+    urlOverride: `${Ye}/api/app/kosdev.ddk/network/reports`
   });
   return e == null ? void 0 : e.data;
-}, br = async (e, t) => await fr({
-  urlOverride: `${ze}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
+}, Sr = async (e, t) => await Tr({
+  urlOverride: `${Ye}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
   tracker: t
-}), Ys = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), sa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNetworkTests: mr,
-  getTestsReports: yr,
-  performGroupTest: br
+  getNetworkTests: Or,
+  getTestsReports: Mr,
+  performGroupTest: Sr
 }, Symbol.toStringTag, { value: "Module" }));
-var Ni = Object.defineProperty, zi = Object.getOwnPropertyDescriptor, ht = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? zi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && Ni(t, r, o), o;
+  return i && o && Zi(t, r, o), o;
 };
-const ie = "network-test-container-model";
-let ge = class {
+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 he(this), this.models = new st({
+    this.id = e, this.logger = r.logger, this.futureHandler = new me(this), this.models = new ct({
       parentId: e,
       indexMap: {
         group: "group"
@@ -1952,13 +1999,13 @@ let ge = class {
     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)
     );
-    return r ? _i(new Date(r)) : "";
+    return r ? Li(new Date(r)) : "";
   }
   async load() {
     this.logger.debug(`loading network-test-container container ${this.id}`);
-    const e = await mr(), t = await yr();
+    const e = await Or(), t = await Mr();
     e && e.forEach((r) => {
-      const i = hr.factory(r.id)(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);
@@ -1979,14 +2026,14 @@ let ge = class {
   async performTest(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const r = await br(e, t);
+    const r = await Sr(e, t);
     return r == null ? void 0 : r.data;
   }
   onFutureUpdate(e) {
     const { clientData: t } = e;
     t && t.forEach((r) => {
       const i = this.getModel(r.id);
-      if (_(() => {
+      if (P(() => {
         this.lastTested = this.lastTested > new Date(r.timestamp) ? this.lastTested : new Date(r.timestamp);
       }), i) {
         const o = {
@@ -1998,85 +2045,93 @@ let ge = class {
           timestamp: new Date(r.timestamp),
           results: r.results
         };
-        _(() => {
+        P(() => {
           i.updateModel(o);
         });
       }
     });
   }
 };
-ht([
-  Ie
-], ge.prototype, "models", 2);
-ht([
+Pt([
+  Fe
+], he.prototype, "models", 2);
+Pt([
   v()
-], ge.prototype, "performTest", 1);
-ge = ht([
-  l(ie)
-], ge);
-const Bi = {
+], he.prototype, "performTest", 1);
+he = Pt([
+  l(se)
+], he);
+const ts = {
   registration: {
-    [ie]: {
-      class: ge,
+    [se]: {
+      class: he,
       singleton: !0
     },
-    ...hr.registration
+    ...$r.registration
   },
-  type: ie,
-  predicate: u(ie),
-  factory: c.Singleton.create(ie)
+  type: se,
+  predicate: d(se),
+  factory: u.Singleton.create(se)
 };
-var Ki = Object.defineProperty, Yi = Object.getOwnPropertyDescriptor, vr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Yi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && Ki(t, r, o), o;
+  return i && o && rs(t, r, o), o;
 };
-const se = "nutritive-sweetener-model";
-let Se = class {
-  constructor(e, t, r) {
+const ae = "nutritive-sweetener-model", is = lt("statePath");
+let fe = class {
+  constructor(e, t) {
     s(this, "id");
     s(this, "assemblyModel");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+    s(this, "pumpState");
+    this.id = e;
   }
-  getHolder() {
+  get holder() {
     return this.assemblyModel.getHoldersByGroup("ns")[0];
   }
-  getPump() {
-    return this.getHolder().pumps.data[0];
+  getHolder() {
+    return this.holder;
   }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing nutritive-sweetener ${this.id}`);
+  get statePath() {
+    return `${this.pump.path}:airVent:state`;
   }
-  async load() {
-    this.logger.debug(`loading nutritive-sweetener ${this.id}`);
+  get pump() {
+    return this.holder.pumps.data[0];
+  }
+  getPump() {
+    return this.pump;
   }
 };
-vr([
-  m({ modelType: je.type })
-], Se.prototype, "assemblyModel", 2);
-Se = vr([
-  l(se)
-], Se);
-const qi = {
+$t([
+  m({ modelType: Ve.type })
+], fe.prototype, "assemblyModel", 2);
+$t([
+  oo({
+    path: is
+  })
+], fe.prototype, "pumpState", 2);
+fe = $t([
+  l(ae),
+  pt()
+], fe);
+const ss = {
   registration: {
-    [se]: {
-      class: Se,
+    [ae]: {
+      class: fe,
       singleton: !1
     }
   },
-  type: se,
-  predicate: u(se),
-  factory: c.Factory.create(se)
+  type: ae,
+  predicate: d(ae),
+  factory: u.Factory.create(ae)
 };
-var Gi = Object.defineProperty, Qi = Object.getOwnPropertyDescriptor, _r = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Qi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && Gi(t, r, o), o;
+  return i && o && as(t, r, o), o;
 };
-const ae = "plain-water-model";
-let Ce = class {
+const ne = "plain-water-model";
+let we = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "assemblyModel");
@@ -2089,7 +2144,7 @@ let Ce = class {
   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 at(t, Gt.type);
+    return dt(t, rr.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2099,45 +2154,45 @@ let Ce = class {
     this.logger.debug(`loading plain-water ${this.id}`);
   }
 };
-_r([
-  m({ modelType: je.type })
-], Ce.prototype, "assemblyModel", 2);
-Ce = _r([
-  l(ae)
-], Ce);
-const Xi = {
+Cr([
+  m({ modelType: Ve.type })
+], we.prototype, "assemblyModel", 2);
+we = Cr([
+  l(ne)
+], we);
+const ls = {
   registration: {
-    [ae]: {
-      class: Ce,
+    [ne]: {
+      class: we,
       singleton: !1
     }
   },
-  type: ae,
-  predicate: u(ae),
-  factory: c.Factory.create(ae)
-}, { URL: $r } = h("REBOOT_SERVICE"), { postModel: Ji } = f.build({
-  basePath: `${$r}/api/reboot`
-}), Zi = g.createLogger({ name: "reboot-service", group: "Services" }), Tr = async () => (Zi.debug("sending POST call for Reboot Dispenser"), await Ji({
-  urlOverride: `${$r}/api/app/kosdev.ddk/ncui/reboot`,
+  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`,
   model: {}
-})), qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), aa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  rebootDispenser: Tr
+  rebootDispenser: Er
 }, Symbol.toStringTag, { value: "Module" }));
-var es = Object.getOwnPropertyDescriptor, ts = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? es(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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;
 };
-const ne = "reboot-model";
-let ot = class {
+const le = "reboot-model";
+let at = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
     this.id = e, this.logger = r.logger;
   }
   async completeReboot() {
-    await Tr();
+    await Er();
   }
   updateModel() {
   }
@@ -2149,27 +2204,27 @@ let ot = class {
     this.logger.debug(`loading reboot ${this.id}`);
   }
 };
-ot = ts([
-  l(ne)
-], ot);
-const rs = {
+at = ps([
+  l(le)
+], at);
+const gs = {
   registration: {
-    [ne]: {
-      class: ot,
+    [le]: {
+      class: at,
       singleton: !1
     }
   },
-  type: ne,
-  predicate: u(ne),
-  factory: c.Factory.create(ne)
+  type: le,
+  predicate: d(le),
+  factory: u.Factory.create(le)
 };
-var os = Object.defineProperty, is = Object.getOwnPropertyDescriptor, C = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? is(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && os(t, r, o), o;
+  return i && o && hs(t, r, o), o;
 };
-const le = "settings-model";
-let P = class {
+const ce = "settings-model";
+let _ = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -2182,13 +2237,12 @@ let P = class {
     s(this, "ncuiLanguage");
     s(this, "name");
     s(this, "activateAndRebootTime");
+    s(this, "horizontalMode");
     this.id = e, this.logger = r.logger;
   }
-  updateModel(e) {
-  }
   // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing settings ${this.id}`);
+  async ready() {
+    this.updateDisplayMode();
   }
   async getNcuiLanguageList() {
     this.ncuiLanguageData = {
@@ -2216,90 +2270,107 @@ let P = class {
       }
     };
   }
+  handleUpdateDisplayMode() {
+    this.updateDisplayMode();
+  }
+  updateDisplayMode() {
+    this.horizontalMode.value ? document.body.setAttribute("data-dashboard-layout", "horizontal") : document.body.setAttribute("data-dashboard-layout", "vertical");
+  }
 };
-C([
-  d({
+O([
+  c({
     path: "system:app",
     attribute: "resolveDelaysMs"
     // optionsExpander: () => [],
   })
-], P.prototype, "resolveDelaysMs", 2);
-C([
-  d({
+], _.prototype, "resolveDelaysMs", 2);
+O([
+  c({
     path: "system:app",
     attribute: "dateFormat"
     // optionsExpander: () => [],
   })
-], P.prototype, "dateFormat", 2);
-C([
-  d({
+], _.prototype, "dateFormat", 2);
+O([
+  c({
     path: "system:app",
     attribute: "timeFormat"
     // optionsExpander: () => [],
   })
-], P.prototype, "timeFormat", 2);
-C([
-  d({
+], _.prototype, "timeFormat", 2);
+O([
+  c({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hidePlainWaterBev"
   })
-], P.prototype, "hidePlainWaterBev", 2);
-C([
-  d({
+], _.prototype, "hidePlainWaterBev", 2);
+O([
+  c({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hideCarbWaterBev"
   })
-], P.prototype, "hideCarbWaterBev", 2);
-C([
-  d({
+], _.prototype, "hideCarbWaterBev", 2);
+O([
+  c({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
   })
-], P.prototype, "ncuiLanguage", 2);
-C([
-  d({
+], _.prototype, "ncuiLanguage", 2);
+O([
+  c({
     path: "kos:device",
     attribute: "name"
   })
-], P.prototype, "name", 2);
-C([
-  d({
+], _.prototype, "name", 2);
+O([
+  c({
     path: "kos:service:OTA",
     attribute: "activateAndRebootTime"
   })
-], P.prototype, "activateAndRebootTime", 2);
-P = C([
-  l(le)
-], P);
-const ss = {
+], _.prototype, "activateAndRebootTime", 2);
+O([
+  c({
+    path: "app:kosdev.ddk:app",
+    attribute: "ncui.uiConfig.display.horizontalMode"
+  })
+], _.prototype, "horizontalMode", 2);
+O([
+  ut({
+    dependencies: (e) => [e.horizontalMode.value]
+  })
+], _.prototype, "handleUpdateDisplayMode", 1);
+_ = O([
+  l(ce)
+], _);
+const ms = {
   registration: {
-    [le]: {
-      class: P,
+    [ce]: {
+      class: _,
       singleton: !0
     }
   },
-  type: le,
-  predicate: u(le),
-  factory: c.Singleton.create(le)
-}, { URL: Pr } = h("SETTINGS_SERVICE"), { getAll: Or } = f.build({
-  basePath: `${Pr}/api/settings`
-}), as = g.createLogger({
+  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({
   name: "settings-service",
   group: "Services"
-}), ns = async () => (as.debug("sending GET for settings"), await Or({})), ls = async () => await Or({
-  urlOverride: `${Pr}api/app/kosdev.ddk/ncui/languages`
-}), Gs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), 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({
   __proto__: null,
-  getNcuiLanguage: ls,
-  getSettings: ns
+  getNcuiLanguage: vs,
+  getSettings: bs
 }, Symbol.toStringTag, { value: "Module" }));
-var cs = Object.getOwnPropertyDescriptor, us = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? cs(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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;
 };
-const ce = "utilities-model";
-let it = class {
+const ue = "utilities-model";
+let nt = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "name");
@@ -2326,61 +2397,61 @@ let it = class {
     this.logger.debug(`loading utilities ${this.id}`);
   }
 };
-it = us([
-  l(ce)
-], it);
-const Mr = {
+nt = Ps([
+  l(ue)
+], nt);
+const kr = {
   registration: {
-    [ce]: {
-      class: it,
+    [ue]: {
+      class: nt,
       singleton: !1
     }
   },
-  type: ce,
-  predicate: u(ce),
-  factory: c.Factory.create(ce)
-}, { URL: _e } = h("UTILITIES_SERVICE"), { getAll: qe } = f.build({
-  basePath: `${_e}/api/utilities`
-}), Ge = g.createLogger({
+  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({
   name: "utilities-service",
   group: "Services"
-}), Sr = async () => {
-  Ge.debug("sending GET for utilities");
+}), Ir = async () => {
+  Je.debug("sending GET for utilities");
   try {
-    const e = await qe({
-      urlOverride: `${_e}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.utilities`
+    const e = await Xe({
+      urlOverride: `${$e}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.utilities`
     });
     if ((e == null ? void 0 : e.status) !== 200) {
-      Ge.info("no extensions found, using base data");
-      const t = await qe({
-        urlOverride: `${_e}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+      Je.info("no extensions found, using base data");
+      const t = await Xe({
+        urlOverride: `${$e}/api/kos/descriptor/system:app/kondra.ncui.utilities`
       });
       return (t == null ? void 0 : t.data) ?? [];
     }
     return (e == null ? void 0 : e.data) ?? [];
   } catch (e) {
-    Ge.info(`error fetching utilities: ${e}. Using base data`);
-    const t = await qe({
-      urlOverride: `${_e}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+    Je.info(`error fetching utilities: ${e}. Using base data`);
+    const t = await Xe({
+      urlOverride: `${$e}/api/kos/descriptor/system:app/kondra.ncui.utilities`
     });
     return (t == null ? void 0 : t.data) ?? [];
   }
-}, Qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, la = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getUtilities: Sr
+  getUtilities: Ir
 }, Symbol.toStringTag, { value: "Module" }));
-var ds = Object.defineProperty, ps = Object.getOwnPropertyDescriptor, Cr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ps(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && ds(t, r, o), o;
+  return i && o && $s(t, r, o), o;
 };
-const ue = "utilities-container-model";
-let we = class {
+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 st({
+    this.id = e, this.logger = r.logger, this._models = new ct({
       parentId: e,
       sortKey: "id",
       indexMap: {
@@ -2412,13 +2483,13 @@ let we = class {
   // -------------------LIFECYCLE----------------------------
   async load() {
     this.logger.debug(`loading utilities-container container ${this.id}`);
-    const e = await Sr();
+    const e = await Ir();
     e == null || e.forEach((t, r) => {
       t.forEach((i) => {
         const o = {
           ...i,
           columnId: String(r)
-        }, n = Mr.factory(i.name)(
+        }, n = kr.factory(i.name)(
           o
         );
         this.addModel(n);
@@ -2426,174 +2497,54 @@ let we = class {
     });
   }
 };
-Cr([
-  Ie
-], we.prototype, "_models", 2);
-we = Cr([
-  l(ue)
-], we);
-const gs = {
+Rr([
+  Fe
+], Ee.prototype, "_models", 2);
+Ee = Rr([
+  l(de)
+], Ee);
+const Os = {
   registration: {
-    [ue]: {
-      class: we,
+    [de]: {
+      class: Ee,
       singleton: !0
     },
-    ...Mr.registration
+    ...kr.registration
   },
-  type: ue,
-  predicate: u(ue),
-  factory: c.Singleton.create(ue)
-}, Xs = {
-  ...Lo.registration,
-  ...dt.registration,
-  ...ct.registration,
-  ...Ho.registration,
-  ...pt.registration,
-  ...Zo.registration,
-  ...ai.registration,
-  ...gi.registration,
-  ...Pi.registration,
-  ...ji.registration,
-  ...Bi.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,
-  ...Xi.registration,
-  ...rs.registration,
+  ...ts.registration,
   ...ss.registration,
-  ...jt.registration,
-  ...gs.registration
-};
-var hs = Object.defineProperty, fs = Object.getOwnPropertyDescriptor, wr = (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 Er = "trouble-action-model";
-let Ee = 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 = Jr(), this.troubleActionData = t.definitions.reduce((i, o) => (i[o.troubleType] = o, i), {});
-  }
-  // -------------------LIFECYCLE----------------------------
-  get activeTrouble() {
-    const e = Object.keys(this.troubleActionData);
-    if (e.length > 0) {
-      const t = e[0], r = this.troubleContainer.troubles.getIndexByKey(
-        "byType",
-        t
-      );
-      return r.length > 0 ? r[0] : void 0;
-    }
-  }
-  get activeTroubleType() {
-    var e;
-    return (e = this.activeTrouble) == null ? void 0 : e.type;
-  }
-  async init() {
-    this.logger.debug(`initializing trouble-action ${this.id}`), this.disposer = Zr(() => {
-      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;
-        }
-        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;
-        }
-      });
-    });
-  }
-  unload() {
-    var e;
-    (e = this.disposer) == null || e.call(this);
-  }
-  async load() {
-    this.logger.debug(`loading trouble-action ${this.id}`);
-  }
-};
-wr([
-  m({ modelType: nt.type })
-], Ee.prototype, "troubleContainer", 2);
-Ee = wr([
-  l(Er)
-], Ee);
-const Js = new Fe({
-  class: Ee,
-  type: Er
-}), { URL: Lr } = h("START_SERVICE"), { getOne: ms } = f.build({
-  basePath: `${Lr}/api/start`
-}), ys = g.createLogger({ name: "start-service", group: "Services" }), Dr = async () => (ys.debug("navigating to NCUI"), await ms({
-  urlOverride: `${Lr}/api/app/kosdev.ddk/ncui/open`
-})), Zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  navigateToNCui: Dr
-}, Symbol.toStringTag, { value: "Module" }));
-var bs = Object.defineProperty, vs = Object.getOwnPropertyDescriptor, kr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? vs(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 && bs(t, r, o), o;
-};
-const Ir = "start-model";
-let Le = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "troubles");
-    this.id = e, this.logger = r.logger;
-  }
-  get firmwareFailed() {
-    return this.troubles.troubles.getIndexByKey(
-      "byType",
-      "FirmwareUpdateFailedTrouble"
-    ).length > 0;
-  }
-  get firmwareInProgress() {
-    return this.troubles.troubles.getIndexByKey(
-      "byType",
-      "FirmwareUpdateInProgressTrouble"
-    ).length > 0;
-  }
-  async navigate() {
-    await Dr();
-  }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing start ${this.id}`);
-  }
-  async load() {
-    this.logger.debug(`loading start ${this.id}`);
-  }
-};
-kr([
-  m({ modelType: nt.type })
-], Le.prototype, "troubles", 2);
-Le = kr([
-  l(Ir)
-], Le);
-const ea = new Fe({
-  class: Le,
-  type: Ir
-}), { URL: ye } = h("SPM-PUMP_SERVICE"), { postModel: Be } = f.build({
-  basePath: `${ye}/api/spm-pump`
+  ...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"
-}), Rr = async (e, t) => {
+}), Fr = async (e, t) => {
   $.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`
   );
   try {
-    const r = await Be({
+    const r = await qe({
       model: {},
-      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
+      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;
@@ -2610,14 +2561,14 @@ const ea = new Fe({
     };
     return T.initiateFuture(i), i;
   }
-}, Fr = async (e, t) => {
+}, Ar = async (e, t) => {
   $.debug(
     `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`
   );
   try {
-    const r = await Be({
+    const r = await qe({
       model: {},
-      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
+      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;
@@ -2634,12 +2585,12 @@ const ea = new Fe({
     };
     return T.initiateFuture(i), i;
   }
-}, Ar = async (e, t, r, i) => {
+}, xr = async (e, t, r, i) => {
   $.debug(
     `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`
   );
   try {
-    const o = await Be({
+    const o = await qe({
       model: {
         ...r,
         // commandedCalibrationVolume: 0,
@@ -2648,7 +2599,7 @@ const ea = new Fe({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
+      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;
@@ -2665,13 +2616,13 @@ const ea = new Fe({
     };
     return T.initiateFuture(n), n;
   }
-}, xr = async (e, t, r, i) => {
-  var o, n, a, O, D;
+}, 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 Be({
+    const p = await qe({
       model: {
         ...i,
         // commandedCalibrationVolume: 0,
@@ -2680,39 +2631,39 @@ const ea = new Fe({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/complete`
+      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 Ae) {
-      const ft = ((a = (n = p.payload) == null ? void 0 : n.data) == null ? void 0 : a.error) || ((O = p.payload) == null ? void 0 : O.error) || "unknownError";
-      return [ft, ((D = p.payload) == null ? void 0 : D.data) || { error: ft }];
+    ), 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" }];
-}, ta = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, ua = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  performCalibrate: Fr,
-  performComplete: xr,
-  performPreCalibrate: Rr,
-  performVerify: Ar
+  performCalibrate: Ar,
+  performComplete: jr,
+  performPreCalibrate: Fr,
+  performVerify: xr
 }, Symbol.toStringTag, { value: "Module" }));
-var _s = Object.defineProperty, $s = Object.getOwnPropertyDescriptor, Ke = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? $s(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+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 && _s(t, r, o), o;
+  return i && o && Ms(t, r, o), o;
 };
-const jr = "spm-pump-model";
-let U = class {
+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 he(this);
+    this.id = e, this.logger = r.logger, this.pump = t.companionParent, this.futureHandler = new me(this);
   }
   get name() {
     return this.pump.name;
@@ -2733,16 +2684,16 @@ let U = class {
     return this.futureHandler.future;
   }
   async performPreCalibrate(e) {
-    return Rr(this.pump.path, e);
+    return Fr(this.pump.path, e);
   }
   async performCalibrate(e) {
-    return Fr(this.pump.path, e);
+    return Ar(this.pump.path, e);
   }
   async performVerify(e, t, r) {
-    return Ar(this.pump.path, e, t, r);
+    return xr(this.pump.path, e, t, r);
   }
   async performComplete(e, t, r) {
-    return xr(this.pump.path, e, t, r);
+    return jr(this.pump.path, e, t, r);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2752,81 +2703,202 @@ let U = class {
     this.logger.debug(`loading spm-pump ${this.id}`);
   }
 };
-Ke([
+Ge([
   v()
-], U.prototype, "performPreCalibrate", 1);
-Ke([
+], V.prototype, "performPreCalibrate", 1);
+Ge([
   v()
-], U.prototype, "performCalibrate", 1);
-Ke([
+], V.prototype, "performCalibrate", 1);
+Ge([
   v()
-], U.prototype, "performVerify", 1);
-U = Ke([
-  l(jr)
-], U);
-const ra = new ke({
-  class: U,
-  type: jr
+], 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), {});
+  }
+  // -------------------LIFECYCLE----------------------------
+  get activeTrouble() {
+    const e = Object.keys(this.troubleActionData);
+    if (e.length > 0) {
+      const t = e[0], r = this.troubleContainer.troubles.getIndexByKey(
+        "byType",
+        t
+      );
+      return r.length > 0 ? r[0] : void 0;
+    }
+  }
+  get activeTroubleType() {
+    var e;
+    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;
+        }
+        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;
+        }
+      });
+    });
+  }
+  unload() {
+    var e;
+    (e = this.disposer) == null || e.call(this);
+  }
+  async load() {
+    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({
+  __proto__: null,
+  navigateToNCui: Hr
+}, 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;
+  }
+  get firmwareFailed() {
+    return this.troubles.troubles.getIndexByKey(
+      "byType",
+      "FirmwareUpdateFailedTrouble"
+    ).length > 0;
+  }
+  get firmwareInProgress() {
+    return this.troubles.troubles.getIndexByKey(
+      "byType",
+      "FirmwareUpdateInProgressTrouble"
+    ).length > 0;
+  }
+  async navigate() {
+    await Hr();
+  }
+  // -------------------LIFECYCLE----------------------------
+  async init() {
+    this.logger.debug(`initializing start ${this.id}`);
+  }
+  async load() {
+    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
 });
 export {
-  ws as AgitationControl,
-  Lo as Animation,
-  Es as AnimationServices,
-  dt as Application,
-  ct as Auth,
-  Ss as AuthServices,
-  Ho as CarbWater,
-  ks as CopyLogs,
-  Ds as CopyLogsServices,
-  Xs as DDKModels,
-  pt as DashboardOperations,
-  Is as DashboardOperationsServices,
-  Zo as Dispenser,
-  ai as DispenserInfo,
-  Fs as DispenserInfoServices,
-  Rs as DispenserServices,
-  po as Door,
-  pe as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
-  gi as Enrollment,
-  As as EnrollmentServices,
-  Gt as FcmPump,
-  Ls as FcmPumpServices,
-  Pi as IngredientSummary,
-  Ns as LfcvPump,
-  zs as LfcvPumpServices,
-  Ks as Lockout,
-  Bs as LockoutServices,
-  Vs as MACRO_KEYS,
-  ji as MacroAssignment,
-  hr as NetworkTest,
-  Bi as NetworkTestContainer,
-  Ys as NetworkTestServices,
-  qi as NutritiveSweetener,
-  Xi as PlainWater,
-  rs as Reboot,
-  qs as RebootServices,
-  ss as Settings,
-  Gs as SettingsServices,
-  xt as SetupStep,
-  jt as SetupStepContainer,
-  Cs as SetupStepServices,
-  ra as SpmPump,
-  ta as SpmPumpServices,
-  ea as Start,
-  Zs as StartServices,
-  oo as TROUBLE_TYPE_PRIME,
-  bt as TROUBLE_TYPE_PURGE,
-  Js as TroubleActionManager,
-  Mr as Utilities,
-  gs as UtilitiesContainer,
-  Qs as UtilitiesServices,
-  _i as calculateTimeDifference,
-  vi as executeDashboardKeyFactory,
-  js as isMacroGroup,
-  xs as isMicroGroup,
-  Us as macroHolderMap,
-  bi as registerDashboardKeyFactory,
-  Ws as toSeconds,
-  Hs as toTimeComponents,
-  Ht as troubleVisibilityFilter
+  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
 };