@kosdev-code/kos-ddk-models 2.1.1 → 2.1.2

package/index.mjs

@@ -1,38 +1,38 @@
-var Ar = Object.defineProperty;
-var jr = (e, t, r) => t in e ? Ar(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var s = (e, t, r) => (jr(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { resolveServiceUrl as h, ServiceFactory as f, KosLog as g, kosTopicHandler as we, kosModel as l, kosAction as _, Kos as c, isKosModel as u, createPropKey as Ur, kosStateProp as Vr, KosModelRegistrationFactory as Ee, kosDependency as m, KosModelContainer as tt, resolveContainerDeltas as pt, kosChild as Le, Device as Hr, kosConfigProperty as d, kosFuture as v, kosModelEffect as $t, MultipleFutureHandler as Wr, FutureEndState as b, TroubleServices as De, Troubles as gt, SingletonKosModelRegistrationFactory as ke, FetchError as Re, FutureManager as T, FutureHandler as pe, getKosCompanionModel as rt, StorageDeviceContainer as Nr, kosFutureAware as zr, kosLoggerAware as Br, KosDataContainer as Kr, TroubleContainer as ot, troubleByTypeReducer as Yr, registerExtensionPoint as qr, ExtensionManager as Ie, kosConfigBean as Gr, ObservableData as Qr, kosAutoEffect as Xr } from "@kosdev-code/kos-ui-sdk";
-import { AGITATION_REQUIRED_TROUBLE as Tt, CartridgeAgitatorEvents as Pt, FreestyleHolder as Jr } from "@kosdev-code/kos-freestyle-sdk";
-import { Assembly as Fe, HolderContainer as Zr, IngredientContainer as eo } from "@kosdev-code/kos-dispense-sdk";
-const ht = "PurgeTrouble", to = "PrimeTrouble", { URL: it } = h("AUTH_SERVICE"), { getOne: ro, postModel: oo } = f.build({
-  basePath: `${it}/api/auth`
-}), Ot = g.createLogger({ name: "auth-service", group: "Services" }), Mt = async () => (Ot.debug("sending GET for auth"), await ro({
-  urlOverride: `${it}/api/app/kosdev.ddk/auth/role`
-})), St = async (e) => (Ot.debug("sending POST for auth"), await oo({
-  urlOverride: `${it}/api/app/kosdev.ddk/auth/pincode/${e}`,
+var yo = Object.defineProperty;
+var fo = (e, t, o) => t in e ? yo(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o;
+var i = (e, t, o) => (fo(e, typeof t != "symbol" ? t + "" : t, o), o);
+import { resolveServiceUrl as h, ServiceFactory as y, KosLog as g, kosTopicHandler as Te, kosModel as l, kosAction as v, Kos as c, isKosModel as u, createPropKey as ht, kosStateProp as vo, kosConfigProperty as d, KosModelRegistrationFactory as mo, kosDependency as p, KosModelContainer as Ve, resolveContainerDeltas as it, kosChild as $e, Device as bo, kosFuture as M, kosModelEffect as Pe, MultipleFutureHandler as _o, FutureEndState as T, TroubleServices as Me, Troubles as nt, SingletonKosModelRegistrationFactory as He, getKosCompanionModel as Be, FetchError as yt, StorageDeviceContainer as To, kosFutureAware as $o, kosLoggerAware as Ke, KosDataContainer as Po, TroubleContainer as Ye, FutureHandler as Ge, troubleByTypeReducer as Mo, registerExtensionPoint as Oo, ExtensionManager as Oe, kosConfigBean as So, kosStateBean as wo, ObservableData as Eo } from "@kosdev-code/kos-ui-sdk";
+import { AGITATION_REQUIRED_TROUBLE as ft, CartridgeAgitatorEvents as vt, FcmPump as mt, FreestyleHolder as Co } from "@kosdev-code/kos-freestyle-sdk";
+import { Assembly as Se, HolderContainer as Lo, IngredientContainer as Do } from "@kosdev-code/kos-dispense-sdk";
+const at = "PurgeTrouble", ko = "PrimeTrouble", { URL: qe } = h("AUTH_SERVICE"), { getOne: Io, postModel: Ro } = y.build({
+  basePath: `${qe}/api/auth`
+}), bt = g.createLogger({ name: "auth-service", group: "Services" }), _t = async () => (bt.debug("sending GET for auth"), await Io({
+  urlOverride: `${qe}/api/app/kosdev.ddk/auth/role`
+})), Tt = async (e) => (bt.debug("sending POST for auth"), await Ro({
+  urlOverride: `${qe}/api/app/kosdev.ddk/auth/pincode/${e}`,
   model: {}
-})), Ss = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getCurrentRole: Mt,
-  sendPinCode: St
+  getCurrentRole: _t,
+  sendPinCode: Tt
 }, Symbol.toStringTag, { value: "Module" }));
-var io = Object.defineProperty, so = Object.getOwnPropertyDescriptor, Ct = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? so(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && io(t, r, o), o;
-};
-const z = "auth-model", ft = (e) => e.toLowerCase();
-let be = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "currentRole");
-    this.id = e, this.logger = r.logger, this.currentRole = "crew";
+var Ao = Object.defineProperty, Fo = Object.getOwnPropertyDescriptor, $t = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Fo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Ao(t, o, r), r;
+};
+const x = "auth-model", lt = (e) => e.toLowerCase();
+let he = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "currentRole");
+    this.id = e, this.logger = o.logger, this.currentRole = "crew";
   }
   async authorize(e) {
     if (!e)
       return !1;
-    const t = await St(e);
+    const t = await Tt(e);
     return (t == null ? void 0 : t.status) === 200 ? t.data : !1;
   }
   // -------------------LIFECYCLE----------------------------
@@ -41,99 +41,109 @@ let be = class {
   }
   async load() {
     this.logger.debug(`loading auth ${this.id}`);
-    const e = await Mt();
-    (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), _(() => {
-      this.currentRole = ft(e.data);
+    const e = await _t();
+    (e == null ? void 0 : e.status) === 200 && (this.logger.debug(`response ${e.data}`), v(() => {
+      this.currentRole = lt(e.data);
     }));
   }
   handleRoleChange(e) {
-    this.currentRole = ft(e);
+    this.currentRole = lt(e);
   }
   forceRole(e) {
     this.currentRole = e;
   }
 };
-Ct([
-  we({
+$t([
+  Te({
     topic: "/app/kosdev.ddk/auth/role",
     websocket: !0
   })
-], be.prototype, "handleRoleChange", 1);
-be = Ct([
-  l(z)
-], be);
-const st = {
+], he.prototype, "handleRoleChange", 1);
+he = $t([
+  l(x)
+], he);
+const Qe = {
   registration: {
-    [z]: {
-      class: be,
+    [x]: {
+      class: he,
       singleton: !1
     }
   },
-  type: z,
-  predicate: u(z),
-  factory: c.Factory.create(z)
-};
-var ao = Object.defineProperty, no = Object.getOwnPropertyDescriptor, wt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? no(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && ao(t, r, o), o;
-};
-const Et = "door-model", lo = Ur("doorPath");
-let ve = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "doorPath");
-    s(this, "open");
-    this.id = e, this.logger = r.logger, this.doorPath = t.doorPath;
+  type: x,
+  predicate: u(x),
+  factory: c.Factory.create(x)
+};
+var xo = Object.defineProperty, Uo = Object.getOwnPropertyDescriptor, Xe = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Uo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && xo(t, o, r), r;
+};
+const Pt = "door-model", jo = ht("doorPath");
+let re = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "doorPath");
+    i(this, "open");
+    i(this, "ignoreDoor");
+    this.id = e, this.logger = o.logger, this.doorPath = t.doorPath;
   }
   get currentState() {
     return this.open.value === void 0 ? "UNKNOWN" : this.open.value ? "OPEN" : "CLOSED";
   }
   get isOpen() {
-    return this.open.value === void 0 ? !0 : this.open.value;
+    const e = this.open.value === void 0 ? !0 : this.open.value;
+    return this.ignoreDoor.value ? (this.logger.debug(
+      "Door state is being ignored (treating as closed) due to ignoreDoor config property being true."
+    ), !1) : e;
   }
 };
-wt([
-  Vr({ path: lo, attribute: "state" })
-], ve.prototype, "open", 2);
-ve = wt([
-  l(Et)
-], ve);
-const co = new Ee({
-  class: ve,
-  type: Et
-}), { URL: at } = h("SETUP-STEP_SERVICE"), { getAll: uo, postModel: po } = f.build({
-  basePath: `${at}/api/setup-step`
-}), Lt = g.createLogger({
+Xe([
+  vo({ path: jo, attribute: "state" })
+], re.prototype, "open", 2);
+Xe([
+  d({
+    path: "app:kosdev.ddk:app",
+    attribute: "ncui.ignoreDoorStateOnExit"
+  })
+], re.prototype, "ignoreDoor", 2);
+re = Xe([
+  l(Pt)
+], re);
+const Wo = new mo({
+  class: re,
+  type: Pt
+}), { URL: Je } = h("SETUP-STEP_SERVICE"), { getAll: No, postModel: zo } = y.build({
+  basePath: `${Je}/api/setup-step`
+}), Mt = g.createLogger({
   name: "setup-step-service",
   group: "Services"
-}), Dt = async () => (Lt.debug("sending GET for setup-step"), await uo({
-  urlOverride: `${at}/api/app/kosdev.ddk/setup/steps`
-})), kt = async (e) => (Lt.debug("sending POST for setup-step"), await po({
-  urlOverride: `${at}/api/app/kosdev.ddk/setup/complete/${e}`,
+}), Ot = async () => (Mt.debug("sending GET for setup-step"), await No({
+  urlOverride: `${Je}/api/app/kosdev.ddk/setup/steps`
+})), St = async (e) => (Mt.debug("sending POST for setup-step"), await zo({
+  urlOverride: `${Je}/api/app/kosdev.ddk/setup/complete/${e}`,
   model: {}
-})), Cs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), Ks = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getSetupSteps: Dt,
-  markStepComplete: kt
+  getSetupSteps: Ot,
+  markStepComplete: St
 }, Symbol.toStringTag, { value: "Module" }));
