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

package/index.mjs

@@ -1,8 +1,8 @@
 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 a = (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 _, isKosModel as c, Kos 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 Re, Troubles as pt, SingletonKosModelRegistrationFactory as pe, FetchError as Ie, FutureManager as P, 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 ke, kosConfigBean as qr, ObservableData as Gr, kosAutoEffect as Qr } from "@kosdev-code/kos-ui-sdk";
-import { AGITATION_REQUIRED_TROUBLE as Pt, CartridgeAgitatorEvents as Tt } from "@kosdev-code/kos-freestyle-sdk";
+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`
@@ -11,22 +11,22 @@ const gt = "PurgeTrouble", Zr = "PrimeTrouble", { URL: ot } = h("AUTH_SERVICE"),
 })), St = async (e) => (Ot.debug("sending POST for auth"), await to({
   urlOverride: `${ot}/api/app/kosdev.ddk/auth/pincode/${e}`,
   model: {}
-})), ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), $s = /* @__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, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
+  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 && ro(t, r, o), o;
 };
 const N = "auth-model", ht = (e) => e.toLowerCase();
 let ve = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "currentRole");
+    s(this, "id");
+    s(this, "logger");
+    s(this, "currentRole");
     this.id = e, this.logger = r.logger, this.currentRole = "crew";
   }
   async authorize(e) {
@@ -70,21 +70,21 @@ const it = {
     }
   },
   type: N,
-  predicate: c(N),
-  factory: u.Factory.create(N)
+  predicate: u(N),
+  factory: c.Factory.create(N)
 };
 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, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
+  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 && io(t, r, o), o;
 };
 const Et = "door-model", ao = Ur("doorPath");
 let _e = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "doorPath");
-    a(this, "open");
+    s(this, "id");
+    s(this, "logger");
+    s(this, "doorPath");
+    s(this, "open");
     this.id = e, this.logger = r.logger, this.doorPath = t.doorPath;
   }
   get currentState() {
@@ -110,29 +110,29 @@ const no = new Le({
   group: "Services"
 }), Dt = async () => (Lt.debug("sending GET for setup-step"), await lo({
   urlOverride: `${st}/api/app/kosdev.ddk/setup/steps`
-})), Rt = async (e) => (Lt.debug("sending POST for setup-step"), await co({
+})), kt = async (e) => (Lt.debug("sending POST for setup-step"), await co({
   urlOverride: `${st}/api/app/kosdev.ddk/setup/complete/${e}`,
   model: {}
-})), Es = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), Ts = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getSetupSteps: Dt,
-  markStepComplete: Rt
+  markStepComplete: kt
 }, Symbol.toStringTag, { value: "Module" }));
-var uo = Object.defineProperty, po = Object.getOwnPropertyDescriptor, go = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? po(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && uo(t, r, o), o;
+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--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
 const B = "setup-step-model";
 let Ke = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "idx");
-    a(this, "name");
-    a(this, "complete");
-    a(this, "preStep");
-    a(this, "exclusive");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "idx");
+    s(this, "name");
+    s(this, "complete");
+    s(this, "preStep");
+    s(this, "exclusive");
+    s(this, "logger");
     this.id = e, this.idx = t.idx, this.logger = r.logger, this.name = t.name, this.complete = t.complete, this.preStep = t.preStep, this.exclusive = t.exclusive;
   }
   updateModel(e) {
@@ -145,7 +145,7 @@ let Ke = class {
     return `setup.${this.name}.body`;
   }
   async completeStep() {
-    const e = await Rt(this.name);
+    const e = await kt(this.name);
     (e == null ? void 0 : e.status) === 200 && _(() => {
       this.complete = !0;
     });
@@ -158,10 +158,10 @@ let Ke = class {
     this.logger.debug(`loading setup-step ${this.id}`);
   }
 };
-Ke = go([
+Ke = po([
   l(B)
 ], Ke);
-const It = {
+const Rt = {
   registration: {
     [B]: {
       class: Ke,
@@ -169,18 +169,18 @@ const It = {
     }
   },
   type: B,
-  predicate: c(B),
-  factory: u.Factory.create(B)
+  predicate: u(B),
+  factory: c.Factory.create(B)
 };
-var ho = Object.defineProperty, fo = Object.getOwnPropertyDescriptor, xe = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? fo(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && ho(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && go(t, r, o), o;
 };
 const K = "setup-step-container-model";
 function ft(e) {
   return (t) => {
-    const r = It.factory(t.id)(t);
+    const r = Rt.factory(t.id)(t);
     r.updateModel(t), e.addModel(r);
   };
 }
@@ -189,13 +189,13 @@ function mt(e) {
     e.removeModel(t);
   };
 }
-let I = class {
+let R = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "_currentStep");
-    a(this, "logger");
-    a(this, "models");
-    a(this, "authModel");
+    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 tt({
       parentId: e,
       sortKey: "idx"
@@ -279,33 +279,33 @@ let I = class {
 };
 xe([
   De
-], I.prototype, "models", 2);
+], R.prototype, "models", 2);
 xe([
   m({ modelType: it.type })
-], I.prototype, "authModel", 2);
+], R.prototype, "authModel", 2);
 xe([
   Ee({
     topic: "/app/kosdev.ddk/setup/steps",
     websocket: !0
   })
-], I.prototype, "handleStepChanges", 1);
-I = xe([
+], R.prototype, "handleStepChanges", 1);
+R = xe([
   l(K)
-], I);
-const kt = {
+], R);
+const It = {
   registration: {
     [K]: {
-      class: I,
+      class: R,
       singleton: !0
     },
-    ...It.registration
+    ...Rt.registration
   },
   type: K,
-  predicate: c(K),
-  factory: u.Singleton.create(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" }), mo = async () => {
+}), Ae = g.createLogger({ name: "auth-service", group: "Services" }), fo = async () => {
   Ae.debug("sending GET for cuis");
   const e = await xt({
     urlOverride: `${he}/api/app/kosdev.ddk/cui`
@@ -313,7 +313,7 @@ const kt = {
   if ((e == null ? void 0 : e.status) !== 200)
     throw new Error("Failed to retrieve cuis");
   return e.data;
-}, yo = async () => {
+}, mo = async () => {
   Ae.debug("sending GET for navigation");
   const e = await xt({
     urlOverride: `${he}/api/kos/descriptor/system:app/kondra.ncui.navigations`
@@ -321,38 +321,38 @@ const kt = {
   if ((e == null ? void 0 : e.status) !== 200)
     throw new Error("Failed to retrieve navigation data");
   return e.data;
-}, bo = async () => (Ae.debug("navigating to CUI"), await Ft({
+}, yo = async () => (Ae.debug("navigating to CUI"), await Ft({
   urlOverride: `${he}/api/app/kosdev.ddk/cui/open`
-})), vo = async () => (Ae.debug("navigating to NCUI"), await Ft({
+})), bo = async () => (Ae.debug("navigating to NCUI"), await Ft({
   urlOverride: `${he}/api/app/kosdev.ddk/ncui/open`
 }));
-var _o = 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, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && _o(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && vo(t, r, o), o;
 };
 const Y = "application-model", At = (e, t = "") => e.reduce((r, i) => {
   const o = t ? `${t}.${i.name}` : i.name;
   if (r[o] = { ...i, root: !t }, i.children) {
     const n = At(i.children, o);
-    Object.keys(n).forEach((s) => {
-      r[s] = n[s];
+    Object.keys(n).forEach((a) => {
+      r[a] = n[a];
     });
   }
   return r;
 }, {});
 let M = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "device");
-    a(this, "authModel");
-    a(this, "setupStepContainer");
-    a(this, "door");
-    a(this, "ncuiLanguage");
-    a(this, "activeCui");
-    a(this, "fallbackCui");
-    a(this, "_cuis", []);
-    a(this, "_navigationItems", []);
+    s(this, "id");
+    s(this, "device");
+    s(this, "authModel");
+    s(this, "setupStepContainer");
+    s(this, "door");
+    s(this, "ncuiLanguage");
+    s(this, "activeCui");
+    s(this, "fallbackCui");
+    s(this, "_cuis", []);
+    s(this, "_navigationItems", []);
     // @kosConfigProperty({
     //   path: 'somewhere.enable.dial.animation',
     //   attribute: 'enableDialAnimation',
@@ -368,8 +368,8 @@ let M = class {
     //   attribute: 'enableSidebarAnimation',
     // })
     // enableSidebarAnimation!: KosConfigProperty<boolean>;
-    a(this, "languages");
-    a(this, "logger");
+    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({
       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 vo();
+    this.logger.info("navigating to NCUI"), await bo();
   }
   async exit() {
-    this.logger.info("navigating to CUI"), await bo();
+    this.logger.info("navigating to CUI"), await yo();
   }
   // -------------------LIFECYCLE----------------------------
   async load() {
     var r, i;
     this.logger.debug(`loading application ${this.id}`);
-    const e = await yo();
+    const e = await mo();
     this._navigationItems = e;
-    const t = await mo();
+    const t = await fo();
     this._cuis = t, (r = this.setupStepContainer) != null && r.hasIncompletePreSteps && ((i = this.authModel) == null || i.forceRole("technician")), this.languages = [
       {
         name: "English",
@@ -420,7 +420,7 @@ L([
   m({ modelType: it.type })
 ], M.prototype, "authModel", 2);
 L([
-  m({ modelType: kt.type })
+  m({ modelType: It.type })
 ], M.prototype, "setupStepContainer", 2);
 L([
   De
@@ -455,8 +455,8 @@ const at = {
     }
   },
   type: Y,
-  predicate: c(Y),
-  factory: u.Singleton.create(
+  predicate: u(Y),
+  factory: c.Singleton.create(
     Y
   )
 }, be = {
@@ -465,7 +465,7 @@ const at = {
   technician: 1,
   manager: 2
 }, jt = (e) => (t) => {
-  if (t.type === Pt)
+  if (t.type === Tt)
     return !1;
   const r = (t == null ? void 0 : t.role) || "technician";
   if (e && r) {
@@ -474,25 +474,25 @@ const at = {
   }
   return !1;
 };
-var Po = 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, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Po(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && $o(t, r, o), o;
 };
-const Ut = "agitation-control-model", Ye = "resolve", Oo = "agitate";
+const Ut = "agitation-control-model", Ye = "resolve", Po = "agitate";
 let C = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "futureHandler");
-    a(this, "logger");
-    a(this, "troubleContainer");
-    a(this, "_agitationFutureId");
-    a(this, "_canExit", !0);
-    a(this, "_exiting", !1);
-    a(this, "_isFailed", !1);
-    a(this, "disposer");
-    a(this, "application");
-    a(this, "inProgress", []);
+    s(this, "id");
+    s(this, "futureHandler");
+    s(this, "logger");
+    s(this, "troubleContainer");
+    s(this, "_agitationFutureId");
+    s(this, "_canExit", !0);
+    s(this, "_exiting", !1);
+    s(this, "_isFailed", !1);
+    s(this, "disposer");
+    s(this, "application");
+    s(this, "inProgress", []);
     this.id = e, this.logger = r.logger, this.troubleContainer = t.companionParent, this.futureHandler = new Wr(this, Ye);
   }
   set isFailed(e) {
@@ -538,7 +538,7 @@ 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 Re.bulkResolveTroubles(
+    return this.inProgress.push(...t), t.length === 0 ? void 0 : await ke.bulkResolveTroubles(
       t,
       e
     );
@@ -554,7 +554,7 @@ let C = class {
   }
   get visibleTroubles() {
     const e = this.application.currentRole;
-    return this.troubleContainer.troubles.data.filter(jt(e)).filter((t) => t.type !== Pt);
+    return this.troubleContainer.troubles.data.filter(jt(e)).filter((t) => t.type !== Tt);
   }
   // -------------------LIFECYCLE----------------------------
   get future() {
@@ -564,7 +564,7 @@ let C = class {
     return this.futureHandler.getFuture(Ye);
   }
   get agitateFuture() {
-    return this.futureHandler.getFuture(Oo);
+    return this.futureHandler.getFuture(Po);
   }
   handleAgitationStarted(e) {
     this.logger.info(`Agitation started for ${e.path}`), this._agitationFutureId = String(e.futureId);
@@ -592,10 +592,10 @@ U([
   v({ alias: Ye })
 ], C.prototype, "resolveDeferredTroubles", 1);
 U([
-  Ee({ topic: Tt.TOPIC_AGITATION_STARTED })
+  Ee({ topic: Pt.TOPIC_AGITATION_STARTED })
 ], C.prototype, "handleAgitationStarted", 1);
 U([
-  Ee({ topic: Tt.TOPIC_AGITATION_ENDED })
+  Ee({ topic: Pt.TOPIC_AGITATION_ENDED })
 ], C.prototype, "handleAgitationEnded", 1);
 U([
   _t({
@@ -605,24 +605,24 @@ U([
 C = U([
   l(Ut)
 ], C);
-const Ls = new pe({
+const Ps = new pe({
   class: C,
   type: Ut
 });
-var Mo = Object.defineProperty, So = Object.getOwnPropertyDescriptor, fe = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? So(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Mo(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Oo(t, r, o), o;
 };
 const q = "animation-model";
-let R = class {
+let k = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "disableAll");
-    a(this, "enableDial");
-    a(this, "enableModal");
-    a(this, "enableSideBar");
+    s(this, "id");
+    s(this, "logger");
+    s(this, "disableAll");
+    s(this, "enableDial");
+    s(this, "enableModal");
+    s(this, "enableSideBar");
     this.id = e, this.logger = r.logger;
   }
 };
@@ -631,46 +631,46 @@ fe([
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.disableAll"
   })
-], R.prototype, "disableAll", 2);
+], k.prototype, "disableAll", 2);
 fe([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableDial"
   })
-], R.prototype, "enableDial", 2);
+], k.prototype, "enableDial", 2);
 fe([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableModal"
   })
-], R.prototype, "enableModal", 2);
+], k.prototype, "enableModal", 2);
 fe([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableSideBar"
   })
-], R.prototype, "enableSideBar", 2);
-R = fe([
+], k.prototype, "enableSideBar", 2);
+k = fe([
   l(q)
-], R);
-const Co = {
+], k);
+const So = {
   registration: {
     [q]: {
-      class: R,
+      class: k,
       singleton: !0
     }
   },
   type: q,
-  predicate: c(q),
-  factory: u.Singleton.create(q)
-}, { URL: wo } = h("ANIMATION_SERVICE"), { getAll: Eo } = f.build({
-  basePath: `${wo}/api/animation`
-}), Lo = g.createLogger({
+  predicate: u(q),
+  factory: c.Singleton.create(q)
+}, { URL: Co } = h("ANIMATION_SERVICE"), { getAll: wo } = f.build({
+  basePath: `${Co}/api/animation`
+}), Eo = g.createLogger({
   name: "animation-service",
   group: "Services"
-}), Do = async () => (Lo.debug("sending GET for animation"), await Eo({})), Ds = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Lo = async () => (Eo.debug("sending GET for animation"), await wo({})), Os = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getAnimations: Do
+  getAnimations: Lo
 }, Symbol.toStringTag, { value: "Module" })), { URL: V } = h("FCM-PUMP_SERVICE"), { postModel: me } = f.build({
   basePath: `${V}/api/fcm-pump`
 }), y = g.createLogger({
@@ -682,18 +682,18 @@ const Co = {
     `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
   );
   try {
-    const s = await me({
+    const a = await me({
       model: {},
       urlOverride: `${V}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
     });
-    return y.debug("performElectricalTest - response:", s), ((s == null ? void 0 : s.status) === 200 || (s == null ? void 0 : s.status) === 499) && ((t = s.data) != null && t.error) ? [s.data.error || "unknownError", s.data] : [void 0, s == null ? void 0 : s.data];
-  } catch (s) {
+    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`,
-      s
-    ), s instanceof Ie) {
-      const O = ((i = (r = s.payload) == null ? void 0 : r.data) == null ? void 0 : i.error) || ((o = s.payload) == null ? void 0 : o.error) || "unknownError";
-      return [O, ((n = s.payload) == null ? void 0 : n.data) || { error: O }];
+      a
+    ), a instanceof Re) {
+      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 }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
@@ -707,7 +707,7 @@ const Co = {
       urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
       tracker: t
     });
-    return y.debug("performPreCalibrate - response:", r), r != null && r.data && P.initiateFuture(r.data), r == null ? void 0 : r.data;
+    return y.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
   } catch (r) {
     y.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
@@ -719,7 +719,7 @@ const Co = {
       tracker: t,
       reason: "Failed to resolve trouble"
     };
-    return P.initiateFuture(i), i;
+    return T.initiateFuture(i), i;
   }
 }, Wt = async (e, t) => {
   y.debug(
@@ -731,7 +731,7 @@ const Co = {
       urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
       tracker: t
     });
-    return y.debug("performPreCalibrate - response:", r), r != null && r.data && P.initiateFuture(r.data), r == null ? void 0 : r.data;
+    return y.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
   } catch (r) {
     y.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`,
@@ -743,7 +743,7 @@ const Co = {
       tracker: t,
       reason: "Failed to resolve trouble"
     };
-    return P.initiateFuture(i), i;
+    return T.initiateFuture(i), i;
   }
 }, zt = async (e, t, r) => {
   y.debug(
@@ -755,7 +755,7 @@ const Co = {
       urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
       tracker: r
     });
-    return y.debug("performVerify - response:", i), i != null && i.data && P.initiateFuture(i.data), i == null ? void 0 : i.data;
+    return y.debug("performVerify - response:", i), i != null && i.data && T.initiateFuture(i.data), i == null ? void 0 : i.data;
   } catch (i) {
     y.error(
       `performVerify - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
@@ -767,7 +767,7 @@ const Co = {
       tracker: r,
       reason: "Failed to resolve trouble"
     };
-    return P.initiateFuture(o), o;
+    return T.initiateFuture(o), o;
   }
 }, Nt = async (e, t, r) => {
   y.debug(
@@ -786,7 +786,7 @@ const Co = {
     );
     return;
   }
-}, Rs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Ms = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   performCalibrate: Wt,
   performComplete: Nt,
