@7365admin1/layer-common 4.122.1 → 4.122.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.122.3
+
+### Patch Changes
+
+- 6d9f5ad: Lift queue: when no robot ride is being drawn and the lift's read-only gateway is connected, the car in the shaft now follows the real lift - it moves to the lift's current floor, the doors open and close with the lift's door state, the car shows an up/down arrow while moving, and it turns the alert colour in fire/emergency modes. Before, the card text updated but the car only ever moved for robot rides.
+
+## 4.122.2
+
+### Patch Changes
+
+- ad65b64: Map editor: Add floor beside the floor list adds a floor no robot reports yet (saved as an empty level), so a lift shaft can stop on two floors at a site whose robots are all on one floor. The one-floor lift message now says how.
+
 ## 4.122.1
 
 ### Patch Changes
@@ -3234,11 +3246,11 @@ Monthly report: a month that had patrols opens the list of that month's patrol r
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                    GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                                                                                                                                    GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                                                                                                                                        GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                                                                                                                                        GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                    owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                                                                                                                                    staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                                                                                                                                        owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                                                                                                                                        staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/Robot/LiftQueue.vue

@@ -85,10 +85,13 @@
           <div
             class="hero-lift__carbox"
             :class="`hero-lift__carbox--${l.carTone}`"
-            :style="{ height: `${l.carH}px`, top: `${l.fromTop}px`, '--from': `${l.fromTop}px`, '--to': `${l.toTop}px`, animation: l.riding ? 'heroLift 6s ease-in-out infinite alternate' : 'none' }"
+            :style="{ height: `${l.carH}px`, top: `${l.fromTop}px`, '--from': `${l.fromTop}px`, '--to': `${l.toTop}px`, animation: l.riding ? 'heroLift 6s ease-in-out infinite alternate' : 'none', transition: l.live ? 'top 1.8s linear' : 'none' }"
           >
             <span class="hero-lift__carlabel">{{ l.carLabel }}</span>
-            <div class="hero-lift__doors" :style="{ animation: l.riding ? 'heroDoors 6s ease-in-out infinite' : 'none' }" />
+            <div
+              class="hero-lift__doors"
+              :style="l.live ? { transform: `scaleX(${1 - l.doors})`, transition: 'transform 0.8s ease' } : { animation: l.riding ? 'heroDoors 6s ease-in-out infinite' : 'none' }"
+            />
           </div>
         </div>
       </div>

package/components/Robot/MapEditor.vue

@@ -39,6 +39,9 @@
       <select v-model.number="floor" class="hero-input hero-select hero-editor__floor" aria-label="Floor">
         <option v-for="f in allFloors" :key="f" :value="f">{{ floorName(f) }}</option>
       </select>
+      <div class="hero-seg" role="group" aria-label="Floors">
+        <button type="button" class="hero-seg__opt" title="Add a floor no robot is on yet (e.g. a lift's other stops)" @click="addFloor">Add floor</button>
+      </div>
       <label class="hero-editor__graphpick">
         <span>Route graph</span>
         <select v-model.number="graph" class="hero-input hero-select hero-editor__floor" aria-label="Route graph">
