@kosdev-code/kos-dispense-sdk 2.0.8 → 2.0.9

package/{dispense-registration-manager-CM5dCYOj.js → dispense-registration-manager-BtVe7yFS.js}

@@ -1,12 +1,12 @@
 var it = Object.defineProperty;
 var at = (e, t, r) => t in e ? it(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var o = (e, t, r) => (at(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { kosModel as m, isKosModel as v, Kos as P, resolveServiceUrl as N, ServiceFactory as T, KosLog as f, KosModelContainer as E, KosExtensionUtils as z, kosChild as M, FetchError as nt, ExtensionManager as u, EXTENSION_TROUBLE_MAPPER as fe, EXTENSION_TROUBLE_DATA_MAPPER as X, getKosModelSync as S, kosDependency as le, TroubleContainer as xe, troubleByTypeReducer as De, kosAction as I, kosTopicHandler as q, DependencyLifecycle as Ne, getKosModel as Te, FutureManager as be, kosFuture as ve, FutureHandler as st, isKosDataModel as ot, ChildModels as dt, KosFeatureFlags as lt, kosParentAware as pt, createPropKey as ct, MultipleFutureHandler as gt, getAllKosCompanionModels as te, EventBus as re, KosContextManager as ut, destroyKosModel as ht, SingletonKosModelRegistrationFactory as yt, KosModelRegistry as mt, RegistrationManager as _, registerCoreModels as It, registerLegacyModel as ft } from "@kosdev-code/kos-ui-sdk";
+import { kosModel as m, isKosModel as v, Kos as P, resolveServiceUrl as N, ServiceFactory as T, KosLog as f, KosModelContainer as E, KosExtensionUtils as z, kosChild as M, FetchError as nt, ExtensionManager as u, EXTENSION_TROUBLE_MAPPER as fe, EXTENSION_TROUBLE_DATA_MAPPER as X, getKosModelSync as S, kosDependency as le, TroubleContainer as Re, troubleByTypeReducer as xe, kosAction as I, kosTopicHandler as q, DependencyLifecycle as Ne, getKosModel as Te, FutureManager as be, kosFuture as ve, FutureHandler as st, isKosDataModel as ot, ChildModels as dt, KosFeatureFlags as lt, kosParentAware as pt, createPropKey as ct, MultipleFutureHandler as gt, arraysEqual as ut, getAllKosCompanionModels as te, EventBus as re, KosContextManager as ht, destroyKosModel as yt, SingletonKosModelRegistrationFactory as mt, KosModelRegistry as It, RegistrationManager as _, registerCoreModels as ft, registerLegacyModel as bt } from "@kosdev-code/kos-ui-sdk";
 import "react";
-var g = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e))(g || {}), $ = /* @__PURE__ */ ((e) => (e.Nozzle = "nozzle-model", e.Availability = "availability-model", e.Holder = "holder-model", e.HolderContainer = "holder-container-model", e.IngredientContainer = "ingredient-container-model", e.Ingredient = "ingredient-model", e.Pump = "pump-model", e.PumpContainer = "pump-container-model", e))($ || {}), bt = Object.defineProperty, vt = Object.getOwnPropertyDescriptor, Pt = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? vt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var g = /* @__PURE__ */ ((e) => (e.IngredientLoader = "kos.ingredient.loader", e.IngredientMapper = "kos.ingredient.mapper", e.IngredientIndex = "kos.ingredient.index", e.IngredientTypeMapper = "kos.ingredient.type.mapper", e.HolderTypeMapper = "kos.holder.type.mapper", e.HolderMapper = "kos.holder.mapper", e.HolderIndex = "kos.holder.index", e.HolderIngredientMapper = "kos.holder.ingredient.mapper", e.AvailabilityMapper = "kos.availability.mapper", e.AvailabilityLoader = "kos.availability.loader", e.SelectedPourableMapper = "kos.selected.pourable.mapper", e.AssemblyMapper = "kos.assembly.mapper", e.BoardMapper = "kos.board.mapper", e.BoardIndex = "kos.board.index", e.PumpIndex = "kos.pump.index", e))(g || {}), $ = /* @__PURE__ */ ((e) => (e.Nozzle = "nozzle-model", e.Availability = "availability-model", e.Holder = "holder-model", e.HolderContainer = "holder-container-model", e.IngredientContainer = "ingredient-container-model", e.Ingredient = "ingredient-model", e.Pump = "pump-model", e.PumpContainer = "pump-container-model", e))($ || {}), vt = Object.defineProperty, Pt = Object.getOwnPropertyDescriptor, Mt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Pt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && bt(t, r, i), i;
+  return a && i && vt(t, r, i), i;
 };
 const A = "ingredient-model";
 let he = class {
@@ -36,7 +36,7 @@ let he = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-he = Pt([
+he = Mt([
   m(A)
 ], he);
 const Le = {
@@ -49,17 +49,17 @@ const Le = {
   type: A,
   predicate: v(A),
   factory: P.Factory.create(A)
-}, { URL: Be } = N("INGREDIENT_SERVICE"), { getOne: Mt } = T.build({
+}, { URL: Be } = N("INGREDIENT_SERVICE"), { getOne: _t } = T.build({
   basePath: `${Be}/api/ext/dispense/ingredients`
-}), _t = async () => await Mt({
+}), Ot = async () => await _t({
   urlOverride: `${Be}/api/ext/dispense/ingredients`
 });
-var Ot = Object.defineProperty, wt = Object.getOwnPropertyDescriptor, Ae = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? wt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var wt = Object.defineProperty, Et = Object.getOwnPropertyDescriptor, Ae = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Et(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && Ot(t, r, i), i;
+  return a && i && wt(t, r, i), i;
 };
-const j = "ingredient-container-model", Et = f.createLogger({ name: "ingredient-container-model" });
+const j = "ingredient-container-model", $t = f.createLogger({ name: "ingredient-container-model" });
 let ae = class {
   constructor(e, t) {
     o(this, "id");
@@ -80,8 +80,8 @@ let ae = class {
   }
   async load(e) {
     var i;
-    Et.debug(`loading ingredient container ${this.id}`);
-    const t = await _t();
+    $t.debug(`loading ingredient container ${this.id}`);
+    const t = await Ot();
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load ingredients");
     const r = await z.executeLoaderExtension({
@@ -127,12 +127,12 @@ const je = {
   type: j,
   predicate: v(j),
   factory: P.Singleton.create(j)
-}, { URL: pe } = N("HOLDER_SERVICE"), { getAll: $t, postModel: Ue, deleteModel: Ct } = T.build({
+}, { URL: pe } = N("HOLDER_SERVICE"), { getAll: Ct, postModel: Ue, deleteModel: zt } = T.build({
   basePath: `${pe}/api/kos/holders`
-}), zt = f.createLogger({
+}), St = f.createLogger({
   name: "holder-service",
   group: "Services"
-}), Fr = async () => await $t({}), St = async (e, t) => {
+}), Kr = async () => await Ct({}), Dt = async (e, t) => {
   if (!e || !t)
     throw new Error("Missing holderPath or ingredientId");
   return await Ue({
@@ -142,23 +142,23 @@ const je = {
 }, Rt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return await Ct({
+  return await zt({
     id: e,
     urlOverride: `${pe}/api/ext/dispense/assignments/${e}`
   });
 }, xt = async (e) => {
   if (!e)
     throw new Error("Missing holderPath");
-  return zt.debug(
+  return St.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${e}`
   ), await Ue({
     model: {},
     urlOverride: `${pe}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: ne } = N("ASSIGNMENT_SERVICE"), { getAll: Dt, postModel: Ge, deleteModel: Nt } = T.build({
+}, { URL: ne } = N("ASSIGNMENT_SERVICE"), { getAll: Nt, postModel: Ge, deleteModel: Tt } = T.build({
   destinationAddress: "",
   basePath: `${ne}/api/ext/dispense/assignments`
-}), se = window.kosUseFos, Kr = async () => await Dt({ fos: se }), Tt = async (e, t) => {
+}), se = window.kosUseFos, Vr = async () => await Nt({ fos: se }), Lt = async (e, t) => {
   var i, n, s, l;
   const r = JSON.stringify(t), a = `${ne}/api/ext/dispense/assignments`;
   try {
@@ -175,18 +175,18 @@ const je = {
       ];
   }
   return ["unknownError", void 0];
-}, Vr = async (e) => {
+}, kr = async (e) => {
   const t = se ? `${ne}/api/ingredients/assignments/${e.holderPath}` : `${ne}/api/ext/dispense/assignments`;
   return await Ge({
     model: { ...e, fuelGauge: 680 },
     fos: se,
     urlOverride: t
   });
-}, kr = async (e) => await Nt({ id: e, fos: se });
-var Lt = Object.defineProperty, Bt = Object.getOwnPropertyDescriptor, ce = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Bt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+}, Yr = async (e) => await Tt({ id: e, fos: se });
+var Bt = Object.defineProperty, At = Object.getOwnPropertyDescriptor, ce = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? At(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && Lt(t, r, i), i;
+  return a && i && Bt(t, r, i), i;
 };
 const U = $.Holder, Ce = f.createLogger({ name: "holder-model" });
 u[fe].register(
@@ -235,14 +235,14 @@ u[X].register(
     return {};
   }
 );
-class At extends Error {
+class jt extends Error {
   constructor(r, a) {
     super(a);
     o(this, "type");
     this.name = "AssignmentError", this.type = r;
   }
 }
-let R = class {
+let D = class {
   constructor(e, {
     path: t,
     name: r,
@@ -302,7 +302,7 @@ let R = class {
     );
   }
   get canPour() {
-    return this.pumps.data.every((e) => e.canPour);
+    return !this.shouldDefer && this.pumps.data.every((e) => e.canPour);
   }
   get isPouring() {
     const e = this.pumps.data.some((t) => t.isPouring);
@@ -351,7 +351,7 @@ let R = class {
   }
   get troublesByType() {
     return this.troubles.reduce(
-      De,
+      xe,
       {}
     );
   }
@@ -396,9 +396,9 @@ let R = class {
     if (!e)
       throw new Error("Invalid override");
     try {
-      const [t, r] = await Tt(this.path, e);
+      const [t, r] = await Lt(this.path, e);
       if (t)
-        throw new At(
+        throw new jt(
           t,
           `Failed to perform rfid override on holder ${this.id}`
         );
@@ -411,13 +411,16 @@ let R = class {
   }
   async assignIngredient(e) {
     try {
-      e ? await St(this.path, e) : await Rt(this.path), I(() => {
+      e ? await Dt(this.path, e) : await Rt(this.path), I(() => {
         this.ingredientId = e;
       });
     } catch (t) {
       throw Ce.error(`Failed to perform assign ingredient to holder ${this.id}`, t), t;
     }
   }
+  get shouldDefer() {
+    return this.troubles.some((e) => e.shouldDefer);
+  }
   async replaceLine() {
     await xt(this.path);
   }
@@ -443,27 +446,27 @@ let R = class {
 };
 ce([
   M
-], R.prototype, "pumps", 2);
+], D.prototype, "pumps", 2);
 ce([
   le({ modelType: je.type })
-], R.prototype, "ingredientContainer", 2);
+], D.prototype, "ingredientContainer", 2);
 ce([
-  le({ modelType: xe.type })
-], R.prototype, "troubleContainer", 2);
-R = ce([
+  le({ modelType: Re.type })
+], D.prototype, "troubleContainer", 2);
+D = ce([
   m(U)
-], R);
+], D);
 const He = {
   registration: {
     [U]: {
-      class: R,
+      class: D,
       singleton: !1
     }
   },
   type: U,
   predicate: v(U),
   factory: P.Factory.create(U)
-}, jt = async (e, t) => {
+}, Ut = async (e, t) => {
   var $e;
   const r = u.propertyMapper.executeMapper(
     g.HolderIngredientMapper,
@@ -487,19 +490,19 @@ const He = {
     data: y
   };
   return He.factory(t.path)(ee);
-}, { URL: Ut } = N("ASSEMBLY_SERVICE"), { getOne: Gt } = T.build({
-  basePath: `${Ut}/api/kos/device/assemblies`
-}), Ht = f.createLogger({
+}, { URL: Gt } = N("ASSEMBLY_SERVICE"), { getOne: Ht } = T.build({
+  basePath: `${Gt}/api/kos/device/assemblies`
+}), Ft = f.createLogger({
   name: "assembly-service",
   group: "Services"
-}), Fe = async () => (Ht.debug("sending GET for assembly"), await Gt({}));
-var Ft = Object.defineProperty, Kt = Object.getOwnPropertyDescriptor, ge = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Kt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+}), Fe = async () => (Ft.debug("sending GET for assembly"), await Ht({}));
+var Kt = Object.defineProperty, Vt = Object.getOwnPropertyDescriptor, ge = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Vt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && Ft(t, r, i), i;
+  return a && i && Kt(t, r, i), i;
 };
 const G = "board-container-model", Ke = "/kos/hardware/board/linked", Ve = "/kos/hardware/board/unlinked";
-let x = class {
+let R = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "logger");
@@ -539,34 +542,34 @@ let x = class {
 };
 ge([
   M
-], x.prototype, "models", 2);
+], R.prototype, "models", 2);
 ge([
   q({
     lifecycle: Ne.INIT,
     topic: Ke,
     websocket: !0
   })
-], x.prototype, "handleBoardLinkEvent", 1);
+], R.prototype, "handleBoardLinkEvent", 1);
 ge([
   q({
     lifecycle: Ne.INIT,
     topic: Ve,
     websocket: !0
   })
-], x.prototype, "handleBoardUnlinkEvent", 1);
-x = ge([
+], R.prototype, "handleBoardUnlinkEvent", 1);
+R = ge([
   m(G)
-], x);
-const Vt = async (e) => {
+], R);
+const kt = async (e) => {
   const t = e.data.boardPath, { model: r } = S(t);
   return {
     boardName: (r == null ? void 0 : r.name) || ""
   };
 };
-var kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, ke = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Yt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Yt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, ke = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Zt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && kt(t, r, i), i;
+  return a && i && Yt(t, r, i), i;
 };
 const H = $.PumpContainer;
 var Ye = /* @__PURE__ */ ((e) => (e.byBoard = "byBoard", e.byType = "byType", e.byNozzle = "byNozzle", e))(Ye || {});
@@ -639,12 +642,12 @@ const Pe = {
 }, Ze = async (e) => {
   const t = [], { model: r } = await Te(e);
   return r && (t.push(r.boardPath), t.push(r.nozzlePath), t.push(r.holderPath)), t;
-}, Zt = async (e) => {
+}, Jt = async (e) => {
   const t = [], r = e.data.pumpPath;
   t.push(r);
   const a = await Ze(r);
   return [...t, ...a];
-}, Jt = async (e) => {
+}, Xt = async (e) => {
   const t = [], r = e.data.boardPath;
   t.push(e.data.boardPath);
   const a = await Te(
@@ -663,10 +666,10 @@ const Pe = {
   }
   return Array.from(new Set(t));
 };
-var Xt = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, Wt = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? qt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var qt = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Qt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Wt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && Xt(t, r, i), i;
+  return a && i && qt(t, r, i), i;
 };
 const F = "board-model", ze = (e, t) => {
   const { type: r, name: a, path: i, linked: n, instanceId: s, link: l, ...d } = e;
@@ -674,11 +677,11 @@ const F = "board-model", ze = (e, t) => {
 };
 u[fe].register(
   "board",
-  Jt
+  Xt
 );
 u[X].register(
   "board",
-  Vt
+  kt
 );
 let ye = class {
   constructor(e, t, r) {
@@ -702,7 +705,7 @@ let ye = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-ye = Wt([
+ye = Qt([
   m(F)
 ], ye);
 const Je = {
@@ -718,7 +721,7 @@ const Je = {
 }, Xe = {
   registration: {
     [G]: {
-      class: x,
+      class: R,
       singleton: !0
     },
     ...Je.registration
@@ -729,13 +732,13 @@ const Je = {
     G
   )
 };
-var Qt = Object.defineProperty, er = Object.getOwnPropertyDescriptor, ue = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? er(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var er = Object.defineProperty, tr = Object.getOwnPropertyDescriptor, ue = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? tr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && Qt(t, r, i), i;
+  return a && i && er(t, r, i), i;
 };
-const K = $.HolderContainer, tr = "/kos/insertion/insert/start", rr = "/kos/insertion/insert/complete", ir = "/kos/insertion/insert/update", ar = "/kos/insertion/remove", nr = "/kos/pumpEvent/replaceLine", sr = "/kos/handle/*";
-let D = class {
+const K = $.HolderContainer, rr = "/kos/insertion/insert/start", ir = "/kos/insertion/insert/complete", ar = "/kos/insertion/insert/update", nr = "/kos/insertion/remove", sr = "/kos/pumpEvent/replaceLine", or = "/kos/handle/*";
+let x = class {
   constructor(e, t, r) {
     o(this, "id");
     o(this, "holders");
@@ -783,33 +786,33 @@ let D = class {
 };
 ue([
   M
-], D.prototype, "holders", 2);
+], x.prototype, "holders", 2);
 ue([
   q({
-    topic: sr,
+    topic: or,
     websocket: !0,
     condition: (e, t) => t.holders.getModel(e.path) !== void 0
   })
-], D.prototype, "handleHolderEvents", 1);
+], x.prototype, "handleHolderEvents", 1);
 ue([
   q({
     topic: [
-      tr,
       rr,
       ir,
       ar,
-      nr
+      nr,
+      sr
     ],
     websocket: !0
   })
-], D.prototype, "handleInsertion", 1);
-D = ue([
+], x.prototype, "handleInsertion", 1);
+x = ue([
   m(K)
-], D);
+], x);
 const qe = {
   registration: {
     [K]: {
-      class: D,
+      class: x,
       singleton: !0
     }
   },
@@ -818,7 +821,7 @@ const qe = {
   factory: P.Singleton.create(
     K
   )
-}, or = f.createLogger({ name: "board-utils" }), dr = async (e) => {
+}, dr = f.createLogger({ name: "board-utils" }), lr = async (e) => {
   const t = await z.executeDataMapperExtension({
     extension: g.BoardMapper,
     data: e,
@@ -832,39 +835,39 @@ const qe = {
     ...d
   }, h = Je.factory(e.path)(c);
   return h.updateModel(c), h;
-}, lr = (e) => async (t) => {
-  or.debug(`adding board ${t.name}`);
-  const r = await dr(t);
+}, pr = (e) => async (t) => {
+  dr.debug(`adding board ${t.name}`);
+  const r = await lr(t);
   e.addModel(r);
 };
 var p = /* @__PURE__ */ ((e) => (e.IDLE = "IDLE", e.POURING = "POURING", e.POUR_STARTING = "POUR_STARTING", e.POUR_CANCELING = "POUR_CANCELING", e.POUR_CANCELED = "POUR_CANCELED", e.POUR_COMPLETE = "POUR_COMPLETE", e))(p || {});
-const { URL: Me } = N("PUMP_SERVICE"), { postModel: pr, getOne: cr } = T.build({
+const { URL: Me } = N("PUMP_SERVICE"), { postModel: cr, getOne: gr } = T.build({
   basePath: `${Me}/api/kos/holders`
 });
 f.createLogger({
   name: "pump-service",
   group: "Services"
 });
-const gr = async ({
+const ur = async ({
   intent: e,
   pumpId: t,
   tracker: r
 }) => {
-  const a = `${Me}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await pr({ model: {}, urlOverride: a, tracker: r });
+  const a = `${Me}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await cr({ model: {}, urlOverride: a, tracker: r });
   return i != null && i.data && be.initiateFuture(i.data), i;
-}, ur = async (e, t) => {
-  const r = `${Me}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, a = await cr({ urlOverride: r });
+}, hr = async (e, t) => {
+  const r = `${Me}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, a = await gr({ urlOverride: r });
   return a != null && a.data ? a.data : { volume: -1 };
 };
-var hr = Object.defineProperty, yr = Object.getOwnPropertyDescriptor, _e = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? yr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var yr = Object.defineProperty, mr = Object.getOwnPropertyDescriptor, _e = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? mr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && hr(t, r, i), i;
+  return a && i && yr(t, r, i), i;
 };
 const V = $.Pump;
 u[fe].register(
   "pump",
-  Zt
+  Jt
 );
 let J = class {
   constructor(e, t) {
@@ -920,7 +923,7 @@ let J = class {
   }
   get troublesByType() {
     return this.troubles.reduce(
-      De,
+      xe,
       {}
     );
   }
@@ -950,7 +953,7 @@ let J = class {
     return this.futureHandler.future;
   }
   async resolveIntentVolume(e) {
-    return await ur(this.path, e);
+    return await hr(this.path, e);
   }
   async performIntent(e, t) {
     const r = typeof e == "string" ? e : e.intent;
@@ -960,7 +963,7 @@ let J = class {
       if (this.currentState === p.IDLE) {
         if (this.currentState = p.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const a = await gr({
+        const a = await ur({
           tracker: t,
           intent: r,
           pumpId: this.path
@@ -977,7 +980,7 @@ let J = class {
   // -------------------ENTITY----------------------------
 };
 _e([
-  le({ modelType: xe.type })
+  le({ modelType: Re.type })
 ], J.prototype, "troubleContainer", 2);
 _e([
   ve()
@@ -995,7 +998,7 @@ const We = {
   type: V,
   predicate: v(V),
   factory: P.Factory.create(V)
-}, mr = f.createLogger({ name: "pump-utils" }), Ir = (e, t) => {
+}, Ir = f.createLogger({ name: "pump-utils" }), fr = (e, t) => {
   const r = (t.pumps ?? []).length > 1, a = {
     boardPath: t.boardPath,
     holderPath: t.holderPath,
@@ -1012,8 +1015,8 @@ const We = {
   return i.updateModel(a), i;
 }, Qe = (e) => (t) => (r) => (a) => {
   var l;
-  mr.debug(`adding pump ${a.name}`);
-  const i = Ir(r.path, a);
+  Ir.debug(`adding pump ${a.name}`);
+  const i = fr(r.path, a);
   e.addModel(i);
   const n = i.holderPath, s = t.holders.getModel(n);
   s == null || s.pumps.addModel(i), s != null && s.nozzlePaths.includes(r.path) || s == null || s.nozzlePaths.push(r.path), (l = a == null ? void 0 : a.pumps) == null || l.forEach((d) => {
@@ -1026,12 +1029,12 @@ const We = {
     Qe(e)(t)(r)(h);
   });
 };
-var fr = Object.defineProperty, br = Object.getOwnPropertyDescriptor, W = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? br(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var br = Object.defineProperty, vr = Object.getOwnPropertyDescriptor, W = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? vr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && fr(t, r, i), i;
+  return a && i && br(t, r, i), i;
 };
-const k = "assembly-model", vr = "assembly-data";
+const k = "assembly-model", Pr = "assembly-data";
 let O = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1095,7 +1098,7 @@ let O = class {
         data: t.data,
         contextData: {}
       });
-      e.set(vr, r), Object.assign(this, r), Object.entries(r).forEach(([a, i]) => {
+      e.set(Pr, r), Object.assign(this, r), Object.entries(r).forEach(([a, i]) => {
         ot(i) && (this.logger.debug(`adding child model ${a} from extension data`), this[dt][a] = !0);
       });
       for await (const a of t.data.assemblies) {
@@ -1112,11 +1115,11 @@ let O = class {
           lt.enableFeature(y);
         });
         for await (const y of i)
-          this.logger.debug(`adding board ${y.name}`), await lr(this.boardContainer)(y);
+          this.logger.debug(`adding board ${y.name}`), await pr(this.boardContainer)(y);
         for await (const [y, C] of Object.entries(n))
           for await (const ee of C) {
             this.logger.debug(`adding holder ${ee.name}`);
-            const Ee = await jt(y, ee);
+            const Ee = await Ut(y, ee);
             this.holderContainer.holders.addModel(Ee);
           }
         const B = Qe(this.pumpContainer)(
@@ -1132,7 +1135,9 @@ let O = class {
   }
 };
 W([
-  le({ modelType: "trouble-container-model" })
+  le({
+    modelType: "trouble-container-model"
+  })
 ], O.prototype, "troubleContainer", 2);
 W([
   M
@@ -1157,10 +1162,10 @@ const et = {
   predicate: v(k),
   factory: P.Singleton.create(k)
 };
-var Pr = Object.defineProperty, Mr = Object.getOwnPropertyDescriptor, _r = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Mr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Mr = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, Or = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? _r(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && Pr(t, r, i), i;
+  return a && i && Mr(t, r, i), i;
 };
 const Y = $.Availability;
 let me = class {
@@ -1188,7 +1193,7 @@ let me = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-me = _r([
+me = Or([
   pt(),
   m(Y)
 ], me);
@@ -1204,9 +1209,9 @@ const Ie = {
   factory: P.Factory.create(
     Y
   )
-}, { URL: L } = N("NOZZLE_SERVICE"), { postModel: Oe, deleteModel: Or, getOne: wr } = T.build({
+}, { URL: L } = N("NOZZLE_SERVICE"), { postModel: Oe, deleteModel: wr, getOne: Er } = T.build({
   basePath: `${L}/api/nozzle`
-}), Er = async (e, t) => {
+}), $r = async (e, t) => {
   const r = await Oe({
     model: {},
     urlOverride: `${L}/api/ext/dispense/nozzle/${e}/pipeline/beverage/pour`,
@@ -1214,7 +1219,7 @@ const Ie = {
     tracker: t
   });
   return r != null && r.data && be.initiateFuture(r.data), r;
-}, $r = async (e, t, r) => {
+}, Cr = async (e, t, r) => {
   const a = await Oe({
     model: {},
     urlOverride: `${L}/api/ext/dispense/nozzle/${t}/pipeline/beverage/fixed/${e}`,
@@ -1222,12 +1227,12 @@ const Ie = {
     tracker: r
   });
   return a != null && a.data && be.initiateFuture(a.data), a;
-}, Cr = async (e) => await wr({
+}, zr = async (e) => await Er({
   urlOverride: `${L}${e}/pipeline/beverage/availability`
-}), zr = async (e, t) => await Oe({
+}), Sr = async (e, t) => await Oe({
   model: t,
   urlOverride: `${L}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
-}), Sr = async (e) => await Or({
+}), Dr = async (e) => await wr({
   id: e,
   urlOverride: `${L}/api/ext/dispense/nozzle/${e}/pipeline/beverage/select`
 });
@@ -1236,9 +1241,9 @@ var Rr = Object.defineProperty, xr = Object.getOwnPropertyDescriptor, Q = (e, t,
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
   return a && i && Rr(t, r, i), i;
 };
-const Z = $.Nozzle, Dr = ct(
+const Z = $.Nozzle, Nr = ct(
   "beverageTopicPrefix"
-), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Se = "/kos/nozzle/pour/started", Nr = "/kos/nozzle/pour/progress", Tr = "/kos/nozzle/pour/cancel";
+), ie = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0, Se = "/kos/nozzle/pour/started", Tr = "/kos/nozzle/pour/progress", Lr = "/kos/nozzle/pour/cancel";
 let w = class {
   constructor(e, t, r) {
     /** the unique identifier for this nozzle.*/
@@ -1347,12 +1352,16 @@ let w = class {
     context: r
   }) {
     if (!e) {
-      const l = await Sr(this.name);
+      const l = await Dr(this.name);
       if ((l == null ? void 0 : l.status) !== 200)
         throw new Error("Failed to clear pourable");
       this._selectedBeverage = void 0;
       return;
     }
+    if (e === this._selectedBeverage && ut(this._additionalItems, t)) {
+      this.logger.info("No change in selected pourable");
+      return;
+    }
     this._selectedBeverage = e, this._additionalItems = t;
     let a = await u.dataMapper.executeMapper(
       g.SelectedPourableMapper,
@@ -1368,7 +1377,7 @@ let w = class {
     (!a || Object.keys(a).length === 0) && (this.logger.info(
       `No selected pourable mapper defined, using the default payload ${i}`
     ), a = i);
-    const n = a ?? i, s = await zr(this.name, n);
+    const n = a ?? i, s = await Sr(this.name, n);
     if ((s == null ? void 0 : s.status) !== 200)
       throw new Error("Failed to select pourable");
   }
@@ -1422,14 +1431,14 @@ let w = class {
       reason: e.reason,
       timeRemaining: e.timeRemaining
     };
-    re.publish(Nr, t);
+    re.publish(Tr, t);
   }
   async pour(e) {
     try {
       if (this.currentState === p.IDLE) {
         if (this.updateIfCurrent(p.IDLE, p.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const t = await Er(this.name, e);
+        const t = await $r(this.name, e);
         this.updateIfCurrent(p.POUR_STARTING, p.POURING), te(this).forEach((a) => {
           var i;
           ie(a) && ((i = a.onPourStart) == null || i.call(a));
@@ -1450,7 +1459,7 @@ let w = class {
       if (this.currentState === p.IDLE) {
         if (this.currentState = p.POUR_STARTING, !t)
           throw new Error("No tracker provided");
-        const r = await $r(e, this.name, t);
+        const r = await Cr(e, this.name, t);
         this.currentState === p.POUR_STARTING && I(() => {
           this.currentState = p.POURING;
         }), te(this).forEach((i) => {
@@ -1483,7 +1492,7 @@ let w = class {
       const t = {
         nozzleId: this.id
       };
-      re.publish(Tr, t);
+      re.publish(Lr, t);
     } else
       this.logger.warn(`Cannot cancel pour in state ${this.currentState}`);
   }
@@ -1501,7 +1510,7 @@ let w = class {
   async load(e) {
     var a, i;
     this.logger.debug(`loading nozzle ${this.id}`);
-    const t = await Cr(this.urlPrefix);
+    const t = await zr(this.urlPrefix);
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load nozzle availability");
     const r = await u.loader.executeLoader(
@@ -1530,7 +1539,7 @@ let w = class {
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
-    const t = ut.getContext(this.id), r = (t == null ? void 0 : t.get(g.AvailabilityLoader)) || {};
+    const t = ht.getContext(this.id), r = (t == null ? void 0 : t.get(g.AvailabilityLoader)) || {};
     if (e.rebuild)
       for (const a of Object.keys(e == null ? void 0 : e.groups) || []) {
         this._availabilityItems.getIndexByKey("group", a).filter(
@@ -1538,7 +1547,7 @@ let w = class {
             (s) => `${this.id}-${a}-${s.id}` === n.id
           )
         ).forEach((n) => {
-          this._availabilityItems.removeModel(n.id), ht(n);
+          this._availabilityItems.removeModel(n.id), yt(n);
         });
         for (const n of (e == null ? void 0 : e.groups[a]) || []) {
           const s = await u.dataMapper.executeMapper(
@@ -1602,7 +1611,7 @@ Q([
 ], w.prototype, "fixedPour", 1);
 Q([
   q({
-    topic: `${Dr}/availability`,
+    topic: `${Nr}/availability`,
     websocket: !0
   })
 ], w.prototype, "updateAvailability", 1);
@@ -1620,10 +1629,10 @@ const we = {
   predicate: v(Z),
   factory: P.Factory.create(Z)
 };
-var Lr = Object.defineProperty, Br = Object.getOwnPropertyDescriptor, tt = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? Br(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Br = Object.defineProperty, Ar = Object.getOwnPropertyDescriptor, tt = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? Ar(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (i = (a ? s(t, r, i) : s(i)) || i);
-  return a && i && Lr(t, r, i), i;
+  return a && i && Br(t, r, i), i;
 };
 const rt = "device-assembly-model";
 let de = class {
@@ -1665,10 +1674,10 @@ tt([
 de = tt([
   m(rt)
 ], de);
-const Ar = new yt({
+const jr = new mt({
   class: de,
   type: rt
-}), Re = {
+}), De = {
   ...je.registration,
   ...Le.registration,
   ...qe.registration,
@@ -1679,9 +1688,9 @@ const Ar = new yt({
   ...Ie.registration,
   ...et.registration,
   ...Xe.registration
-}, jr = (e) => () => (It(e)(), Ar.register(), Object.keys(Re).forEach((t) => {
-  const r = Re[t];
-  ft(e)(t, r);
+}, Ur = (e) => () => (ft(e)(), jr.register(), Object.keys(De).forEach((t) => {
+  const r = De[t];
+  bt(e)(t, r);
 }), u[X].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
@@ -1707,27 +1716,27 @@ const Ar = new yt({
   companion: _.companion.register(e),
   legacy: _.model.registerLegacyModel(e)
 }), b = {
-  ...mt
+  ...It
 };
 b.dispense = {
-  models: jr(b)
+  models: Ur(b)
 };
 b.preload = _.model.preloadModel(b);
 b.model = _.model.register(b);
 b.companion = _.companion.register(b);
 b.legacy = _.model.registerLegacyModel(b);
-const Yr = b;
+const Zr = b;
 export {
   et as A,
-  x as B,
-  $r as C,
+  R as B,
+  Cr as C,
   $ as D,
   g as E,
-  Er as F,
-  zr as G,
+  $r as F,
+  Sr as G,
   He as H,
   Le as I,
-  Yr as K,
+  Zr as K,
   we as N,
   We as P,
   Ke as T,
@@ -1735,27 +1744,27 @@ export {
   Ve as b,
   Xe as c,
   Je as d,
-  Ar as e,
+  jr as e,
   qe as f,
   je as g,
   Pe as h,
   Ye as i,
   p as j,
-  Re as k,
-  _t as l,
-  Vr as m,
-  St as n,
-  kr as o,
-  Kr as p,
-  Fr as q,
-  jr as r,
+  De as k,
+  Ot as l,
+  kr as m,
+  Dt as n,
+  Yr as o,
+  Vr as p,
+  Kr as q,
+  Ur as r,
   xt as s,
-  Tt as t,
+  Lt as t,
   Rt as u,
   Fe as v,
-  ur as w,
-  gr as x,
-  Sr as y,
-  Cr as z
+  hr as w,
+  ur as x,
+  Dr as y,
+  zr as z
 };
-//# sourceMappingURL=dispense-registration-manager-CM5dCYOj.js.map
+//# sourceMappingURL=dispense-registration-manager-BtVe7yFS.js.map