-var go = Object.getOwnPropertyDescriptor, ho = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? go(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var Vo = Object.getOwnPropertyDescriptor, Ho = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Vo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const B = "setup-step-model";
-let Ke = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "idx");
-    s(this, "name");
-    s(this, "complete");
-    s(this, "preStep");
-    s(this, "exclusive");
-    s(this, "logger");
-    this.id = e, this.idx = t.idx, this.logger = r.logger, this.name = t.name, this.complete = t.complete, this.preStep = t.preStep, this.exclusive = t.exclusive;
+const U = "setup-step-model";
+let Ae = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "idx");
+    i(this, "name");
+    i(this, "complete");
+    i(this, "preStep");
+    i(this, "exclusive");
+    i(this, "logger");
+    this.id = e, this.idx = t.idx, this.logger = o.logger, this.name = t.name, this.complete = t.complete, this.preStep = t.preStep, this.exclusive = t.exclusive;
   }
   updateModel(e) {
     this.name = e.name, this.idx = e.idx, this.complete = e.complete, this.preStep = e.preStep, this.exclusive = e.exclusive;
@@ -145,8 +155,8 @@ let Ke = class {
     return `setup.${this.name}.body`;
   }
   async completeStep() {
-    const e = await kt(this.name);
-    (e == null ? void 0 : e.status) === 200 && _(() => {
+    const e = await St(this.name);
+    (e == null ? void 0 : e.status) === 200 && v(() => {
       this.complete = !0;
     });
   }
@@ -158,45 +168,45 @@ let Ke = class {
     this.logger.debug(`loading setup-step ${this.id}`);
   }
 };
-Ke = ho([
-  l(B)
-], Ke);
-const Rt = {
+Ae = Ho([
+  l(U)
+], Ae);
+const wt = {
   registration: {
-    [B]: {
-      class: Ke,
+    [U]: {
+      class: Ae,
       singleton: !1
     }
   },
-  type: B,
-  predicate: u(B),
-  factory: c.Factory.create(B)
+  type: U,
+  predicate: u(U),
+  factory: c.Factory.create(U)
 };
-var fo = Object.defineProperty, mo = Object.getOwnPropertyDescriptor, xe = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? mo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && fo(t, r, o), o;
+var Bo = Object.defineProperty, Ko = Object.getOwnPropertyDescriptor, we = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Ko(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Bo(t, o, r), r;
 };
-const K = "setup-step-container-model";
-function mt(e) {
+const j = "setup-step-container-model";
+function dt(e) {
   return (t) => {
-    const r = Rt.factory(t.id)(t);
-    r.updateModel(t), e.addModel(r);
+    const o = wt.factory(t.id)(t);
+    o.updateModel(t), e.addModel(o);
   };
 }
-function yt(e) {
+function ct(e) {
   return (t) => {
     e.removeModel(t);
   };
 }
-let R = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "_currentStep");
-    s(this, "logger");
-    s(this, "models");
-    s(this, "authModel");
-    this.id = e, this.logger = r.logger, this._currentStep = void 0, this.models = new tt({
+let E = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "_currentStep");
+    i(this, "logger");
+    i(this, "models");
+    i(this, "authModel");
+    this.id = e, this.logger = o.logger, this._currentStep = void 0, this.models = new Ve({
       parentId: e,
       sortKey: "idx"
     });
@@ -212,7 +222,7 @@ let R = class {
     if (!this._currentStep)
       this._currentStep = this.firstIncompleteStep;
     else {
-      const e = this._currentStep.idx, t = this.models.data.find((r) => r.idx > e);
+      const e = this._currentStep.idx, t = this.models.data.find((o) => o.idx > e);
       t && (this._currentStep = t);
     }
   }
@@ -247,112 +257,124 @@ let R = class {
   }
   async load() {
     this.logger.debug(`loading setup-step-container container ${this.id}`);
-    const e = await Dt();
+    const e = await Ot();
     if (e != null && e.data) {
       const t = e.data.map(
-        (r, i) => ({
-          ...r,
-          idx: i,
-          id: `setup-${r.name}`
+        (o, s) => ({
+          ...o,
+          idx: s,
+          id: `setup-${o.name}`
         })
       );
-      pt({
+      it({
         container: this.models,
-        onAddItem: mt(this),
-        onRemoveItem: yt(this)
+        onAddItem: dt(this),
+        onRemoveItem: ct(this)
       })(t);
     }
     this.nextStep();
   }
   handleStepChanges(e) {
-    const t = e.map((r, i) => ({
-      ...r,
-      idx: i,
-      id: `setup-${r.name}`
+    const t = e.map((o, s) => ({
+      ...o,
+      idx: s,
+      id: `setup-${o.name}`
     }));
-    pt({
+    it({
       container: this.models,
-      onAddItem: mt(this),
-      onRemoveItem: yt(this)
+      onAddItem: dt(this),
+      onRemoveItem: ct(this)
     })(t);
   }
 };
-xe([
-  Le
-], R.prototype, "models", 2);
-xe([
-  m({ modelType: st.type })
-], R.prototype, "authModel", 2);
-xe([
-  we({
+we([
+  $e
+], E.prototype, "models", 2);
+we([
+  p({ modelType: Qe.type })
+], E.prototype, "authModel", 2);
+we([
+  Te({
     topic: "/app/kosdev.ddk/setup/steps",
     websocket: !0
   })
-], R.prototype, "handleStepChanges", 1);
-R = xe([
-  l(K)
-], R);
-const It = {
+], E.prototype, "handleStepChanges", 1);
+E = we([
+  l(j)
+], E);
+const Et = {
   registration: {
-    [K]: {
-      class: R,
+    [j]: {
+      class: E,
       singleton: !0
     },
-    ...Rt.registration
+    ...wt.registration
   },
-  type: K,
-  predicate: u(K),
-  factory: c.Singleton.create(K)
-}, { URL: ge } = h("AUTH_SERVICE"), { getOne: Ft, getAll: xt } = f.build({
-  basePath: `${ge}/api/app/kosdev.ddk/ncui/`
-}), Ae = g.createLogger({ name: "auth-service", group: "Services" }), yo = async () => {
-  Ae.debug("sending GET for cuis");
-  const e = await xt({
-    urlOverride: `${ge}/api/app/kosdev.ddk/cui`
+  type: j,
+  predicate: u(j),
+  factory: c.Singleton.create(j)
+}, { URL: S } = h("AUTH_SERVICE"), { getOne: Ct, getAll: pe } = y.build({
+  basePath: `${S}/api/app/kosdev.ddk/ncui/`
+}), se = g.createLogger({ name: "auth-service", group: "Services" }), Yo = async () => {
+  se.debug("sending GET for cuis");
+  const e = await pe({
+    urlOverride: `${S}/api/app/kosdev.ddk/cui`
   });
   if ((e == null ? void 0 : e.status) !== 200)
     throw new Error("Failed to retrieve cuis");
   return e.data;
-}, bo = async () => {
-  Ae.debug("sending GET for navigation");
-  const e = await xt({
-    urlOverride: `${ge}/api/kos/descriptor/system:app/kondra.ncui.navigations`
-  });
-  if ((e == null ? void 0 : e.status) !== 200)
-    throw new Error("Failed to retrieve navigation data");
-  return e.data;
-}, vo = async () => (Ae.debug("navigating to CUI"), await Ft({
-  urlOverride: `${ge}/api/app/kosdev.ddk/cui/open`
-})), _o = async () => (Ae.debug("navigating to NCUI"), await Ft({
-  urlOverride: `${ge}/api/app/kosdev.ddk/ncui/open`
+}, Go = async () => {
+  se.debug("sending GET for navigation");
+  try {
+    const e = await pe({
+      urlOverride: `${S}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.navigations`
+    });
+    if ((e == null ? void 0 : e.status) !== 200) {
+      se.info("no extensions found, using base data");
+      const t = await pe({
+        urlOverride: `${S}/api/kos/descriptor/system:app/kondra.ncui.navigations`
+      });
+      return (t == null ? void 0 : t.data) ?? [];
+    }
+    return (e == null ? void 0 : e.data) ?? [];
+  } catch {
+    const t = await pe({
+      urlOverride: `${S}/api/kos/descriptor/system:app/kondra.ncui.navigations`
+    });
+    return (t == null ? void 0 : t.data) ?? [];
+  }
+}, qo = async () => (se.debug("navigating to CUI"), await Ct({
+  urlOverride: `${S}/api/app/kosdev.ddk/cui/open`
+})), Qo = async () => (se.debug("navigating to NCUI"), await Ct({
+  urlOverride: `${S}/api/app/kosdev.ddk/ncui/open`
 }));
-var $o = Object.defineProperty, To = Object.getOwnPropertyDescriptor, L = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? To(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && $o(t, r, o), o;
-};
-const Y = "application-model", At = (e, t = "") => e.reduce((r, i) => {
-  const o = t ? `${t}.${i.name}` : i.name;
-  if (r[o] = { ...i, root: !t }, i.children) {
-    const n = At(i.children, o);
+var Xo = Object.defineProperty, Jo = Object.getOwnPropertyDescriptor, O = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Jo(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Xo(t, o, r), r;
+};
+const W = "application-model", Lt = (e, t = "") => e.reduce((o, s) => {
+  const r = t ? `${t}.${s.name}` : s.name;
+  if (o[r] = { ...s, root: !t }, s.children) {
+    const n = Lt(s.children, r);
     Object.keys(n).forEach((a) => {
-      r[a] = n[a];
+      o[a] = n[a];
     });
   }
-  return r;
+  return o;
 }, {});
-let M = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "device");
-    s(this, "authModel");
-    s(this, "setupStepContainer");
-    s(this, "door");
-    s(this, "ncuiLanguage");
-    s(this, "activeCui");
-    s(this, "fallbackCui");
-    s(this, "_cuis", []);
-    s(this, "_navigationItems", []);
+let b = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "device");
+    i(this, "authModel");
+    i(this, "setupStepContainer");
+    i(this, "door");
+    i(this, "ncuiLanguage");
+    i(this, "activeCui");
+    i(this, "fallbackCui");
+    i(this, "_cuis", []);
+    i(this, "_navigationItems", []);
     // @kosConfigProperty({
     //   path: 'somewhere.enable.dial.animation',
     //   attribute: 'enableDialAnimation',
@@ -368,9 +390,9 @@ let M = class {
     //   attribute: 'enableSidebarAnimation',
     // })
     // enableSidebarAnimation!: KosConfigProperty<boolean>;
-    s(this, "languages");
-    s(this, "logger");
-    this.id = e, this.languages = [], this._cuis = [], this.logger = r.logger, this.door = co.instance("app:kosdev.ddk:service:door:door").options({
+    i(this, "languages");
+    i(this, "logger");
+    this.id = e, this.languages = [], this._cuis = [], this.logger = o.logger, this.door = Wo.instance("app:kosdev.ddk:service:door:door").options({
       doorPath: "app:kosdev.ddk:service:door:door"
     }).build();
   }
@@ -381,10 +403,10 @@ let M = class {
     return this.authModel.currentRole;
   }
   get cuis() {
-    return this._cuis.reduce((e, t) => (e[t.name] = t, e), {});
+    return this._cuis.reduce((e, t) => (e[t.appId] = t, e), {});
   }
   get navigationItems() {
-    return At(this._navigationItems);
+    return Lt(this._navigationItems);
   }
   get hasCuiDefined() {
     return !!this.activeCui.value || !!this.fallbackCui.value;
@@ -393,19 +415,19 @@ let M = class {
     return this.door.isOpen;
   }
   async enter() {
-    this.logger.info("navigating to NCUI"), await _o();
+    this.logger.info("navigating to NCUI"), await Qo();
   }
   async exit() {
-    this.logger.info("navigating to CUI"), await vo();
+    this.logger.info("navigating to CUI"), await qo();
   }
   // -------------------LIFECYCLE----------------------------
   async load() {
-    var r, i;
+    var o, s;
     this.logger.debug(`loading application ${this.id}`);
-    const e = await bo();
+    const e = await Go();
     this._navigationItems = e;
-    const t = await yo();
-    this._cuis = t, (r = this.setupStepContainer) != null && r.hasIncompletePreSteps && ((i = this.authModel) == null || i.forceRole("technician")), this.languages = [
+    const t = await Yo();
+    this._cuis = t, (o = this.setupStepContainer) != null && o.hasIncompletePreSteps && ((s = this.authModel) == null || s.forceRole("technician")), this.languages = [
       {
         name: "English",
         locale: "en"
@@ -413,87 +435,87 @@ let M = class {
     ];
   }
 };
-L([
-  m({ modelType: Hr.type })
-], M.prototype, "device", 2);
-L([
-  m({ modelType: st.type })
-], M.prototype, "authModel", 2);
-L([
-  m({ modelType: It.type })
-], M.prototype, "setupStepContainer", 2);
-L([
-  Le
-], M.prototype, "door", 2);
-L([
+O([
+  p({ modelType: bo.type })
+], b.prototype, "device", 2);
+O([
+  p({ modelType: Qe.type })
+], b.prototype, "authModel", 2);
+O([
+  p({ modelType: Et.type })
+], b.prototype, "setupStepContainer", 2);
+O([
+  $e
+], b.prototype, "door", 2);
+O([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
     //updated attribute for language config property
   })
-], M.prototype, "ncuiLanguage", 2);
-L([
+], b.prototype, "ncuiLanguage", 2);
+O([
   d({
     path: "app:kosdev.ddk:service:cui",
     attribute: "activeCui"
   })
-], M.prototype, "activeCui", 2);
-L([
+], b.prototype, "activeCui", 2);
+O([
   d({
     path: "app:kosdev.ddk:service:cui",
     attribute: "fallbackCui"
   })
-], M.prototype, "fallbackCui", 2);
-M = L([
-  l(Y)
-], M);
-const nt = {
+], b.prototype, "fallbackCui", 2);
+b = O([
+  l(W)
+], b);
+const Ze = {
   registration: {
-    [Y]: {
-      class: M,
+    [W]: {
+      class: b,
       singleton: !0
     }
   },
-  type: Y,
-  predicate: u(Y),
+  type: W,
+  predicate: u(W),
   factory: c.Singleton.create(
-    Y
+    W
   )
-}, ye = {
+}, ue = {
   none: 999,
   crew: 0,
   technician: 1,
   manager: 2
-}, jt = (e) => (t) => {
-  if (t.type === Tt)
+}, Dt = (e) => (t) => {
+  if (t.type === ft)
     return !1;
-  const r = (t == null ? void 0 : t.role) || "technician";
-  if (e && r) {
-    const i = ye[e.toLowerCase()] ?? ye.crew, o = ye[r.toLowerCase()] ?? ye.crew;
-    return i >= o;
+  const o = (t == null ? void 0 : t.role) || "technician";
+  if (e && o) {
+    const s = ue[e.toLowerCase()] ?? ue.crew, r = ue[o.toLowerCase()] ?? ue.crew;
+    return s >= r;
   }
   return !1;
 };
-var Po = Object.defineProperty, Oo = Object.getOwnPropertyDescriptor, U = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Oo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Po(t, r, o), o;
-};
-const Ut = "agitation-control-model", Ye = "resolve", Mo = "agitate";
-let w = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "futureHandler");
-    s(this, "logger");
-    s(this, "troubleContainer");
-    s(this, "_agitationFutureId");
-    s(this, "_canExit", !0);
-    s(this, "_exiting", !1);
-    s(this, "_isFailed", !1);
-    s(this, "disposer");
-    s(this, "application");
-    s(this, "inProgress", []);
-    this.id = e, this.logger = r.logger, this.troubleContainer = t.companionParent, this.futureHandler = new Wr(this, Ye);
+var Zo = Object.defineProperty, er = Object.getOwnPropertyDescriptor, I = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? er(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Zo(t, o, r), r;
+};
+const kt = "agitation-control-model", Fe = "resolve", tr = "agitate";
+let $ = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "futureHandler");
+    i(this, "logger");
+    i(this, "troubleContainer");
+    i(this, "_agitationFutureId");
+    i(this, "_canExit", !0);
+    i(this, "_exiting", !1);
+    i(this, "_isFailed", !1);
+    i(this, "disposer");
+    i(this, "application");
+    i(this, "inProgress", []);
+    this.id = e, this.logger = o.logger, this.troubleContainer = t.companionParent, this.futureHandler = new _o(this, Fe);
   }
   set isFailed(e) {
     this._isFailed = e;
@@ -522,23 +544,23 @@ let w = class {
     });
   }
   get readyToResolve() {
-    const e = this.queuedTroubles.length, t = this.queuedTroubles.filter((i) => i.shouldDefer), r = e > 0 && t.length === 0;
-    return this.isDoorClosed && r && this.exiting;
+    const e = this.queuedTroubles.length, t = this.queuedTroubles.filter((s) => s.shouldDefer), o = e > 0 && t.length === 0;
+    return this.isDoorClosed && o && this.exiting;
   }
   onFutureUpdate(e) {
-    e.endState === b.Success ? (this.logger.debug(
+    e.endState === T.Success ? (this.logger.debug(
       `Resolve deferred troubles future ${e.id} completed successfully`
     ), this.queuedTroubles.forEach((t) => {
       t.clearDefer();
-    }), _(() => {
+    }), 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(), _(() => {
+    })) : (e.endState === T.Fail || e.endState === T.Canceled || e.endState === T.Aborted) && (this.logger.error(`Resolve deferred troubles future ${e.id} failed`), this.clearAll(), v(() => {
       this._canExit = !1, this._isFailed = !0;
     }));
   }
   async resolveDeferredTroubles(e) {
-    const t = this.queuedTroubles.filter((i) => !i.shouldDefer).map((i) => i.rawId).filter((i) => !this.inProgress.includes(i));
-    return this.inProgress.push(...t), t.length === 0 ? void 0 : await De.bulkResolveTroubles(
+    const t = this.queuedTroubles.filter((s) => !s.shouldDefer).map((s) => s.rawId).filter((s) => !this.inProgress.includes(s));
+    return this.inProgress.push(...t), t.length === 0 ? void 0 : await Me.bulkResolveTroubles(
       t,
       void 0,
       e
@@ -549,23 +571,23 @@ let w = class {
   }
   get queuedTroubles() {
     return this.troubleContainer.troubles.getIndexByKey(
-      gt.INDEX_TROUBLES_BY_DEFERRED,
-      gt.TROUBLES_DEFERRED
+      nt.INDEX_TROUBLES_BY_DEFERRED,
+      nt.TROUBLES_DEFERRED
     );
   }
   get visibleTroubles() {
     const e = this.application.currentRole;
-    return this.troubleContainer.troubles.data.filter(jt(e)).filter((t) => t.type !== Tt);
+    return this.troubleContainer.troubles.data.filter(Dt(e)).filter((t) => t.type !== ft);
   }
   // -------------------LIFECYCLE----------------------------
   get future() {
     return this.futureHandler.future;
   }
   get resolveFuture() {
-    return this.futureHandler.getFuture(Ye);
+    return this.futureHandler.getFuture(Fe);
   }
   get agitateFuture() {
-    return this.futureHandler.getFuture(Mo);
+    return this.futureHandler.getFuture(tr);
   }
   handleAgitationStarted(e) {
     this.logger.info(`Agitation started for ${e.path}`), this._agitationFutureId = String(e.futureId);
@@ -586,306 +608,109 @@ let w = class {
     this.logger.debug(`loading agitation-control ${this.id}`);
   }
 };
-U([
-  m({ modelType: nt.type })
-], w.prototype, "application", 2);
-U([
-  v({ alias: Ye })
-], w.prototype, "resolveDeferredTroubles", 1);
-U([
-  we({ topic: Pt.TOPIC_AGITATION_STARTED })
-], w.prototype, "handleAgitationStarted", 1);
-U([
-  we({ topic: Pt.TOPIC_AGITATION_ENDED })
-], w.prototype, "handleAgitationEnded", 1);
-U([
-  $t({
+I([
+  p({ modelType: Ze.type })
+], $.prototype, "application", 2);
+I([
+  M({ alias: Fe })
+], $.prototype, "resolveDeferredTroubles", 1);
+I([
+  Te({ topic: vt.TOPIC_AGITATION_STARTED })
+], $.prototype, "handleAgitationStarted", 1);
+I([
+  Te({ topic: vt.TOPIC_AGITATION_ENDED })
+], $.prototype, "handleAgitationEnded", 1);
+I([
+  Pe({
     dependencies: (e) => [e.readyToResolve, e._agitationFutureId]
   })
-], w.prototype, "handleReadyToResolve", 1);
-w = U([
-  l(Ut)
-], w);
-const ws = new ke({
-  class: w,
-  type: Ut
+], $.prototype, "handleReadyToResolve", 1);
+$ = I([
+  l(kt)
+], $);
+const Ys = new He({
+  class: $,
+  type: kt
 });
-var So = Object.defineProperty, Co = Object.getOwnPropertyDescriptor, he = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Co(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && So(t, r, o), o;
+var or = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, le = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? rr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && or(t, o, r), r;
 };
-const q = "animation-model";
-let k = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "disableAll");
-    s(this, "enableDial");
-    s(this, "enableModal");
-    s(this, "enableSideBar");
-    this.id = e, this.logger = r.logger;
+const N = "animation-model";
+let w = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "disableAll");
+    i(this, "enableDial");
+    i(this, "enableModal");
+    i(this, "enableSideBar");
+    this.id = e, this.logger = o.logger;
   }
 };
-he([
+le([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.disableAll"
   })
-], k.prototype, "disableAll", 2);
-he([
+], w.prototype, "disableAll", 2);
+le([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableDial"
   })
-], k.prototype, "enableDial", 2);
-he([
+], w.prototype, "enableDial", 2);
+le([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableModal"
   })
-], k.prototype, "enableModal", 2);
-he([
+], w.prototype, "enableModal", 2);
+le([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.uiConfig.animations.enableSideBar"
   })
-], k.prototype, "enableSideBar", 2);
-k = he([
-  l(q)
-], k);
-const wo = {
+], w.prototype, "enableSideBar", 2);
+w = le([
+  l(N)
+], w);
+const sr = {
   registration: {
-    [q]: {
-      class: k,
+    [N]: {
+      class: w,
       singleton: !0
     }
   },
-  type: q,
-  predicate: u(q),
-  factory: c.Singleton.create(q)
-}, { URL: Eo } = h("ANIMATION_SERVICE"), { getAll: Lo } = f.build({
-  basePath: `${Eo}/api/animation`
-}), Do = g.createLogger({
+  type: N,
+  predicate: u(N),
+  factory: c.Singleton.create(N)
+}, { URL: ir } = h("ANIMATION_SERVICE"), { getAll: nr } = y.build({
+  basePath: `${ir}/api/animation`
+}), ar = g.createLogger({
   name: "animation-service",
   group: "Services"
-}), ko = async () => (Do.debug("sending GET for animation"), await Lo({})), Es = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), lr = async () => (ar.debug("sending GET for animation"), await nr({})), Gs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getAnimations: ko
-}, Symbol.toStringTag, { value: "Module" })), { URL: V } = h("FCM-PUMP_SERVICE"), { postModel: fe } = f.build({
-  basePath: `${V}/api/fcm-pump`
-}), y = g.createLogger({
-  name: "fcm-pump-service",
-  group: "Services"
-}), Vt = async (e) => {
-  var t, r, i, o, n;
-  y.debug(
-    `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
-  );
-  try {
-    const a = await fe({
-      model: {},
-      urlOverride: `${V}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
-    });
-    return y.debug("performElectricalTest - response:", a), ((a == null ? void 0 : a.status) === 200 || (a == null ? void 0 : a.status) === 499) && ((t = a.data) != null && t.error) ? [a.data.error || "unknownError", a.data] : [void 0, a == null ? void 0 : a.data];
-  } catch (a) {
-    if (y.error(
-      `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`,
-      a
-    ), a instanceof Re) {
-      const O = ((i = (r = a.payload) == null ? void 0 : r.data) == null ? void 0 : i.error) || ((o = a.payload) == null ? void 0 : o.error) || "unknownError";
-      return [O, ((n = a.payload) == null ? void 0 : n.data) || { error: O }];
-    }
-  }
-  return ["unknownError", { error: "unknownError" }];
-}, Ht = async (e, t) => {
-  y.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`
-  );
-  try {
-    const r = await fe({
-      model: {},
-      urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
-      tracker: t
-    });
-    return y.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
-  } catch (r) {
-    y.error(
-      `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
-      r
-    );
-    const i = {
-      id: t || "",
-      endState: b.Fail,
-      tracker: t,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(i), i;
-  }
-}, Wt = async (e, t) => {
-  y.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`
-  );
-  try {
-    const r = await fe({
-      model: {},
-      urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
-      tracker: t
-    });
-    return y.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
-  } catch (r) {
-    y.error(
-      `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`,
-      r
-    );
-    const i = {
-      id: t || "",
-      endState: b.Fail,
-      tracker: t,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(i), i;
-  }
-}, Nt = async (e, t, r) => {
-  y.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`
-  );
-  try {
-    const i = await fe({
-      model: {},
-      urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
-      tracker: r
-    });
-    return y.debug("performVerify - response:", i), i != null && i.data && T.initiateFuture(i.data), i == null ? void 0 : i.data;
-  } catch (i) {
-    y.error(
-      `performVerify - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
-      i
-    );
-    const o = {
-      id: r || "",
-      endState: b.Fail,
-      tracker: r,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(o), o;
-  }
-}, Ro = (e) => e ? e.data === "success" || !e.data ? "success" : e.data : "error", zt = async (e, t, r) => {
-  y.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
-  );
-  try {
-    const i = await fe({
-      model: {},
-      urlOverride: `${V}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
-    });
-    return y.debug("performPreCalibrate - response:", i), Ro(i == null ? void 0 : i.data);
-  } catch (i) {
-    y.error(
-      `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`,
-      i
-    );
-    return;
-  }
-}, Ls = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  performCalibrate: Wt,
-  performComplete: zt,
-  performElectricalTest: Vt,
-  performPreCalibrate: Ht,
-  performVerify: Nt
+  getAnimations: lr
 }, Symbol.toStringTag, { value: "Module" }));
-var Io = Object.defineProperty, Fo = Object.getOwnPropertyDescriptor, je = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Fo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Io(t, r, o), o;
-};
-const Bt = "fcm-pump-model", xo = g.createLogger({ name: "fcm-pump-model" });
-let I = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "pumpModel");
-    s(this, "futureHandler");
-    this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent, this.futureHandler = new pe(this);
-  }
-  get future() {
-    return this.futureHandler.future;
-  }
-  get name() {
-    return this.pumpModel.name;
-  }
-  get canPour() {
-    return this.pumpModel.canPour;
-  }
-  get isPouring() {
-    return this.pumpModel.isPouring;
-  }
-  async cancelPour() {
-    return this.pumpModel.cancelPour();
-  }
-  performIntent(e) {
-    return this.pumpModel.performIntent(e);
-  }
-  async performElectricalTest() {
-    const [e, t] = await Vt(this.pumpModel.path);
-    return e && xo.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
-  }
-  getChildren() {
-    return [...this.futureHandler.allFutures];
-  }
-  async performPreCalibrate(e) {
-    return Ht(this.pumpModel.path, e);
-  }
-  async performCalibrate(e) {
-    return Wt(this.pumpModel.path, e);
-  }
-  async performVerify(e, t) {
-    return Nt(this.pumpModel.path, e, t);
-  }
-  async performComplete(e, t) {
-    return zt(this.pumpModel.path, e, t);
-  }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing fcm-pump ${this.id}`);
-  }
-  async load() {
-    this.logger.debug(`loading fcm-pump ${this.id}`);
-  }
-};
-je([
-  v()
-], I.prototype, "performPreCalibrate", 1);
-je([
-  v()
-], I.prototype, "performCalibrate", 1);
-je([
-  v()
-], I.prototype, "performVerify", 1);
-I = je([
-  l(Bt)
-], I);
-const Kt = new Ee({
-  class: I,
-  type: Bt
-});
-var Ao = Object.defineProperty, jo = Object.getOwnPropertyDescriptor, Yt = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? jo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Ao(t, r, o), o;
-};
-const G = "carb-water-model";
-let _e = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "assemblyModel");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+var dr = Object.defineProperty, cr = Object.getOwnPropertyDescriptor, It = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? cr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && dr(t, o, r), r;
+};
+const z = "carb-water-model";
+let ye = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "assemblyModel");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger;
   }
   getPump() {
     const t = this.assemblyModel.getHoldersByGroup("carb")[0].pumps.data[0];
-    return rt(t, Kt.type);
+    return Be(t, mt.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -895,102 +720,102 @@ let _e = class {
     this.logger.debug(`loading carb-water ${this.id}`);
   }
 };
-Yt([
-  m({ modelType: Fe.type })
-], _e.prototype, "assemblyModel", 2);
-_e = Yt([
-  l(G)
-], _e);
-const Uo = {
+It([
+  p({ modelType: Se.type })
+], ye.prototype, "assemblyModel", 2);
+ye = It([
+  l(z)
+], ye);
+const ur = {
   registration: {
-    [G]: {
-      class: _e,
+    [z]: {
+      class: ye,
       singleton: !1
     }
   },
-  type: G,
-  predicate: u(G),
-  factory: c.Factory.create(G)
-}, { URL: H } = h("COPY-LOGS_SERVICE"), { getAll: Vo, getOne: Ho, postModel: qt, deleteModel: Wo } = f.build({
-  basePath: `${H}/api/copy-logs`
-}), $e = g.createLogger({
+  type: z,
+  predicate: u(z),
+  factory: c.Factory.create(z)
+}, { URL: R } = h("COPY-LOGS_SERVICE"), { getAll: pr, getOne: gr, postModel: Rt, deleteModel: hr } = y.build({
+  basePath: `${R}/api/copy-logs`
+}), fe = g.createLogger({
   name: "copy-logs-service",
   group: "Services"
-}), Gt = async (e, t) => {
-  const r = await Wo({
+}), At = async (e, t) => {
+  const o = await hr({
     tracker: t,
     id: e,
-    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
+    urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/${e}`
   });
-  if (!(r != null && r.data))
+  if (!(o != null && o.data))
     throw new Error("No response from server");
-  return r.data;
-}, Qt = async (e, t) => {
-  const r = await qt({
+  return o.data;
+}, Ft = async (e, t) => {
+  const o = await Rt({
     model: {},
     tracker: t,
-    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${e}`
+    urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/eraseAndCopy/${e}`
   });
-  if (!(r != null && r.data))
+  if (!(o != null && o.data))
     throw new Error("No response from server");
-  return r.data;
-}, Xt = async (e, t) => {
-  const r = await qt({
+  return o.data;
+}, xt = async (e, t) => {
+  const o = await Rt({
     model: {},
     tracker: t,
-    urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/${e}`
+    urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/${e}`
   });
-  if (!(r != null && r.data))
+  if (!(o != null && o.data))
     throw new Error("No response from server");
-  return r.data;
-}, Jt = async () => {
-  $e.debug("sending GET for copy-logs");
+  return o.data;
+}, Ut = async () => {
+  fe.debug("sending GET for copy-logs");
   try {
-    const e = await Vo({
-      urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/volumes/size`
+    const e = await pr({
+      urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/volumes/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof Re)
-      return $e.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof yt)
+      return fe.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, Zt = async () => {
-  $e.debug("sending GET for log file size");
+}, jt = async () => {
+  fe.debug("sending GET for log file size");
   try {
-    const e = await Ho({
-      urlOverride: `${H}/api/app/kosdev.ddk/copyLogs/files/size`
+    const e = await gr({
+      urlOverride: `${R}/api/app/kosdev.ddk/copyLogs/files/size`
     });
     return [void 0, e == null ? void 0 : e.data];
   } catch (e) {
-    if (e instanceof Re)
-      return $e.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
+    if (e instanceof yt)
+      return fe.error(`Error fetching log file size: ${e.payload.error}`), [e.payload.error, void 0];
   }
   return ["unknownError", void 0];
-}, Ds = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  copyLogFromVolume: Xt,
-  eraseAndCopyLogsToVolume: Qt,
-  eraseVolume: Gt,
-  getLogFileSize: Zt,
-  getVolumes: Jt
+  copyLogFromVolume: xt,
+  eraseAndCopyLogsToVolume: Ft,
+  eraseVolume: At,
+  getLogFileSize: jt,
+  getVolumes: Ut
 }, Symbol.toStringTag, { value: "Module" }));
-var er = Object.defineProperty, No = Object.getOwnPropertyDescriptor, zo = (e, t, r) => t in e ? er(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, W = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? No(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && er(t, r, o), o;
-}, Bo = (e, t, r) => (zo(e, t + "", r), r);
-const Ko = "copy-logs-model";
-let S = class {
+var Wt = Object.defineProperty, yr = Object.getOwnPropertyDescriptor, fr = (e, t, o) => t in e ? Wt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o, A = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? yr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Wt(t, o, r), r;
+}, vr = (e, t, o) => (fr(e, t + "", o), o);
+const mr = "copy-logs-model";
+let _ = class {
   constructor(e) {
-    s(this, "id");
-    s(this, "_volumes");
-    s(this, "storageDeviceContainer");
-    s(this, "_activeVolume");
-    s(this, "_logFileSize", 0);
-    s(this, "_actionState", "idle");
-    s(this, "copyProgress");
-    this.id = e, this._volumes = new Kr(), this._activeVolume = void 0, this.copyProgress = {
+    i(this, "id");
+    i(this, "_volumes");
+    i(this, "storageDeviceContainer");
+    i(this, "_activeVolume");
+    i(this, "_logFileSize", 0);
+    i(this, "_actionState", "idle");
+    i(this, "copyProgress");
+    this.id = e, this._volumes = new Po(), this._activeVolume = void 0, this.copyProgress = {
       bytesCopied: 0,
       bytesToCopy: 0,
       filesCopied: 0,
@@ -1030,19 +855,19 @@ let S = class {
   }
   get diskFull() {
     var e;
-    return ((e = this.future) == null ? void 0 : e.status) === b.Success && this.copyProgress.filesSkipped > 0;
+    return ((e = this.future) == null ? void 0 : e.status) === T.Success && this.copyProgress.filesSkipped > 0;
   }
   onFutureUpdate(e) {
-    this.logger.info(`Future update: ${e.status}`), e.status === b.Success && (this.logger.info(`Future success: ${e.status}`), this.diskFull && _(() => {
-      e.endState = b.Fail, e.reason = "errDiskFull";
-    })), e.status === b.Fail && this.logger.error(`Future failed: ${e.status}`), e.note === "copy" ? _(() => {
+    this.logger.info(`Future update: ${e.status}`), e.status === T.Success && (this.logger.info(`Future success: ${e.status}`), this.diskFull && v(() => {
+      e.endState = T.Fail, e.reason = "errDiskFull";
+    })), e.status === T.Fail && this.logger.error(`Future failed: ${e.status}`), e.note === "copy" ? v(() => {
       this._actionState = "copying", this.copyProgress = e.clientData || {
         bytesCopied: 0,
         bytesToCopy: 0,
         filesCopied: 0,
         filesSkipped: 0
       };
-    }) : (this._actionState = "erasing", _(() => {
+    }) : (this._actionState = "erasing", v(() => {
       this.copyProgress = {
         bytesCopied: 0,
         bytesToCopy: 0,
@@ -1055,31 +880,31 @@ let S = class {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (_(() => {
+    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}`), Qt(this._activeVolume.id, e);
+    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), Ft(this._activeVolume.id, e);
   }
   async eraseVolume(e) {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (_(() => {
+    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}`), Gt(this._activeVolume.id, e);
+    return this.logger.info(`Erasing volume ${(t = this._activeVolume) == null ? void 0 : t.name}`), At(this._activeVolume.id, e);
   }
   async copyLogs(e) {
     var t;
     if (!e)
       throw new Error("No tracker provided");
-    if (_(() => {
+    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}`), Xt(this._activeVolume.id, e);
+    return this.logger.info(`Copying logs to ${(t = this._activeVolume) == null ? void 0 : t.name}`), xt(this._activeVolume.id, e);
   }
   handleInsertion() {
     this.inserted ? this.syncVolumes() : (this._volumes.clear(), this.clearActiveVolume());
@@ -1088,27 +913,27 @@ let S = class {
     this.logger.debug(`initializing copy-logs ${this.id}`);
   }
   async syncVolumes() {
-    const [e, t] = await Jt(), [r, i] = await Zt();
-    if (r) {
-      this.logger.error(`Error fetching log file size: ${r}`);
+    const [e, t] = await Ut(), [o, s] = await jt();
+    if (o) {
+      this.logger.error(`Error fetching log file size: ${o}`);
       return;
     }
     if (e) {
       this.logger.error(`Error fetching volumes: ${e}`);
       return;
     }
-    t && (t.forEach((o) => {
-      const n = this.storageDeviceContainer.getModel(o.id);
+    t && (t.forEach((r) => {
+      const n = this.storageDeviceContainer.getModel(r.id);
       if (n) {
         const a = {
-          id: o.id,
+          id: r.id,
           name: n.label,
-          freeBytes: o.info.freeBytes,
-          totalBytes: o.info.totalBytes
+          freeBytes: r.info.freeBytes,
+          totalBytes: r.info.totalBytes
         };
         this._volumes.addModel(a);
       }
-    }), t.length === 1 ? this.updateActiveVolume(this._volumes.data[0]) : this.clearActiveVolume()), i && (this.logger.info(`Log file size: ${i}`), this.updateLogFileSize(parseInt(i, 10)));
+    }), t.length === 1 ? this.updateActiveVolume(this._volumes.data[0]) : this.clearActiveVolume()), s && (this.logger.info(`Log file size: ${s}`), this.updateLogFileSize(parseInt(s, 10)));
   }
   async activate() {
     this.logger.debug(`activating copy-logs ${this.id}`), await this.syncVolumes();
@@ -1117,82 +942,82 @@ let S = class {
     this.logger.debug(`loading copy-logs ${this.id}`);
   }
 };
-Bo(S, "Registration");
-W([
-  m({ modelType: Nr.type })
-], S.prototype, "storageDeviceContainer", 2);
-W([
-  v()
-], S.prototype, "eraseAndCopyVolume", 1);
-W([
-  v()
-], S.prototype, "eraseVolume", 1);
-W([
-  v()
-], S.prototype, "copyLogs", 1);
-W([
-  $t({
+vr(_, "Registration");
+A([
+  p({ modelType: To.type })
+], _.prototype, "storageDeviceContainer", 2);
+A([
+  M()
+], _.prototype, "eraseAndCopyVolume", 1);
+A([
+  M()
+], _.prototype, "eraseVolume", 1);
+A([
+  M()
+], _.prototype, "copyLogs", 1);
+A([
+  Pe({
     dependencies: (e) => [e.inserted]
   })
-], S.prototype, "handleInsertion", 1);
-S = W([
-  l({ modelTypeId: Ko, singleton: !0 }),
-  zr(),
-  Br()
-], S);
-const ks = S.Registration, tr = g.createLogger({
+], _.prototype, "handleInsertion", 1);
+_ = A([
+  l({ modelTypeId: mr, singleton: !0 }),
+  $o(),
+  Ke()
+], _);
+const Qs = _.Registration, Nt = g.createLogger({
   name: "dashboard-operations-service",
   group: "Services"
-}), rr = async (e, t) => (tr.debug("resolveAll"), await De.bulkResolveTroubles(
+}), zt = async (e, t) => (Nt.debug("resolveAll"), await Me.bulkResolveTroubles(
   e,
   void 0,
   t
-)), or = async (e, t) => (tr.debug("resolveTrouble"), await De.resolveTrouble(
+)), Vt = async (e, t) => (Nt.debug("resolveTrouble"), await Me.resolveTrouble(
   e,
   void 0,
   t
-)), Rs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+)), Xs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  resolveAll: rr,
-  resolveTrouble: or
+  resolveAll: zt,
+  resolveTrouble: Vt
 }, Symbol.toStringTag, { value: "Module" }));
-var Yo = Object.defineProperty, qo = Object.getOwnPropertyDescriptor, Ue = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? qo(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Yo(t, r, o), o;
+var br = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, Ee = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? _r(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && br(t, o, r), r;
 };
-const Q = "dashboard-operations-model";
-function bt(e) {
+const V = "dashboard-operations-model";
+function ut(e) {
   return !e.deferred;
 }
-function vt(e) {
+function pt(e) {
   return e.deferred;
 }
-let F = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "troubles");
-    s(this, "futureHandler");
-    s(this, "logger");
-    this.id = e, this.futureHandler = new pe(this), this.logger = r.logger;
+let C = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "troubles");
+    i(this, "futureHandler");
+    i(this, "logger");
+    this.id = e, this.futureHandler = new Ge(this), this.logger = o.logger;
   }
   get troublesByType() {
     return this.troubles.troubles.data.reduce(
-      Yr,
+      Mo,
       {}
     );
   }
   get queuedPurgeTroubles() {
-    return this.purgeTroubles.filter(vt);
+    return this.purgeTroubles.filter(pt);
   }
   get queuedPrimeTroubles() {
-    return this.primeTroubles.filter(vt);
+    return this.primeTroubles.filter(pt);
   }
   get resolvablePrimeTroubles() {
-    return this.primeTroubles.filter(bt);
+    return this.primeTroubles.filter(ut);
   }
   get resolvablePurgeTroubles() {
-    return this.purgeTroubles.filter(bt);
+    return this.purgeTroubles.filter(ut);
   }
   get hasResolvablePurgeTroubles() {
     return this.resolvablePurgeTroubles.length > 0;
@@ -1207,10 +1032,10 @@ let F = class {
     return this.primeTroubles.length > 0;
   }
   get purgeTroubles() {
-    return this.troublesByType[ht] || [];
+    return this.troublesByType[at] || [];
   }
   get primeTroubles() {
-    return this.troublesByType[to] || [];
+    return this.troublesByType[ko] || [];
   }
   get future() {
     return this.futureHandler.getFuture();
@@ -1218,17 +1043,17 @@ let F = class {
   async resolveAllTroubles(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const r = e === ht ? this.purgeTroubles : this.primeTroubles;
-    r.filter((a) => a.shouldDefer).forEach((a) => {
+    const o = e === at ? this.purgeTroubles : this.primeTroubles;
+    o.filter((a) => a.shouldDefer).forEach((a) => {
       this.logger.info(`Deferring trouble ${a.rawId}`), a.defer();
     });
-    const o = r.filter((a) => !a.shouldDefer).map((a) => a.rawId);
-    return o.length === 0 ? void 0 : await rr(o, t);
+    const r = o.filter((a) => !a.shouldDefer).map((a) => a.rawId);
+    return r.length === 0 ? void 0 : await zt(r, t);
   }
   async resolveTrouble(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    return await or(e, t);
+    return await Vt(e, t);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1238,40 +1063,42 @@ let F = class {
     this.logger.debug(`loading dashboard-operations ${this.id}`);
   }
 };
-Ue([
-  m({ modelType: ot.type })
-], F.prototype, "troubles", 2);
-Ue([
-  v()
-], F.prototype, "resolveAllTroubles", 1);
-Ue([
-  v()
-], F.prototype, "resolveTrouble", 1);
-F = Ue([
-  l(Q)
-], F);
-const lt = {
+Ee([
+  p({
+    modelType: Ye.type
+  })
+], C.prototype, "troubles", 2);
+Ee([
+  M()
+], C.prototype, "resolveAllTroubles", 1);
+Ee([
+  M()
+], C.prototype, "resolveTrouble", 1);
+C = Ee([
+  l(V)
+], C);
+const et = {
   registration: {
-    [Q]: {
-      class: F,
+    [V]: {
+      class: C,
       singleton: !0
     }
   },
-  type: Q,
-  predicate: u(Q),
-  factory: c.Singleton.create(Q)
+  type: V,
+  predicate: u(V),
+  factory: c.Singleton.create(V)
 };
-var Go = Object.getOwnPropertyDescriptor, Qo = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Go(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var Tr = Object.getOwnPropertyDescriptor, $r = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Tr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const X = "dispenser-model";
-let qe = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+const H = "dispenser-model";
+let xe = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger;
   }
   updateModel() {
   }
@@ -1283,40 +1110,40 @@ let qe = class {
     this.logger.debug(`loading dispenser ${this.id}`);
   }
 };
-qe = Qo([
-  l(X)
-], qe);
-const Xo = {
+xe = $r([
+  l(H)
+], xe);
+const Pr = {
   registration: {
-    [X]: {
-      class: qe,
+    [H]: {
+      class: xe,
       singleton: !0
     }
   },
-  type: X,
-  predicate: u(X),
-  factory: c.Singleton.create(X)
-}, { URL: Jo } = h("DISPENSER_SERVICE"), { getAll: Zo } = f.build({
-  basePath: `${Jo}/api/dispenser`
-}), ei = g.createLogger({
+  type: H,
+  predicate: u(H),
+  factory: c.Singleton.create(H)
+}, { URL: Mr } = h("DISPENSER_SERVICE"), { getAll: Or } = y.build({
+  basePath: `${Mr}/api/dispenser`
+}), Sr = g.createLogger({
   name: "dispenser-service",
   group: "Services"
-}), ti = async () => (ei.debug("sending GET for dispenser"), await Zo({})), Is = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), wr = async () => (Sr.debug("sending GET for dispenser"), await Or({})), Js = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispensers: ti
+  getDispensers: wr
 }, Symbol.toStringTag, { value: "Module" }));
-var ri = Object.defineProperty, oi = Object.getOwnPropertyDescriptor, ir = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? oi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && ri(t, r, o), o;
+var Er = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, Ht = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Cr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Er(t, o, r), r;
 };
-const J = "dispenser-info-model";
-let Te = class {
-  constructor(e, t, r) {
-    s(this, "logger");
-    s(this, "id");
-    s(this, "name");
-    this.id = e, this.logger = r.logger;
+const B = "dispenser-info-model";
+let ve = class {
+  constructor(e, t, o) {
+    i(this, "logger");
+    i(this, "id");
+    i(this, "name");
+    this.id = e, this.logger = o.logger;
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1326,48 +1153,48 @@ let Te = class {
     this.logger.debug(`loading dispenser-info ${this.id}`);
   }
 };
-ir([
+Ht([
   d({
     path: "kos:device",
     attribute: "name"
   })
-], Te.prototype, "name", 2);
-Te = ir([
-  l(J)
-], Te);
-const ii = {
+], ve.prototype, "name", 2);
+ve = Ht([
+  l(B)
+], ve);
+const Lr = {
   registration: {
-    [J]: {
-      class: Te,
+    [B]: {
+      class: ve,
       singleton: !1
     }
   },
-  type: J,
-  predicate: u(J),
+  type: B,
+  predicate: u(B),
   factory: c.Factory.create(
-    J
+    B
   )
-}, { URL: si } = h("DISPENSER-INFO_SERVICE"), { getAll: ai } = f.build({
-  basePath: `${si}/api/dispenser-info`
-}), ni = g.createLogger({
+}, { URL: Dr } = h("DISPENSER-INFO_SERVICE"), { getAll: kr } = y.build({
+  basePath: `${Dr}/api/dispenser-info`
+}), Ir = g.createLogger({
   name: "dispenser-info-service",
   group: "Services"
-}), li = async () => (ni.debug("sending GET for dispenser-info"), await ai({})), Fs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Rr = async () => (Ir.debug("sending GET for dispenser-info"), await kr({})), Zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getDispenserInfos: li
+  getDispenserInfos: Rr
 }, Symbol.toStringTag, { value: "Module" }));
-var ci = Object.getOwnPropertyDescriptor, ui = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ci(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var Ar = Object.getOwnPropertyDescriptor, Fr = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Ar(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const Z = "enrollment-model";
-let Ge = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "enrolled");
-    this.id = e, this.logger = r.logger, this.enrolled = !1;
+const K = "enrollment-model";
+let Ue = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "enrolled");
+    this.id = e, this.logger = o.logger, this.enrolled = !1;
   }
   updateModel(e) {
     console.log("updateModel:", e);
@@ -1380,77 +1207,77 @@ let Ge = class {
     this.logger.debug(`loading enrollment ${this.id}`);
   }
 };
-Ge = ui([
-  l(Z)
-], Ge);
-const di = {
+Ue = Fr([
+  l(K)
+], Ue);
+const xr = {
   registration: {
-    [Z]: {
-      class: Ge,
+    [K]: {
+      class: Ue,
       singleton: !0
     }
   },
-  type: Z,
-  predicate: u(Z),
-  factory: c.Singleton.create(Z)
-}, { URL: pi } = h("ENROLLMENT_SERVICE"), { getAll: gi } = f.build({
-  basePath: `${pi}/api/enrollment`
-}), hi = g.createLogger({
+  type: K,
+  predicate: u(K),
+  factory: c.Singleton.create(K)
+}, { URL: Ur } = h("ENROLLMENT_SERVICE"), { getAll: jr } = y.build({
+  basePath: `${Ur}/api/enrollment`
+}), Wr = g.createLogger({
   name: "enrollment-service",
   group: "Services"
-}), fi = async () => (hi.debug("sending GET for enrollment"), await gi({})), xs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Nr = async () => (Wr.debug("sending GET for enrollment"), await jr({})), ei = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getEnrollments: fi
-}, Symbol.toStringTag, { value: "Module" })), As = (e) => e.toLowerCase().includes("micros"), js = (e) => !e.toLowerCase().includes("micros"), Us = (e) => (t) => {
-  const r = e == null ? void 0 : e.getHoldersByGroup(t);
-  return r ? r.map((i) => ({ id: i.id, name: i.ingredientName, path: i.path })) : null;
-}, Vs = ["water", "carb", "ns", "nss"], ue = "dashboardKeyFactory", Be = [];
-qr(ue, {
+  getEnrollments: Nr
+}, Symbol.toStringTag, { value: "Module" })), ti = (e) => e.toLowerCase().includes("micros"), oi = (e) => !e.toLowerCase().includes("micros"), ri = (e) => (t) => {
+  const o = e == null ? void 0 : e.getHoldersByGroup(t);
+  return o ? o.map((s) => ({ id: s.id, name: s.ingredientName, path: s.path })) : null;
+}, si = ["water", "carb", "ns", "nss"], ie = "dashboardKeyFactory", ke = [];
+Oo(ie, {
   register: (e, t) => {
-    Be.includes(t) || Be.push(t);
+    ke.includes(t) || ke.push(t);
   },
   execute: (e, t) => {
-    const r = Be.sort((i, o) => i.rank - o.rank);
-    for (const i of r) {
-      const o = i.factory(t);
-      if (o)
-        return o;
+    const o = ke.sort((s, r) => s.rank - r.rank);
+    for (const s of o) {
+      const r = s.factory(t);
+      if (r)
+        return r;
     }
   }
 });
-const mi = (e) => {
-  Ie[ue].register(
-    ue,
+const zr = (e) => {
+  Oe[ie].register(
+    ie,
     e
   );
-}, yi = (e) => Ie[ue].execute(
-  ue,
+}, Vr = (e) => Oe[ie].execute(
+  ie,
   e
 );
-Ie.registerDashboardKeyFactory = mi;
-Ie.executeDashboardKeyFactory = yi;
-const Qe = 3600, sr = 60, Hs = (e) => {
-  const t = Math.floor(e / Qe), r = Math.floor(e % Qe / sr);
-  return { hours: t, minutes: r };
-}, Ws = (e, t) => e * Qe + t * sr, bi = (e) => {
-  const r = (/* @__PURE__ */ new Date()).valueOf() - e.valueOf(), i = Math.floor(r / (1e3 * 60)), o = Math.floor(i / 60), n = Math.floor(o / 24), a = i % 60, O = o % 24;
-  let D = "";
-  return n > 0 && (D += `${n} day${n > 1 ? "s" : ""} `), O > 0 && (D += `${O} hour${O > 1 ? "s" : ""} `), (a > 0 || n === 0 && O === 0) && (D += `${a} minute${a > 1 ? "s" : ""} `), D;
-};
-var vi = Object.defineProperty, _i = Object.getOwnPropertyDescriptor, Ve = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? _i(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && vi(t, r, o), o;
-};
-const ee = "ingredient-summary-model";
-let x = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "assemblyModel");
-    s(this, "dashboardOperationModel");
-    s(this, "appModel");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger, this.dashboardOperationModel = lt.factory({});
+Oe.registerDashboardKeyFactory = zr;
+Oe.executeDashboardKeyFactory = Vr;
+const je = 3600, Bt = 60, ii = (e) => {
+  const t = Math.floor(e / je), o = Math.floor(e % je / Bt);
+  return { hours: t, minutes: o };
+}, ni = (e, t) => e * je + t * Bt, Hr = (e) => {
+  const o = (/* @__PURE__ */ new Date()).valueOf() - e.valueOf(), s = Math.floor(o / (1e3 * 60)), r = Math.floor(s / 60), n = Math.floor(r / 24), a = s % 60, de = r % 24;
+  let ce = "";
+  return n > 0 && (ce += `${n} day${n > 1 ? "s" : ""} `), de > 0 && (ce += `${de} hour${de > 1 ? "s" : ""} `), (a > 0 || n === 0 && de === 0) && (ce += `${a} minute${a > 1 ? "s" : ""} `), ce;
+};
+var Br = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, Ce = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Kr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Br(t, o, r), r;
+};
+const Y = "ingredient-summary-model";
+let L = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "assemblyModel");
+    i(this, "dashboardOperationModel");
+    i(this, "appModel");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger, this.dashboardOperationModel = et.factory({});
   }
   get highPriorityHolders() {
     return this.assemblyModel.allHolders.filter(
@@ -1458,16 +1285,16 @@ let x = class {
     );
   }
   get actionRequiredHolders() {
-    const e = this.appModel.currentRole, t = jt(e);
-    return this.assemblyModel.allHolders.filter((r) => {
-      const i = rt(
-        r,
-        Jr.type
+    const e = this.appModel.currentRole, t = Dt(e);
+    return this.assemblyModel.allHolders.filter((o) => {
+      const s = Be(
+        o,
+        Co.type
       );
-      if (i != null && i.isRemote)
+      if (s != null && s.isRemote)
         return !1;
-      const o = r.troubles.filter(t);
-      return o.length > 0 && o.find((n) => n.resolvable);
+      const r = o.troubles.filter(t);
+      return r.length > 0 && r.find((n) => n.resolvable);
     });
   }
   get lowLevelHolders() {
@@ -1484,104 +1311,53 @@ let x = class {
     this.logger.debug(`loading ingredient-summary ${this.id}`);
   }
 };
-Ve([
-  m({ modelType: Fe.type })
-], x.prototype, "assemblyModel", 2);
-Ve([
-  m({ modelType: lt.type })
-], x.prototype, "dashboardOperationModel", 2);
-Ve([
-  m({ modelType: nt.type })
-], x.prototype, "appModel", 2);
-x = Ve([
-  l(ee)
-], x);
-const $i = {
+Ce([
+  p({ modelType: Se.type })
+], L.prototype, "assemblyModel", 2);
+Ce([
+  p({ modelType: et.type })
+], L.prototype, "dashboardOperationModel", 2);
+Ce([
+  p({ modelType: Ze.type })
+], L.prototype, "appModel", 2);
+L = Ce([
+  l(Y)
+], L);
+const Yr = {
   registration: {
-    [ee]: {
-      class: x,
+    [Y]: {
+      class: L,
       singleton: !1
     }
   },
-  type: ee,
-  predicate: u(ee),
+  type: Y,
+  predicate: u(Y),
   factory: c.Factory.create(
-    ee
+    Y
   )
-};
-var Ti = Object.getOwnPropertyDescriptor, Pi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ti(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
-};
-const ar = "lfcv-pump-model";
-let Xe = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "pumpModel");
-    this.id = e, this.logger = r.logger, this.pumpModel = t.companionParent;
-  }
-  get name() {
-    return this.pumpModel.name;
-  }
-  get canPour() {
-    return this.pumpModel.canPour;
-  }
-  get isPouring() {
-    return this.pumpModel.isPouring;
-  }
-  async cancelPour() {
-    return this.pumpModel.cancelPour();
-  }
-  performIntent(e) {
-    return this.pumpModel.performIntent(e);
-  }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing lfcv-pump ${this.id}`);
-  }
-  async load() {
-    this.logger.debug(`loading lfcv-pump ${this.id}`);
-  }
-};
-Xe = Pi([
-  l(ar)
-], Xe);
-const Ns = new Ee({
-  class: Xe,
-  type: ar
-}), { URL: Oi } = h("LFCV-PUMP_SERVICE"), { getAll: Mi } = f.build({
-  basePath: `${Oi}/api/lfcv-pump`
-}), Si = g.createLogger({
-  name: "lfcv-pump-service",
-  group: "Services"
-}), Ci = async () => (Si.debug("sending GET for lfcv-pump"), await Mi({})), zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  getLfcvPumps: Ci
-}, Symbol.toStringTag, { value: "Module" })), { URL: ct } = h("LOCKOUT_SERVICE"), { postModel: nr } = f.build({
-  basePath: `${ct}/api/app/kosdev.ddk/lockout`
-}), lr = g.createLogger({ name: "lockout-service", group: "Services" }), wi = async () => (lr.info("lock"), await nr({
+}, { URL: tt } = h("LOCKOUT_SERVICE"), { postModel: Kt } = y.build({
+  basePath: `${tt}/api/app/kosdev.ddk/lockout`
+}), Yt = g.createLogger({ name: "lockout-service", group: "Services" }), Gr = async () => (Yt.info("lock"), await Kt({
   model: {},
-  urlOverride: `${ct}/api/app/kosdev.ddk/lockout/lockNow`
-})), cr = async (e) => {
-  lr.info("unlock");
-  const t = await nr({
+  urlOverride: `${tt}/api/app/kosdev.ddk/lockout/lockNow`
+})), Gt = async (e) => {
+  Yt.info("unlock");
+  const t = await Kt({
     model: {},
-    urlOverride: `${ct}/api/app/kosdev.ddk/lockout/unlock/${e}`
+    urlOverride: `${tt}/api/app/kosdev.ddk/lockout/unlock/${e}`
   });
   return t == null ? void 0 : t.data;
-}, Bs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, ai = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  lock: wi,
-  unlock: cr
+  lock: Gr,
+  unlock: Gt
 }, Symbol.toStringTag, { value: "Module" }));
-var Ei = Object.defineProperty, Li = Object.getOwnPropertyDescriptor, N = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Li(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Ei(t, r, o), o;
+var qr = Object.defineProperty, Qr = Object.getOwnPropertyDescriptor, F = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Qr(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && qr(t, o, r), r;
 };
-const ur = "lockout-model", Di = [
+const qt = "lockout-model", Xr = [
   { 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" },
@@ -1590,11 +1366,11 @@ const ur = "lockout-model", Di = [
   { day: "saturday", lock: "dayWiseLockConfigMap.Sat.enabled", open: "dayWiseLockConfigMap.Sat.unlockTime", close: "dayWiseLockConfigMap.Sat.lockTime" },
   { day: "sunday", lock: "dayWiseLockConfigMap.Sun.enabled", open: "dayWiseLockConfigMap.Sun.unlockTime", close: "dayWiseLockConfigMap.Sun.lockTime" }
 ];
-let E = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "dayEnabledList", [
+let P = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "dayEnabledList", [
       "dayWiseLockConfigMap.Sun.enabled",
       "dayWiseLockConfigMap.Mon.enabled",
       "dayWiseLockConfigMap.Tue.enabled",
@@ -1603,7 +1379,7 @@ let E = class {
       "dayWiseLockConfigMap.Fri.enabled",
       "dayWiseLockConfigMap.Sat.enabled"
     ]);
-    s(this, "dayOpenAtList", [
+    i(this, "dayOpenAtList", [
       "dayWiseLockConfigMap.Sun.unlockTime",
       "dayWiseLockConfigMap.Mon.unlockTime",
       "dayWiseLockConfigMap.Tue.unlockTime",
@@ -1612,7 +1388,7 @@ let E = class {
       "dayWiseLockConfigMap.Fri.unlockTime",
       "dayWiseLockConfigMap.Sat.unlockTime"
     ]);
-    s(this, "dayCloseAtList", [
+    i(this, "dayCloseAtList", [
       "dayWiseLockConfigMap.Sun.lockTime",
       "dayWiseLockConfigMap.Mon.lockTime",
       "dayWiseLockConfigMap.Tue.lockTime",
@@ -1621,22 +1397,22 @@ let E = class {
       "dayWiseLockConfigMap.Fri.lockTime",
       "dayWiseLockConfigMap.Sat.lockTime"
     ]);
-    s(this, "saveMap");
-    s(this, "pin");
-    s(this, "nextLockSkipped");
-    s(this, "nextLockTime");
-    s(this, "nextUnLockTime");
-    s(this, "cuiLockout");
-    this.id = e, this.logger = r.logger, this.saveMap = /* @__PURE__ */ new Map();
+    i(this, "saveMap");
+    i(this, "pin");
+    i(this, "nextLockSkipped");
+    i(this, "nextLockTime");
+    i(this, "nextUnLockTime");
+    i(this, "cuiLockout");
+    this.id = e, this.logger = o.logger, this.saveMap = /* @__PURE__ */ new Map();
   }
   get enabled() {
     const e = this.getProp(
       "oneTimeLockConfig.lockTime"
-    ), t = e !== void 0 && e !== "", r = this.getProp("lockScheduleEnabled");
-    return t || r;
+    ), t = e !== void 0 && e !== "", o = this.getProp("lockScheduleEnabled");
+    return t || o;
   }
   get schedule() {
-    return Di;
+    return Xr;
   }
   getProp(e) {
     return this.saveMap.get(e);
@@ -1653,7 +1429,7 @@ let E = class {
       this.nextLockSkipped.updateProperty("0");
   }
   async unlock(e) {
-    return await cr(e);
+    return await Gt(e);
   }
   async save() {
     return this.saveMap.forEach((e, t) => {
@@ -1675,61 +1451,61 @@ let E = class {
     this.logger.debug(`loading lockout ${this.id}`);
   }
 };
-N([
+F([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "pin"
   })
-], E.prototype, "pin", 2);
-N([
+], P.prototype, "pin", 2);
+F([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockSkipped"
   })
-], E.prototype, "nextLockSkipped", 2);
-N([
+], P.prototype, "nextLockSkipped", 2);
+F([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextLockTime"
   })
-], E.prototype, "nextLockTime", 2);
-N([
+], P.prototype, "nextLockTime", 2);
+F([
   d({
     path: "app:kosdev.ddk:service:cuiLockout",
     attribute: "nextUnLockTime"
   })
-], E.prototype, "nextUnLockTime", 2);
-N([
-  Gr({ path: "app:kosdev.ddk:service:cuiLockout" })
-], E.prototype, "cuiLockout", 2);
-E = N([
-  l(ur)
-], E);
-const Ks = new ke({
-  class: E,
-  type: ur
-}), ki = async (e, t) => await De.bulkResolveTroubles(
+], P.prototype, "nextUnLockTime", 2);
+F([
+  So({ path: "app:kosdev.ddk:service:cuiLockout" })
+], P.prototype, "cuiLockout", 2);
+P = F([
+  l(qt)
+], P);
+const li = new He({
+  class: P,
+  type: qt
+}), Jr = async (e, t) => await Me.bulkResolveTroubles(
   e,
   void 0,
   t
 );
-var Ri = Object.defineProperty, Ii = Object.getOwnPropertyDescriptor, He = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ii(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Ri(t, r, o), o;
-};
-const te = "macro-assignment-model", _t = "PurgeTrouble", Fi = "PrimeTrouble";
-let A = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
+var Zr = Object.defineProperty, es = Object.getOwnPropertyDescriptor, Le = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? es(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Zr(t, o, r), r;
+};
+const G = "macro-assignment-model", gt = "PurgeTrouble", ts = "PrimeTrouble";
+let D = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
     /**
      * futureHandler is used to handle async operations
      */
-    s(this, "futureHandler");
-    s(this, "holders");
-    s(this, "ingredients");
-    this.id = e, this.futureHandler = new pe(), this.logger = r.logger;
+    i(this, "futureHandler");
+    i(this, "holders");
+    i(this, "ingredients");
+    this.id = e, this.futureHandler = new Ge(), this.logger = o.logger;
   }
   /**
    * shortcut to the current running future
@@ -1758,15 +1534,15 @@ let A = class {
    * Relying on the indexing of troubles by type to find the purge troubles.
    */
   get holderPurgeTroubles() {
-    return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[_t] || [];
-      return t = [...t, ...i], t;
+    return this.macroHolders.reduce((t, o) => {
+      const s = o.troublesByType[gt] || [];
+      return t = [...t, ...s], t;
     }, []);
   }
   get holderPrimeTroubles() {
-    return this.macroHolders.reduce((t, r) => {
-      const i = r.troublesByType[Fi] || [];
-      return t = [...t, ...i], t;
+    return this.macroHolders.reduce((t, o) => {
+      const s = o.troublesByType[ts] || [];
+      return t = [...t, ...s], t;
     }, []);
   }
   /**
@@ -1801,53 +1577,53 @@ let A = class {
   async resolveAll(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const i = (e === _t ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
-    return await ki(i, t);
-  }
-};
-He([
-  m({ modelType: Zr.type })
-], A.prototype, "holders", 2);
-He([
-  m({ modelType: eo.type })
-], A.prototype, "ingredients", 2);
-He([
-  v()
-], A.prototype, "resolveAll", 1);
-A = He([
-  l(te)
-], A);
-const xi = {
+    const s = (e === gt ? this.holderPurgeTroubles : this.holderPrimeTroubles).map((n) => n.rawId);
+    return await Jr(s, t);
+  }
+};
+Le([
+  p({ modelType: Lo.type })
+], D.prototype, "holders", 2);
+Le([
+  p({ modelType: Do.type })
+], D.prototype, "ingredients", 2);
+Le([
+  M()
+], D.prototype, "resolveAll", 1);
+D = Le([
+  l(G)
+], D);
+const os = {
   registration: {
-    [te]: {
-      class: A,
+    [G]: {
+      class: D,
       singleton: !0
     }
   },
-  type: te,
-  predicate: u(te),
+  type: G,
+  predicate: u(G),
   factory: c.Singleton.create(
-    te
+    G
   )
 };
-var Ai = Object.getOwnPropertyDescriptor, ji = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ai(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var rs = Object.getOwnPropertyDescriptor, ss = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? rs(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const re = "network-test-model";
-let Je = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "group");
-    s(this, "passed");
-    s(this, "inProgress");
-    s(this, "failureTime");
-    s(this, "timestamp");
-    s(this, "name");
-    s(this, "results");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger, this.group = t.group, this.passed = !1, this.inProgress = !1, this.name = t.name, this.results = [];
+const q = "network-test-model";
+let We = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "group");
+    i(this, "passed");
+    i(this, "inProgress");
+    i(this, "failureTime");
+    i(this, "timestamp");
+    i(this, "name");
+    i(this, "results");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger, this.group = t.group, this.passed = !1, this.inProgress = !1, this.name = t.name, this.results = [];
   }
   updateModel(e) {
     this.group = e.group, this.name = e.name, this.passed = e.passed, this.failureTime = e.failureTime, this.inProgress = e.inProgress, this.timestamp = e.timestamp, this.results = e.results;
@@ -1860,58 +1636,58 @@ let Je = class {
     this.logger.debug(`loading network-test ${this.id}`);
   }
 };
-Je = ji([
-  l(re)
-], Je);
-const dr = {
+We = ss([
+  l(q)
+], We);
+const Qt = {
   registration: {
-    [re]: {
-      class: Je,
+    [q]: {
+      class: We,
       singleton: !1
     }
   },
-  type: re,
-  predicate: u(re),
-  factory: c.Factory.create(re)
-}, { URL: We } = h("NETWORK-TEST_SERVICE"), { getAll: Ui, getOne: pr } = f.build({
-  basePath: `${We}/api/app/ncui/network/tests`
-}), Vi = g.createLogger({
+  type: q,
+  predicate: u(q),
+  factory: c.Factory.create(q)
+}, { URL: De } = h("NETWORK-TEST_SERVICE"), { getAll: is, getOne: Xt } = y.build({
+  basePath: `${De}/api/app/ncui/network/tests`
+}), ns = g.createLogger({
   name: "network-test-service",
   group: "Services"
-}), gr = async () => {
-  Vi.debug("sending GET for network-test");
-  const e = await Ui({
-    urlOverride: `${We}/api/app/kosdev.ddk/network/tests`
+}), Jt = async () => {
+  ns.debug("sending GET for network-test");
+  const e = await is({
+    urlOverride: `${De}/api/app/kosdev.ddk/network/tests`
   });
   return e == null ? void 0 : e.data;
-}, hr = async () => {
-  const e = await pr({
-    urlOverride: `${We}/api/app/kosdev.ddk/network/reports`
+}, Zt = async () => {
+  const e = await Xt({
+    urlOverride: `${De}/api/app/kosdev.ddk/network/reports`
   });
   return e == null ? void 0 : e.data;
-}, fr = async (e, t) => await pr({
-  urlOverride: `${We}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
+}, eo = async (e, t) => await Xt({
+  urlOverride: `${De}/api/app/kosdev.ddk/network/tests/run/group/${e}`,
   tracker: t
-}), Ys = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), di = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNetworkTests: gr,
-  getTestsReports: hr,
-  performGroupTest: fr
+  getNetworkTests: Jt,
+  getTestsReports: Zt,
+  performGroupTest: eo
 }, Symbol.toStringTag, { value: "Module" }));
-var Hi = Object.defineProperty, Wi = Object.getOwnPropertyDescriptor, ut = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Wi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Hi(t, r, o), o;
-};
-const oe = "network-test-container-model";
-let de = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "lastTested");
-    s(this, "futureHandler");
-    s(this, "models");
-    this.id = e, this.logger = r.logger, this.futureHandler = new pe(this), this.models = new tt({
+var as = Object.defineProperty, ls = Object.getOwnPropertyDescriptor, ot = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? ls(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && as(t, o, r), r;
+};
+const Q = "network-test-container-model";
+let ne = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "lastTested");
+    i(this, "futureHandler");
+    i(this, "models");
+    this.id = e, this.logger = o.logger, this.futureHandler = new Ge(this), this.models = new Ve({
       parentId: e,
       indexMap: {
         group: "group"
@@ -1937,28 +1713,28 @@ let de = class {
     );
   }
   getLastTested(e) {
-    const t = this.models.getIndexByKey("group", e).map((i) => i.timestamp && new Date(i.timestamp)), r = Math.max(
-      ...t.map((i) => i ? i.getTime() : 0)
+    const t = this.models.getIndexByKey("group", e).map((s) => s.timestamp && new Date(s.timestamp)), o = Math.max(
+      ...t.map((s) => s ? s.getTime() : 0)
     );
-    return r ? bi(new Date(r)) : "";
+    return o ? Hr(new Date(o)) : "";
   }
   async load() {
     this.logger.debug(`loading network-test-container container ${this.id}`);
-    const e = await gr(), t = await hr();
-    e && e.forEach((r) => {
-      const i = dr.factory(r.id)(r);
-      this.addModel(i);
-    }), e && t && e.forEach((r) => {
-      const i = t == null ? void 0 : t[r.group], o = i == null ? void 0 : i[r.id], n = this.getModel(r.id);
-      if (n && o) {
+    const e = await Jt(), t = await Zt();
+    e && e.forEach((o) => {
+      const s = Qt.factory(o.id)(o);
+      this.addModel(s);
+    }), e && t && e.forEach((o) => {
+      const s = t == null ? void 0 : t[o.group], r = s == null ? void 0 : s[o.id], n = this.getModel(o.id);
+      if (n && r) {
         const a = {
-          group: o.group,
-          name: o.name,
-          passed: o.passed,
-          failureTime: o.failureTime ? new Date(o.failureTime) : void 0,
-          inProgress: o.inProgress,
-          timestamp: new Date(o.timestamp),
-          results: o.results
+          group: r.group,
+          name: r.name,
+          passed: r.passed,
+          failureTime: r.failureTime ? new Date(r.failureTime) : void 0,
+          inProgress: r.inProgress,
+          timestamp: new Date(r.timestamp),
+          results: r.results
         };
         n.updateModel(a);
       }
@@ -1967,117 +1743,125 @@ let de = class {
   async performTest(e, t) {
     if (!t)
       throw new Error("No tracker provided");
-    const r = await fr(e, t);
-    return r == null ? void 0 : r.data;
+    const o = await eo(e, t);
+    return o == null ? void 0 : o.data;
   }
   onFutureUpdate(e) {
     const { clientData: t } = e;
-    t && t.forEach((r) => {
-      const i = this.getModel(r.id);
-      if (_(() => {
-        this.lastTested = this.lastTested > new Date(r.timestamp) ? this.lastTested : new Date(r.timestamp);
-      }), i) {
-        const o = {
-          group: r.group,
-          name: r.name,
-          passed: r.passed,
-          failureTime: r.failureTime ? new Date(r.failureTime) : void 0,
-          inProgress: r.inProgress,
-          timestamp: new Date(r.timestamp),
-          results: r.results
+    t && t.forEach((o) => {
+      const s = this.getModel(o.id);
+      if (v(() => {
+        this.lastTested = this.lastTested > new Date(o.timestamp) ? this.lastTested : new Date(o.timestamp);
+      }), s) {
+        const r = {
+          group: o.group,
+          name: o.name,
+          passed: o.passed,
+          failureTime: o.failureTime ? new Date(o.failureTime) : void 0,
+          inProgress: o.inProgress,
+          timestamp: new Date(o.timestamp),
+          results: o.results
         };
-        _(() => {
-          i.updateModel(o);
+        v(() => {
+          s.updateModel(r);
         });
       }
     });
   }
 };
-ut([
-  Le
-], de.prototype, "models", 2);
-ut([
-  v()
-], de.prototype, "performTest", 1);
-de = ut([
-  l(oe)
-], de);
-const Ni = {
+ot([
+  $e
+], ne.prototype, "models", 2);
+ot([
+  M()
+], ne.prototype, "performTest", 1);
+ne = ot([
+  l(Q)
+], ne);
+const ds = {
   registration: {
-    [oe]: {
-      class: de,
+    [Q]: {
+      class: ne,
       singleton: !0
     },
-    ...dr.registration
+    ...Qt.registration
   },
-  type: oe,
-  predicate: u(oe),
-  factory: c.Singleton.create(oe)
+  type: Q,
+  predicate: u(Q),
+  factory: c.Singleton.create(Q)
 };
-var zi = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, mr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Bi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && zi(t, r, o), o;
+var cs = Object.defineProperty, us = Object.getOwnPropertyDescriptor, rt = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? us(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && cs(t, o, r), r;
 };
-const ie = "nutritive-sweetener-model";
-let Pe = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "assemblyModel");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+const X = "nutritive-sweetener-model", ps = ht("statePath");
+let ae = class {
+  constructor(e, t) {
+    i(this, "id");
+    i(this, "assemblyModel");
+    i(this, "pumpState");
+    this.id = e;
   }
-  getHolder() {
+  get holder() {
     return this.assemblyModel.getHoldersByGroup("ns")[0];
   }
-  getPump() {
-    return this.getHolder().pumps.data[0];
+  getHolder() {
+    return this.holder;
   }
-  // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing nutritive-sweetener ${this.id}`);
+  get statePath() {
+    return `${this.pump.path}:airVent:state`;
   }
-  async load() {
-    this.logger.debug(`loading nutritive-sweetener ${this.id}`);
+  get pump() {
+    return this.holder.pumps.data[0];
+  }
+  getPump() {
+    return this.pump;
   }
 };
-mr([
-  m({ modelType: Fe.type })
-], Pe.prototype, "assemblyModel", 2);
-Pe = mr([
-  l(ie)
-], Pe);
-const Ki = {
+rt([
+  p({ modelType: Se.type })
+], ae.prototype, "assemblyModel", 2);
+rt([
+  wo({
+    path: ps
+  })
+], ae.prototype, "pumpState", 2);
+ae = rt([
+  l(X),
+  Ke()
+], ae);
+const gs = {
   registration: {
-    [ie]: {
-      class: Pe,
+    [X]: {
+      class: ae,
       singleton: !1
     }
   },
-  type: ie,
-  predicate: u(ie),
-  factory: c.Factory.create(ie)
+  type: X,
+  predicate: u(X),
+  factory: c.Factory.create(X)
 };
-var Yi = Object.defineProperty, qi = Object.getOwnPropertyDescriptor, yr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? qi(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && Yi(t, r, o), o;
+var hs = Object.defineProperty, ys = Object.getOwnPropertyDescriptor, to = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? ys(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && hs(t, o, r), r;
 };
-const se = "plain-water-model";
-let Oe = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "assemblyModel");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+const J = "plain-water-model";
+let me = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "assemblyModel");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger;
   }
   getHolder() {
     return this.assemblyModel.getHoldersByGroup("water")[0];
   }
   getPump() {
-    var i, o;
-    const e = this.getHolder(), t = (o = (i = e == null ? void 0 : e.pumps) == null ? void 0 : i.data) == null ? void 0 : o[0];
-    return rt(t, Kt.type);
+    var s, r;
+    const e = this.getHolder(), t = (r = (s = e == null ? void 0 : e.pumps) == null ? void 0 : s.data) == null ? void 0 : r[0];
+    return Be(t, mt.type);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2087,45 +1871,45 @@ let Oe = class {
     this.logger.debug(`loading plain-water ${this.id}`);
   }
 };
-yr([
-  m({ modelType: Fe.type })
-], Oe.prototype, "assemblyModel", 2);
-Oe = yr([
-  l(se)
-], Oe);
-const Gi = {
+to([
+  p({ modelType: Se.type })
+], me.prototype, "assemblyModel", 2);
+me = to([
+  l(J)
+], me);
+const fs = {
   registration: {
-    [se]: {
-      class: Oe,
+    [J]: {
+      class: me,
       singleton: !1
     }
   },
-  type: se,
-  predicate: u(se),
-  factory: c.Factory.create(se)
-}, { URL: br } = h("REBOOT_SERVICE"), { postModel: Qi } = f.build({
-  basePath: `${br}/api/reboot`
-}), Xi = g.createLogger({ name: "reboot-service", group: "Services" }), vr = async () => (Xi.debug("sending POST call for Reboot Dispenser"), await Qi({
-  urlOverride: `${br}/api/app/kosdev.ddk/ncui/reboot`,
+  type: J,
+  predicate: u(J),
+  factory: c.Factory.create(J)
+}, { URL: oo } = h("REBOOT_SERVICE"), { postModel: vs } = y.build({
+  basePath: `${oo}/api/reboot`
+}), ms = g.createLogger({ name: "reboot-service", group: "Services" }), ro = async () => (ms.debug("sending POST call for Reboot Dispenser"), await vs({
+  urlOverride: `${oo}/api/app/kosdev.ddk/ncui/reboot`,
   model: {}
-})), qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+})), ci = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  rebootDispenser: vr
+  rebootDispenser: ro
 }, Symbol.toStringTag, { value: "Module" }));
-var Ji = Object.getOwnPropertyDescriptor, Zi = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? Ji(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var bs = Object.getOwnPropertyDescriptor, _s = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? bs(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const ae = "reboot-model";
-let Ze = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger;
+const Z = "reboot-model";
+let Ne = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger;
   }
   async completeReboot() {
-    await vr();
+    await ro();
   }
   updateModel() {
   }
@@ -2137,46 +1921,45 @@ let Ze = class {
     this.logger.debug(`loading reboot ${this.id}`);
   }
 };
-Ze = Zi([
-  l(ae)
-], Ze);
-const es = {
+Ne = _s([
+  l(Z)
+], Ne);
+const Ts = {
   registration: {
-    [ae]: {
-      class: Ze,
+    [Z]: {
+      class: Ne,
       singleton: !1
     }
   },
-  type: ae,
-  predicate: u(ae),
-  factory: c.Factory.create(ae)
-};
-var ts = Object.defineProperty, rs = Object.getOwnPropertyDescriptor, C = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? rs(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && ts(t, r, o), o;
-};
-const ne = "settings-model";
-let P = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "ncuiLanguageData");
-    s(this, "resolveDelaysMs");
-    s(this, "dateFormat");
-    s(this, "timeFormat");
-    s(this, "hidePlainWaterBev");
-    s(this, "hideCarbWaterBev");
-    s(this, "ncuiLanguage");
-    s(this, "name");
-    s(this, "activateAndRebootTime");
-    this.id = e, this.logger = r.logger;
-  }
-  updateModel(e) {
+  type: Z,
+  predicate: u(Z),
+  factory: c.Factory.create(Z)
+};
+var $s = Object.defineProperty, Ps = Object.getOwnPropertyDescriptor, m = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Ps(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && $s(t, o, r), r;
+};
+const ee = "settings-model";
+let f = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "ncuiLanguageData");
+    i(this, "resolveDelaysMs");
+    i(this, "dateFormat");
+    i(this, "timeFormat");
+    i(this, "hidePlainWaterBev");
+    i(this, "hideCarbWaterBev");
+    i(this, "ncuiLanguage");
+    i(this, "name");
+    i(this, "activateAndRebootTime");
+    i(this, "horizontalMode");
+    this.id = e, this.logger = o.logger;
   }
   // -------------------LIFECYCLE----------------------------
-  async init() {
-    this.logger.debug(`initializing settings ${this.id}`);
+  async ready() {
+    this.updateDisplayMode();
   }
   async getNcuiLanguageList() {
     this.ncuiLanguageData = {
@@ -2204,98 +1987,115 @@ let P = class {
       }
     };
   }
+  handleUpdateDisplayMode() {
+    this.updateDisplayMode();
+  }
+  updateDisplayMode() {
+    this.horizontalMode.value ? document.body.setAttribute("data-dashboard-layout", "horizontal") : document.body.setAttribute("data-dashboard-layout", "vertical");
+  }
 };
-C([
+m([
   d({
     path: "system:app",
     attribute: "resolveDelaysMs"
     // optionsExpander: () => [],
   })
-], P.prototype, "resolveDelaysMs", 2);
-C([
+], f.prototype, "resolveDelaysMs", 2);
+m([
   d({
     path: "system:app",
     attribute: "dateFormat"
     // optionsExpander: () => [],
   })
-], P.prototype, "dateFormat", 2);
-C([
+], f.prototype, "dateFormat", 2);
+m([
   d({
     path: "system:app",
     attribute: "timeFormat"
     // optionsExpander: () => [],
   })
-], P.prototype, "timeFormat", 2);
-C([
+], f.prototype, "timeFormat", 2);
+m([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hidePlainWaterBev"
   })
-], P.prototype, "hidePlainWaterBev", 2);
-C([
+], f.prototype, "hidePlainWaterBev", 2);
+m([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.hideCarbWaterBev"
   })
-], P.prototype, "hideCarbWaterBev", 2);
-C([
+], f.prototype, "hideCarbWaterBev", 2);
+m([
   d({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.ncuiLanguage"
   })
-], P.prototype, "ncuiLanguage", 2);
-C([
+], f.prototype, "ncuiLanguage", 2);
+m([
   d({
     path: "kos:device",
     attribute: "name"
   })
-], P.prototype, "name", 2);
-C([
+], f.prototype, "name", 2);
+m([
   d({
     path: "kos:service:OTA",
     attribute: "activateAndRebootTime"
   })
-], P.prototype, "activateAndRebootTime", 2);
-P = C([
-  l(ne)
-], P);
-const os = {
+], f.prototype, "activateAndRebootTime", 2);
+m([
+  d({
+    path: "app:kosdev.ddk:app",
+    attribute: "ncui.uiConfig.display.horizontalMode"
+  })
+], f.prototype, "horizontalMode", 2);
+m([
+  Pe({
+    dependencies: (e) => [e.horizontalMode.value]
+  })
+], f.prototype, "handleUpdateDisplayMode", 1);
+f = m([
+  l(ee)
+], f);
+const Ms = {
   registration: {
-    [ne]: {
-      class: P,
+    [ee]: {
+      class: f,
       singleton: !0
     }
   },
-  type: ne,
-  predicate: u(ne),
-  factory: c.Singleton.create(ne)
-}, { URL: _r } = h("SETTINGS_SERVICE"), { getAll: $r } = f.build({
-  basePath: `${_r}/api/settings`
-}), is = g.createLogger({
+  type: ee,
+  predicate: u(ee),
+  factory: c.Singleton.create(ee)
+}, { URL: so } = h("SETTINGS_SERVICE"), { getAll: io } = y.build({
+  basePath: `${so}/api/settings`
+}), Os = g.createLogger({
   name: "settings-service",
   group: "Services"
-}), ss = async () => (is.debug("sending GET for settings"), await $r({})), as = async () => await $r({
-  urlOverride: `${_r}api/app/kosdev.ddk/ncui/languages`
-}), Gs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Ss = async () => (Os.debug("sending GET for settings"), await io({})), ws = async () => await io({
+  urlOverride: `${so}api/app/kosdev.ddk/ncui/languages`
+}), ui = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getNcuiLanguage: as,
-  getSettings: ss
+  getNcuiLanguage: ws,
+  getSettings: Ss
 }, Symbol.toStringTag, { value: "Module" }));
-var ns = Object.getOwnPropertyDescriptor, ls = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ns(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = a(o) || o);
-  return o;
+var Es = Object.getOwnPropertyDescriptor, Cs = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Es(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = a(r) || r);
+  return r;
 };
-const le = "utilities-model";
-let et = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "name");
-    s(this, "options");
-    s(this, "roles");
-    s(this, "columnId");
-    s(this, "logger");
-    this.id = e, this.logger = r.logger, this.name = t.name, this.options = t.options, this.roles = t == null ? void 0 : t.roles, this.columnId = t.columnId;
+const te = "utilities-model";
+let ze = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "name");
+    i(this, "options");
+    i(this, "roles");
+    i(this, "columnId");
+    i(this, "logger");
+    this.id = e, this.logger = o.logger, this.name = t.name, this.options = t.options, this.roles = t == null ? void 0 : t.roles, this.columnId = t.columnId;
   }
   updateModel(e) {
     this.name = e.name, this.options = e.options, this.roles = e == null ? void 0 : e.roles;
@@ -2314,46 +2114,61 @@ let et = class {
     this.logger.debug(`loading utilities ${this.id}`);
   }
 };
-et = ls([
-  l(le)
-], et);
-const Tr = {
+ze = Cs([
+  l(te)
+], ze);
+const no = {
   registration: {
-    [le]: {
-      class: et,
+    [te]: {
+      class: ze,
       singleton: !1
     }
   },
-  type: le,
-  predicate: u(le),
-  factory: c.Factory.create(le)
-}, { URL: Pr } = h("UTILITIES_SERVICE"), { getAll: cs } = f.build({
-  basePath: `${Pr}/api/utilities`
-}), us = g.createLogger({
+  type: te,
+  predicate: u(te),
+  factory: c.Factory.create(te)
+}, { URL: ge } = h("UTILITIES_SERVICE"), { getAll: Ie } = y.build({
+  basePath: `${ge}/api/utilities`
+}), Re = g.createLogger({
   name: "utilities-service",
   group: "Services"
-}), Or = async () => {
-  us.debug("sending GET for utilities");
-  const e = await cs({
-    urlOverride: `${Pr}/api/kos/descriptor/system:app/kondra.ncui.utilities`
-  });
-  return e == null ? void 0 : e.data;
-}, Qs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), ao = async () => {
+  Re.debug("sending GET for utilities");
+  try {
+    const e = await Ie({
+      urlOverride: `${ge}/api/kos/descriptor/app:kosdev.ddk:ncuiDescriptor/kondra.ncui.utilities`
+    });
+    if ((e == null ? void 0 : e.status) !== 200) {
+      Re.info("no extensions found, using base data");
+      const t = await Ie({
+        urlOverride: `${ge}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+      });
+      return (t == null ? void 0 : t.data) ?? [];
+    }
+    return (e == null ? void 0 : e.data) ?? [];
+  } catch (e) {
+    Re.info(`error fetching utilities: ${e}. Using base data`);
+    const t = await Ie({
+      urlOverride: `${ge}/api/kos/descriptor/system:app/kondra.ncui.utilities`
+    });
+    return (t == null ? void 0 : t.data) ?? [];
+  }
+}, pi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getUtilities: Or
+  getUtilities: ao
 }, Symbol.toStringTag, { value: "Module" }));
-var ds = Object.defineProperty, ps = Object.getOwnPropertyDescriptor, Mr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? ps(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && ds(t, r, o), o;
+var Ls = Object.defineProperty, Ds = Object.getOwnPropertyDescriptor, lo = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Ds(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && Ls(t, o, r), r;
 };
-const ce = "utilities-container-model";
-let Me = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new tt({
+const oe = "utilities-container-model";
+let be = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "_models");
+    this.id = e, this.logger = o.logger, this._models = new Ve({
       parentId: e,
       sortKey: "id",
       indexMap: {
@@ -2385,142 +2200,223 @@ let Me = class {
   // -------------------LIFECYCLE----------------------------
   async load() {
     this.logger.debug(`loading utilities-container container ${this.id}`);
-    const e = await Or();
-    e == null || e.forEach((t, r) => {
-      t.forEach((i) => {
-        const o = {
-          ...i,
-          columnId: String(r)
-        }, n = Tr.factory(i.name)(
-          o
+    const e = await ao();
+    e == null || e.forEach((t, o) => {
+      t.forEach((s) => {
+        const r = {
+          ...s,
+          columnId: String(o)
+        }, n = no.factory(s.name)(
+          r
         );
         this.addModel(n);
       });
     });
   }
 };
-Mr([
-  Le
-], Me.prototype, "_models", 2);
-Me = Mr([
-  l(ce)
-], Me);
-const gs = {
+lo([
+  $e
+], be.prototype, "_models", 2);
+be = lo([
+  l(oe)
+], be);
+const ks = {
   registration: {
-    [ce]: {
-      class: Me,
+    [oe]: {
+      class: be,
       singleton: !0
     },
-    ...Tr.registration
+    ...no.registration
   },
-  type: ce,
-  predicate: u(ce),
-  factory: c.Singleton.create(ce)
-}, Xs = {
-  ...wo.registration,
-  ...nt.registration,
-  ...st.registration,
-  ...Uo.registration,
-  ...lt.registration,
-  ...Xo.registration,
-  ...ii.registration,
-  ...di.registration,
-  ...$i.registration,
-  ...xi.registration,
-  ...Ni.registration,
-  ...Ki.registration,
-  ...Gi.registration,
-  ...es.registration,
+  type: oe,
+  predicate: u(oe),
+  factory: c.Singleton.create(oe)
+}, gi = {
+  ...sr.registration,
+  ...Ze.registration,
+  ...Qe.registration,
+  ...ur.registration,
+  ...et.registration,
+  ...Pr.registration,
+  ...Lr.registration,
+  ...xr.registration,
+  ...Yr.registration,
   ...os.registration,
-  ...It.registration,
-  ...gs.registration
-};
-var hs = Object.defineProperty, fs = Object.getOwnPropertyDescriptor, Sr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? fs(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && hs(t, r, o), o;
-};
-const Cr = "trouble-action-model";
-let Se = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "troubleContainer");
-    s(this, "disposer");
-    s(this, "state");
-    s(this, "troubleActionData");
-    this.id = e, this.logger = r.logger, this.state = Qr(), this.troubleActionData = t.definitions.reduce((i, o) => (i[o.troubleType] = o, i), {});
+  ...ds.registration,
+  ...gs.registration,
+  ...fs.registration,
+  ...Ts.registration,
+  ...Ms.registration,
+  ...Et.registration,
+  ...ks.registration
+};
+var co = Object.defineProperty, Is = Object.getOwnPropertyDescriptor, Rs = (e, t, o) => t in e ? co(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o, st = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Is(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && co(t, o, r), r;
+}, As = (e, t, o) => (Rs(e, t + "", o), o);
+const Fs = "trouble-action-model";
+let k = class {
+  /**
+   * Creates a new TroubleActionModel instance.
+   *
+   * Initializes the model with trouble action definitions that map trouble
+   * types to state key-value pairs. The model begins monitoring the trouble
+   * container immediately upon creation.
+   *
+   * @param modelId - Unique identifier for this model instance
+   * @param options - Configuration options containing trouble action definitions
+   * @param context - KOS creation context providing logger and framework services
+   *
+   * @category Lifecycle
+   */
+  constructor(e, t) {
+    /**
+     * Unique identifier for this model instance.
+     *
+     * Set during construction and used for model lifecycle management
+     * and debugging purposes.
+     *
+     * @category Model Properties
+     */
+    i(this, "id");
+    i(this, "troubleContainer");
+    /**
+     * Observable state object mapping trouble state keys to values.
+     *
+     * This reactive state object is automatically updated when troubles are
+     * added or removed from the system. Keys and values are determined by
+     * the trouble action definitions provided during model initialization.
+     *
+     * State keys that no longer have associated active troubles are set to
+     * undefined.
+     *
+     * @example
+     * ```typescript
+     * // Access state values
+     * const isAgitationRequired = troubleActionModel.state.agitationRequired;
+     *
+     * // State is reactive - updates automatically propagate to React components
+     * ```
+     *
+     * @category Model State
+     */
+    i(this, "state");
+    /**
+     * Internal mapping of trouble types to their action definitions.
+     *
+     * Built from the definitions array provided in TroubleActionOptions during
+     * construction. Used for efficient lookup when processing trouble changes.
+     *
+     * @category Internal State
+     */
+    i(this, "troubleActionData");
+    this.id = e, this.state = Eo(), this.troubleActionData = t.definitions.reduce((o, s) => (o[s.troubleType] = s, o), {});
   }
   // -------------------LIFECYCLE----------------------------
+  /**
+   * Gets the first active trouble that has an associated action definition.
+   *
+   * Returns the first trouble found that matches any of the configured trouble
+   * action definitions. If multiple troubles are active, priority is determined
+   * by the order of trouble type keys in the troubleActionData object.
+   *
+   * @returns The active trouble model, or undefined if no matching troubles exist
+   *
+   * @example
+   * ```typescript
+   * const trouble = troubleActionModel.activeTrouble;
+   * if (trouble) {
+   *   console.log(`Active trouble: ${trouble.type}`);
+   *   console.log(`Resolvable: ${trouble.resolvable}`);
+   * }
+   * ```
+   *
+   * @category Trouble Access
+   * @see {@link TroubleContainerModel} for trouble data structure
+   */
   get activeTrouble() {
     const e = Object.keys(this.troubleActionData);
     if (e.length > 0) {
-      const t = e[0], r = this.troubleContainer.troubles.getIndexByKey(
+      const t = e[0], o = this.troubleContainer.troubles.getIndexByKey(
         "byType",
         t
       );
-      return r.length > 0 ? r[0] : void 0;
+      return o.length > 0 ? o[0] : void 0;
     }
   }
+  /**
+   * Gets the type of the first active trouble with an associated action definition.
+   *
+   * Convenience getter that extracts the trouble type from the active trouble.
+   * Commonly used for conditional UI rendering based on trouble type.
+   *
+   * @returns The active trouble type string, or undefined if no troubles are active
+   *
+   * @example
+   * ```typescript
+   * const troubleType = troubleActionModel.activeTroubleType;
+   * if (troubleType === 'InsufficientAgitationTrouble') {
+   *   // Show agitation required UI
+   * }
+   * ```
+   *
+   * @category Trouble Access
+   */
   get activeTroubleType() {
     var e;
     return (e = this.activeTrouble) == null ? void 0 : e.type;
   }
-  async init() {
-    this.logger.debug(`initializing trouble-action ${this.id}`), this.disposer = Xr(() => {
-      const e = this.troubleContainer.troubles.data.reduce((t, r) => {
-        const i = r.type;
-        if (this.troubleActionData[i]) {
-          const o = this.troubleActionData[i].stateKey ?? i, n = this.troubleActionData[i].stateValue ?? i;
-          t[o] = n;
-        }
-        return t;
-      }, {});
-      this.state.setValues(e), Object.keys(this.troubleActionData).forEach((t) => {
-        if (this.troubleContainer.troubles.getIndexByKey("byType", t).length === 0) {
-          const r = this.troubleActionData[t].stateKey ?? t;
-          this.state[r] = void 0;
-        }
-      });
+  handleTroubleActions() {
+    const e = this.troubleContainer.troubles.data.reduce((t, o) => {
+      const s = o.type;
+      if (this.troubleActionData[s]) {
+        const r = this.troubleActionData[s].stateKey ?? s, n = this.troubleActionData[s].stateValue ?? s;
+        t[r] = n;
+      }
+      return t;
+    }, {});
+    this.state.setValues(e), Object.keys(this.troubleActionData).forEach((t) => {
+      if (this.troubleContainer.troubles.getIndexByKey("byType", t).length === 0) {
+        const o = this.troubleActionData[t].stateKey ?? t;
+        this.state[o] = void 0;
+      }
     });
   }
-  unload() {
-    var e;
-    (e = this.disposer) == null || e.call(this);
-  }
-  async load() {
-    this.logger.debug(`loading trouble-action ${this.id}`);
-  }
 };
-Sr([
-  m({ modelType: ot.type })
-], Se.prototype, "troubleContainer", 2);
-Se = Sr([
-  l(Cr)
-], Se);
-const Js = new ke({
-  class: Se,
-  type: Cr
-}), { URL: wr } = h("START_SERVICE"), { getOne: ms } = f.build({
-  basePath: `${wr}/api/start`
-}), ys = g.createLogger({ name: "start-service", group: "Services" }), Er = async () => (ys.debug("navigating to NCUI"), await ms({
-  urlOverride: `${wr}/api/app/kosdev.ddk/ncui/open`
-})), Zs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+As(k, "Registration");
+st([
+  p({ modelType: Ye.type })
+], k.prototype, "troubleContainer", 2);
+st([
+  Pe({
+    dependencies: (e) => [e.troubleContainer.troubles.data]
+  })
+], k.prototype, "handleTroubleActions", 1);
+k = st([
+  l({ modelTypeId: Fs, singleton: !0 }),
+  Ke()
+], k);
+const hi = k.Registration, { URL: uo } = h("START_SERVICE"), { getOne: xs } = y.build({
+  basePath: `${uo}/api/start`
+}), Us = g.createLogger({ name: "start-service", group: "Services" }), po = async () => (Us.debug("navigating to NCUI"), await xs({
+  urlOverride: `${uo}/api/app/kosdev.ddk/ncui/open`
+})), yi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  navigateToNCui: Er
+  navigateToNCui: po
 }, Symbol.toStringTag, { value: "Module" }));
-var bs = Object.defineProperty, vs = Object.getOwnPropertyDescriptor, Lr = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? vs(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && bs(t, r, o), o;
+var js = Object.defineProperty, Ws = Object.getOwnPropertyDescriptor, go = (e, t, o, s) => {
+  for (var r = s > 1 ? void 0 : s ? Ws(t, o) : t, n = e.length - 1, a; n >= 0; n--)
+    (a = e[n]) && (r = (s ? a(t, o, r) : a(r)) || r);
+  return s && r && js(t, o, r), r;
 };
-const Dr = "start-model";
-let Ce = class {
-  constructor(e, t, r) {
-    s(this, "id");
-    s(this, "logger");
-    s(this, "troubles");
-    this.id = e, this.logger = r.logger;
+const ho = "start-model";
+let _e = class {
+  constructor(e, t, o) {
+    i(this, "id");
+    i(this, "logger");
+    i(this, "troubles");
+    this.id = e, this.logger = o.logger;
   }
   get firmwareFailed() {
     return this.troubles.troubles.getIndexByKey(
@@ -2535,7 +2431,7 @@ let Ce = class {
     ).length > 0;
   }
   async navigate() {
-    await Er();
+    await po();
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -2545,261 +2441,69 @@ let Ce = class {
     this.logger.debug(`loading start ${this.id}`);
   }
 };
-Lr([
-  m({ modelType: ot.type })
-], Ce.prototype, "troubles", 2);
-Ce = Lr([
-  l(Dr)
-], Ce);
-const ea = new ke({
-  class: Ce,
-  type: Dr
-}), { URL: me } = h("SPM-PUMP_SERVICE"), { postModel: Ne } = f.build({
-  basePath: `${me}/api/spm-pump`
-}), $ = g.createLogger({
-  name: "spm-pump-service",
-  group: "Services"
-}), kr = async (e, t) => {
-  $.debug(
-    `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`
-  );
-  try {
-    const r = await Ne({
-      model: {},
-      urlOverride: `${me}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
-      tracker: t
-    });
-    return $.debug("performPreCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
-  } catch (r) {
-    $.error(
-      `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
-      r
-    );
-    const i = {
-      id: t || "",
-      endState: b.Fail,
-      tracker: t,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(i), i;
-  }
-}, Rr = async (e, t) => {
-  $.debug(
-    `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`
-  );
-  try {
-    const r = await Ne({
-      model: {},
-      urlOverride: `${me}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
-      tracker: t
-    });
-    return $.debug("performCalibrate - response:", r), r != null && r.data && T.initiateFuture(r.data), r == null ? void 0 : r.data;
-  } catch (r) {
-    $.error(
-      `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
-      r
-    );
-    const i = {
-      id: t || "",
-      endState: b.Fail,
-      tracker: t,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(i), i;
-  }
-}, Ir = async (e, t, r, i) => {
-  $.debug(
-    `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`
-  );
-  try {
-    const o = await Ne({
-      model: {
-        ...r,
-        // commandedCalibrationVolume: 0,
-        measuredCalibrationVolume: t
-        // measuredVerificationVolume: 0,
-        // newCalibrationValue: 0,
-        // pouredCalibrationVolume: 0,
-      },
-      urlOverride: `${me}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
-      tracker: i
-    });
-    return $.debug("performVerify - response:", o), o != null && o.data && T.initiateFuture(o.data), o == null ? void 0 : o.data;
-  } catch (o) {
-    $.error(
-      `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`,
-      o
-    );
-    const n = {
-      id: i || "",
-      endState: b.Fail,
-      tracker: i,
-      reason: "Failed to resolve trouble"
-    };
-    return T.initiateFuture(n), n;
-  }
-}, Fr = async (e, t, r, i) => {
-  var o, n, a, O, D;
-  $.debug(
-    `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`
-  );
-  try {
-    const p = await Ne({
-      model: {
-        ...i,
-        // commandedCalibrationVolume: 0,
-        measuredCalibrationVolume: t,
-        measuredVerificationVolume: r
-        // newCalibrationValue: 0,
-        // pouredCalibrationVolume: 0,
-      },
-      urlOverride: `${me}/api/ext/freestyle/microCalibration/pour/${e}/complete`
-    });
-    return $.debug("performComplete - response:", p), ((p == null ? void 0 : p.status) === 200 || (p == null ? void 0 : p.status) === 499) && ((o = p.data) != null && o.error) ? [p.data.error || "unknownError", p.data] : [void 0, p == null ? void 0 : p.data];
-  } catch (p) {
-    if ($.error(
-      `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`,
-      p
-    ), p instanceof Re) {
-      const dt = ((a = (n = p.payload) == null ? void 0 : n.data) == null ? void 0 : a.error) || ((O = p.payload) == null ? void 0 : O.error) || "unknownError";
-      return [dt, ((D = p.payload) == null ? void 0 : D.data) || { error: dt }];
-    }
-  }
-  return ["unknownError", { error: "unknownError" }];
-}, ta = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  performCalibrate: Rr,
-  performComplete: Fr,
-  performPreCalibrate: kr,
-  performVerify: Ir
-}, Symbol.toStringTag, { value: "Module" }));
-var _s = Object.defineProperty, $s = Object.getOwnPropertyDescriptor, ze = (e, t, r, i) => {
-  for (var o = i > 1 ? void 0 : i ? $s(t, r) : t, n = e.length - 1, a; n >= 0; n--)
-    (a = e[n]) && (o = (i ? a(t, r, o) : a(o)) || o);
-  return i && o && _s(t, r, o), o;
-};
-const xr = "spm-pump-model";
-let j = 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 pe(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 kr(this.pump.path, e);
-  }
-  async performCalibrate(e) {
-    return Rr(this.pump.path, e);
-  }
-  async performVerify(e, t, r) {
-    return Ir(this.pump.path, e, t, r);
-  }
-  async performComplete(e, t, r) {
-    return Fr(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}`);
-  }
-};
-ze([
-  v()
-], j.prototype, "performPreCalibrate", 1);
-ze([
-  v()
-], j.prototype, "performCalibrate", 1);
-ze([
-  v()
-], j.prototype, "performVerify", 1);
-j = ze([
-  l(xr)
-], j);
-const ra = new Ee({
-  class: j,
-  type: xr
+go([
+  p({ modelType: Ye.type })
+], _e.prototype, "troubles", 2);
+_e = go([
+  l(ho)
+], _e);
+const fi = new He({
+  class: _e,
+  type: ho
 });
 export {
-  ws as AgitationControl,
-  wo as Animation,
-  Es as AnimationServices,
-  nt as Application,
-  st as Auth,
-  Ss as AuthServices,
-  Uo as CarbWater,
-  ks as CopyLogs,
-  Ds as CopyLogsServices,
-  Xs as DDKModels,
-  lt as DashboardOperations,
-  Rs as DashboardOperationsServices,
-  Xo as Dispenser,
-  ii as DispenserInfo,
-  Fs as DispenserInfoServices,
-  Is as DispenserServices,
-  co as Door,
-  ue as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
-  di as Enrollment,
-  xs as EnrollmentServices,
-  Kt as FcmPump,
-  Ls as FcmPumpServices,
-  $i as IngredientSummary,
-  Ns as LfcvPump,
-  zs as LfcvPumpServices,
-  Ks as Lockout,
-  Bs as LockoutServices,
-  Vs as MACRO_KEYS,
-  xi as MacroAssignment,
-  dr as NetworkTest,
-  Ni as NetworkTestContainer,
-  Ys as NetworkTestServices,
-  Ki as NutritiveSweetener,
-  Gi as PlainWater,
-  es as Reboot,
-  qs as RebootServices,
-  os as Settings,
-  Gs as SettingsServices,
-  Rt as SetupStep,
-  It as SetupStepContainer,
-  Cs as SetupStepServices,
-  ra as SpmPump,
-  ta as SpmPumpServices,
-  ea as Start,
-  Zs as StartServices,
-  to as TROUBLE_TYPE_PRIME,
-  ht as TROUBLE_TYPE_PURGE,
-  Js as TroubleActionManager,
-  Tr as Utilities,
-  gs as UtilitiesContainer,
-  Qs as UtilitiesServices,
-  bi as calculateTimeDifference,
-  yi as executeDashboardKeyFactory,
-  js as isMacroGroup,
-  As as isMicroGroup,
-  Us as macroHolderMap,
-  mi as registerDashboardKeyFactory,
-  Ws as toSeconds,
-  Hs as toTimeComponents,
-  jt as troubleVisibilityFilter
+  Ys as AgitationControl,
+  sr as Animation,
+  Gs as AnimationServices,
+  Ze as Application,
+  Qe as Auth,
+  Bs as AuthServices,
+  ur as CarbWater,
+  Qs as CopyLogs,
+  qs as CopyLogsServices,
+  gi as DDKModels,
+  et as DashboardOperations,
+  Xs as DashboardOperationsServices,
+  Pr as Dispenser,
+  Lr as DispenserInfo,
+  Zs as DispenserInfoServices,
+  Js as DispenserServices,
+  Wo as Door,
+  ie as EXTENSION_POINT_DASHBOARD_KEY_FACTORY,
+  xr as Enrollment,
+  ei as EnrollmentServices,
+  Yr as IngredientSummary,
+  li as Lockout,
+  ai as LockoutServices,
+  si as MACRO_KEYS,
+  os as MacroAssignment,
+  Qt as NetworkTest,
+  ds as NetworkTestContainer,
+  di as NetworkTestServices,
+  gs as NutritiveSweetener,
+  fs as PlainWater,
+  Ts as Reboot,
+  ci as RebootServices,
+  Ms as Settings,
+  ui as SettingsServices,
+  wt as SetupStep,
+  Et as SetupStepContainer,
+  Ks as SetupStepServices,
+  fi as Start,
+  yi as StartServices,
+  ko as TROUBLE_TYPE_PRIME,
+  at as TROUBLE_TYPE_PURGE,
+  hi as TroubleActionManager,
+  no as Utilities,
+  ks as UtilitiesContainer,
+  pi as UtilitiesServices,
+  Hr as calculateTimeDifference,
+  Vr as executeDashboardKeyFactory,
+  oi as isMacroGroup,
+  ti as isMicroGroup,
+  ri as macroHolderMap,
+  zr as registerDashboardKeyFactory,
+  ni as toSeconds,
+  ii as toTimeComponents,
+  Dt as troubleVisibilityFilter
 };