@@ -408,6 +411,7 @@ import {
   LIFT_MIN_M,
   NUDGE_BIG_M,
   NUDGE_M,
+  newFloorNo,
   ROUTE_TOOLS,
   routeProblems,
   saveErrorText,
@@ -1062,6 +1066,20 @@ function setLevel(key: "name" | "elevationM", value: string | number) {
   levels.value = { ...levels.value, [String(floor.value)]: { ...cur, [key]: value } };
   state.value = { ...state.value, dirty: true };
 }
+/** A floor with nothing on it yet (no robot reports it): saved as an empty level so a lift can stop there. */
+function addFloor() {
+  const answer = window.prompt("Floor number to add (1 = L1, 0 = G, -1 = B1)");
+  if (answer === null) return;
+  const r = newFloorNo(answer, allFloors.value);
+  if ("error" in r) return void dispatch({ type: "notice", text: r.error, ok: false });
+  const fl = r.floorNo;
+  levels.value = { ...levels.value, [String(fl)]: { name: floorName(fl), elevationM: fl * 4, floorPolys: [], holePolys: [] } };
+  // A selected lift stays selected (its Stops table now lists the floor); otherwise go to the new floor.
+  const liftPicked = single.value?.kind === "lift";
+  if (!liftPicked) floor.value = fl;
+  state.value = { ...state.value, dirty: true };
+  dispatch({ type: "notice", text: `${floorName(fl)} added.${liftPicked ? ` Tick Stops for ${floorName(fl)} below,` : " Select the lift shaft, tick Stops for it,"} then Save.`, ok: true });
+}
 function alignNow() {
   const r = alignFloor(state.value.shapes, state.value.frame, floor.value, alignTo.value);
   if ("error" in r) return void dispatch({ type: "notice", text: r.error!, ok: false });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.122.1",
+  "version": "4.122.3",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/utils/robot-building.ts

@@ -1190,6 +1190,24 @@ export function editorReduce(state: TEditorState, action: TEditorAction): TEdito
   }
 }
 
