@kosdev-code/kos-ddk-models 2.0.0 → 2.0.2

package/index.mjs

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