@kosdev-code/kos-ddk-models 2.0.4 → 2.1.0

package/index.mjs

@@ -1,28 +1,28 @@
 var Ar = Object.defineProperty;
 var jr = (e, t, r) => t in e ? Ar(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var s = (e, t, r) => (jr(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { resolveServiceUrl as h, ServiceFactory as f, KosLog as g, kosTopicHandler as Ee, kosModel as l, kosAction as _, Kos as c, isKosModel as u, createPropKey as Ur, kosStateProp as Vr, KosModelRegistrationFactory as Le, kosDependency as m, KosModelContainer as tt, resolveContainerDeltas as dt, kosChild as De, Device as Hr, kosConfigProperty as d, kosFuture as v, kosModelEffect as _t, MultipleFutureHandler as Wr, FutureEndState as b, TroubleServices as ke, Troubles as pt, SingletonKosModelRegistrationFactory as pe, FetchError as Re, FutureManager as T, FutureHandler as ge, getKosCompanionModel as $t, StorageDeviceContainer as zr, KosDataContainer as Nr, setupCompleteFutureSupport as Br, TroubleContainer as rt, troubleByTypeReducer as Kr, registerExtensionPoint as Yr, ExtensionManager as Ie, kosConfigBean as qr, ObservableData as Gr, kosAutoEffect as Qr } from "@kosdev-code/kos-ui-sdk";
-import { AGITATION_REQUIRED_TROUBLE as Tt, CartridgeAgitatorEvents as Pt } from "@kosdev-code/kos-freestyle-sdk";
-import { Assembly as Fe, HolderContainer as Xr, IngredientContainer as Jr } from "@kosdev-code/kos-dispense-sdk";
-const gt = "PurgeTrouble", Zr = "PrimeTrouble", { URL: ot } = h("AUTH_SERVICE"), { getOne: eo, postModel: to } = f.build({
-  basePath: `${ot}/api/auth`
-}), Ot = g.createLogger({ name: "auth-service", group: "Services" }), Mt = async () => (Ot.debug("sending GET for auth"), await eo({
-  urlOverride: `${ot}/api/app/kosdev.ddk/auth/role`
-})), St = async (e) => (Ot.debug("sending POST for auth"), await to({
-  urlOverride: `${ot}/api/app/kosdev.ddk/auth/pincode/${e}`,
+import { resolveServiceUrl as h, ServiceFactory as f, KosLog as g, kosTopicHandler as we, kosModel as l, kosAction as _, Kos as c, isKosModel as u, createPropKey as Ur, kosStateProp as Vr, KosModelRegistrationFactory as Ee, kosDependency as m, KosModelContainer as tt, resolveContainerDeltas as pt, kosChild as Le, Device as Hr, kosConfigProperty as d, kosFuture as v, kosModelEffect as $t, MultipleFutureHandler as Wr, FutureEndState as b, TroubleServices as De, Troubles as gt, SingletonKosModelRegistrationFactory as ke, FetchError as Re, FutureManager as T, FutureHandler as pe, getKosCompanionModel as rt, StorageDeviceContainer as Nr, kosFutureAware as zr, kosLoggerAware as Br, KosDataContainer as Kr, TroubleContainer as ot, troubleByTypeReducer as Yr, registerExtensionPoint as qr, ExtensionManager as Ie, kosConfigBean as Gr, ObservableData as Qr, kosAutoEffect as Xr } from "@kosdev-code/kos-ui-sdk";
+import { AGITATION_REQUIRED_TROUBLE as Tt, CartridgeAgitatorEvents as Pt, FreestyleHolder as Jr } from "@kosdev-code/kos-freestyle-sdk";
+import { Assembly as Fe, HolderContainer as Zr, IngredientContainer as eo } from "@kosdev-code/kos-dispense-sdk";
+const ht = "PurgeTrouble", to = "PrimeTrouble", { URL: it } = h("AUTH_SERVICE"), { getOne: ro, postModel: oo } = f.build({
+  basePath: `${it}/api/auth`
+}), Ot = g.createLogger({ name: "auth-service", group: "Services" }), Mt = async () => (Ot.debug("sending GET for auth"), await ro({
+  urlOverride: `${it}/api/app/kosdev.ddk/auth/role`
+})), St = async (e) => (Ot.debug("sending POST for auth"), await oo({
+  urlOverride: `${it}/api/app/kosdev.ddk/auth/pincode/${e}`,
   model: {}
-})), $s = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), Ss = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getCurrentRole: Mt,
   sendPinCode: St
 }, Symbol.toStringTag, { value: "Module" }));
-var ro = Object.defineProperty, oo = Object.getOwnPropertyDescriptor, Ct = (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 io = Object.defineProperty, so = Object.getOwnPropertyDescriptor, Ct = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? so(t, r) : t, n = e.length - 1, a; n >= 0; n--)
     (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && ro(t, r, o), o;
+  return i && o && io(t, r, o), o;
 };
-const N = "auth-model", ht = (e) => e.toLowerCase();
-let ve = class {
+const z = "auth-model", ft = (e) => e.toLowerCase();
+let be = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -43,43 +43,43 @@ let ve = class {
     this.logger.debug(`loading auth ${this.id}`);
     const e = await Mt();
     (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), _(() => {
-      this.currentRole = ht(e.data);
+      this.currentRole = ft(e.data);
     }));
   }
   handleRoleChange(e) {
-    this.currentRole = ht(e);
+    this.currentRole = ft(e);
   }
   forceRole(e) {
     this.currentRole = e;
   }
 };
 Ct([
-  Ee({
+  we({
     topic: "/app/kosdev.ddk/auth/role",
     websocket: !0
   })
-], ve.prototype, "handleRoleChange", 1);
-ve = Ct([
-  l(N)
-], ve);
-const it = {
+], be.prototype, "handleRoleChange", 1);
+be = Ct([
+  l(z)
+], be);
+const st = {
   registration: {
-    [N]: {
-      class: ve,
+    [z]: {
+      class: be,
       singleton: !1
     }
   },
-  type: N,
-  predicate: u(N),
-  factory: c.Factory.create(N)
+  type: z,
+  predicate: u(z),
+  factory: c.Factory.create(z)
 };
-var io = Object.defineProperty, so = Object.getOwnPropertyDescriptor, wt = (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 ao = Object.defineProperty, no = Object.getOwnPropertyDescriptor, wt = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? no(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 && io(t, r, o), o;
+  return i && o && ao(t, r, o), o;
 };
-const Et = "door-model", ao = Ur("doorPath");
-let _e = class {
+const Et = "door-model", lo = Ur("doorPath");
+let ve = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -95,31 +95,31 @@ let _e = class {
   }
 };
 wt([
-  Vr({ path: ao, attribute: "state" })
-], _e.prototype, "open", 2);
-_e = wt([
+  Vr({ path: lo, attribute: "state" })
+], ve.prototype, "open", 2);
+ve = wt([
   l(Et)
-], _e);
-const no = new Le({
-  class: _e,
+], ve);
+const co = new Ee({
+  class: ve,
   type: Et
-}), { URL: st } = h("SETUP-STEP_SERVICE"), { getAll: lo, postModel: co } = f.build({
-  basePath: `${st}/api/setup-step`
+}), { URL: at } = h("SETUP-STEP_SERVICE"), { getAll: uo, postModel: po } = f.build({
+  basePath: `${at}/api/setup-step`
 }), Lt = g.createLogger({
   name: "setup-step-service",
   group: "Services"
-}), Dt = async () => (Lt.debug("sending GET for setup-step"), await lo({
-  urlOverride: `${st}/api/app/kosdev.ddk/setup/steps`
-})), kt = async (e) => (Lt.debug("sending POST for setup-step"), await co({
-  urlOverride: `${st}/api/app/kosdev.ddk/setup/complete/${e}`,
+}), Dt = async () => (Lt.debug("sending GET for setup-step"), await uo({
+  urlOverride: `${at}/api/app/kosdev.ddk/setup/steps`
+})), kt = async (e) => (Lt.debug("sending POST for setup-step"), await po({
+  urlOverride: `${at}/api/app/kosdev.ddk/setup/complete/${e}`,
   model: {}
-})), Ts = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), Cs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getSetupSteps: Dt,
   markStepComplete: kt
 }, Symbol.toStringTag, { value: "Module" }));
-var uo = Object.getOwnPropertyDescriptor, po = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? uo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var go = Object.getOwnPropertyDescriptor, ho = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? go(t, r) : t, n = e.length - 1, a; n >= 0; n--)
     (a = e[n]) && (o = a(o) || o);
   return o;
 };
@@ -158,7 +158,7 @@ let Ke = class {
     this.logger.debug(`loading setup-step ${this.id}`);
   }
 };