+/** Floor numbers the API accepts (robot-building-map floorNo). */
+export const FLOOR_MIN = -20;
+export const FLOOR_MAX = 200;
+
+/**
+ * The editor's "Add floor" answer, checked: a whole number (1 = L1, 0 = G,
+ * -1 = B1) in the API's range and not already a floor - or the reason not.
+ */
+export function newFloorNo(input: string | null | undefined, existing: number[]): { floorNo: number } | { error: string } {
+  const t = String(input ?? "").trim().toUpperCase();
+  const m = /^(?:([LB])(\d+)|(-?\d+))$/.exec(t);
+  const n = t === "G" ? 0 : m ? (m[3] !== undefined ? Number(m[3]) : m[1] === "B" ? -Number(m[2]) : Number(m[2])) : NaN;
+  if (!Number.isInteger(n)) return { error: `"${String(input ?? "").trim()}" is not a floor. Type a whole number: 1 for L1, 0 for G, -1 for B1.` };
+  if (n < FLOOR_MIN || n > FLOOR_MAX) return { error: `Floors go from ${floorName(FLOOR_MIN)} to ${floorName(FLOOR_MAX)}.` };
+  if (existing.includes(n)) return { error: `${floorName(n)} is already a floor - pick it in the floor list.` };
+  return { floorNo: n };
+}
+
 /**
  * Why Save must wait, in plain words - or null. The handoff's sentence for
  * an unnamed zone; then what the API would refuse (a lift on one floor,
@@ -1205,7 +1223,7 @@ export function editorProblem(state: TEditorState): string | null {
   const lonely = state.shapes.find((s) => s.kind === "lift" && (s.floors?.length ?? 0) < 2);
   if (lonely) {
     const a = shapeAnchor(lonely);
-    return `Can't save yet: the lift shaft at (${a.x}, ${a.y}) serves only one floor. A lift needs at least two floors - this building's robots report only ${floorName(lonely.floorNo)}.`;
+    return `Can't save yet: the lift shaft at (${a.x}, ${a.y}) serves only one floor. A lift needs at least two floors - select it and tick Stops for another floor (use Add floor beside the floor list if that floor is not there yet).`;
   }
   const long = state.shapes.find((s) => (s.kind === "zone" || s.kind === "waypoint" || s.kind === "fiducial") && (s.name ?? "").length > 60);
   if (long) return `Can't save yet: the name "${long.name!.slice(0, 20)}…" is too long. Use 60 characters or fewer.`;
@@ -1442,6 +1460,21 @@ export function liftQueueRows(lift: Record<string, any>, now = Date.now()): TLif
 const ROW_H = 44;
 const CAR_H = ROW_H - 14;
 
+/**
+ * A floor as the real lift shows it ("B1", "L34", "34", "G") -> the car's y on the rails. Between two rails
+ * (a floor the map has no rail for) the car sits proportionally between them; past the ends it sits on the end.
+ */
+export function liftFloorTop(display: unknown, floors: number[], topOf: (f: number) => number): number | null {
+  const parsed = newFloorNo(String(display ?? "").replace(/\s+/g, ""), []);
+  if (!("floorNo" in parsed) || !floors.length) return null;
+  const v = parsed.floorNo;
+  if (v <= floors[0]!) return topOf(floors[0]!);
+  if (v >= floors.at(-1)!) return topOf(floors.at(-1)!);
+  const i = floors.findIndex((f) => f >= v);
+  const lo = floors[i - 1]!, hi = floors[i]!;
+  return topOf(lo) + ((v - lo) / (hi - lo)) * (topOf(hi) - topOf(lo));
+}
+
 /** The whole card: header words, car status, shaft geometry, rows (README §5). */
 export function liftCard(lift: Record<string, any>, now = Date.now()) {
   const rows = liftQueueRows(lift, now);
@@ -1454,23 +1487,37 @@ export function liftCard(lift: Record<string, any>, now = Date.now()) {
   const rest = floors.includes(idleFloor) ? idleFloor : floors[0] ?? 1;
   const from = riding ? riding.fromNo : rest;
   const to = riding ? riding.toNo : rest;
+  // The real lift (read-only gateway), when no robot ride is drawn: the car follows its floor, doors and direction.
+  const gw = lift?.gateway;
+  const real = !riding && gw?.status === "connected" && gw.state ? gw.state : null;
+  const realTop = real ? liftFloorTop(real.currentFloor, floors, topOf) : null;
+  const live = realTop != null;
+  const realAlarm = live && [3, 4, 5].includes(Number(real.currentMode));
+  const arrow = live ? (real.motionState === 1 ? "▲" : real.motionState === 2 ? "▼" : "") : "";
   return {
     name: String(lift?.liftName ?? "Lift"),
     sub: rows.length ? `${riding ? 1 : 0} riding · ${waiting.length} waiting` : "idle",
-    carText: riding ? `Car · ${riding.robot} · ${riding.from} → ${riding.to}` : "Car idle",
-    carLabel: riding ? riding.robot.replace(/^HERO-/, "") : "",
-    carTone: riding ? "ink" : rows.some((r) => r.state === "timed out") ? "accent" : "neutral",
+    carText: riding
+      ? `Car · ${riding.robot} · ${riding.from} → ${riding.to}`
+      : live
+        ? `Car · floor ${real.currentFloor}${MOTION_TEXT[real.motionState] ? ` · ${MOTION_TEXT[real.motionState]!.toLowerCase()}` : ""}`
+        : "Car idle",
+    carLabel: riding ? riding.robot.replace(/^HERO-/, "") : arrow,
+    carTone: riding ? "ink" : realAlarm || rows.some((r) => r.state === "timed out") ? "accent" : live ? "ink" : "neutral",
+    /** Real lift drawn live: the car glides between readings; doors open (1) / half (0.5, moving) / shut (0). */
+    live,
+    doors: live ? (real.doorState === 2 ? 1 : real.doorState === 1 ? 0.5 : 0) : 0,
     riding: !!riding,
     empty: !rows.length,
     shaftH: (n - 1) * ROW_H + 24,
     carH: CAR_H,
-    fromTop: topOf(from) - CAR_H / 2,
-    toTop: topOf(to) - CAR_H / 2,
+    fromTop: (live ? realTop! : topOf(from)) - CAR_H / 2,
+    toTop: (live ? realTop! : topOf(to)) - CAR_H / 2,
     rails: [...floors].reverse().map((f) => ({
       floorNo: f,
       name: floorName(f),
       top: topOf(f),
-      lit: !!riding && (f === riding.fromNo || f === riding.toNo),
+      lit: riding ? f === riding.fromNo || f === riding.toNo : live && realTop === topOf(f),
       waiting: waiting.filter((w) => w.fromNo === f).map((w) => w.robot),
     })),
     rows,