@7365admin1/layer-common 4.124.0 → 4.124.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.124.2
+
+### Patch Changes
+
+- aefd40e: Robot detail: Cancel now says the robot drives back to its charger (core sends it home after a cancel), and the confirm offers "Stop here" to leave it where it stops.
+
+## 4.124.1
+
+### Patch Changes
+
+- 3f10a5a: Robot setup: saved point names and the zone editor fill in again (an early watcher hit not-yet-created state - point name boxes were empty).
+
 ## 4.124.0
 
 ### Minor Changes
@@ -3264,11 +3276,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/Detail.vue

@@ -245,6 +245,8 @@
       <div class="hero-dialog__body">{{ confirming.text.body }}</div>
       <div class="hero-dialog__actions">
         <v-btn variant="outlined" @click="confirmOpen = false">Don't send</v-btn>
+        <!-- Cancel sends the robot home (core 2026-10-15); this keeps it where it stops. -->
+        <v-btn v-if="confirming.kind === 'cancel'" variant="outlined" @click="confirmSend(true)">Stop here</v-btn>
         <v-btn color="primary" variant="flat" :disabled="!!confirming.zones && !confirming.zoneNames?.length" @click="confirmSend">{{ confirming.text.action }}</v-btn>
       </div>
     </div>
@@ -796,10 +798,10 @@ function pickRoute(id: unknown) {
   c.what = /^patrol/i.test(name) ? name : `patrolling ${name}`;
   c.text = commandConfirm("area", { type: "security", name: record.value?.name, route: { name, stops }, map });
 }
-function confirmSend() {
+function confirmSend(stayHere = false) {
   const c = confirming.value;
   confirmOpen.value = false;
-  if (c) run(c.kind, c.body, c.what);
+  if (c) run(c.kind, stayHere === true ? { ...c.body, stayHere: true } : c.body, c.what);
 }
 
 /** The robot's plan image size for its floor, for turning plan clicks into pixels. */

package/components/Robot/SetupPoints.vue

@@ -65,13 +65,6 @@ const props = defineProps<{ setup: Record<string, any>; busy?: boolean }>();
 const emit = defineEmits<{ apply: [change: Record<string, any>, ctx?: { map?: string }] }>();
 
 const mapId = ref<string | null>(null);
-watch(() => props.setup, (s) => {
-  if (!mapId.value || !(s.maps ?? []).some((m: any) => m.mapId === mapId.value)) mapId.value = s.currentMapId ?? s.maps?.[0]?.mapId ?? null;
-  for (const k of Object.keys(names)) delete names[k];
-  for (const m of s.maps ?? []) for (const p of m.points ?? []) names[p.targetPointId] = p.name;
-  newName.value = "";
-  stopPick();
-}, { immediate: true });
 const map = computed(() => (props.setup.maps ?? []).find((m: any) => m.mapId === mapId.value) ?? null);
 const placed = computed(() => (map.value?.points ?? []).filter((p: any) => p.at).map((p: any) => ({ targetPointId: p.targetPointId, name: p.name, x: p.at.x, y: p.at.y })));
 const names = reactive<Record<string, string>>({});
@@ -100,6 +93,15 @@ function add(at: "robot" | TShare) {
   if (!map.value) return;
   emit("apply", { action: "point-add", mapId: map.value.mapId, name: newName.value.trim(), at, ...yaw() }, { map: map.value.name });
 }
+// Last: an immediate watcher runs during setup, so everything it touches must already exist.
+watch(() => props.setup, (s) => {
+  if (!mapId.value || !(s.maps ?? []).some((m: any) => m.mapId === mapId.value)) mapId.value = s.currentMapId ?? s.maps?.[0]?.mapId ?? null;
+  for (const k of Object.keys(names)) delete names[k];
+  for (const m of s.maps ?? []) for (const p of m.points ?? []) names[p.targetPointId] = p.name;
+  newName.value = "";
+  stopPick();
+}, { immediate: true });
+
 function donePick() {
   if (!picked.value || !map.value) return;
   const at = { x: Math.round(picked.value.x * 100) / 100, y: Math.round(picked.value.y * 100) / 100 };

package/components/Robot/SetupZones.vue

@@ -109,7 +109,6 @@ function reset() {
   wallsDirty.value = slowDirty.value = false;
   cancelDraw();
 }
-watch(() => props.setup, reset, { immediate: true });
 
 /* ---- drawing ---- */
 const drawing = ref<{ kind: TKind; name: string; target: TDraftShape | null } | null>(null);
@@ -145,6 +144,9 @@ const drawn = computed(() => [
   ...safe.value.map((z) => ({ kind: "safe" as const, name: z.name, points: z.points })),
 ]);
 
+// Last: an immediate watcher runs during setup, so everything reset() touches must already exist.
+watch(() => props.setup, reset, { immediate: true });
+
 function save(kind: "wall" | "slow") {
   if (!map.value) return;
   emit("apply", zonesChange(map.value.mapId, kind, kind === "wall" ? loadedWalls.value : loadedSlow.value, kind === "wall" ? walls.value : slow.value), { map: map.value.name });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.124.0",
+  "version": "4.124.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-display.ts

@@ -1767,7 +1767,7 @@ export function commandConfirm(
     return: `${who} stops what it is doing and drives back to its charger.`,
     pause: `${who} stops where it is and waits. Press Resume to carry on.`,
     resume: `${who} carries on with the job it paused.`,
-    cancel: `${who} stops the current job and stays where it is. It will not carry on by itself.`,
+    cancel: `${who} stops the current job and drives back to its charger. Choose "Stop here" to leave it where it stops instead.`,
     navigate: at ? `${who} drives to ${at}.` : `${who} drives to the point you pick.`,
     relocalize: at
       ? `${who} is told it is standing at ${at}. Only do this if it really is there - a wrong position gets it lost.`