@7365admin1/layer-common 4.122.0 → 4.122.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 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
+
+- 811b0e5: Lift queue: after Connect gateway / New code, the card shows the ready-to-paste gateway settings (this app's address and the code) with Copy settings, Done, and three numbered setup steps; the Waiting line says what to check.
+
 ## 4.122.0
 
 ### Minor Changes
@@ -3228,11 +3240,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/assets/css/robot-hero.css

@@ -1272,6 +1272,9 @@ div.hero-editor__wp.hero-editor__sel, div.hero-editor__fid.hero-editor__sel { ou
 .hero-lift__gwreg { display: inline-block; margin: 4px 12px 0 0; font-family: monospace; }
 .hero-lift__gwact { margin-left: auto; display: flex; gap: 6px; }
 .hero-lift__gwcode { flex-basis: 100%; display: flex; align-items: center; flex-wrap: wrap; gap: 6px 10px; padding: 8px 10px; border: 1px solid rgb(var(--v-theme-warning)); }
+.hero-lift__gwini { flex-basis: 100%; margin: 0; padding: 8px 10px; font-family: monospace; font-size: 12px; white-space: pre-wrap; word-break: break-all; user-select: all; background: rgba(var(--v-theme-on-surface), 0.06); }
+.hero-lift__gwsteps { flex-basis: 100%; margin: 0; padding-left: 20px; font-size: 13px; }
+.hero-lift__gwsteps li { margin: 2px 0; }
 .hero-lift__gwcode code { font-family: monospace; word-break: break-all; user-select: all; }
 @media (max-width: 600px) {
   .hero-lift { grid-template-columns: 1fr; }

package/components/Robot/LiftQueue.vue

@@ -57,10 +57,18 @@
           <v-btn v-if="l.gateway" size="small" variant="text" :disabled="busy === `gw:${l.name}`" @click="disconnectGateway(l.name)">Disconnect</v-btn>
         </span>
         <div v-if="newCode?.lift === l.name" class="hero-lift__gwcode" role="alert">
-          <b>Gateway code (shown once):</b>
-          <code>{{ newCode.code }}</code>
-          <v-btn size="x-small" variant="tonal" @click="copyCode">Copy</v-btn>
-          <span class="hero-muted">Paste it as <code>code =</code> in the gateway's lift-gateway.ini, then start the gateway. This card turns Connected within seconds.</span>
+          <b>Gateway settings for {{ l.name }} - shown once, copy them now:</b>
+          <pre class="hero-lift__gwini">{{ gatewayIni }}</pre>
+          <span class="hero-lift__gwact">
+            <v-btn size="small" variant="tonal" @click="copyCode">Copy settings</v-btn>
+            <v-btn size="small" variant="text" @click="newCode = null">Done</v-btn>
+          </span>
+          <ol class="hero-lift__gwsteps">
+            <li>On the gateway (Raspberry Pi / PC), paste these two lines into the <code>[server]</code> section of <code>lift-gateway.ini</code>.</li>
+            <li>Check the link without the lift: <code>python3 lift_gateway.py -c lift-gateway.ini --simulate</code>. It prints "iService365 OK" and this card turns <b>Connected</b>.</li>
+            <li>Wire the lift board's MOD1 port, then run it without <code>--simulate</code>. Floor and door show once the lift's register list is in the <code>[decode]</code> section.</li>
+          </ol>
+          <span class="hero-muted">Lost the code? Press New code - the old one stops working.</span>
         </div>
       </div>
 
@@ -290,10 +298,14 @@ async function disconnectGateway(lift: string) {
     busy.value = "";
   }
 }
+/** The gateway's [server] lines: this app's own address (it forwards /api to iService365) and the code. */
+const gatewayIni = computed(() =>
+  newCode.value ? `url = ${typeof window !== "undefined" ? window.location.origin : ""}\ncode = ${newCode.value.code}` : "",
+);
 async function copyCode() {
   try {
-    await navigator.clipboard.writeText(newCode.value?.code ?? "");
-    toast.value = "Code copied";
+    await navigator.clipboard.writeText(gatewayIni.value);
+    toast.value = "Settings copied";
   } catch {
     toast.value = "Select the code and copy it by hand.";
   }

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.0",
+  "version": "4.122.2",
   "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.`;
@@ -1495,7 +1513,7 @@ export function liftGatewayLine(g: Record<string, any> | null) {
     waiting: {
       text: `Waiting for the gateway (code …${g.codeHint ?? ""})`,
       tone: "neutral",
-      help: "Put the code in the gateway's settings and start it. It turns Connected within seconds.",
+      help: "The gateway has not sent anything yet. Check its lift-gateway.ini (url and code from Connect gateway), its network, and that the program is running.",
     },
     connected: { text: `Connected · last reading ${ago}`, tone: "success", help: "" },
     "no-lift": {