@@ -794,18 +794,18 @@ const Co = {
   performPreCalibrate: Ht,
   performVerify: zt
 }, Symbol.toStringTag, { value: "Module" }));
-var Ro = Object.defineProperty, Io = Object.getOwnPropertyDescriptor, je = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Io(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Ro(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Do(t, r, o), o;
 };
-const Bt = "fcm-pump-model", ko = g.createLogger({ name: "fcm-pump-model" });
-let k = class {
+const Bt = "fcm-pump-model", Ro = g.createLogger({ name: "fcm-pump-model" });
+let I = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "pumpModel");
-    a(this, "futureHandler");
+    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);
   }
   get future() {
@@ -828,7 +828,7 @@ let k = class {
   }
   async performElectricalTest() {
     const [e, t] = await Vt(this.pumpModel.path);
-    return e && ko.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
+    return e && Ro.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
   }
   getChildren() {
     return [...this.futureHandler.allFutures];
@@ -855,31 +855,31 @@ let k = class {
 };
 je([
   v()
-], k.prototype, "performPreCalibrate", 1);
+], I.prototype, "performPreCalibrate", 1);
 je([
   v()
-], k.prototype, "performCalibrate", 1);
+], I.prototype, "performCalibrate", 1);
 je([
   v()
-], k.prototype, "performVerify", 1);
-k = je([
+], I.prototype, "performVerify", 1);
+I = je([
   l(Bt)
-], k);
+], I);
 const Kt = new Le({
-  class: k,
+  class: I,
   type: Bt
 });
