@kosdev-code/kos-dispense-sdk 2.1.33 → 2.1.35

package/{dispense-registration-manager-CcFUS_KM.js → dispense-registration-manager-Cl2UbU1m.js}

@@ -1,9 +1,9 @@
 var ut = Object.defineProperty;
 var yt = (e, t, r) => t in e ? ut(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var o = (e, t, r) => (yt(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { kosModel as P, Kos as v, isKosModel as b, resolveServiceUrl as D, ServiceFactory as T, KosLog as m, KosModelContainer as S, KosExtensionUtils as U, kosChild as _, FetchError as Pt, ExtensionManager as y, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as te, getKosModelSync as x, kosDependency as Be, kosTroubleAware as It, kosAction as O, kosTopicHandler as re, DependencyLifecycle as pe, getKosModel as Ge, FutureManager as he, kosFuture as ge, FutureHandler as je, EXTENSION_FEATURE_FLAG_RESOLVER as mt, isKosDataModel as ft, ChildModels as vt, KosFeatureFlags as bt, kosParentAware as Ot, createPropKey as _t, kosStateEntry as ue, kosStateExit as ye, kosStateGuard as ae, kosLoggerAware as Fe, kosStateMachine as He, MultipleFutureHandler as Et, arraysEqual as Mt, getAllKosCompanionModels as z, EventBus as $, KosContextManager as wt, destroyKosModel as Rt, SingletonKosModelRegistrationFactory as Ct, kosFutureAware as $t, ObservableData as Se, KosModelRegistrationFactory as Nt, KosModelRegistry as Dt, RegistrationManager as R, registerCoreModels as Tt, registerLegacyModel as St } from "@kosdev-code/kos-ui-sdk";
+import { kosModel as P, Kos as v, isKosModel as b, resolveServiceUrl as D, ServiceFactory as S, KosLog as m, KosModelContainer as T, KosExtensionUtils as U, kosChild as _, FetchError as Pt, ExtensionManager as y, EXTENSION_TROUBLE_MAPPER as Me, EXTENSION_TROUBLE_DATA_MAPPER as te, getKosModelSync as x, kosDependency as Be, kosTroubleAware as It, kosAction as O, kosTopicHandler as re, DependencyLifecycle as pe, getKosModel as Ge, FutureManager as ge, kosFuture as he, FutureHandler as je, EXTENSION_FEATURE_FLAG_RESOLVER as mt, isKosDataModel as ft, ChildModels as vt, KosFeatureFlags as bt, kosParentAware as Ot, createPropKey as _t, kosStateEntry as ue, kosStateExit as ye, kosStateGuard as ae, kosLoggerAware as Fe, kosStateMachine as He, MultipleFutureHandler as Et, arraysEqual as Mt, getAllKosCompanionModels as z, EventBus as $, KosContextManager as wt, destroyKosModel as Rt, SingletonKosModelRegistrationFactory as Ct, kosFutureAware as $t, ObservableData as Te, KosModelRegistrationFactory as Nt, KosModelRegistry as Dt, RegistrationManager as R, registerCoreModels as St, registerLegacyModel as Tt } 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.AssemblyFeatureFlags = "kos.assembly.feature.flags", e))(g || {}), L = /* @__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))(L || {}), Lt = Object.getOwnPropertyDescriptor, At = (e, t, r, a) => {
+var h = /* @__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.AssemblyFeatureFlags = "kos.assembly.feature.flags", e))(h || {}), L = /* @__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))(L || {}), Lt = Object.getOwnPropertyDescriptor, At = (e, t, r, a) => {
   for (var i = a > 1 ? void 0 : a ? Lt(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = n(i) || i);
   return i;
@@ -49,7 +49,7 @@ const Ve = {
   type: H,
   predicate: b(H),
   factory: v.Factory.create(H)
-}, { URL: Ke } = D("INGREDIENT_SERVICE"), { getOne: Ut } = T.build({
+}, { URL: Ke } = D("INGREDIENT_SERVICE"), { getOne: Ut } = S.build({
   basePath: `${Ke}/api/ext/dispense/ingredients`
 }), zt = async () => await Ut({
   urlOverride: `${Ke}/api/ext/dispense/ingredients`
@@ -64,11 +64,11 @@ let se = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "ingredients");
-    this.id = e, this.ingredients = new S({
+    this.id = e, this.ingredients = new T({
       indexMap: {
         ingredientType: "type"
       },
-      extensionId: g.IngredientIndex,
+      extensionId: h.IngredientIndex,
       parentId: e
     });
   }
@@ -86,23 +86,23 @@ let se = class {
       throw new Error("Failed to load ingredients");
     const r = await U.executeLoaderExtension({
       context: e,
-      extension: g.IngredientLoader
+      extension: h.IngredientLoader
     }), a = (t == null ? void 0 : t.data) ?? {};
     for (const s of Object.keys(a))
       for (const n of ((i = t == null ? void 0 : t.data) == null ? void 0 : i[s]) || []) {
-        const l = await U.executeDataMapperExtension({
-          extension: g.IngredientMapper,
+        const c = await U.executeDataMapperExtension({
+          extension: h.IngredientMapper,
           data: n,
           contextData: r
-        }), c = await U.executePropertyMapperExtension({
-          extension: g.IngredientTypeMapper,
+        }), l = await U.executePropertyMapperExtension({
+          extension: h.IngredientTypeMapper,
           data: n,
           contextData: r
         }), p = {
           ...n,
-          type: c || n.type,
-          ...l,
-          data: l
+          type: l || n.type,
+          ...c,
+          data: c
         }, u = Ve.factory(n.id)(
           p
         );
@@ -127,7 +127,7 @@ const Ye = {
   type: V,
   predicate: b(V),
   factory: v.Singleton.create(V)
-}, { URL: Pe } = D("HOLDER_SERVICE"), { getAll: jt, postModel: Ze, deleteModel: Ft } = T.build({
+}, { URL: Pe } = D("HOLDER_SERVICE"), { getAll: jt, postModel: Ze, deleteModel: Ft } = S.build({
   basePath: `${Pe}/api/kos/holders`
 }), Ht = m.createLogger({
   name: "holder-service",
@@ -155,23 +155,23 @@ const Ye = {
     model: {},
     urlOverride: `${Pe}/api/ext/dispense/pumpEvents/replaceLine/${e}`
   });
-}, { URL: ne } = D("ASSIGNMENT_SERVICE"), { getAll: Yt, postModel: Xe, deleteModel: Zt } = T.build({
+}, { URL: ne } = D("ASSIGNMENT_SERVICE"), { getAll: Yt, postModel: Xe, deleteModel: Zt } = S.build({
   destinationAddress: "",
   basePath: `${ne}/api/ext/dispense/assignments`
 }), oe = window.kosUseFos, la = async () => await Yt({ fos: oe }), Xt = async (e, t) => {
-  var i, s, n, l;
+  var i, s, n, c;
   const r = JSON.stringify(t), a = `${ne}/api/ext/dispense/assignments`;
   try {
-    const c = await Xe({
+    const l = await Xe({
       model: { holderPath: e, factoryJson: r },
       urlOverride: a
     });
-    return (c == null ? void 0 : c.status) === 200 && ((i = c == null ? void 0 : c.data) != null && i.error) ? [c.data.error || "unknownError", c.data] : [void 0, c == null ? void 0 : c.data];
-  } catch (c) {
-    if (c instanceof Pt)
+    return (l == null ? void 0 : l.status) === 200 && ((i = l == null ? void 0 : l.data) != null && i.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
+  } catch (l) {
+    if (l instanceof Pt)
       return [
-        ((n = (s = c.payload) == null ? void 0 : s.data) == null ? void 0 : n.error) || "unknownError",
-        (l = c.payload) == null ? void 0 : l.data
+        ((n = (s = l.payload) == null ? void 0 : s.data) == null ? void 0 : n.error) || "unknownError",
+        (c = l.payload) == null ? void 0 : c.data
       ];
   }
   return ["unknownError", void 0];
@@ -250,8 +250,8 @@ let ee = class {
     ingredientId: i,
     ingredientType: s,
     slice: n,
-    group: l,
-    data: c,
+    group: c,
+    data: l,
     enjoyByDate: p
   }, u) {
     o(this, "id");
@@ -267,7 +267,7 @@ let ee = class {
     o(this, "enjoyByDate");
     o(this, "pumps");
     o(this, "ingredientContainer");
-    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = a, this.ingredientId = i, this.group = l, this.slice = n, this.enjoyByDate = p, this.data = c, this.pumps = new S({
+    this.id = e, this.path = t, this.name = r, this.ingredientType = s, this.ingredientSource = a, this.ingredientId = i, this.group = c, this.slice = n, this.enjoyByDate = p, this.data = l, this.pumps = new T({
       parentId: e,
       sortKey: "path"
     }), this.logger = u.logger;
@@ -280,10 +280,10 @@ let ee = class {
     ingredientType: i,
     group: s,
     slice: n,
-    enjoyByDate: l,
-    data: c
+    enjoyByDate: c,
+    data: l
   }) {
-    this.path = e, this.name = t, this.ingredientId = a, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = l, this.slice = n, this.group = s, this.data = c;
+    this.path = e, this.name = t, this.ingredientId = a, this.ingredientType = i, this.ingredientSource = r, this.enjoyByDate = c, this.slice = n, this.group = s, this.data = l;
   }
   get hasEnjoyByDate() {
     return !!this.enjoyByDate && !this.unassigned;
@@ -452,30 +452,30 @@ const Je = {
   predicate: b(K),
   factory: v.Factory.create(K)
 }, Qt = async (e, t) => {
-  var Te;
+  var Se;
   const r = y.propertyMapper.executeMapper(
-    g.HolderIngredientMapper,
+    h.HolderIngredientMapper,
     t
   ), a = y.propertyMapper.executeMapper(
-    g.HolderTypeMapper,
+    h.HolderTypeMapper,
     t
   ) || t.ingType, i = await U.executeDataMapperExtension({
-    extension: g.HolderMapper,
+    extension: h.HolderMapper,
     data: t,
     contextData: {}
-  }), { name: s, path: n, ingredientId: l, ingType: c, ingSource: p, slice: u, ...F } = t, h = { ...F, ...i }, M = u || { pos: 0 }, C = {
+  }), { name: s, path: n, ingredientId: c, ingType: l, ingSource: p, slice: u, ...F } = t, g = { ...F, ...i }, M = u || { pos: 0 }, C = {
     name: s,
     path: n,
-    ingredientId: r || l,
-    ingredientType: a || c,
+    ingredientId: r || c,
+    ingredientType: a || l,
     ingredientSource: p,
-    enjoyByDate: (Te = t.container) != null && Te.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
+    enjoyByDate: (Se = t.container) != null && Se.enjoyByDate ? new Date(t.container.enjoyByDate) : void 0,
     slice: M,
     group: e,
-    data: h
+    data: g
   };
   return Je.factory(t.path)(C);
-}, { URL: er } = D("ASSEMBLY_SERVICE"), { getOne: tr } = T.build({
+}, { URL: er } = D("ASSEMBLY_SERVICE"), { getOne: tr } = S.build({
   basePath: `${er}/api/kos/device/assemblies`
 }), rr = m.createLogger({
   name: "assembly-service",
@@ -492,9 +492,9 @@ let B = class {
     o(this, "id");
     o(this, "logger");
     o(this, "models");
-    this.id = e, this.logger = r.logger, this.models = new S({
+    this.id = e, this.logger = r.logger, this.models = new T({
       parentId: e,
-      extensionId: g.BoardIndex
+      extensionId: h.BoardIndex
     });
   }
   get boardList() {
@@ -562,14 +562,14 @@ let de = class {
   constructor(e, t) {
     o(this, "id");
     o(this, "pumps");
-    this.id = e, this.pumps = new S({
+    this.id = e, this.pumps = new T({
       indexMap: {
         byNozzle: (r) => r.nozzlePaths,
         byBoard: (r) => r.boardPath,
         byType: "type"
       },
       parentId: e,
-      extensionId: g.PumpIndex
+      extensionId: h.PumpIndex
     });
   }
   /**
@@ -643,10 +643,10 @@ const Re = {
       tt.byBoard,
       r
     ).map(
-      (l) => rt(l.path)
+      (c) => rt(c.path)
     );
-    (await Promise.allSettled(s)).forEach((l) => {
-      l.status === "fulfilled" && l.value.forEach((c) => t.push(c));
+    (await Promise.allSettled(s)).forEach((c) => {
+      c.status === "fulfilled" && c.value.forEach((l) => t.push(l));
     });
   }
   return Array.from(new Set(t));
@@ -657,8 +657,8 @@ var cr = Object.getOwnPropertyDescriptor, pr = (e, t, r, a) => {
   return i;
 };
 const Z = "board-model", Ae = (e, t) => {
-  const { type: r, name: a, path: i, linked: s, instanceId: n, link: l, ...c } = e;
-  t.type = r, t.name = a, t.path = i, t.linked = s, t.link = Object.freeze(l), t.instanceId = n, Object.assign(t, c);
+  const { type: r, name: a, path: i, linked: s, instanceId: n, link: c, ...l } = e;
+  t.type = r, t.name = a, t.path = i, t.linked = s, t.link = Object.freeze(c), t.instanceId = n, Object.assign(t, l);
 };
 y[Me].register(
   "board",
@@ -717,10 +717,10 @@ const at = {
     k
   )
 };
-var hr = Object.defineProperty, gr = Object.getOwnPropertyDescriptor, me = (e, t, r, a) => {
-  for (var i = a > 1 ? void 0 : a ? gr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
+var gr = Object.defineProperty, hr = Object.getOwnPropertyDescriptor, me = (e, t, r, a) => {
+  for (var i = a > 1 ? void 0 : a ? hr(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
-  return a && i && hr(t, r, i), i;
+  return a && i && gr(t, r, i), i;
 };
 const X = L.HolderContainer, ur = "/kos/insertion/insert/start", yr = "/kos/insertion/insert/complete", Pr = "/kos/insertion/insert/update", Ir = "/kos/insertion/remove", mr = "/kos/pumpEvent/replaceLine", fr = "/kos/handle/*";
 let G = class {
@@ -728,13 +728,13 @@ let G = class {
     o(this, "id");
     o(this, "holders");
     o(this, "logger");
-    this.id = e, this.holders = new S({
+    this.id = e, this.holders = new T({
       indexMap: {
         nozzle: (a) => a.nozzlePaths,
         group: "group"
       },
       parentId: e,
-      extensionId: g.HolderIndex
+      extensionId: h.HolderIndex
     }), this.logger = r.logger;
   }
   updateModel() {
@@ -754,14 +754,14 @@ let G = class {
       () => this.logger.debug("Received insertion event", JSON.stringify(e))
     ), (Array.isArray(e) ? e : [e]).forEach((r) => {
       O(() => {
-        var s, n, l;
+        var s, n, c;
         const a = r.ingredientId, i = this.holders.getModel(r.path);
         i && (this.logger.info(
           `Received insertion event for holder ${i.path}`
-        ), i.updateIngredient(a), i.slice.currentVolMl = (s = r.slice) == null ? void 0 : s.currentVolMl, i.slice.maxVolMl = (n = r.slice) == null ? void 0 : n.maxVolMl, (l = r == null ? void 0 : r.container) != null && l.enjoyByDate ? i.enjoyByDate = new Date(r.container.enjoyByDate) : i.enjoyByDate = void 0, r.pumps.forEach((c) => {
+        ), i.updateIngredient(a), i.slice.currentVolMl = (s = r.slice) == null ? void 0 : s.currentVolMl, i.slice.maxVolMl = (n = r.slice) == null ? void 0 : n.maxVolMl, (c = r == null ? void 0 : r.container) != null && c.enjoyByDate ? i.enjoyByDate = new Date(r.container.enjoyByDate) : i.enjoyByDate = void 0, r.pumps.forEach((l) => {
           O(() => {
-            const p = i.pumps.getModel(c.path);
-            p && (p.ingredientId = c.ingredientId, p.inserted = c.inserted, p.prevIngredientId = c.prevIngredientId);
+            const p = i.pumps.getModel(l.path);
+            p && (p.ingredientId = l.ingredientId, p.inserted = l.inserted, p.prevIngredientId = l.prevIngredientId);
           });
         }));
       });
@@ -808,16 +808,16 @@ const st = {
   )
 }, vr = m.createLogger({ name: "board-utils" }), br = async (e) => {
   const t = await U.executeDataMapperExtension({
-    extension: g.BoardMapper,
+    extension: h.BoardMapper,
     data: e,
     contextData: {}
-  }), { type: r, name: a, path: i, linked: s, instanceId: n, ...l } = e, c = { ...l, ...t }, p = {
+  }), { type: r, name: a, path: i, linked: s, instanceId: n, ...c } = e, l = { ...c, ...t }, p = {
     type: r,
     name: a,
     path: i,
     linked: s,
     instanceId: n,
-    ...c
+    ...l
   }, u = at.factory(e.path)(p);
   return u.updateModel(p), u;
 }, Or = (e) => async (t) => {
@@ -826,7 +826,7 @@ const st = {
   e.addModel(r);
 };
 var d = /* @__PURE__ */ ((e) => (e.IDLE = "IDLE", e.POURING = "POURING", e.POUR_STARTING = "POUR_STARTING", e.POUR_CANCELING = "POUR_CANCELING", e))(d || {});
-const { URL: Ce } = D("PUMP_SERVICE"), { postModel: _r, getOne: Er } = T.build({
+const { URL: Ce } = D("PUMP_SERVICE"), { postModel: _r, getOne: Er } = S.build({
   basePath: `${Ce}/api/kos/holders`
 });
 m.createLogger({
@@ -839,7 +839,7 @@ const Mr = async ({
   tracker: r
 }) => {
   const a = `${Ce}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${t}/${e}`, i = await _r({ model: {}, urlOverride: a, tracker: r });
-  return i != null && i.data && he.initiateFuture(i.data), i;
+  return i != null && i.data && ge.initiateFuture(i.data), i;
 }, wr = async (e, t) => {
   const r = `${Ce}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${e}/${t}/volume`, a = await Er({ urlOverride: r });
   return a != null && a.data ? a.data : { volume: -1 };
@@ -878,14 +878,14 @@ let le = class {
       boardPath: i,
       nozzlePath: s,
       name: n,
-      path: l,
-      childPump: c,
+      path: c,
+      childPump: l,
       virtual: p,
       prevIngredientId: u,
       state: F,
-      ...h
+      ...g
     } = t;
-    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = a, this.boardPath = i, this.nozzlePath = s, this.name = n, this.path = l, this.childPump = !!c, this.virtual = !!p, this.prevIngredientId = u, this.state = F, Object.assign(this, h), this.futureHandler = new je(this);
+    this.inserted = r, this.type = t.type, this.ingredientId = t.ingredientId, this.holderPath = a, this.boardPath = i, this.nozzlePath = s, this.name = n, this.path = c, this.childPump = !!l, this.virtual = !!p, this.prevIngredientId = u, this.state = F, Object.assign(this, g), this.futureHandler = new je(this);
   }
   updateModel(e) {
     const {
@@ -895,10 +895,10 @@ let le = class {
       nozzlePath: i,
       childPump: s,
       name: n,
-      path: l,
-      ...c
+      path: c,
+      ...l
     } = e;
-    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = a, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!s, this.name = n, this.path = l, this.prevIngredientId = e.prevIngredientId, Object.assign(this, c);
+    this.inserted = t, this.type = e.type, this.ingredientId = e.ingredientId, this.holderPath = r, this.boardPath = a, this.nozzlePath = i, this.childPump = this.childPump ? this.childPump : !!s, this.name = n, this.path = c, this.prevIngredientId = e.prevIngredientId, Object.assign(this, l);
   }
   // -------------------LIFECYCLE----------------------------
   get pouringState() {
@@ -954,7 +954,7 @@ let le = class {
   // -------------------ENTITY----------------------------
 };
 nt([
-  ge()
+  he()
 ], le.prototype, "performIntent", 1);
 le = nt([
   P(J)
@@ -991,10 +991,10 @@ const ot = {
     Ue.debug(`adding pump ${a.name}`);
     const s = $r(r.path, a);
     e.addModel(s);
-    const n = s.holderPath, l = t.holders.getModel(n);
-    l == null || l.pumps.addModel(s), l != null && l.nozzlePaths.includes(r.path) || l == null || l.nozzlePaths.push(r.path), (i = a == null ? void 0 : a.pumps) == null || i.forEach((c) => {
+    const n = s.holderPath, c = t.holders.getModel(n);
+    c == null || c.pumps.addModel(s), c != null && c.nozzlePaths.includes(r.path) || c == null || c.nozzlePaths.push(r.path), (i = a == null ? void 0 : a.pumps) == null || i.forEach((l) => {
       const p = s.holderPath, u = {
-        ...c,
+        ...l,
         childPump: !0,
         holderPath: p,
         ingredientId: s.ingredientId
@@ -1010,7 +1010,7 @@ var Nr = Object.defineProperty, Dr = Object.getOwnPropertyDescriptor, ie = (e, t
     (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
   return a && i && Nr(t, r, i), i;
 };
-const q = "assembly-model", Tr = "assembly-data", Sr = "assembly-raw-data";
+const q = "assembly-model", Sr = "assembly-data", Tr = "assembly-raw-data";
 let N = class {
   constructor(e, t, r) {
     o(this, "id");
@@ -1064,7 +1064,7 @@ let N = class {
   async ready() {
     var e;
     (e = this.troubleContainer) == null || e.troubles.increment(), y[mt].execute(
-      g.AssemblyFeatureFlags,
+      h.AssemblyFeatureFlags,
       this
     );
   }
@@ -1073,47 +1073,47 @@ let N = class {
     const t = await qe();
     if ((t == null ? void 0 : t.status) === 200) {
       const r = await U.executeDataMapperExtension({
-        extension: g.AssemblyMapper,
+        extension: h.AssemblyMapper,
         data: t.data,
         contextData: {}
       });
-      e.set(Tr, r), Object.assign(this, r), Object.entries(r).forEach(([a, i]) => {
+      e.set(Sr, r), Object.assign(this, r), Object.entries(r).forEach(([a, i]) => {
         ft(i) && (this.logger.debug(`adding child model ${a} from extension data`), this[vt][a] = !0);
-      }), e.set(Sr, t.data);
+      }), e.set(Tr, t.data);
       for await (const a of t.data.assemblies) {
         const {
           boards: i = [],
           holders: s = {},
           nozzles: n = [],
-          core: l,
-          name: c,
+          core: c,
+          name: l,
           path: p,
           ...u
         } = a;
-        this.logger.debug(`adding assembly ${c}`), this.logger.warn(`Assembly rest keys: ${Object.keys(u).join(", ")}`), Object.keys(u).forEach((h) => {
+        this.logger.debug(`adding assembly ${l}`), this.logger.warn(`Assembly rest keys: ${Object.keys(u).join(", ")}`), Object.keys(u).forEach((g) => {
           var M;
-          if (this.logger.warn(`Enabling feature flag: ${h}`), bt.enableFeature(h), e.set(`assembly-feature-${h}`, u[h]), ((M = u[h].state) == null ? void 0 : M.path) !== void 0) {
-            const C = u[h].state.path;
-            this.logger.warn(`Feature flag ${h} state path: ${C}`), e.set(`assembly-state-path-${h}`, C);
+          if (this.logger.warn(`Enabling feature flag: ${g}`), bt.enableFeature(g), e.set(`assembly-feature-${g}`, u[g]), ((M = u[g].state) == null ? void 0 : M.path) !== void 0) {
+            const C = u[g].state.path;
+            this.logger.warn(`Feature flag ${g} state path: ${C}`), e.set(`assembly-state-path-${g}`, C);
           }
         });
-        for await (const h of i)
-          this.logger.debug(`adding board ${h.name}`), await Or(this.boardContainer)(h);
-        for await (const [h, M] of Object.entries(
+        for await (const g of i)
+          this.logger.debug(`adding board ${g.name}`), await Or(this.boardContainer)(g);
+        for await (const [g, M] of Object.entries(
           s ?? {}
         ))
           for await (const C of M) {
             this.logger.debug(`adding holder ${C.name}`);
-            const De = await Qt(h, C);
+            const De = await Qt(g, C);
             this.holderContainer.holders.addModel(De);
           }
         const F = dt(this.pumpContainer)(
           this.holderContainer
         );
-        n.forEach((h) => {
-          this._nozzlePaths.add(h.path);
-          const M = F(h);
-          h.pumps.forEach(M);
+        n.forEach((g) => {
+          this._nozzlePaths.add(g.path);
+          const M = F(g);
+          g.pumps.forEach(M);
         });
       }
     }
@@ -1195,7 +1195,7 @@ const Ee = {
   factory: v.Factory.create(
     W
   )
-}, { URL: j } = D("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Ur, getOne: zr } = T.build({
+}, { URL: j } = D("NOZZLE_SERVICE"), { postModel: $e, deleteModel: Ur, getOne: zr } = S.build({
   basePath: `${j}/api/nozzle`
 }), xr = async (e, t) => {
   const r = await $e({
@@ -1204,7 +1204,7 @@ const Ee = {
     ordered: !0,
     tracker: t
   });
-  return r != null && r.data && he.initiateFuture(r.data), r;
+  return r != null && r.data && ge.initiateFuture(r.data), r;
 }, Br = async (e, t, r) => {
   const a = await $e({
     model: {},
@@ -1212,7 +1212,7 @@ const Ee = {
     ordered: !0,
     tracker: r
   });
-  return a != null && a.data && he.initiateFuture(a.data), a;
+  return a != null && a.data && ge.initiateFuture(a.data), a;
 }, Gr = async (e) => await zr({
   urlOverride: `${j}${e}/pipeline/beverage/availability`
 }), jr = async (e, t) => await $e({
@@ -1244,7 +1244,7 @@ let I = class {
     o(this, "beverageTopicPrefix");
     o(this, "topicPrefix");
     o(this, "urlPrefix");
-    this.id = e, this.path = t.path, this.name = t.name, this.beverageTopicPrefix = t.beverageTopicPrefix, this.topicPrefix = t.topicPrefix, this.urlPrefix = t.urlPrefix, this._selectedBeverage = void 0, this._selectedBrand = void 0, this._additionalItems = [], this.futureHandler = new Et(this), this._availabilityItems = new S({
+    this.id = e, this.path = t.path, this.name = t.name, this.beverageTopicPrefix = t.beverageTopicPrefix, this.topicPrefix = t.topicPrefix, this.urlPrefix = t.urlPrefix, this._selectedBeverage = void 0, this._selectedBrand = void 0, this._additionalItems = [], this.futureHandler = new Et(this), this._availabilityItems = new T({
       indexMap: {
         byGroup: "groupId",
         byParent: "parentId"
@@ -1316,8 +1316,8 @@ let I = class {
   updateModel() {
   }
   // -------------------LIFECYCLE----------------------------
-  setSelectedBrand(e) {
-    this._selectedBrand = e, this._selectedBeverage = void 0;
+  setSelectedBrand(e, t) {
+    t && this.logger.debug("context is currenty being ignored when setting brand"), this._selectedBrand = e, this._selectedBeverage = void 0;
   }
   get selectedBrand() {
     return this._selectedBrand;
@@ -1330,11 +1330,7 @@ let I = class {
    * @param pourable.additional The additional items such as flavors or other items that could be incorporated
    * into the pourable.
    * */
-  async setSelectedPourable({
-    beverage: e,
-    additional: t,
-    context: r
-  }) {
+  async setSelectedPourable({ beverage: e, additional: t, context: r }, a = !1) {
     if (!e) {
       const l = await Fr(this.name);
       if ((l == null ? void 0 : l.status) !== 200)
@@ -1342,27 +1338,34 @@ let I = class {
       this._selectedBeverage = void 0;
       return;
     }
-    if (e === this._selectedBeverage && Mt(this._additionalItems, t)) {
+    if (!a && e === this._selectedBeverage && Mt(this._additionalItems, t)) {
       this.logger.info("No change in selected pourable");
       return;
     }
     this._selectedBeverage = e, this._additionalItems = t;
-    let a = await y.dataMapper.executeMapper(
-      g.SelectedPourableMapper,
-      {
-        beverage: e,
-        additional: t,
-        context: r
-      }
-    );
-    const i = {
+    let i;
+    try {
+      i = await y.dataMapper.executeMapper(
+        h.SelectedPourableMapper,
+        {
+          beverage: e,
+          additional: t,
+          context: r
+        }
+      );
+    } catch (l) {
+      this.logger.error(
+        `Error executing SelectedPourableMapper, falling back to default payload. Error: ${l}`
+      ), i = void 0;
+    }
+    const s = {
       bevId: e.rawId
     };
-    (!a || Object.keys(a).length === 0) && (this.logger.info(
-      `No selected pourable mapper defined, using the default payload ${i}`
-    ), a = i);
-    const s = a ?? i, n = await jr(this.name, s);
-    if ((n == null ? void 0 : n.status) !== 200)
+    (!i || Object.keys(i).length === 0) && (this.logger.info(
+      `No selected pourable mapper defined, using the default payload ${s}`
+    ), i = s);
+    const n = i ?? s, c = await jr(this.name, n);
+    if ((c == null ? void 0 : c.status) !== 200)
       throw new Error("Failed to select pourable");
   }
   /**
@@ -1496,33 +1499,33 @@ let I = class {
     if ((t == null ? void 0 : t.status) !== 200)
       throw new Error("Failed to load nozzle availability");
     const r = await y.loader.executeLoader(
-      g.AvailabilityLoader,
+      h.AvailabilityLoader,
       {}
     );
-    e == null || e.set(g.AvailabilityLoader, r), e == null || e.set(Ne.type, this);
+    e == null || e.set(h.AvailabilityLoader, r), e == null || e.set(Ne.type, this);
     for (const s of Object.keys((a = t.data) == null ? void 0 : a.groups) || [])
       for (const n of ((i = t.data) == null ? void 0 : i.groups[s]) || []) {
-        const l = await y.dataMapper.executeMapper(
-          g.AvailabilityMapper,
+        const c = await y.dataMapper.executeMapper(
+          h.AvailabilityMapper,
           { ...n, groupId: s },
           r
-        ), c = {
+        ), l = {
           ...n,
           note: n.note ?? void 0,
           kosParentId: this.id,
           rawId: n.id,
           groupId: s,
-          data: l,
+          data: c,
           properties: n.properties || {}
         }, p = Ee.factory(
           `${this.id}-${s}-${n.id}`
-        )(c);
+        )(l);
         this._availabilityItems.addModel(p);
       }
     this.updateGroupMembers();
   }
   async updateAvailability(e) {
-    const t = wt.getContext(this.id), r = (t == null ? void 0 : t.get(g.AvailabilityLoader)) || {};
+    const t = wt.getContext(this.id), r = (t == null ? void 0 : t.get(h.AvailabilityLoader)) || {};
     if (e.rebuild)
       for (const a of Object.keys(e == null ? void 0 : e.groups) || []) {
         this._availabilityItems.getIndexByKey("group", a).filter(
@@ -1534,10 +1537,10 @@ let I = class {
         });
         for (const s of (e == null ? void 0 : e.groups[a]) || []) {
           const n = await y.dataMapper.executeMapper(
-            g.AvailabilityMapper,
+            h.AvailabilityMapper,
             { ...s, groupId: a },
             r
-          ), l = {
+          ), c = {
             ...s,
             note: s.note ?? void 0,
             kosParentId: this.id,
@@ -1546,15 +1549,15 @@ let I = class {
             data: n,
             taggedIds: s.taggedIds,
             properties: s.properties || {}
-          }, c = this._availabilityItems.getModel(
+          }, l = this._availabilityItems.getModel(
             `${this.id}-${a}-${s.id}`
           );
-          if (c)
-            c.updateModel(l);
+          if (l)
+            l.updateModel(c);
           else {
             const p = Ee.factory(
               `${this.id}-${a}-${s.id}`
-            )(l);
+            )(c);
             this._availabilityItems.addModel(p);
           }
         }
@@ -1563,7 +1566,7 @@ let I = class {
       for (const a of Object.keys(e == null ? void 0 : e.groups) || [])
         for (const i of (e == null ? void 0 : e.groups[a]) || []) {
           const s = await y.dataMapper.executeMapper(
-            g.AvailabilityMapper,
+            h.AvailabilityMapper,
             { ...i, groupId: a },
             r
           ), n = {
@@ -1576,10 +1579,10 @@ let I = class {
             type: i.type,
             taggedIds: i.taggedIds,
             properties: i.properties || {}
-          }, l = this._availabilityItems.getModel(
+          }, c = this._availabilityItems.getModel(
             `${this.id}-${a}-${i.id}`
           );
-          l && l.updateModel(n);
+          c && c.updateModel(n);
         }
     this.updateGroupMembers();
   }
@@ -1601,11 +1604,11 @@ E([
   ye(d.POUR_CANCELING)
 ], I.prototype, "handleCanceled", 1);
 E([
-  ge(),
+  he(),
   ae({ allowedStates: [d.IDLE] })
 ], I.prototype, "pour", 1);
 E([
-  ge(),
+  he(),
   ae({ allowedStates: [d.IDLE] })
 ], I.prototype, "fixedPour", 1);
 E([
@@ -1681,7 +1684,7 @@ let ce = class {
     o(this, "id");
     o(this, "deviceNozzles");
     o(this, "logger");
-    this.id = e, this.logger = r.logger, this.deviceNozzles = new S();
+    this.id = e, this.logger = r.logger, this.deviceNozzles = new T();
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1698,7 +1701,7 @@ let ce = class {
     const e = await qe();
     (e == null ? void 0 : e.status) === 200 && e.data.assemblies.map((r) => r.nozzles ?? []).flat().forEach((r) => {
       var n;
-      const a = r.path, i = ((n = r.pipelines.find((l) => l.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = Ne.factory(a)({
+      const a = r.path, i = ((n = r.pipelines.find((c) => c.name === "beverage")) == null ? void 0 : n.topicPrefix) || "", s = Ne.factory(a)({
         path: r.path,
         name: r.name,
         urlPrefix: r.urlPrefix,
@@ -1718,23 +1721,23 @@ ce = ct([
 const Jr = new Ct({
   class: ce,
   type: pt
-}), { URL: ht } = D("GENERIC_POUR_SERVICE"), { postModel: qr } = T.build({
-  basePath: `${ht}/api/nozzle`
+}), { URL: gt } = D("GENERIC_POUR_SERVICE"), { postModel: qr } = S.build({
+  basePath: `${gt}/api/nozzle`
 }), Wr = async (e, t) => {
   const r = await qr({
     model: {},
-    urlOverride: `${ht}${e}`,
+    urlOverride: `${gt}${e}`,
     ordered: !0,
     tracker: t
   });
-  return r != null && r.data && he.initiateFuture(r.data), r;
+  return r != null && r.data && ge.initiateFuture(r.data), r;
 };
 var Qr = Object.defineProperty, ea = Object.getOwnPropertyDescriptor, A = (e, t, r, a) => {
   for (var i = a > 1 ? void 0 : a ? ea(t, r) : t, s = e.length - 1, n; s >= 0; s--)
     (n = e[s]) && (i = (a ? n(t, r, i) : n(i)) || i);
   return a && i && Qr(t, r, i), i;
 };
-const gt = "generic-pour-model", ta = "/kos/generic/pour/started", ra = "/kos/generic/pour/progress", aa = "/kos/generic/pour/cancel", ve = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
+const ht = "generic-pour-model", ta = "/kos/generic/pour/started", ra = "/kos/generic/pour/progress", aa = "/kos/generic/pour/cancel", ve = (e) => e.onPourStart !== void 0 && e.onPourCancel !== void 0 && e.onPourProgress !== void 0;
 let w = class {
   constructor(e, t) {
     o(this, "id");
@@ -1742,7 +1745,7 @@ let w = class {
     o(this, "pourType");
     o(this, "selectedId");
     o(this, "state");
-    this.id = e, this.futureHandler = new je(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId, this.state = Se(t.initialData || {});
+    this.id = e, this.futureHandler = new je(this), this.servicePathFactory = t.servicePathFactory, this.pourType = t.pourType || "free", this.selectedId = t.selectedId, this.state = Te(t.initialData || {});
   }
   get servicePath() {
     return this.selectedId ? this.servicePathFactory(this.selectedId, this.state) : "";
@@ -1754,7 +1757,7 @@ let w = class {
     delete this.state[e];
   }
   clearContextData() {
-    this.state = Se();
+    this.state = Te();
   }
   updateModel(e) {
     e.pourType && (this.pourType = e.pourType), e.initialData && this.state.setValues(e.initialData);
@@ -1865,7 +1868,7 @@ A([
   ye(d.POUR_CANCELING)
 ], w.prototype, "handleCanceled", 1);
 A([
-  ge(),
+  he(),
   ae({ allowedStates: [d.IDLE] })
 ], w.prototype, "pour", 1);
 A([
@@ -1874,7 +1877,7 @@ A([
   })
 ], w.prototype, "cancelPour", 1);
 w = A([
-  P(gt),
+  P(ht),
   Fe(),
   $t(),
   He(
@@ -1914,9 +1917,9 @@ w = A([
     }
   )
 ], w);
-const ha = new Nt({
+const ga = new Nt({
   class: w,
-  type: gt
+  type: ht
 }), xe = {
   ...Ye.registration,
   ...Ve.registration,
@@ -1928,9 +1931,9 @@ const ha = new Nt({
   ...Ee.registration,
   ...lt.registration,
   ...it.registration
-}, ia = (e) => () => (Tt(e)(), Jr.register(), Object.keys(xe).forEach((t) => {
+}, ia = (e) => () => (St(e)(), Jr.register(), Object.keys(xe).forEach((t) => {
   const r = xe[t];
-  St(e)(t, r);
+  Tt(e)(t, r);
 }), y[te].register(
   "FirmwareUpdateInProgressTrouble",
   async (t) => {
@@ -1965,19 +1968,19 @@ f.preload = R.model.preloadModel(f);
 f.model = R.model.register(f);
 f.companion = R.companion.register(f);
 f.legacy = R.model.registerLegacyModel(f);
-const ga = f;
+const ha = f;
 export {
   lt as A,
   B,
-  Tr as C,
+  Sr as C,
   L as D,
-  g as E,
+  h as E,
   wr as F,
-  ha as G,
+  ga as G,
   Je as H,
   Ve as I,
   Mr as J,
-  ga as K,
+  ha as K,
   Fr as L,
   Gr as M,
   Ne as N,
@@ -1987,7 +1990,7 @@ export {
   jr as R,
   Wr as S,
   We as T,
-  Sr as a,
+  Tr as a,
   Ee as b,
   Qe as c,
   it as d,
@@ -2014,4 +2017,4 @@ export {
   Kt as y,
   qe as z
 };
-//# sourceMappingURL=dispense-registration-manager-CcFUS_KM.js.map
+//# sourceMappingURL=dispense-registration-manager-Cl2UbU1m.js.map