-Ke = po([
+Ke = ho([
   l(B)
 ], Ke);
 const Rt = {
@@ -172,19 +172,19 @@ const Rt = {
   predicate: u(B),
   factory: c.Factory.create(B)
 };
-var go = Object.defineProperty, ho = Object.getOwnPropertyDescriptor, xe = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ho(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var fo = Object.defineProperty, mo = Object.getOwnPropertyDescriptor, xe = (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 && go(t, r, o), o;
+  return i && o && fo(t, r, o), o;
 };
 const K = "setup-step-container-model";
-function ft(e) {
+function mt(e) {
   return (t) => {
     const r = Rt.factory(t.id)(t);
     r.updateModel(t), e.addModel(r);
   };
 }
-function mt(e) {
+function yt(e) {
   return (t) => {
     e.removeModel(t);
   };
@@ -256,10 +256,10 @@ let R = class {
           id: `setup-${r.name}`
         })
       );
-      dt({
+      pt({
         container: this.models,
-        onAddItem: ft(this),
-        onRemoveItem: mt(this)
+        onAddItem: mt(this),
+        onRemoveItem: yt(this)
       })(t);
     }
     this.nextStep();
@@ -270,21 +270,21 @@ let R = class {
       idx: i,
       id: `setup-${r.name}`
     }));
-    dt({
+    pt({
       container: this.models,
-      onAddItem: ft(this),
-      onRemoveItem: mt(this)
+      onAddItem: mt(this),
+      onRemoveItem: yt(this)
     })(t);
   }
 };
 xe([
-  De
+  Le
 ], R.prototype, "models", 2);
 xe([
-  m({ modelType: it.type })
+  m({ modelType: st.type })
 ], R.prototype, "authModel", 2);
 xe([
-  Ee({
+  we({
     topic: "/app/kosdev.ddk/setup/steps",
     websocket: !0
   })
@@ -303,33 +303,33 @@ const It = {
   type: K,
   predicate: u(K),
   factory: c.Singleton.create(K)
-}, { URL: he } = h("AUTH_SERVICE"), { getOne: Ft, getAll: xt } = f.build({
-  basePath: `${he}/api/app/kosdev.ddk/ncui/`
-}), Ae = g.createLogger({ name: "auth-service", group: "Services" }), fo = async () => {
+}, { URL: ge } = h("AUTH_SERVICE"), { getOne: Ft, getAll: xt } = f.build({
+  basePath: `${ge}/api/app/kosdev.ddk/ncui/`
+}), Ae = g.createLogger({ name: "auth-service", group: "Services" }), yo = async () => {
   Ae.debug("sending GET for cuis");
   const e = await xt({
-    urlOverride: `${he}/api/app/kosdev.ddk/cui`
+    urlOverride: `${ge}/api/app/kosdev.ddk/cui`
   });
   if ((e == null ? void 0 : e.status) !== 200)
     throw new Error("Failed to retrieve cuis");
   return e.data;
-}, mo = async () => {
+}, bo = async () => {
   Ae.debug("sending GET for navigation");
   const e = await xt({
-    urlOverride: `${he}/api/kos/descriptor/system:app/kondra.ncui.navigations`
+    urlOverride: `${ge}/api/kos/descriptor/system:app/kondra.ncui.navigations`
   });
   if ((e == null ? void 0 : e.status) !== 200)
     throw new Error("Failed to retrieve navigation data");
   return e.data;
-}, yo = async () => (Ae.debug("navigating to CUI"), await Ft({
-  urlOverride: `${he}/api/app/kosdev.ddk/cui/open`
-})), bo = async () => (Ae.debug("navigating to NCUI"), await Ft({
-  urlOverride: `${he}/api/app/kosdev.ddk/ncui/open`
+}, vo = async () => (Ae.debug("navigating to CUI"), await Ft({
+  urlOverride: `${ge}/api/app/kosdev.ddk/cui/open`
+})), _o = async () => (Ae.debug("navigating to NCUI"), await Ft({
+  urlOverride: `${ge}/api/app/kosdev.ddk/ncui/open`
 }));
-var vo = Object.defineProperty, _o = Object.getOwnPropertyDescriptor, L = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? _o(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var $o = Object.defineProperty, To = Object.getOwnPropertyDescriptor, L = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? To(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 && vo(t, r, o), o;
+  return i && o && $o(t, r, o), o;
 };
 const Y = "application-model", At = (e, t = "") => e.reduce((r, i) => {
   const o = t ? `${t}.${i.name}` : i.name;
@@ -370,7 +370,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 = no.instance("app:kosdev.ddk:service:door:door").options({
+    this.id = e, this.languages = [], this._cuis = [], this.logger = r.logger, this.door = co.instance("app:kosdev.ddk:service:door:door").options({
       doorPath: "app:kosdev.ddk:service:door:door"
     }).build();
   }
@@ -393,18 +393,18 @@ let M = class {
     return this.door.isOpen;
   }
   async enter() {
-    this.logger.info("navigating to NCUI"), await bo();
+    this.logger.info("navigating to NCUI"), await _o();
   }
   async exit() {
-    this.logger.info("navigating to CUI"), await yo();
+    this.logger.info("navigating to CUI"), await vo();
   }
   // -------------------LIFECYCLE----------------------------
   async load() {
     var r, i;
     this.logger.debug(`loading application ${this.id}`);
-    const e = await mo();
+    const e = await bo();
     this._navigationItems = e;
-    const t = await fo();
+    const t = await yo();
     this._cuis = t, (r = this.setupStepContainer) != null && r.hasIncompletePreSteps && ((i = this.authModel) == null || i.forceRole("technician")), this.languages = [
       {
         name: "English",
@@ -417,13 +417,13 @@ L([
   m({ modelType: Hr.type })
 ], M.prototype, "device", 2);
 L([
-  m({ modelType: it.type })
+  m({ modelType: st.type })
 ], M.prototype, "authModel", 2);
 L([
   m({ modelType: It.type })
 ], M.prototype, "setupStepContainer", 2);
 L([
-  De
+  Le
 ], M.prototype, "door", 2);
 L([
   d({
@@ -447,7 +447,7 @@ L([
 M = L([
   l(Y)
 ], M);
-const at = {
+const nt = {
   registration: {
     [Y]: {
       class: M,
@@ -459,7 +459,7 @@ const at = {
   factory: c.Singleton.create(
     Y
   )
-}, be = {
+}, ye = {
   none: 999,
   crew: 0,
   technician: 1,
@@ -469,18 +469,18 @@ const at = {
     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 = ye[e.toLowerCase()] ?? ye.crew, o = ye[r.toLowerCase()] ?? ye.crew;
     return i >= o;
   }
   return !1;
 };
-var $o = Object.defineProperty, To = Object.getOwnPropertyDescriptor, U = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? To(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var Po = Object.defineProperty, Oo = Object.getOwnPropertyDescriptor, U = (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 && $o(t, r, o), o;
+  return i && o && Po(t, r, o), o;
 };
-const Ut = "agitation-control-model", Ye = "resolve", Po = "agitate";
-let C = class {
+const Ut = "agitation-control-model", Ye = "resolve", Mo = "agitate";
+let w = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "futureHandler");
@@ -538,8 +538,9 @@ let C = class {
   }
   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 ke.bulkResolveTroubles(
+    return this.inProgress.push(...t), t.length === 0 ? void 0 : await De.bulkResolveTroubles(
       t,
+      void 0,
       e
     );
   }
@@ -548,8 +549,8 @@ let C = class {
   }
   get queuedTroubles() {
     return this.troubleContainer.troubles.getIndexByKey(
-      pt.INDEX_TROUBLES_BY_DEFERRED,
-      pt.TROUBLES_DEFERRED
+      gt.INDEX_TROUBLES_BY_DEFERRED,
+      gt.TROUBLES_DEFERRED
     );
   }
   get visibleTroubles() {
@@ -564,7 +565,7 @@ let C = class {
     return this.futureHandler.getFuture(Ye);
   }
   get agitateFuture() {
-    return this.futureHandler.getFuture(Po);
+    return this.futureHandler.getFuture(Mo);
   }
   handleAgitationStarted(e) {
     this.logger.info(`Agitation started for ${e.path}`), this._agitationFutureId = String(e.futureId);
@@ -586,33 +587,33 @@ let C = class {
   }
 };
 U([
-  m({ modelType: at.type })
-], C.prototype, "application", 2);
+  m({ modelType: nt.type })
+], w.prototype, "application", 2);
 U([
   v({ alias: Ye })
-], C.prototype, "resolveDeferredTroubles", 1);
+], w.prototype, "resolveDeferredTroubles", 1);
 U([
-  Ee({ topic: Pt.TOPIC_AGITATION_STARTED })
-], C.prototype, "handleAgitationStarted", 1);
+  we({ topic: Pt.TOPIC_AGITATION_STARTED })
+], w.prototype, "handleAgitationStarted", 1);
 U([
-  Ee({ topic: Pt.TOPIC_AGITATION_ENDED })
-], C.prototype, "handleAgitationEnded", 1);
+  we({ topic: Pt.TOPIC_AGITATION_ENDED })
+], w.prototype, "handleAgitationEnded", 1);
 U([
-  _t({
+  $t({
     dependencies: (e) => [e.readyToResolve, e._agitationFutureId]
   })
-], C.prototype, "handleReadyToResolve", 1);
-C = U([
+], w.prototype, "handleReadyToResolve", 1);
+w = U([
   l(Ut)
-], C);
-const Ps = new pe({
-  class: C,
+], w);
+const ws = new ke({
+  class: w,
   type: Ut
 });
-var Oo = Object.defineProperty, Mo = Object.getOwnPropertyDescriptor, fe = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Mo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var So = Object.defineProperty, Co = Object.getOwnPropertyDescriptor, he = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Co(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 && Oo(t, r, o), o;
+  return i && o && So(t, r, o), o;
 };
 const q = "animation-model";
 let k = class {
@@ -626,34 +627,34 @@ let k = class {
     this.id = e, this.logger = r.logger;
   }
 };
-fe([
+he([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.disableAll"
   })
 ], k.prototype, "disableAll", 2);
-fe([
+he([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableDial"
   })
 ], k.prototype, "enableDial", 2);
-fe([
+he([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableModal"
   })
 ], k.prototype, "enableModal", 2);
-fe([
+he([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableSideBar"
   })
 ], k.prototype, "enableSideBar", 2);
-k = fe([
+k = he([
   l(q)
 ], k);
-const So = {
+const wo = {
   registration: {
     [q]: {
       class: k,
@@ -663,15 +664,15 @@ const So = {
   type: q,
   predicate: u(q),
   factory: c.Singleton.create(q)
-}, { URL: Co } = h("ANIMATION_SERVICE"), { getAll: wo } = f.build({
-  basePath: `${Co}/api/animation`
-}), Eo = g.createLogger({
+}, { URL: Eo } = h("ANIMATION_SERVICE"), { getAll: Lo } = f.build({
+  basePath: `${Eo}/api/animation`
+}), Do = g.createLogger({
   name: "animation-service",
   group: "Services"
-}), Lo = async () => (Eo.debug("sending GET for animation"), await wo({})), Os = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), ko = async () => (Do.debug("sending GET for animation"), await Lo({})), Es = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getAnimations: Lo
-}, Symbol.toStringTag, { value: "Module" })), { URL: V } = h("FCM-PUMP_SERVICE"), { postModel: me } = f.build({
+  getAnimations: ko
+}, Symbol.toStringTag, { value: "Module" })), { URL: V } = h("FCM-PUMP_SERVICE"), { postModel: fe } = f.build({
   basePath: `${V}/api/fcm-pump`
 }), y = g.createLogger({
   name: "fcm-pump-service",
@@ -682,7 +683,7 @@ const So = {
     `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
   );
   try {
-    const a = await me({
+    const a = await fe({
       model: {},
       urlOverride: `${V}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
     });
@@ -702,7 +703,7 @@ const So = {
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`
   );
   try {
-    const r = await me({
+    const r = await fe({
       model: {},
       urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
       tracker: t
@@ -726,7 +727,7 @@ const So = {
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`
   );
   try {
-    const r = await me({
+    const r = await fe({
       model: {},
       urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
       tracker: t
@@ -745,12 +746,12 @@ const So = {
     };
     return T.initiateFuture(i), i;
   }
-}, zt = async (e, t, r) => {
+}, Nt = 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 fe({
       model: {},
       urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
       tracker: r
@@ -769,16 +770,16 @@ const So = {
     };
     return T.initiateFuture(o), o;
   }
-}, Nt = async (e, t, r) => {
+}, Ro = (e) => e ? e.data === "success" || !e.data ? "success" : e.data : "error", zt = 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 fe({
       model: {},
       urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
     });
-    return y.debug("performPreCalibrate - response:", i), i == null ? void 0 : i.data;
+    return y.debug("performPreCalibrate - response:", i), Ro(i == null ? void 0 : i.data);
   } catch (i) {
     y.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`,
@@ -786,27 +787,27 @@ const So = {
     );
     return;
   }
-}, Ms = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Ls = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   performCalibrate: Wt,
-  performComplete: Nt,
+  performComplete: zt,
   performElectricalTest: Vt,
   performPreCalibrate: Ht,
-  performVerify: zt
+  performVerify: Nt
 }, Symbol.toStringTag, { value: "Module" }));
-var Do = Object.defineProperty, ko = Object.getOwnPropertyDescriptor, je = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ko(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var Io = Object.defineProperty, Fo = Object.getOwnPropertyDescriptor, je = (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 && Do(t, r, o), o;
+  return i && o && Io(t, r, o), o;
 };
-const Bt = "fcm-pump-model", Ro = g.createLogger({ name: "fcm-pump-model" });
+const Bt = "fcm-pump-model", xo = g.createLogger({ name: "fcm-pump-model" });
 let I = 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 ge(this);
+    this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent, this.futureHandler = new pe(this);
   }
   get future() {
     return this.futureHandler.future;
@@ -828,7 +829,7 @@ let I = class {
   }
   async performElectricalTest() {
     const [e, t] = await Vt(this.pumpModel.path);
-    return e && Ro.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
+    return e && xo.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
   }
   getChildren() {
     return [...this.futureHandler.allFutures];
@@ -840,10 +841,10 @@ let I = class {
     return Wt(this.pumpModel.path, e);
   }
   async performVerify(e, t) {
-    return zt(this.pumpModel.path, e, t);
+    return Nt(this.pumpModel.path, e, t);
   }
   async performComplete(e, t) {
-    return Nt(this.pumpModel.path, e, t);
+    return zt(this.pumpModel.path, e, t);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -865,17 +866,17 @@ je([
 I = je([
   l(Bt)
 ], I);
-const Kt = new Le({
+const Kt = new Ee({
   class: I,
   type: Bt
 });
-var Io = Object.defineProperty, Fo = Object.getOwnPropertyDescriptor, Yt = (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 Ao = Object.defineProperty, jo = Object.getOwnPropertyDescriptor, Yt = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? jo(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 && Io(t, r, o), o;
+  return i && o && Ao(t, r, o), o;
 };
 const G = "carb-water-model";
-let $e = class {
+let _e = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "assemblyModel");
@@ -884,7 +885,7 @@ let $e = class {
   }
   getPump() {
     const t = this.assemblyModel.getHoldersByGroup("carb")[0].pumps.data[0];
-    return $t(t, Kt.type);
+    return rt(t, Kt.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -896,27 +897,27 @@ let $e = class {
 };
 Yt([
   m({ modelType: Fe.type })
-], $e.prototype, "assemblyModel", 2);
-$e = Yt([
+], _e.prototype, "assemblyModel", 2);
+_e = Yt([
   l(G)
-], $e);
-const xo = {
+], _e);
+const Uo = {
   registration: {
     [G]: {
-      class: $e,
+      class: _e,
       singleton: !1
     }
   },
   type: G,
   predicate: u(G),
   factory: c.Factory.create(G)
-}, { URL: H } = h("COPY-LOGS_SERVICE"), { getAll: Ao, getOne: jo, postModel: qt, deleteModel: Uo } = f.build({
+}, { URL: H } = h("COPY-LOGS_SERVICE"), { getAll: Vo, getOne: Ho, postModel: qt, deleteModel: Wo } = f.build({
   basePath: `${H}/api/copy-logs`
-}), Te = g.createLogger({
+}), $e = g.createLogger({
   name: "copy-logs-service",
   group: "Services"
 }), Gt = async (e, t) => {
-  const r = await Uo({
+  const r = await Wo({
     tracker: t,
     id: e,
     urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
@@ -943,30 +944,30 @@ const xo = {
     throw new Error("No response from server");
   return r.data;
 }, Jt = async () => {
-  Te.debug("sending GET for copy-logs");
+  $e.debug("sending GET for copy-logs");
   try {
-    const e = await Ao({
+    const e = await Vo({
       urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/volumes/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
     if (e instanceof Re)
-      return Te.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+      return $e.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
 }, Zt = async () => {
-  Te.debug("sending GET for log file size");
+  $e.debug("sending GET for log file size");
   try {
-    const e = await jo({
+    const e = await Ho({
       urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/files/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
     if (e instanceof Re)
-      return Te.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+      return $e.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, Ss = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Ds = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   copyLogFromVolume: Xt,
   eraseAndCopyLogsToVolume: Qt,
@@ -974,31 +975,27 @@ const xo = {
   getLogFileSize: Zt,
   getVolumes: Jt
 }, Symbol.toStringTag, { value: "Module" }));
-var Vo = Object.defineProperty, Ho = Object.getOwnPropertyDescriptor, W = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ho(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var er = Object.defineProperty, No = Object.getOwnPropertyDescriptor, zo = (e, t, r) => t in e ? er(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, W = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? No(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 && Vo(t, r, o), o;
-};
-const er = "copy-logs-model";
-let w = class {
-  constructor(e, t, r) {
+  return i && o && er(t, r, o), o;
+}, Bo = (e, t, r) => (zo(e, t + "", r), r);
+const Ko = "copy-logs-model";
+let S = class {
+  constructor(e) {
     s(this, "id");
-    s(this, "logger");
     s(this, "_volumes");
-    // Only declare what's needed internally - setupCompleteFutureSupport() handles the rest
-    s(this, "futureHandler");
-    s(this, "future");
     s(this, "storageDeviceContainer");
     s(this, "_activeVolume");
     s(this, "_logFileSize", 0);
     s(this, "_actionState", "idle");
     s(this, "copyProgress");
-    this.id = e, this.logger = r.logger, this._volumes = new Nr(), this._activeVolume = void 0, this.copyProgress = {
+    this.id = e, this._volumes = new Kr(), this._activeVolume = void 0, this.copyProgress = {
       bytesCopied: 0,
       bytesToCopy: 0,
       filesCopied: 0,
       filesSkipped: 0
-    }, Br(this);
+    };
   }
   // -------------------LIFECYCLE----------------------------
   get volumes() {
@@ -1120,50 +1117,55 @@ let w = class {
     this.logger.debug(`loading copy-logs ${this.id}`);
   }
 };
+Bo(S, "Registration");
 W([
-  m({ modelType: zr.type })
-], w.prototype, "storageDeviceContainer", 2);
+  m({ modelType: Nr.type })
+], S.prototype, "storageDeviceContainer", 2);
 W([
   v()
-], w.prototype, "eraseAndCopyVolume", 1);
+], S.prototype, "eraseAndCopyVolume", 1);
 W([
   v()
-], w.prototype, "eraseVolume", 1);
+], S.prototype, "eraseVolume", 1);
 W([
   v()
-], w.prototype, "copyLogs", 1);
+], S.prototype, "copyLogs", 1);
 W([
-  _t({
+  $t({
     dependencies: (e) => [e.inserted]
   })
-], w.prototype, "handleInsertion", 1);
-w = W([
-  l(er)
-], w);
-const Cs = new pe({
-  class: w,
-  type: er
-}), tr = g.createLogger({
+], S.prototype, "handleInsertion", 1);
+S = W([
+  l({ modelTypeId: Ko, singleton: !0 }),
+  zr(),
+  Br()
+], S);
+const ks = S.Registration, tr = g.createLogger({
   name: "dashboard-operations-service",
   group: "Services"
-}), rr = async (e, t) => (tr.debug("resolveAll"), await ke.bulkResolveTroubles(
+}), rr = async (e, t) => (tr.debug("resolveAll"), await De.bulkResolveTroubles(
   e,
+  void 0,
   t
-)), or = async (e, t) => (tr.debug("resolveTrouble"), await ke.resolveTrouble(e, t)), ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+)), or = async (e, t) => (tr.debug("resolveTrouble"), await De.resolveTrouble(
+  e,
+  void 0,
+  t
+)), Rs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   resolveAll: rr,
   resolveTrouble: or
 }, Symbol.toStringTag, { value: "Module" }));
-var Wo = Object.defineProperty, zo = Object.getOwnPropertyDescriptor, Ue = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? zo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var Yo = Object.defineProperty, qo = Object.getOwnPropertyDescriptor, Ue = (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 && Wo(t, r, o), o;
+  return i && o && Yo(t, r, o), o;
 };
 const Q = "dashboard-operations-model";
-function yt(e) {
+function bt(e) {
   return !e.deferred;
 }
-function bt(e) {
+function vt(e) {
   return e.deferred;
 }
 let F = class {
@@ -1172,25 +1174,25 @@ let F = class {
     s(this, "troubles");
     s(this, "futureHandler");
     s(this, "logger");
-    this.id = e, this.futureHandler = new ge(this), this.logger = r.logger;
+    this.id = e, this.futureHandler = new pe(this), this.logger = r.logger;
   }
   get troublesByType() {
     return this.troubles.troubles.data.reduce(
-      Kr,
+      Yr,
       {}
     );
   }
   get queuedPurgeTroubles() {
-    return this.purgeTroubles.filter(bt);
+    return this.purgeTroubles.filter(vt);
   }
   get queuedPrimeTroubles() {
-    return this.primeTroubles.filter(bt);
+    return this.primeTroubles.filter(vt);
   }
   get resolvablePrimeTroubles() {
-    return this.primeTroubles.filter(yt);
+    return this.primeTroubles.filter(bt);
   }
   get resolvablePurgeTroubles() {
-    return this.purgeTroubles.filter(yt);
+    return this.purgeTroubles.filter(bt);
   }
   get hasResolvablePurgeTroubles() {
     return this.resolvablePurgeTroubles.length > 0;
@@ -1205,10 +1207,10 @@ let F = class {
     return this.primeTroubles.length > 0;
   }
   get purgeTroubles() {
-    return this.troublesByType[gt] || [];
+    return this.troublesByType[ht] || [];
   }
   get primeTroubles() {
-    return this.troublesByType[Zr] || [];
+    return this.troublesByType[to] || [];
   }
   get future() {
     return this.futureHandler.getFuture();
@@ -1216,7 +1218,7 @@ let F = class {
   async resolveAllTroubles(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const r = e === gt ? this.purgeTroubles : this.primeTroubles;
+    const r = e === ht ? this.purgeTroubles : this.primeTroubles;
     r.filter((a) => a.shouldDefer).forEach((a) => {
       this.logger.info(`Deferring trouble ${a.rawId}`), a.defer();
     });
@@ -1237,7 +1239,7 @@ let F = class {
   }
 };
 Ue([
-  m({ modelType: rt.type })
+  m({ modelType: ot.type })
 ], F.prototype, "troubles", 2);
 Ue([
   v()
@@ -1248,7 +1250,7 @@ Ue([
 F = Ue([
   l(Q)
 ], F);
-const nt = {
+const lt = {
   registration: {
     [Q]: {
       class: F,
@@ -1259,8 +1261,8 @@ const nt = {
   predicate: u(Q),
   factory: c.Singleton.create(Q)
 };
-var No = Object.getOwnPropertyDescriptor, Bo = (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.getOwnPropertyDescriptor, Qo = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Go(t, r) : t, n = e.length - 1, a; n >= 0; n--)
     (a = e[n]) && (o = a(o) || o);
   return o;
 };
@@ -1281,10 +1283,10 @@ let qe = class {
     this.logger.debug(`loading dispenser ${this.id}`);
   }
 };
-qe = Bo([
+qe = Qo([
   l(X)
 ], qe);
-const Ko = {
+const Xo = {
   registration: {
     [X]: {
       class: qe,
@@ -1294,22 +1296,22 @@ const Ko = {
   type: X,
   predicate: u(X),
   factory: c.Singleton.create(X)
-}, { URL: Yo } = h("DISPENSER_SERVICE"), { getAll: qo } = f.build({
-  basePath: `${Yo}/api/dispenser`
-}), Go = g.createLogger({
+}, { URL: Jo } = h("DISPENSER_SERVICE"), { getAll: Zo } = f.build({
+  basePath: `${Jo}/api/dispenser`
+}), ei = g.createLogger({
   name: "dispenser-service",
   group: "Services"
-}), Qo = async () => (Go.debug("sending GET for dispenser"), await qo({})), Es = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), ti = async () => (ei.debug("sending GET for dispenser"), await Zo({})), Is = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispensers: Qo
+  getDispensers: ti
 }, Symbol.toStringTag, { value: "Module" }));
-var Xo = Object.defineProperty, Jo = Object.getOwnPropertyDescriptor, ir = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Jo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var ri = Object.defineProperty, oi = Object.getOwnPropertyDescriptor, ir = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? oi(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 && Xo(t, r, o), o;
+  return i && o && ri(t, r, o), o;
 };
 const J = "dispenser-info-model";
-let Pe = class {
+let Te = class {
   constructor(e, t, r) {
     s(this, "logger");
     s(this, "id");
@@ -1329,14 +1331,14 @@ ir([
     path: "kos:device",
     attribute: "name"
   })
-], Pe.prototype, "name", 2);
-Pe = ir([
+], Te.prototype, "name", 2);
+Te = ir([
   l(J)
-], Pe);
-const Zo = {
+], Te);
+const ii = {
   registration: {
     [J]: {
-      class: Pe,
+      class: Te,
       singleton: !1
     }
   },
@@ -1345,17 +1347,17 @@ const Zo = {
   factory: c.Factory.create(
     J
   )
-}, { URL: ei } = h("DISPENSER-INFO_SERVICE"), { getAll: ti } = f.build({
-  basePath: `${ei}/api/dispenser-info`
-}), ri = g.createLogger({
+}, { URL: si } = h("DISPENSER-INFO_SERVICE"), { getAll: ai } = f.build({
+  basePath: `${si}/api/dispenser-info`
+}), ni = g.createLogger({
   name: "dispenser-info-service",
   group: "Services"
-}), oi = async () => (ri.debug("sending GET for dispenser-info"), await ti({})), Ls = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), li = async () => (ni.debug("sending GET for dispenser-info"), await ai({})), Fs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispenserInfos: oi
+  getDispenserInfos: li
 }, Symbol.toStringTag, { value: "Module" }));
-var ii = Object.getOwnPropertyDescriptor, si = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ii(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var ci = Object.getOwnPropertyDescriptor, ui = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? ci(t, r) : t, n = e.length - 1, a; n >= 0; n--)
     (a = e[n]) && (o = a(o) || o);
   return o;
 };
@@ -1378,10 +1380,10 @@ let Ge = class {
     this.logger.debug(`loading enrollment ${this.id}`);
   }
 };
-Ge = si([
+Ge = ui([
   l(Z)
 ], Ge);
-const ai = {
+const di = {
   registration: {
     [Z]: {
       class: Ge,
@@ -1391,19 +1393,19 @@ const ai = {
   type: Z,
   predicate: u(Z),
   factory: c.Singleton.create(Z)
-}, { URL: ni } = h("ENROLLMENT_SERVICE"), { getAll: li } = f.build({
-  basePath: `${ni}/api/enrollment`
-}), ci = g.createLogger({
+}, { URL: pi } = h("ENROLLMENT_SERVICE"), { getAll: gi } = f.build({
+  basePath: `${pi}/api/enrollment`
+}), hi = g.createLogger({
   name: "enrollment-service",
   group: "Services"
-}), ui = async () => (ci.debug("sending GET for enrollment"), await li({})), Ds = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), fi = async () => (hi.debug("sending GET for enrollment"), await gi({})), xs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getEnrollments: ui
-}, Symbol.toStringTag, { value: "Module" })), ks = (e) => e.toLowerCase().includes("micros"), Rs = (e) => !e.toLowerCase().includes("micros"), Is = (e) => (t) => {
+  getEnrollments: fi
+}, Symbol.toStringTag, { value: "Module" })), As = (e) => e.toLowerCase().includes("micros"), js = (e) => !e.toLowerCase().includes("micros"), Us = (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;
-}, Fs = ["water", "carb", "ns", "nss"], ue = "dashboardKeyFactory", Be = [];
-Yr(ue, {
+}, Vs = ["water", "carb", "ns", "nss"], ue = "dashboardKeyFactory", Be = [];
+qr(ue, {
   register: (e, t) => {
     Be.includes(t) || Be.push(t);
   },
@@ -1416,29 +1418,29 @@ Yr(ue, {
     }
   }
 });
-const di = (e) => {
+const mi = (e) => {
   Ie[ue].register(
     ue,
     e
   );
-}, pi = (e) => Ie[ue].execute(
+}, yi = (e) => Ie[ue].execute(
   ue,
   e
 );
-Ie.registerDashboardKeyFactory = di;
-Ie.executeDashboardKeyFactory = pi;
-const Qe = 3600, sr = 60, xs = (e) => {
+Ie.registerDashboardKeyFactory = mi;
+Ie.executeDashboardKeyFactory = yi;
+const Qe = 3600, sr = 60, Hs = (e) => {
   const t = Math.floor(e / Qe), r = Math.floor(e % Qe / sr);
   return { hours: t, minutes: r };
-}, As = (e, t) => e * Qe + t * sr, gi = (e) => {
+}, Ws = (e, t) => e * Qe + t * sr, bi = (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;
   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;
 };
-var hi = Object.defineProperty, fi = Object.getOwnPropertyDescriptor, Ve = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? fi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var vi = Object.defineProperty, _i = Object.getOwnPropertyDescriptor, Ve = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? _i(t, r) : t, n = e.length - 1, a; n >= 0; n--)
     (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && hi(t, r, o), o;
+  return i && o && vi(t, r, o), o;
 };
 const ee = "ingredient-summary-model";
 let x = class {
@@ -1448,7 +1450,7 @@ let x = class {
     s(this, "dashboardOperationModel");
     s(this, "appModel");
     s(this, "logger");
-    this.id = e, this.logger = r.logger, this.dashboardOperationModel = nt.factory({});
+    this.id = e, this.logger = r.logger, this.dashboardOperationModel = lt.factory({});
   }
   get highPriorityHolders() {
     return this.assemblyModel.allHolders.filter(
@@ -1458,8 +1460,14 @@ let x = class {
   get actionRequiredHolders() {
     const e = this.appModel.currentRole, t = jt(e);
     return this.assemblyModel.allHolders.filter((r) => {
-      const i = r.troubles.filter(t);
-      return i.length > 0 && i.find((o) => o.resolvable);
+      const i = rt(
+        r,
+        Jr.type
+      );
+      if (i != null && i.isRemote)
+        return !1;
+      const o = r.troubles.filter(t);
+      return o.length > 0 && o.find((n) => n.resolvable);
     });
   }
   get lowLevelHolders() {
@@ -1480,15 +1488,15 @@ Ve([
   m({ modelType: Fe.type })
 ], x.prototype, "assemblyModel", 2);
 Ve([
-  m({ modelType: nt.type })
+  m({ modelType: lt.type })
 ], x.prototype, "dashboardOperationModel", 2);
 Ve([
-  m({ modelType: at.type })
+  m({ modelType: nt.type })
 ], x.prototype, "appModel", 2);
 x = Ve([
   l(ee)
 ], x);
-const mi = {
+const $i = {
   registration: {
     [ee]: {
       class: x,
@@ -1501,8 +1509,8 @@ const mi = {
     ee
   )
 };
-var yi = Object.getOwnPropertyDescriptor, bi = (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 Ti = Object.getOwnPropertyDescriptor, Pi = (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 = a(o) || o);
   return o;
 };
@@ -1537,43 +1545,43 @@ let Xe = class {
     this.logger.debug(`loading lfcv-pump ${this.id}`);
   }
 };
-Xe = bi([
+Xe = Pi([
   l(ar)
 ], Xe);
-const js = new Le({
+const Ns = new Ee({
   class: Xe,
   type: ar
-}), { URL: vi } = h("LFCV-PUMP_SERVICE"), { getAll: _i } = f.build({
-  basePath: `${vi}/api/lfcv-pump`
-}), $i = g.createLogger({
+}), { URL: Oi } = h("LFCV-PUMP_SERVICE"), { getAll: Mi } = f.build({
+  basePath: `${Oi}/api/lfcv-pump`
+}), Si = g.createLogger({
   name: "lfcv-pump-service",
   group: "Services"
-}), Ti = async () => ($i.debug("sending GET for lfcv-pump"), await _i({})), Us = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ci = async () => (Si.debug("sending GET for lfcv-pump"), await Mi({})), zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getLfcvPumps: Ti
-}, Symbol.toStringTag, { value: "Module" })), { URL: lt } = h("LOCKOUT_SERVICE"), { postModel: nr } = f.build({
-  basePath: `${lt}/api/app/kosdev.ddk/lockout`
-}), lr = g.createLogger({ name: "lockout-service", group: "Services" }), Pi = async () => (lr.info("lock"), await nr({
+  getLfcvPumps: Ci
+}, Symbol.toStringTag, { value: "Module" })), { URL: ct } = h("LOCKOUT_SERVICE"), { postModel: nr } = f.build({
+  basePath: `${ct}/api/app/kosdev.ddk/lockout`
+}), lr = g.createLogger({ name: "lockout-service", group: "Services" }), wi = async () => (lr.info("lock"), await nr({
   model: {},
-  urlOverride: `${lt}/api/app/kosdev.ddk/lockout/lockNow`
+  urlOverride: `${ct}/api/app/kosdev.ddk/lockout/lockNow`
 })), cr = async (e) => {
   lr.info("unlock");
   const t = await nr({
     model: {},
-    urlOverride: `${lt}/api/app/kosdev.ddk/lockout/unlock/${e}`
+    urlOverride: `${ct}/api/app/kosdev.ddk/lockout/unlock/${e}`
   });
   return t == null ? void 0 : t.data;
-}, Vs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  lock: Pi,
+  lock: wi,
   unlock: cr
 }, Symbol.toStringTag, { value: "Module" }));
-var Oi = Object.defineProperty, Mi = Object.getOwnPropertyDescriptor, z = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Mi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var Ei = Object.defineProperty, Li = Object.getOwnPropertyDescriptor, N = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Li(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 && Oi(t, r, o), o;
+  return i && o && Ei(t, r, o), o;
 };
-const ur = "lockout-model", Si = [
+const ur = "lockout-model", Di = [
   { 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" },
@@ -1628,7 +1636,7 @@ let E = class {
     return t || r;
   }
   get schedule() {
-    return Si;
+    return Di;
   }
   getProp(e) {
     return this.saveMap.get(e);
@@ -1667,49 +1675,50 @@ let E = class {
     this.logger.debug(`loading lockout ${this.id}`);
   }
 };
-z([
+N([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "pin"
   })
 ], E.prototype, "pin", 2);
-z([
+N([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockSkipped"
   })
 ], E.prototype, "nextLockSkipped", 2);
-z([
+N([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockTime"
   })
 ], E.prototype, "nextLockTime", 2);
-z([
+N([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextUnLockTime"
   })
 ], E.prototype, "nextUnLockTime", 2);
-z([
-  qr({ path: "app:kosdev.ddk:service:cuiLockout" })
+N([
+  Gr({ path: "app:kosdev.ddk:service:cuiLockout" })
 ], E.prototype, "cuiLockout", 2);
-E = z([
+E = N([
   l(ur)
 ], E);
-const Hs = new pe({
+const Ks = new ke({
   class: E,
   type: ur
-}), Ci = async (e, t) => await ke.bulkResolveTroubles(
+}), ki = async (e, t) => await De.bulkResolveTroubles(
   e,
+  void 0,
   t
 );
-var wi = Object.defineProperty, Ei = Object.getOwnPropertyDescriptor, He = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ei(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var Ri = Object.defineProperty, Ii = Object.getOwnPropertyDescriptor, He = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Ii(t, r) : t, n = e.length - 1, a; n >= 0; n--)
     (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && wi(t, r, o), o;
+  return i && o && Ri(t, r, o), o;
 };
-const te = "macro-assignment-model", vt = "PurgeTrouble", Li = "PrimeTrouble";
+const te = "macro-assignment-model", _t = "PurgeTrouble", Fi = "PrimeTrouble";
 let A = class {
   constructor(e, t, r) {
     s(this, "id");
@@ -1720,7 +1729,7 @@ let A = class {
     s(this, "futureHandler");
     s(this, "holders");
     s(this, "ingredients");
-    this.id = e, this.futureHandler = new ge(), this.logger = r.logger;
+    this.id = e, this.futureHandler = new pe(), this.logger = r.logger;
   }
   /**
    * shortcut to the current running future
@@ -1750,13 +1759,13 @@ let A = class {
    */
   get holderPurgeTroubles() {
     return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[vt] || [];
+      const i = r.troublesByType[_t] || [];
       return t = [...t, ...i], t;
     }, []);
   }
   get holderPrimeTroubles() {
     return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[Li] || [];
+      const i = r.troublesByType[Fi] || [];
       return t = [...t, ...i], t;
     }, []);
   }
@@ -1792,15 +1801,15 @@ let A = class {
   async resolveAll(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const i = (e === vt ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
-    return await Ci(i, t);
+    const i = (e === _t ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
+    return await ki(i, t);
   }
 };
 He([
-  m({ modelType: Xr.type })
+  m({ modelType: Zr.type })
 ], A.prototype, "holders", 2);
 He([
-  m({ modelType: Jr.type })
+  m({ modelType: eo.type })
 ], A.prototype, "ingredients", 2);
 He([
   v()
@@ -1808,7 +1817,7 @@ He([
 A = He([
   l(te)
 ], A);
-const Di = {
+const xi = {
   registration: {
     [te]: {
       class: A,
@@ -1821,8 +1830,8 @@ const Di = {
     te
   )
 };
-var ki = Object.getOwnPropertyDescriptor, Ri = (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 Ai = Object.getOwnPropertyDescriptor, ji = (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 = a(o) || o);
   return o;
 };
@@ -1851,7 +1860,7 @@ let Je = class {
     this.logger.debug(`loading network-test ${this.id}`);
   }
 };
-Je = Ri([
+Je = ji([
   l(re)
 ], Je);
 const dr = {
@@ -1864,14 +1873,14 @@ const dr = {
   type: re,
   predicate: u(re),
   factory: c.Factory.create(re)
-}, { URL: We } = h("NETWORK-TEST_SERVICE"), { getAll: Ii, getOne: pr } = f.build({
+}, { URL: We } = h("NETWORK-TEST_SERVICE"), { getAll: Ui, getOne: pr } = f.build({
   basePath: `${We}/api/app/ncui/network/tests`
-}), Fi = g.createLogger({
+}), Vi = g.createLogger({
   name: "network-test-service",
   group: "Services"
 }), gr = async () => {
-  Fi.debug("sending GET for network-test");
-  const e = await Ii({
+  Vi.debug("sending GET for network-test");
+  const e = await Ui({
     urlOverride: `${We}/api/app/kosdev.ddk/network/tests`
   });
   return e == null ? void 0 : e.data;
@@ -1883,16 +1892,16 @@ const dr = {
 }, fr = async (e, t) => await pr({
   urlOverride: `${We}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
   tracker: t
-}), Ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ys = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getNetworkTests: gr,
   getTestsReports: hr,
   performGroupTest: fr
 }, Symbol.toStringTag, { value: "Module" }));
-var xi = Object.defineProperty, Ai = Object.getOwnPropertyDescriptor, ct = (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 Hi = Object.defineProperty, Wi = Object.getOwnPropertyDescriptor, ut = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Wi(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 && xi(t, r, o), o;
+  return i && o && Hi(t, r, o), o;
 };
 const oe = "network-test-container-model";
 let de = class {
@@ -1902,7 +1911,7 @@ let de = class {
     s(this, "lastTested");
     s(this, "futureHandler");
     s(this, "models");
-    this.id = e, this.logger = r.logger, this.futureHandler = new ge(this), this.models = new tt({
+    this.id = e, this.logger = r.logger, this.futureHandler = new pe(this), this.models = new tt({
       parentId: e,
       indexMap: {
         group: "group"
@@ -1931,7 +1940,7 @@ let de = 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 ? gi(new Date(r)) : "";
+    return r ? bi(new Date(r)) : "";
   }
   async load() {
     this.logger.debug(`loading network-test-container container ${this.id}`);
@@ -1984,16 +1993,16 @@ let de = class {
     });
   }
 };
-ct([
-  De
+ut([
+  Le
 ], de.prototype, "models", 2);
-ct([
+ut([
   v()
 ], de.prototype, "performTest", 1);
-de = ct([
+de = ut([
   l(oe)
 ], de);
-const ji = {
+const Ni = {
   registration: {
     [oe]: {
       class: de,
@@ -2005,13 +2014,13 @@ const ji = {
   predicate: u(oe),
   factory: c.Singleton.create(oe)
 };
-var Ui = Object.defineProperty, Vi = Object.getOwnPropertyDescriptor, mr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Vi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var zi = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, mr = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Bi(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 && Ui(t, r, o), o;
+  return i && o && zi(t, r, o), o;
 };
 const ie = "nutritive-sweetener-model";
-let Oe = class {
+let Pe = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "assemblyModel");
@@ -2034,14 +2043,14 @@ let Oe = class {
 };
 mr([
   m({ modelType: Fe.type })
-], Oe.prototype, "assemblyModel", 2);
-Oe = mr([
+], Pe.prototype, "assemblyModel", 2);
+Pe = mr([
   l(ie)
-], Oe);
-const Hi = {
+], Pe);
+const Ki = {
   registration: {
     [ie]: {
-      class: Oe,
+      class: Pe,
       singleton: !1
     }
   },
@@ -2049,13 +2058,13 @@ const Hi = {
   predicate: u(ie),
   factory: c.Factory.create(ie)
 };
-var Wi = Object.defineProperty, zi = Object.getOwnPropertyDescriptor, yr = (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 Yi = Object.defineProperty, qi = Object.getOwnPropertyDescriptor, yr = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? qi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
     (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Wi(t, r, o), o;
+  return i && o && Yi(t, r, o), o;
 };
 const se = "plain-water-model";
-let Me = class {
+let Oe = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "assemblyModel");
@@ -2068,7 +2077,7 @@ let Me = 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 $t(t, Kt.type);
+    return rt(t, Kt.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2080,31 +2089,31 @@ let Me = class {
 };
 yr([
   m({ modelType: Fe.type })
-], Me.prototype, "assemblyModel", 2);
-Me = yr([
+], Oe.prototype, "assemblyModel", 2);
+Oe = yr([
   l(se)
-], Me);
-const Ni = {
+], Oe);
+const Gi = {
   registration: {
     [se]: {
-      class: Me,
+      class: Oe,
       singleton: !1
     }
   },
   type: se,
   predicate: u(se),
   factory: c.Factory.create(se)
-}, { URL: br } = h("REBOOT_SERVICE"), { postModel: Bi } = f.build({
+}, { URL: br } = h("REBOOT_SERVICE"), { postModel: Qi } = f.build({
   basePath: `${br}/api/reboot`
-}), Ki = g.createLogger({ name: "reboot-service", group: "Services" }), vr = async () => (Ki.debug("sending POST call for Reboot Dispenser"), await Bi({
+}), Xi = g.createLogger({ name: "reboot-service", group: "Services" }), vr = async () => (Xi.debug("sending POST call for Reboot Dispenser"), await Qi({
   urlOverride: `${br}/api/app/kosdev.ddk/ncui/reboot`,
   model: {}
-})), zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   rebootDispenser: vr
 }, Symbol.toStringTag, { value: "Module" }));
-var Yi = Object.getOwnPropertyDescriptor, qi = (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 Ji = Object.getOwnPropertyDescriptor, Zi = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? Ji(t, r) : t, n = e.length - 1, a; n >= 0; n--)
     (a = e[n]) && (o = a(o) || o);
   return o;
 };
@@ -2128,10 +2137,10 @@ let Ze = class {
     this.logger.debug(`loading reboot ${this.id}`);
   }
 };
-Ze = qi([
+Ze = Zi([
   l(ae)
 ], Ze);
-const Gi = {
+const es = {
   registration: {
     [ae]: {
       class: Ze,
@@ -2142,10 +2151,10 @@ const Gi = {
   predicate: u(ae),
   factory: c.Factory.create(ae)
 };
-var Qi = Object.defineProperty, Xi = Object.getOwnPropertyDescriptor, S = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Xi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var ts = Object.defineProperty, rs = Object.getOwnPropertyDescriptor, C = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? rs(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 && Qi(t, r, o), o;
+  return i && o && ts(t, r, o), o;
 };
 const ne = "settings-model";
 let P = class {
@@ -2196,61 +2205,61 @@ let P = class {
     };
   }
 };
-S([
+C([
   d({
     path: "system:app",
     attribute: "resolveDelaysMs"
     // optionsExpander: () => [],
   })
 ], P.prototype, "resolveDelaysMs", 2);
-S([
+C([
   d({
     path: "system:app",
     attribute: "dateFormat"
     // optionsExpander: () => [],
   })
 ], P.prototype, "dateFormat", 2);
-S([
+C([
   d({
     path: "system:app",
     attribute: "timeFormat"
     // optionsExpander: () => [],
   })
 ], P.prototype, "timeFormat", 2);
-S([
+C([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hidePlainWaterBev"
   })
 ], P.prototype, "hidePlainWaterBev", 2);
-S([
+C([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hideCarbWaterBev"
   })
 ], P.prototype, "hideCarbWaterBev", 2);
-S([
+C([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
   })
 ], P.prototype, "ncuiLanguage", 2);
-S([
+C([
   d({
     path: "kos:device",
     attribute: "name"
   })
 ], P.prototype, "name", 2);
-S([
+C([
   d({
     path: "kos:service:OTA",
     attribute: "activateAndRebootTime"
   })
 ], P.prototype, "activateAndRebootTime", 2);
-P = S([
+P = C([
   l(ne)
 ], P);
-const Ji = {
+const os = {
   registration: {
     [ne]: {
       class: P,
@@ -2262,18 +2271,18 @@ const Ji = {
   factory: c.Singleton.create(ne)
 }, { URL: _r } = h("SETTINGS_SERVICE"), { getAll: $r } = f.build({
   basePath: `${_r}/api/settings`
-}), Zi = g.createLogger({
+}), is = g.createLogger({
   name: "settings-service",
   group: "Services"
-}), es = async () => (Zi.debug("sending GET for settings"), await $r({})), ts = async () => await $r({
+}), ss = async () => (is.debug("sending GET for settings"), await $r({})), as = async () => await $r({
   urlOverride: `${_r}api/app/kosdev.ddk/ncui/languages`
-}), Ns = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Gs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNcuiLanguage: ts,
-  getSettings: es
+  getNcuiLanguage: as,
+  getSettings: ss
 }, Symbol.toStringTag, { value: "Module" }));
-var rs = Object.getOwnPropertyDescriptor, os = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? rs(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var ns = Object.getOwnPropertyDescriptor, ls = (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 = a(o) || o);
   return o;
 };
@@ -2305,7 +2314,7 @@ let et = class {
     this.logger.debug(`loading utilities ${this.id}`);
   }
 };
-et = os([
+et = ls([
   l(le)
 ], et);
 const Tr = {
@@ -2318,28 +2327,28 @@ const Tr = {
   type: le,
   predicate: u(le),
   factory: c.Factory.create(le)
-}, { URL: Pr } = h("UTILITIES_SERVICE"), { getAll: is } = f.build({
+}, { URL: Pr } = h("UTILITIES_SERVICE"), { getAll: cs } = f.build({
   basePath: `${Pr}/api/utilities`
-}), ss = g.createLogger({
+}), us = g.createLogger({
   name: "utilities-service",
   group: "Services"
 }), Or = async () => {
-  ss.debug("sending GET for utilities");
-  const e = await is({
+  us.debug("sending GET for utilities");
+  const e = await cs({
     urlOverride: `${Pr}/api/kos/descriptor/system:app/kondra.ncui.utilities`
   });
   return e == null ? void 0 : e.data;
-}, Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getUtilities: Or
 }, Symbol.toStringTag, { value: "Module" }));
-var as = Object.defineProperty, ns = Object.getOwnPropertyDescriptor, Mr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ns(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var ds = Object.defineProperty, ps = Object.getOwnPropertyDescriptor, Mr = (e, t, r, i) => {
+  for (var o = i > 1 ? void 0 : i ? ps(t, r) : t, n = e.length - 1, a; n >= 0; n--)
     (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && as(t, r, o), o;
+  return i && o && ds(t, r, o), o;
 };
 const ce = "utilities-container-model";
-let Se = class {
+let Me = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -2391,15 +2400,15 @@ let Se = class {
   }
 };
 Mr([
-  De
-], Se.prototype, "_models", 2);
-Se = Mr([
+  Le
+], Me.prototype, "_models", 2);
+Me = Mr([
   l(ce)
-], Se);
-const ls = {
+], Me);
+const gs = {
   registration: {
     [ce]: {
-      class: Se,
+      class: Me,
       singleton: !0
     },
     ...Tr.registration
@@ -2407,32 +2416,32 @@ const ls = {
   type: ce,
   predicate: u(ce),
   factory: c.Singleton.create(ce)
-}, Ks = {
-  ...So.registration,
-  ...at.registration,
-  ...it.registration,
-  ...xo.registration,
+}, Xs = {
+  ...wo.registration,
   ...nt.registration,
-  ...Ko.registration,
-  ...Zo.registration,
-  ...ai.registration,
-  ...mi.registration,
-  ...Di.registration,
-  ...ji.registration,
-  ...Hi.registration,
+  ...st.registration,
+  ...Uo.registration,
+  ...lt.registration,
+  ...Xo.registration,
+  ...ii.registration,
+  ...di.registration,
+  ...$i.registration,
+  ...xi.registration,
   ...Ni.registration,
+  ...Ki.registration,
   ...Gi.registration,
-  ...Ji.registration,
+  ...es.registration,
+  ...os.registration,
   ...It.registration,
-  ...ls.registration
+  ...gs.registration
 };
-var cs = Object.defineProperty, us = Object.getOwnPropertyDescriptor, Sr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? us(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var hs = Object.defineProperty, fs = Object.getOwnPropertyDescriptor, Sr = (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 && cs(t, r, o), o;
+  return i && o && hs(t, r, o), o;
 };
 const Cr = "trouble-action-model";
-let Ce = class {
+let Se = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -2440,7 +2449,7 @@ let Ce = class {
     s(this, "disposer");
     s(this, "state");
     s(this, "troubleActionData");
-    this.id = e, this.logger = r.logger, this.state = Gr(), this.troubleActionData = t.definitions.reduce((i, o) => (i[o.troubleType] = o, i), {});
+    this.id = e, this.logger = r.logger, this.state = Qr(), this.troubleActionData = t.definitions.reduce((i, o) => (i[o.troubleType] = o, i), {});
   }
   // -------------------LIFECYCLE----------------------------
   get activeTrouble() {
@@ -2458,7 +2467,7 @@ let Ce = class {
     return (e = this.activeTrouble) == null ? void 0 : e.type;
   }
   async init() {
-    this.logger.debug(`initializing trouble-action ${this.id}`), this.disposer = Qr(() => {
+    this.logger.debug(`initializing trouble-action ${this.id}`), this.disposer = Xr(() => {
       const e = this.troubleContainer.troubles.data.reduce((t, r) => {
         const i = r.type;
         if (this.troubleActionData[i]) {
@@ -2484,29 +2493,29 @@ let Ce = class {
   }
 };
 Sr([
-  m({ modelType: rt.type })
-], Ce.prototype, "troubleContainer", 2);
-Ce = Sr([
+  m({ modelType: ot.type })
+], Se.prototype, "troubleContainer", 2);
+Se = Sr([
   l(Cr)
-], Ce);
-const Ys = new pe({
-  class: Ce,
+], Se);
+const Js = new ke({
+  class: Se,
   type: Cr
-}), { URL: wr } = h("START_SERVICE"), { getOne: ds } = f.build({
+}), { URL: wr } = h("START_SERVICE"), { getOne: ms } = f.build({
   basePath: `${wr}/api/start`
-}), ps = g.createLogger({ name: "start-service", group: "Services" }), Er = async () => (ps.debug("navigating to NCUI"), await ds({
+}), ys = g.createLogger({ name: "start-service", group: "Services" }), Er = async () => (ys.debug("navigating to NCUI"), await ms({
   urlOverride: `${wr}/api/app/kosdev.ddk/ncui/open`
-})), qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), Zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   navigateToNCui: Er
 }, Symbol.toStringTag, { value: "Module" }));
-var gs = Object.defineProperty, hs = Object.getOwnPropertyDescriptor, Lr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? hs(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var bs = Object.defineProperty, vs = Object.getOwnPropertyDescriptor, Lr = (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 && gs(t, r, o), o;
+  return i && o && bs(t, r, o), o;
 };
 const Dr = "start-model";
-let we = class {
+let Ce = class {
   constructor(e, t, r) {
     s(this, "id");
     s(this, "logger");
@@ -2537,16 +2546,16 @@ let we = class {
   }
 };
 Lr([
-  m({ modelType: rt.type })
-], we.prototype, "troubles", 2);
-we = Lr([
+  m({ modelType: ot.type })
+], Ce.prototype, "troubles", 2);
+Ce = Lr([
   l(Dr)
-], we);
-const Gs = new pe({
-  class: we,
+], Ce);
+const ea = new ke({
+  class: Ce,
   type: Dr
-}), { URL: ye } = h("SPM-PUMP_SERVICE"), { postModel: ze } = f.build({
-  basePath: `${ye}/api/spm-pump`
+}), { URL: me } = h("SPM-PUMP_SERVICE"), { postModel: Ne } = f.build({
+  basePath: `${me}/api/spm-pump`
 }), $ = g.createLogger({
   name: "spm-pump-service",
   group: "Services"
@@ -2555,9 +2564,9 @@ const Gs = new pe({
     `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`
   );
   try {
-    const r = await ze({
+    const r = await Ne({
       model: {},
-      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
+      urlOverride: `${me}/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;
@@ -2579,9 +2588,9 @@ const Gs = new pe({
     `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`
   );
   try {
-    const r = await ze({
+    const r = await Ne({
       model: {},
-      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
+      urlOverride: `${me}/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;
@@ -2603,7 +2612,7 @@ const Gs = new pe({
     `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`
   );
   try {
-    const o = await ze({
+    const o = await Ne({
       model: {
         ...r,
         // commandedCalibrationVolume: 0,
@@ -2612,7 +2621,7 @@ const Gs = new pe({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
+      urlOverride: `${me}/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;
@@ -2635,7 +2644,7 @@ const Gs = new pe({
     `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`
   );
   try {
-    const p = await ze({
+    const p = await Ne({
       model: {
         ...i,
         // commandedCalibrationVolume: 0,
@@ -2644,7 +2653,7 @@ const Gs = new pe({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/complete`
+      urlOverride: `${me}/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) {
@@ -2652,22 +2661,22 @@ const Gs = new pe({
       `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`,
       p
     ), p instanceof Re) {
-      const ut = ((a = (n = p.payload) == null ? void 0 : n.data) == null ? void 0 : a.error) || ((O = p.payload) == null ? void 0 : O.error) || "unknownError";
-      return [ut, ((D = p.payload) == null ? void 0 : D.data) || { error: ut }];
+      const dt = ((a = (n = p.payload) == null ? void 0 : n.data) == null ? void 0 : a.error) || ((O = p.payload) == null ? void 0 : O.error) || "unknownError";
+      return [dt, ((D = p.payload) == null ? void 0 : D.data) || { error: dt }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
-}, Qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, ta = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   performCalibrate: Rr,
   performComplete: Fr,
   performPreCalibrate: kr,
   performVerify: Ir
 }, Symbol.toStringTag, { value: "Module" }));
-var fs = Object.defineProperty, ms = Object.getOwnPropertyDescriptor, Ne = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ms(t, r) : t, n = e.length - 1, a; n >= 0; n--)
+var _s = Object.defineProperty, $s = Object.getOwnPropertyDescriptor, ze = (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 = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && fs(t, r, o), o;
+  return i && o && _s(t, r, o), o;
 };
 const xr = "spm-pump-model";
 let j = class {
@@ -2676,7 +2685,7 @@ let j = class {
     s(this, "logger");
     s(this, "pump");
     s(this, "futureHandler");
-    this.id = e, this.logger = r.logger, this.pump = t.companionParent, this.futureHandler = new ge(this);
+    this.id = e, this.logger = r.logger, this.pump = t.companionParent, this.futureHandler = new pe(this);
   }
   get name() {
     return this.pump.name;
@@ -2716,81 +2725,81 @@ let j = class {
     this.logger.debug(`loading spm-pump ${this.id}`);
   }
 };
-Ne([
+ze([
   v()
 ], j.prototype, "performPreCalibrate", 1);
-Ne([
+ze([
   v()
 ], j.prototype, "performCalibrate", 1);
-Ne([
+ze([
   v()
 ], j.prototype, "performVerify", 1);
-j = Ne([
+j = ze([
   l(xr)
 ], j);
-const Xs = new Le({
+const ra = new Ee({
   class: j,
   type: xr
 });
 export {
-  Ps as AgitationControl,
-  So as Animation,
-  Os as AnimationServices,
-  at as Application,
-  it as Auth,
-  $s as AuthServices,
-  xo as CarbWater,
-  Cs as CopyLogs,
-  Ss as CopyLogsServices,
-  Ks as DDKModels,
-  nt as DashboardOperations,
-  ws as DashboardOperationsServices,
-  Ko as Dispenser,
-  Zo as DispenserInfo,
-  Ls as DispenserInfoServices,
-  Es as DispenserServices,
-  no as Door,
+  ws as AgitationControl,
+  wo as Animation,
+  Es as AnimationServices,
+  nt as Application,
+  st as Auth,
+  Ss as AuthServices,
+  Uo as CarbWater,
+  ks as CopyLogs,
+  Ds as CopyLogsServices,
+  Xs as DDKModels,
+  lt as DashboardOperations,
+  Rs as DashboardOperationsServices,
+  Xo as Dispenser,
+  ii as DispenserInfo,
+  Fs as DispenserInfoServices,
+  Is as DispenserServices,
+  co as Door,
   ue as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
-  ai as Enrollment,
-  Ds as EnrollmentServices,
+  di as Enrollment,
+  xs as EnrollmentServices,
   Kt as FcmPump,
-  Ms as FcmPumpServices,
-  mi as IngredientSummary,
-  js as LfcvPump,
-  Us as LfcvPumpServices,
-  Hs as Lockout,
-  Vs as LockoutServices,
-  Fs as MACRO_KEYS,
-  Di as MacroAssignment,
+  Ls as FcmPumpServices,
+  $i as IngredientSummary,
+  Ns as LfcvPump,
+  zs as LfcvPumpServices,
+  Ks as Lockout,
+  Bs as LockoutServices,
+  Vs as MACRO_KEYS,
+  xi as MacroAssignment,
   dr as NetworkTest,
-  ji as NetworkTestContainer,
-  Ws as NetworkTestServices,
-  Hi as NutritiveSweetener,
-  Ni as PlainWater,
-  Gi as Reboot,
-  zs as RebootServices,
-  Ji as Settings,
-  Ns as SettingsServices,
+  Ni as NetworkTestContainer,
+  Ys as NetworkTestServices,
+  Ki as NutritiveSweetener,
+  Gi as PlainWater,
+  es as Reboot,
+  qs as RebootServices,
+  os as Settings,
+  Gs as SettingsServices,
   Rt as SetupStep,
   It as SetupStepContainer,
-  Ts as SetupStepServices,
-  Xs as SpmPump,
-  Qs as SpmPumpServices,
-  Gs as Start,
-  qs as StartServices,
-  Zr as TROUBLE_TYPE_PRIME,
-  gt as TROUBLE_TYPE_PURGE,
-  Ys as TroubleActionManager,
+  Cs as SetupStepServices,
+  ra as SpmPump,
+  ta as SpmPumpServices,
+  ea as Start,
+  Zs as StartServices,
+  to as TROUBLE_TYPE_PRIME,
+  ht as TROUBLE_TYPE_PURGE,
+  Js as TroubleActionManager,
   Tr as Utilities,
-  ls as UtilitiesContainer,
-  Bs as UtilitiesServices,
-  gi as calculateTimeDifference,
-  pi as executeDashboardKeyFactory,
-  Rs as isMacroGroup,
-  ks as isMicroGroup,
-  Is as macroHolderMap,
-  di as registerDashboardKeyFactory,
-  As as toSeconds,
-  xs as toTimeComponents,
+  gs as UtilitiesContainer,
+  Qs as UtilitiesServices,
+  bi as calculateTimeDifference,
+  yi as executeDashboardKeyFactory,
+  js as isMacroGroup,
+  As as isMicroGroup,
+  Us as macroHolderMap,
+  mi as registerDashboardKeyFactory,
+  Ws as toSeconds,
+  Hs as toTimeComponents,
   jt as troubleVisibilityFilter
 };