-var Fo = Object.defineProperty, xo = Object.getOwnPropertyDescriptor, Yt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? xo(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Fo(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Io(t, r, o), o;
 };
 const G = "carb-water-model";
 let $e = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "assemblyModel");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "assemblyModel");
+    s(this, "logger");
     this.id = e, this.logger = r.logger;
   }
   getPump() {
@@ -900,7 +900,7 @@ Yt([
 $e = Yt([
   l(G)
 ], $e);
-const Ao = {
+const xo = {
   registration: {
     [G]: {
       class: $e,
@@ -908,15 +908,15 @@ const Ao = {
     }
   },
   type: G,
-  predicate: c(G),
-  factory: u.Factory.create(G)
-}, { URL: H } = h("COPY-LOGS_SERVICE"), { getAll: jo, getOne: Uo, postModel: qt, deleteModel: Vo } = f.build({
+  predicate: u(G),
+  factory: c.Factory.create(G)
+}, { URL: H } = h("COPY-LOGS_SERVICE"), { getAll: Ao, getOne: jo, postModel: qt, deleteModel: Uo } = f.build({
   basePath: `${H}/api/copy-logs`
-}), Pe = g.createLogger({
+}), Te = g.createLogger({
   name: "copy-logs-service",
   group: "Services"
 }), Gt = async (e, t) => {
-  const r = await Vo({
+  const r = await Uo({
     tracker: t,
     id: e,
     urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
@@ -943,30 +943,30 @@ const Ao = {
     throw new Error("No response from server");
   return r.data;
 }, Jt = async () => {
-  Pe.debug("sending GET for copy-logs");
+  Te.debug("sending GET for copy-logs");
   try {
-    const e = await jo({
+    const e = await Ao({
       urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/volumes/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof Ie)
-      return Pe.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof Re)
+      return Te.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
 }, Zt = async () => {
-  Pe.debug("sending GET for log file size");
+  Te.debug("sending GET for log file size");
   try {
-    const e = await Uo({
+    const e = await jo({
       urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/files/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof Ie)
-      return Pe.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof Re)
+      return Te.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, Is = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Ss = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   copyLogFromVolume: Xt,
   eraseAndCopyLogsToVolume: Qt,
@@ -974,25 +974,25 @@ const Ao = {
   getLogFileSize: Zt,
   getVolumes: Jt
 }, Symbol.toStringTag, { value: "Module" }));
-var Ho = Object.defineProperty, Wo = Object.getOwnPropertyDescriptor, W = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Wo(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Ho(t, r, o), o;
+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--)
+    (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) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "_volumes");
+    s(this, "id");
+    s(this, "logger");
+    s(this, "_volumes");
     // Only declare what's needed internally - setupCompleteFutureSupport() handles the rest
-    a(this, "futureHandler");
-    a(this, "future");
-    a(this, "storageDeviceContainer");
-    a(this, "_activeVolume");
-    a(this, "_logFileSize", 0);
-    a(this, "_actionState", "idle");
-    a(this, "copyProgress");
+    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 = {
       bytesCopied: 0,
       bytesToCopy: 0,
@@ -1103,13 +1103,13 @@ let w = class {
     t && (t.forEach((o) => {
       const n = this.storageDeviceContainer.getModel(o.id);
       if (n) {
-        const s = {
+        const a = {
           id: o.id,
           name: n.label,
           freeBytes: o.info.freeBytes,
           totalBytes: o.info.totalBytes
         };
-        this._volumes.addModel(s);
+        this._volumes.addModel(a);
       }
     }), t.length === 1 ? this.updateActiveVolume(this._volumes.data[0]) : this.clearActiveVolume()), i && (this.logger.info(`Log file size: ${i}`), this.updateLogFileSize(parseInt(i, 10)));
   }
@@ -1140,24 +1140,24 @@ W([
 w = W([
   l(er)
 ], w);
-const ks = new pe({
+const Cs = new pe({
   class: w,
   type: er
 }), tr = g.createLogger({
   name: "dashboard-operations-service",
   group: "Services"
-}), rr = async (e, t) => (tr.debug("resolveAll"), await Re.bulkResolveTroubles(
+}), rr = async (e, t) => (tr.debug("resolveAll"), await ke.bulkResolveTroubles(
   e,
   t
-)), or = async (e, t) => (tr.debug("resolveTrouble"), await Re.resolveTrouble(e, t)), Fs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+)), or = async (e, t) => (tr.debug("resolveTrouble"), await ke.resolveTrouble(e, t)), ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   resolveAll: rr,
   resolveTrouble: or
 }, Symbol.toStringTag, { value: "Module" }));
-var zo = Object.defineProperty, No = Object.getOwnPropertyDescriptor, Ue = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? No(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && zo(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Wo(t, r, o), o;
 };
 const Q = "dashboard-operations-model";
 function yt(e) {
@@ -1168,10 +1168,10 @@ function bt(e) {
 }
 let F = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "troubles");
-    a(this, "futureHandler");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "troubles");
+    s(this, "futureHandler");
+    s(this, "logger");
     this.id = e, this.futureHandler = new ge(this), this.logger = r.logger;
   }
   get troublesByType() {
@@ -1217,10 +1217,10 @@ let F = class {
     if (!t)
       throw new Error("No tracker provided");
     const r = e === gt ? this.purgeTroubles : this.primeTroubles;
-    r.filter((s) => s.shouldDefer).forEach((s) => {
-      this.logger.info(`Deferring trouble ${s.rawId}`), s.defer();
+    r.filter((a) => a.shouldDefer).forEach((a) => {
+      this.logger.info(`Deferring trouble ${a.rawId}`), a.defer();
     });
-    const o = r.filter((s) => !s.shouldDefer).map((s) => s.rawId);
+    const o = r.filter((a) => !a.shouldDefer).map((a) => a.rawId);
     return o.length === 0 ? void 0 : await rr(o, t);
   }
   async resolveTrouble(e, t) {
@@ -1256,19 +1256,19 @@ const nt = {
     }
   },
   type: Q,
-  predicate: c(Q),
-  factory: u.Singleton.create(Q)
+  predicate: u(Q),
+  factory: c.Singleton.create(Q)
 };
-var Bo = Object.defineProperty, Ko = Object.getOwnPropertyDescriptor, Yo = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ko(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Bo(t, r, o), o;
+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--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
 const X = "dispenser-model";
 let qe = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "logger");
     this.id = e, this.logger = r.logger;
   }
   updateModel() {
@@ -1281,10 +1281,10 @@ let qe = class {
     this.logger.debug(`loading dispenser ${this.id}`);
   }
 };
-qe = Yo([
+qe = Bo([
   l(X)
 ], qe);
-const qo = {
+const Ko = {
   registration: {
     [X]: {
       class: qe,
@@ -1292,28 +1292,28 @@ const qo = {
     }
   },
   type: X,
-  predicate: c(X),
-  factory: u.Singleton.create(X)
-}, { URL: Go } = h("DISPENSER_SERVICE"), { getAll: Qo } = f.build({
-  basePath: `${Go}/api/dispenser`
-}), Xo = g.createLogger({
+  predicate: u(X),
+  factory: c.Singleton.create(X)
+}, { URL: Yo } = h("DISPENSER_SERVICE"), { getAll: qo } = f.build({
+  basePath: `${Yo}/api/dispenser`
+}), Go = g.createLogger({
   name: "dispenser-service",
   group: "Services"
-}), Jo = async () => (Xo.debug("sending GET for dispenser"), await Qo({})), xs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Qo = async () => (Go.debug("sending GET for dispenser"), await qo({})), Es = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispensers: Jo
+  getDispensers: Qo
 }, Symbol.toStringTag, { value: "Module" }));
-var Zo = Object.defineProperty, ei = Object.getOwnPropertyDescriptor, ir = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ei(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Zo(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Xo(t, r, o), o;
 };
 const J = "dispenser-info-model";
-let Te = class {
+let Pe = class {
   constructor(e, t, r) {
-    a(this, "logger");
-    a(this, "id");
-    a(this, "name");
+    s(this, "logger");
+    s(this, "id");
+    s(this, "name");
     this.id = e, this.logger = r.logger;
   }
   // -------------------LIFECYCLE----------------------------
@@ -1329,42 +1329,42 @@ ir([
     path: "kos:device",
     attribute: "name"
   })
-], Te.prototype, "name", 2);
-Te = ir([
+], Pe.prototype, "name", 2);
+Pe = ir([
   l(J)
-], Te);
-const ti = {
+], Pe);
+const Zo = {
   registration: {
     [J]: {
-      class: Te,
+      class: Pe,
       singleton: !1
     }
   },
   type: J,
-  predicate: c(J),
-  factory: u.Factory.create(
+  predicate: u(J),
+  factory: c.Factory.create(
     J
   )
-}, { URL: ri } = h("DISPENSER-INFO_SERVICE"), { getAll: oi } = f.build({
-  basePath: `${ri}/api/dispenser-info`
-}), ii = g.createLogger({
+}, { URL: ei } = h("DISPENSER-INFO_SERVICE"), { getAll: ti } = f.build({
+  basePath: `${ei}/api/dispenser-info`
+}), ri = g.createLogger({
   name: "dispenser-info-service",
   group: "Services"
-}), si = async () => (ii.debug("sending GET for dispenser-info"), await oi({})), As = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), oi = async () => (ri.debug("sending GET for dispenser-info"), await ti({})), Ls = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispenserInfos: si
+  getDispenserInfos: oi
 }, Symbol.toStringTag, { value: "Module" }));
-var ai = Object.defineProperty, ni = Object.getOwnPropertyDescriptor, li = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ni(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && ai(t, r, o), o;
+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--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
 const Z = "enrollment-model";
 let Ge = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "enrolled");
+    s(this, "id");
+    s(this, "logger");
+    s(this, "enrolled");
     this.id = e, this.logger = r.logger, this.enrolled = !1;
   }
   updateModel(e) {
@@ -1378,10 +1378,10 @@ let Ge = class {
     this.logger.debug(`loading enrollment ${this.id}`);
   }
 };
-Ge = li([
+Ge = si([
   l(Z)
 ], Ge);
-const ci = {
+const ai = {
   registration: {
     [Z]: {
       class: Ge,
@@ -1389,20 +1389,20 @@ const ci = {
     }
   },
   type: Z,
-  predicate: c(Z),
-  factory: u.Singleton.create(Z)
-}, { URL: ui } = h("ENROLLMENT_SERVICE"), { getAll: di } = f.build({
-  basePath: `${ui}/api/enrollment`
-}), pi = g.createLogger({
+  predicate: u(Z),
+  factory: c.Singleton.create(Z)
+}, { URL: ni } = h("ENROLLMENT_SERVICE"), { getAll: li } = f.build({
+  basePath: `${ni}/api/enrollment`
+}), ci = g.createLogger({
   name: "enrollment-service",
   group: "Services"
-}), gi = async () => (pi.debug("sending GET for enrollment"), await di({})), js = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), ui = async () => (ci.debug("sending GET for enrollment"), await li({})), Ds = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getEnrollments: gi
-}, Symbol.toStringTag, { value: "Module" })), Us = (e) => e.toLowerCase().includes("micros"), Vs = (e) => !e.toLowerCase().includes("micros"), Hs = (e) => (t) => {
+  getEnrollments: ui
+}, Symbol.toStringTag, { value: "Module" })), ks = (e) => e.toLowerCase().includes("micros"), Rs = (e) => !e.toLowerCase().includes("micros"), Is = (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;
-}, Ws = ["water", "carb", "ns", "nss"], ue = "dashboardKeyFactory", Be = [];
+}, Fs = ["water", "carb", "ns", "nss"], ue = "dashboardKeyFactory", Be = [];
 Yr(ue, {
   register: (e, t) => {
     Be.includes(t) || Be.push(t);
@@ -1416,38 +1416,38 @@ Yr(ue, {
     }
   }
 });
-const hi = (e) => {
-  ke[ue].register(
+const di = (e) => {
+  Ie[ue].register(
     ue,
     e
   );
-}, fi = (e) => ke[ue].execute(
+}, pi = (e) => Ie[ue].execute(
   ue,
   e
 );
-ke.registerDashboardKeyFactory = hi;
-ke.executeDashboardKeyFactory = fi;
-const Qe = 3600, sr = 60, zs = (e) => {
+Ie.registerDashboardKeyFactory = di;
+Ie.executeDashboardKeyFactory = pi;
+const Qe = 3600, sr = 60, xs = (e) => {
   const t = Math.floor(e / Qe), r = Math.floor(e % Qe / sr);
   return { hours: t, minutes: r };
-}, Ns = (e, t) => e * Qe + t * sr, mi = (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), s = i % 60, O = o % 24;
+}, As = (e, t) => e * Qe + t * sr, gi = (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" : ""} `), (s > 0 || n === 0 && O === 0) && (D += `${s} minute${s > 1 ? "s" : ""} `), 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 yi = Object.defineProperty, bi = Object.getOwnPropertyDescriptor, Ve = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? bi(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && yi(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && hi(t, r, o), o;
 };
 const ee = "ingredient-summary-model";
 let x = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "assemblyModel");
-    a(this, "dashboardOperationModel");
-    a(this, "appModel");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "assemblyModel");
+    s(this, "dashboardOperationModel");
+    s(this, "appModel");
+    s(this, "logger");
     this.id = e, this.logger = r.logger, this.dashboardOperationModel = nt.factory({});
   }
   get highPriorityHolders() {
@@ -1488,7 +1488,7 @@ Ve([
 x = Ve([
   l(ee)
 ], x);
-const vi = {
+const mi = {
   registration: {
     [ee]: {
       class: x,
@@ -1496,22 +1496,22 @@ const vi = {
     }
   },
   type: ee,
-  predicate: c(ee),
-  factory: u.Factory.create(
+  predicate: u(ee),
+  factory: c.Factory.create(
     ee
   )
 };
-var _i = Object.defineProperty, $i = Object.getOwnPropertyDescriptor, Pi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? $i(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && _i(t, r, o), o;
+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--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
 const ar = "lfcv-pump-model";
 let Xe = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "pumpModel");
+    s(this, "id");
+    s(this, "logger");
+    s(this, "pumpModel");
     this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent;
   }
   get name() {
@@ -1537,23 +1537,23 @@ let Xe = class {
     this.logger.debug(`loading lfcv-pump ${this.id}`);
   }
 };
-Xe = Pi([
+Xe = bi([
   l(ar)
 ], Xe);
-const Bs = new Le({
+const js = new Le({
   class: Xe,
   type: ar
-}), { URL: Ti } = h("LFCV-PUMP_SERVICE"), { getAll: Oi } = f.build({
-  basePath: `${Ti}/api/lfcv-pump`
-}), Mi = g.createLogger({
+}), { URL: vi } = h("LFCV-PUMP_SERVICE"), { getAll: _i } = f.build({
+  basePath: `${vi}/api/lfcv-pump`
+}), $i = g.createLogger({
   name: "lfcv-pump-service",
   group: "Services"
-}), Si = async () => (Mi.debug("sending GET for lfcv-pump"), await Oi({})), Ks = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ti = async () => ($i.debug("sending GET for lfcv-pump"), await _i({})), Us = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getLfcvPumps: Si
+  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" }), Ci = async () => (lr.info("lock"), await nr({
+}), lr = g.createLogger({ name: "lockout-service", group: "Services" }), Pi = async () => (lr.info("lock"), await nr({
   model: {},
   urlOverride: `${lt}/api/app/kosdev.ddk/lockout/lockNow`
 })), cr = async (e) => {
@@ -1563,17 +1563,17 @@ const Bs = new Le({
     urlOverride: `${lt}/api/app/kosdev.ddk/lockout/unlock/${e}`
   });
   return t == null ? void 0 : t.data;
-}, Ys = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Vs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  lock: Ci,
+  lock: Pi,
   unlock: cr
 }, Symbol.toStringTag, { value: "Module" }));
-var wi = Object.defineProperty, Ei = Object.getOwnPropertyDescriptor, z = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ei(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && wi(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Oi(t, r, o), o;
 };
-const ur = "lockout-model", Li = [
+const ur = "lockout-model", Si = [
   { 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" },
@@ -1584,9 +1584,9 @@ const ur = "lockout-model", Li = [
 ];
 let E = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "dayEnabledList", [
+    s(this, "id");
+    s(this, "logger");
+    s(this, "dayEnabledList", [
       "dayWiseLockConfigMap.Sun.enabled",
       "dayWiseLockConfigMap.Mon.enabled",
       "dayWiseLockConfigMap.Tue.enabled",
@@ -1595,7 +1595,7 @@ let E = class {
       "dayWiseLockConfigMap.Fri.enabled",
       "dayWiseLockConfigMap.Sat.enabled"
     ]);
-    a(this, "dayOpenAtList", [
+    s(this, "dayOpenAtList", [
       "dayWiseLockConfigMap.Sun.unlockTime",
       "dayWiseLockConfigMap.Mon.unlockTime",
       "dayWiseLockConfigMap.Tue.unlockTime",
@@ -1604,7 +1604,7 @@ let E = class {
       "dayWiseLockConfigMap.Fri.unlockTime",
       "dayWiseLockConfigMap.Sat.unlockTime"
     ]);
-    a(this, "dayCloseAtList", [
+    s(this, "dayCloseAtList", [
       "dayWiseLockConfigMap.Sun.lockTime",
       "dayWiseLockConfigMap.Mon.lockTime",
       "dayWiseLockConfigMap.Tue.lockTime",
@@ -1613,12 +1613,12 @@ let E = class {
       "dayWiseLockConfigMap.Fri.lockTime",
       "dayWiseLockConfigMap.Sat.lockTime"
     ]);
-    a(this, "saveMap");
-    a(this, "pin");
-    a(this, "nextLockSkipped");
-    a(this, "nextLockTime");
-    a(this, "nextUnLockTime");
-    a(this, "cuiLockout");
+    s(this, "saveMap");
+    s(this, "pin");
+    s(this, "nextLockSkipped");
+    s(this, "nextLockTime");
+    s(this, "nextUnLockTime");
+    s(this, "cuiLockout");
     this.id = e, this.logger = r.logger, this.saveMap = /* @__PURE__ */ new Map();
   }
   get enabled() {
@@ -1628,7 +1628,7 @@ let E = class {
     return t || r;
   }
   get schedule() {
-    return Li;
+    return Si;
   }
   getProp(e) {
     return this.saveMap.get(e);
@@ -1697,29 +1697,29 @@ z([
 E = z([
   l(ur)
 ], E);
-const qs = new pe({
+const Hs = new pe({
   class: E,
   type: ur
-}), Di = async (e, t) => await Re.bulkResolveTroubles(
+}), Ci = async (e, t) => await ke.bulkResolveTroubles(
   e,
   t
 );
-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, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Ri(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && wi(t, r, o), o;
 };
-const te = "macro-assignment-model", vt = "PurgeTrouble", ki = "PrimeTrouble";
+const te = "macro-assignment-model", vt = "PurgeTrouble", Li = "PrimeTrouble";
 let A = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "logger");
     /**
      * futureHandler is used to handle async operations
      */
-    a(this, "futureHandler");
-    a(this, "holders");
-    a(this, "ingredients");
+    s(this, "futureHandler");
+    s(this, "holders");
+    s(this, "ingredients");
     this.id = e, this.futureHandler = new ge(), this.logger = r.logger;
   }
   /**
@@ -1756,7 +1756,7 @@ let A = class {
   }
   get holderPrimeTroubles() {
     return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[ki] || [];
+      const i = r.troublesByType[Li] || [];
       return t = [...t, ...i], t;
     }, []);
   }
@@ -1793,7 +1793,7 @@ let A = class {
     if (!t)
       throw new Error("No tracker provided");
     const i = (e === vt ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
-    return await Di(i, t);
+    return await Ci(i, t);
   }
 };
 He([
@@ -1808,7 +1808,7 @@ He([
 A = He([
   l(te)
 ], A);
-const Fi = {
+const Di = {
   registration: {
     [te]: {
       class: A,
@@ -1816,28 +1816,28 @@ const Fi = {
     }
   },
   type: te,
-  predicate: c(te),
-  factory: u.Singleton.create(
+  predicate: u(te),
+  factory: c.Singleton.create(
     te
   )
 };
-var xi = Object.defineProperty, Ai = Object.getOwnPropertyDescriptor, ji = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ai(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && xi(t, r, o), o;
+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--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
 const re = "network-test-model";
 let Je = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "group");
-    a(this, "passed");
-    a(this, "inProgress");
-    a(this, "failureTime");
-    a(this, "timestamp");
-    a(this, "name");
-    a(this, "results");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "group");
+    s(this, "passed");
+    s(this, "inProgress");
+    s(this, "failureTime");
+    s(this, "timestamp");
+    s(this, "name");
+    s(this, "results");
+    s(this, "logger");
     this.id = e, this.logger = r.logger, this.group = t.group, this.passed = !1, this.inProgress = !1, this.name = t.name, this.results = [];
   }
   updateModel(e) {
@@ -1851,7 +1851,7 @@ let Je = class {
     this.logger.debug(`loading network-test ${this.id}`);
   }
 };
-Je = ji([
+Je = Ri([
   l(re)
 ], Je);
 const dr = {
@@ -1862,16 +1862,16 @@ const dr = {
     }
   },
   type: re,
-  predicate: c(re),
-  factory: u.Factory.create(re)
-}, { URL: We } = h("NETWORK-TEST_SERVICE"), { getAll: Ui, getOne: pr } = f.build({
+  predicate: u(re),
+  factory: c.Factory.create(re)
+}, { URL: We } = h("NETWORK-TEST_SERVICE"), { getAll: Ii, getOne: pr } = f.build({
   basePath: `${We}/api/app/ncui/network/tests`
-}), Vi = g.createLogger({
+}), Fi = g.createLogger({
   name: "network-test-service",
   group: "Services"
 }), gr = async () => {
-  Vi.debug("sending GET for network-test");
-  const e = await Ui({
+  Fi.debug("sending GET for network-test");
+  const e = await Ii({
     urlOverride: `${We}/api/app/kosdev.ddk/network/tests`
   });
   return e == null ? void 0 : e.data;
@@ -1883,25 +1883,25 @@ const dr = {
 }, fr = async (e, t) => await pr({
   urlOverride: `${We}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
   tracker: t
-}), Gs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ws = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getNetworkTests: gr,
   getTestsReports: hr,
   performGroupTest: fr
 }, Symbol.toStringTag, { value: "Module" }));
-var Hi = Object.defineProperty, Wi = Object.getOwnPropertyDescriptor, ct = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Wi(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Hi(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && xi(t, r, o), o;
 };
 const oe = "network-test-container-model";
 let de = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "lastTested");
-    a(this, "futureHandler");
-    a(this, "models");
+    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 ge(this), this.models = new tt({
       parentId: e,
       indexMap: {
@@ -1931,7 +1931,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 ? mi(new Date(r)) : "";
+    return r ? gi(new Date(r)) : "";
   }
   async load() {
     this.logger.debug(`loading network-test-container container ${this.id}`);
@@ -1942,7 +1942,7 @@ let de = class {
     }), e && t && e.forEach((r) => {
       const i = t == null ? void 0 : t[r.group], o = i == null ? void 0 : i[r.id], n = this.getModel(r.id);
       if (n && o) {
-        const s = {
+        const a = {
           group: o.group,
           name: o.name,
           passed: o.passed,
@@ -1951,7 +1951,7 @@ let de = class {
           timestamp: new Date(o.timestamp),
           results: o.results
         };
-        n.updateModel(s);
+        n.updateModel(a);
       }
     });
   }
@@ -1993,7 +1993,7 @@ ct([
 de = ct([
   l(oe)
 ], de);
-const zi = {
+const ji = {
   registration: {
     [oe]: {
       class: de,
@@ -2002,20 +2002,20 @@ const zi = {
     ...dr.registration
   },
   type: oe,
-  predicate: c(oe),
-  factory: u.Singleton.create(oe)
+  predicate: u(oe),
+  factory: c.Singleton.create(oe)
 };
-var Ni = 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, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Ni(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Ui(t, r, o), o;
 };
 const ie = "nutritive-sweetener-model";
 let Oe = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "assemblyModel");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "assemblyModel");
+    s(this, "logger");
     this.id = e, this.logger = r.logger;
   }
   getHolder() {
@@ -2038,7 +2038,7 @@ mr([
 Oe = mr([
   l(ie)
 ], Oe);
-const Ki = {
+const Hi = {
   registration: {
     [ie]: {
       class: Oe,
@@ -2046,20 +2046,20 @@ const Ki = {
     }
   },
   type: ie,
-  predicate: c(ie),
-  factory: u.Factory.create(ie)
+  predicate: u(ie),
+  factory: c.Factory.create(ie)
 };
-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, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Yi(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Wi(t, r, o), o;
 };
 const se = "plain-water-model";
 let Me = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "assemblyModel");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "assemblyModel");
+    s(this, "logger");
     this.id = e, this.logger = r.logger;
   }
   getHolder() {
@@ -2084,7 +2084,7 @@ yr([
 Me = yr([
   l(se)
 ], Me);
-const Gi = {
+const Ni = {
   registration: {
     [se]: {
       class: Me,
@@ -2092,27 +2092,27 @@ const Gi = {
     }
   },
   type: se,
-  predicate: c(se),
-  factory: u.Factory.create(se)
-}, { URL: br } = h("REBOOT_SERVICE"), { postModel: Qi } = f.build({
+  predicate: u(se),
+  factory: c.Factory.create(se)
+}, { URL: br } = h("REBOOT_SERVICE"), { postModel: Bi } = f.build({
   basePath: `${br}/api/reboot`
-}), Xi = g.createLogger({ name: "reboot-service", group: "Services" }), vr = async () => (Xi.debug("sending POST call for Reboot Dispenser"), await Qi({
+}), Ki = g.createLogger({ name: "reboot-service", group: "Services" }), vr = async () => (Ki.debug("sending POST call for Reboot Dispenser"), await Bi({
   urlOverride: `${br}/api/app/kosdev.ddk/ncui/reboot`,
   model: {}
-})), Qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   rebootDispenser: vr
 }, Symbol.toStringTag, { value: "Module" }));
-var Ji = Object.defineProperty, Zi = Object.getOwnPropertyDescriptor, es = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Zi(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Ji(t, r, o), o;
+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--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
 const ae = "reboot-model";
 let Ze = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "logger");
     this.id = e, this.logger = r.logger;
   }
   async completeReboot() {
@@ -2128,10 +2128,10 @@ let Ze = class {
     this.logger.debug(`loading reboot ${this.id}`);
   }
 };
-Ze = es([
+Ze = qi([
   l(ae)
 ], Ze);
-const ts = {
+const Gi = {
   registration: {
     [ae]: {
       class: Ze,
@@ -2139,28 +2139,28 @@ const ts = {
     }
   },
   type: ae,
-  predicate: c(ae),
-  factory: u.Factory.create(ae)
+  predicate: u(ae),
+  factory: c.Factory.create(ae)
 };
-var rs = Object.defineProperty, os = Object.getOwnPropertyDescriptor, S = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? os(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && rs(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && Qi(t, r, o), o;
 };
 const ne = "settings-model";
-let T = class {
+let P = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "ncuiLanguageData");
-    a(this, "resolveDelaysMs");
-    a(this, "dateFormat");
-    a(this, "timeFormat");
-    a(this, "hidePlainWaterBev");
-    a(this, "hideCarbWaterBev");
-    a(this, "ncuiLanguage");
-    a(this, "name");
-    a(this, "activateAndRebootTime");
+    s(this, "id");
+    s(this, "logger");
+    s(this, "ncuiLanguageData");
+    s(this, "resolveDelaysMs");
+    s(this, "dateFormat");
+    s(this, "timeFormat");
+    s(this, "hidePlainWaterBev");
+    s(this, "hideCarbWaterBev");
+    s(this, "ncuiLanguage");
+    s(this, "name");
+    s(this, "activateAndRebootTime");
     this.id = e, this.logger = r.logger;
   }
   updateModel(e) {
@@ -2202,90 +2202,90 @@ S([
     attribute: "resolveDelaysMs"
     // optionsExpander: () => [],
   })
-], T.prototype, "resolveDelaysMs", 2);
+], P.prototype, "resolveDelaysMs", 2);
 S([
   d({
     path: "system:app",
     attribute: "dateFormat"
     // optionsExpander: () => [],
   })
-], T.prototype, "dateFormat", 2);
+], P.prototype, "dateFormat", 2);
 S([
   d({
     path: "system:app",
     attribute: "timeFormat"
     // optionsExpander: () => [],
   })
-], T.prototype, "timeFormat", 2);
+], P.prototype, "timeFormat", 2);
 S([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hidePlainWaterBev"
   })
-], T.prototype, "hidePlainWaterBev", 2);
+], P.prototype, "hidePlainWaterBev", 2);
 S([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hideCarbWaterBev"
   })
-], T.prototype, "hideCarbWaterBev", 2);
+], P.prototype, "hideCarbWaterBev", 2);
 S([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
   })
-], T.prototype, "ncuiLanguage", 2);
+], P.prototype, "ncuiLanguage", 2);
 S([
   d({
     path: "kos:device",
     attribute: "name"
   })
-], T.prototype, "name", 2);
+], P.prototype, "name", 2);
 S([
   d({
     path: "kos:service:OTA",
     attribute: "activateAndRebootTime"
   })
-], T.prototype, "activateAndRebootTime", 2);
-T = S([
+], P.prototype, "activateAndRebootTime", 2);
+P = S([
   l(ne)
-], T);
-const is = {
+], P);
+const Ji = {
   registration: {
     [ne]: {
-      class: T,
+      class: P,
       singleton: !0
     }
   },
   type: ne,
-  predicate: c(ne),
-  factory: u.Singleton.create(ne)
+  predicate: u(ne),
+  factory: c.Singleton.create(ne)
 }, { URL: _r } = h("SETTINGS_SERVICE"), { getAll: $r } = f.build({
   basePath: `${_r}/api/settings`
-}), ss = g.createLogger({
+}), Zi = g.createLogger({
   name: "settings-service",
   group: "Services"
-}), as = async () => (ss.debug("sending GET for settings"), await $r({})), ns = async () => await $r({
+}), es = async () => (Zi.debug("sending GET for settings"), await $r({})), ts = async () => await $r({
   urlOverride: `${_r}api/app/kosdev.ddk/ncui/languages`
-}), Xs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ns = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNcuiLanguage: ns,
-  getSettings: as
+  getNcuiLanguage: ts,
+  getSettings: es
 }, Symbol.toStringTag, { value: "Module" }));
-var ls = Object.defineProperty, cs = Object.getOwnPropertyDescriptor, us = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? cs(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && ls(t, r, o), o;
+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--)
+    (a = e[n]) && (o = a(o) || o);
+  return o;
 };
 const le = "utilities-model";
 let et = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "name");
-    a(this, "options");
-    a(this, "roles");
-    a(this, "columnId");
-    a(this, "logger");
+    s(this, "id");
+    s(this, "name");
+    s(this, "options");
+    s(this, "roles");
+    s(this, "columnId");
+    s(this, "logger");
     this.id = e, this.logger = r.logger, this.name = t.name, this.options = t.options, this.roles = t == null ? void 0 : t.roles, this.columnId = t.columnId;
   }
   updateModel(e) {
@@ -2305,10 +2305,10 @@ let et = class {
     this.logger.debug(`loading utilities ${this.id}`);
   }
 };
-et = us([
+et = os([
   l(le)
 ], et);
-const Pr = {
+const Tr = {
   registration: {
     [le]: {
       class: et,
@@ -2316,34 +2316,34 @@ const Pr = {
     }
   },
   type: le,
-  predicate: c(le),
-  factory: u.Factory.create(le)
-}, { URL: Tr } = h("UTILITIES_SERVICE"), { getAll: ds } = f.build({
-  basePath: `${Tr}/api/utilities`
-}), ps = g.createLogger({
+  predicate: u(le),
+  factory: c.Factory.create(le)
+}, { URL: Pr } = h("UTILITIES_SERVICE"), { getAll: is } = f.build({
+  basePath: `${Pr}/api/utilities`
+}), ss = g.createLogger({
   name: "utilities-service",
   group: "Services"
 }), Or = async () => {
-  ps.debug("sending GET for utilities");
-  const e = await ds({
-    urlOverride: `${Tr}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+  ss.debug("sending GET for utilities");
+  const e = await is({
+    urlOverride: `${Pr}/api/kos/descriptor/system:app/kondra.ncui.utilities`
   });
   return e == null ? void 0 : e.data;
-}, Js = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getUtilities: Or
 }, Symbol.toStringTag, { value: "Module" }));
-var gs = Object.defineProperty, hs = Object.getOwnPropertyDescriptor, Mr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? hs(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && gs(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && as(t, r, o), o;
 };
 const ce = "utilities-container-model";
 let Se = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "_models");
+    s(this, "id");
+    s(this, "logger");
+    s(this, "_models");
     this.id = e, this.logger = r.logger, this._models = new tt({
       parentId: e,
       sortKey: "id",
@@ -2382,7 +2382,7 @@ let Se = class {
         const o = {
           ...i,
           columnId: String(r)
-        }, n = Pr.factory(i.name)(
+        }, n = Tr.factory(i.name)(
           o
         );
         this.addModel(n);
@@ -2396,50 +2396,50 @@ Mr([
 Se = Mr([
   l(ce)
 ], Se);
-const fs = {
+const ls = {
   registration: {
     [ce]: {
       class: Se,
       singleton: !0
     },
-    ...Pr.registration
+    ...Tr.registration
   },
   type: ce,
-  predicate: c(ce),
-  factory: u.Singleton.create(ce)
-}, Zs = {
-  ...Co.registration,
+  predicate: u(ce),
+  factory: c.Singleton.create(ce)
+}, Ks = {
+  ...So.registration,
   ...at.registration,
   ...it.registration,
-  ...Ao.registration,
+  ...xo.registration,
   ...nt.registration,
-  ...qo.registration,
-  ...ti.registration,
-  ...ci.registration,
-  ...vi.registration,
-  ...Fi.registration,
-  ...zi.registration,
-  ...Ki.registration,
+  ...Ko.registration,
+  ...Zo.registration,
+  ...ai.registration,
+  ...mi.registration,
+  ...Di.registration,
+  ...ji.registration,
+  ...Hi.registration,
+  ...Ni.registration,
   ...Gi.registration,
-  ...ts.registration,
-  ...is.registration,
-  ...kt.registration,
-  ...fs.registration
+  ...Ji.registration,
+  ...It.registration,
+  ...ls.registration
 };
-var ms = Object.defineProperty, ys = Object.getOwnPropertyDescriptor, Sr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ys(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && ms(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && cs(t, r, o), o;
 };
 const Cr = "trouble-action-model";
 let Ce = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "troubleContainer");
-    a(this, "disposer");
-    a(this, "state");
-    a(this, "troubleActionData");
+    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 = Gr(), this.troubleActionData = t.definitions.reduce((i, o) => (i[o.troubleType] = o, i), {});
   }
   // -------------------LIFECYCLE----------------------------
@@ -2489,28 +2489,28 @@ Sr([
 Ce = Sr([
   l(Cr)
 ], Ce);
-const ea = new pe({
+const Ys = new pe({
   class: Ce,
   type: Cr
-}), { URL: wr } = h("START_SERVICE"), { getOne: bs } = f.build({
+}), { URL: wr } = h("START_SERVICE"), { getOne: ds } = f.build({
   basePath: `${wr}/api/start`
-}), vs = g.createLogger({ name: "start-service", group: "Services" }), Er = async () => (vs.debug("navigating to NCUI"), await bs({
+}), ps = g.createLogger({ name: "start-service", group: "Services" }), Er = async () => (ps.debug("navigating to NCUI"), await ds({
   urlOverride: `${wr}/api/app/kosdev.ddk/ncui/open`
-})), ta = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   navigateToNCui: Er
 }, Symbol.toStringTag, { value: "Module" }));
-var _s = Object.defineProperty, $s = Object.getOwnPropertyDescriptor, Lr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? $s(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && _s(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && gs(t, r, o), o;
 };
 const Dr = "start-model";
 let we = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "troubles");
+    s(this, "id");
+    s(this, "logger");
+    s(this, "troubles");
     this.id = e, this.logger = r.logger;
   }
   get firmwareFailed() {
@@ -2542,7 +2542,7 @@ Lr([
 we = Lr([
   l(Dr)
 ], we);
-const ra = new pe({
+const Gs = new pe({
   class: we,
   type: Dr
 }), { URL: ye } = h("SPM-PUMP_SERVICE"), { postModel: ze } = f.build({
@@ -2550,7 +2550,7 @@ const ra = new pe({
 }), $ = g.createLogger({
   name: "spm-pump-service",
   group: "Services"
-}), Rr = async (e, t) => {
+}), kr = async (e, t) => {
   $.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`
   );
@@ -2560,7 +2560,7 @@ const ra = new pe({
       urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
       tracker: t
     });
-    return $.debug("performPreCalibrate - response:", r), r != null && r.data && P.initiateFuture(r.data), r == null ? void 0 : r.data;
+    return $.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
   } catch (r) {
     $.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
@@ -2572,9 +2572,9 @@ const ra = new pe({
       tracker: t,
       reason: "Failed to resolve trouble"
     };
-    return P.initiateFuture(i), i;
+    return T.initiateFuture(i), i;
   }
-}, Ir = async (e, t) => {
+}, Rr = async (e, t) => {
   $.debug(
     `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`
   );
@@ -2584,7 +2584,7 @@ const ra = new pe({
       urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
       tracker: t
     });
-    return $.debug("performCalibrate - response:", r), r != null && r.data && P.initiateFuture(r.data), r == null ? void 0 : r.data;
+    return $.debug("performCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
   } catch (r) {
     $.error(
       `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
@@ -2596,9 +2596,9 @@ const ra = new pe({
       tracker: t,
       reason: "Failed to resolve trouble"
     };
-    return P.initiateFuture(i), i;
+    return T.initiateFuture(i), i;
   }
-}, kr = async (e, t, r, i) => {
+}, Ir = async (e, t, r, i) => {
   $.debug(
     `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`
   );
@@ -2615,7 +2615,7 @@ const ra = new pe({
       urlOverride: `${ye}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
       tracker: i
     });
-    return $.debug("performVerify - response:", o), o != null && o.data && P.initiateFuture(o.data), o == null ? void 0 : o.data;
+    return $.debug("performVerify - response:", o), o != null && o.data && T.initiateFuture(o.data), o == null ? void 0 : o.data;
   } catch (o) {
     $.error(
       `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`,
@@ -2627,10 +2627,10 @@ const ra = new pe({
       tracker: i,
       reason: "Failed to resolve trouble"
     };
-    return P.initiateFuture(n), n;
+    return T.initiateFuture(n), n;
   }
 }, Fr = async (e, t, r, i) => {
-  var o, n, s, O, D;
+  var o, n, a, O, D;
   $.debug(
     `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`
   );
@@ -2651,31 +2651,31 @@ const ra = new pe({
     if ($.error(
       `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`,
       p
-    ), p instanceof Ie) {
-      const ut = ((s = (n = p.payload) == null ? void 0 : n.data) == null ? void 0 : s.error) || ((O = p.payload) == null ? void 0 : O.error) || "unknownError";
+    ), 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 }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
-}, oa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  performCalibrate: Ir,
+  performCalibrate: Rr,
   performComplete: Fr,
-  performPreCalibrate: Rr,
-  performVerify: kr
+  performPreCalibrate: kr,
+  performVerify: Ir
 }, Symbol.toStringTag, { value: "Module" }));
-var Ps = Object.defineProperty, Ts = Object.getOwnPropertyDescriptor, Ne = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ts(t, r) : t, n = e.length - 1, s; n >= 0; n--)
-    (s = e[n]) && (o = (i ? s(t, r, o) : s(o)) || o);
-  return i && o && Ps(t, r, o), o;
+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--)
+    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
+  return i && o && fs(t, r, o), o;
 };
 const xr = "spm-pump-model";
 let j = class {
   constructor(e, t, r) {
-    a(this, "id");
-    a(this, "logger");
-    a(this, "pump");
-    a(this, "futureHandler");
+    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 ge(this);
   }
   get name() {
@@ -2697,13 +2697,13 @@ let j = class {
     return this.futureHandler.future;
   }
   async performPreCalibrate(e) {
-    return Rr(this.pump.path, e);
+    return kr(this.pump.path, e);
   }
   async performCalibrate(e) {
-    return Ir(this.pump.path, e);
+    return Rr(this.pump.path, e);
   }
   async performVerify(e, t, r) {
-    return kr(this.pump.path, e, t, r);
+    return Ir(this.pump.path, e, t, r);
   }
   async performComplete(e, t, r) {
     return Fr(this.pump.path, e, t, r);
@@ -2728,69 +2728,69 @@ Ne([
 j = Ne([
   l(xr)
 ], j);
-const ia = new Le({
+const Xs = new Le({
   class: j,
   type: xr
 });
 export {
-  Ls as AgitationControl,
-  Co as Animation,
-  Ds as AnimationServices,
+  Ps as AgitationControl,
+  So as Animation,
+  Os as AnimationServices,
   at as Application,
   it as Auth,
-  ws as AuthServices,
-  Ao as CarbWater,
-  ks as CopyLogs,
-  Is as CopyLogsServices,
-  Zs as DDKModels,
+  $s as AuthServices,
+  xo as CarbWater,
+  Cs as CopyLogs,
+  Ss as CopyLogsServices,
+  Ks as DDKModels,
   nt as DashboardOperations,
-  Fs as DashboardOperationsServices,
-  qo as Dispenser,
-  ti as DispenserInfo,
-  As as DispenserInfoServices,
-  xs as DispenserServices,
+  ws as DashboardOperationsServices,
+  Ko as Dispenser,
+  Zo as DispenserInfo,
+  Ls as DispenserInfoServices,
+  Es as DispenserServices,
   no as Door,
   ue as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
-  ci as Enrollment,
-  js as EnrollmentServices,
+  ai as Enrollment,
+  Ds as EnrollmentServices,
   Kt as FcmPump,
-  Rs as FcmPumpServices,
-  vi as IngredientSummary,
-  Bs as LfcvPump,
-  Ks as LfcvPumpServices,
-  qs as Lockout,
-  Ys as LockoutServices,
-  Ws as MACRO_KEYS,
-  Fi as MacroAssignment,
+  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,
   dr as NetworkTest,
-  zi as NetworkTestContainer,
-  Gs as NetworkTestServices,
-  Ki as NutritiveSweetener,
-  Gi as PlainWater,
-  ts as Reboot,
-  Qs as RebootServices,
-  is as Settings,
-  Xs as SettingsServices,
-  It as SetupStep,
-  kt as SetupStepContainer,
-  Es as SetupStepServices,
-  ia as SpmPump,
-  oa as SpmPumpServices,
-  ra as Start,
-  ta as StartServices,
+  ji as NetworkTestContainer,
+  Ws as NetworkTestServices,
+  Hi as NutritiveSweetener,
+  Ni as PlainWater,
+  Gi as Reboot,
+  zs as RebootServices,
+  Ji as Settings,
+  Ns 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,
-  ea as TroubleActionManager,
-  Pr as Utilities,
-  fs as UtilitiesContainer,
-  Js as UtilitiesServices,
-  mi as calculateTimeDifference,
-  fi as executeDashboardKeyFactory,
-  Vs as isMacroGroup,
-  Us as isMicroGroup,
-  Hs as macroHolderMap,
-  hi as registerDashboardKeyFactory,
-  Ns as toSeconds,
-  zs as toTimeComponents,
+  Ys 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,
   jt as troubleVisibilityFilter
 };