@7365admin1/layer-common 4.79.0 → 4.80.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.80.1
+
+### Patch Changes
+
+- dbfc623: Robot detail: each command's outcome line names its command ("Return to charger: …"), and a fault that was already showing when the command was sent is reported as an earlier fault to clear first, not as the new command's result.
+
+## 4.80.0
+
+### Minor Changes
+
+- 200cb0b: Service Providers > Invitations: the status line says who must act while an invitation waits ("Waiting for a Seven365 Super Admin to approve - the email is sent after approval") and, once approved, whether the email went out ("Email sent 30 Sept, 14:14" or "Email failed: <reason> - use Resend", in red). Reads `emailStatus` from core 3.134+; older rows keep "Sent - waiting for their answer".
+
 ## 4.79.0
 
 ### Minor Changes
@@ -1932,11 +1944,11 @@
   `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

@@ -633,17 +633,18 @@ watch([reportsPosition, online], ([r, o], old) => {
 const busy = ref<TRobotCommandKind | "spot" | null>(null);
 /** The last command's real outcome, kept on screen (a toast vanishes in 2.6 s). */
 const commandResult = ref<{ text: string; warn: boolean } | null>(null);
-const watching = ref<{ kind: string; at: number; what?: string } | null>(null);
+const watching = ref<{ kind: string; at: number; what?: string; label?: string; faultBefore?: string } | null>(null);
 watch([lastAt, now], () => {
   const w = watching.value;
   const at = lastAt.value?.getTime() ?? 0;
   // Only a reading taken after the command was accepted counts (never the optimistic status).
   if (!w || at <= w.at + 300) return;
-  const out = commandOutcome(w.kind, polled.value?.ok ? polled.value : null, Date.now() - w.at, { name: record.value?.name, what: w.what });
+  const out = commandOutcome(w.kind, polled.value?.ok ? polled.value : null, Date.now() - w.at, { name: record.value?.name, what: w.what, faultBefore: w.faultBefore });
   if (!out) return;
   // Keep following (Leaving the charger… -> On the way to P4… -> Arrived at P4) until it is done.
   if (out.done) watching.value = null;
-  commandResult.value = { text: out.text, warn: !out.ok };
+  // Each line names its own command, so a new command never looks like the last one's result.
+  commandResult.value = { text: w.label ? `${w.label}: ${out.text}` : out.text, warn: !out.ok };
   if (!out.ok) optimistic.value = null;
 });
 watch(
@@ -656,6 +657,8 @@ watch(
 async function run(kind: TRobotCommandKind | "spot", body: Record<string, unknown>, what?: string) {
   const name = record.value?.name ?? "the robot";
   const before = statusMode.value;
+  // A fault already showing is not the result of this command (commandOutcome).
+  const faultBefore = polled.value?.ok && typeof polled.value.fault?.message === "string" ? polled.value.fault.message : undefined;
   const docked = before === "CHARGED" || before === "CHARGING_CYCLE" || /At charger/.test(String(live.value?.ok ? live.value.statusName ?? "" : ""));
   busy.value = kind;
   optimistic.value = { mode: optimisticMode(kind, before), after: Number.POSITIVE_INFINITY };
@@ -673,7 +676,7 @@ async function run(kind: TRobotCommandKind | "spot", body: Record<string, unknow
     // "Accepted" is not "done": watch real readings for up to 30 s (commandOutcome).
     const outcomeKind = body.kind === "go-to-point" ? "go-to-point" : kind;
     if (commandOutcome(outcomeKind, { mode: "" }, COMMAND_WATCH_MS) !== null) {
-      watching.value = { kind: String(outcomeKind), at: Date.now(), what };
+      watching.value = { kind: String(outcomeKind), at: Date.now(), what, label, faultBefore };
       fastUntil.value = Date.now() + COMMAND_FOLLOW_MS;
       commandResult.value = { text: sentText(docked), warn: false };
     } else commandResult.value = { text: `${label} → ${name} · accepted.`, warn: false };

package/components/ServiceProviderMain.vue

@@ -140,7 +140,11 @@
               :status="item.viewStatus || item.statusRaw || item.status"
               :label="item.status"
             />
-            <div v-if="item.statusLine" class="mt-1 sp-sub">{{ item.statusLine }}</div>
+            <div
+              v-if="item.statusLine"
+              class="mt-1 sp-sub"
+              :class="{ 'text-error': item.statusLine.startsWith('Email failed') }"
+            >{{ item.statusLine }}</div>
             <!-- Was `text-caption text-medium-emphasis` - Roboto 12px at
                  Vuetify's 60% opacity. The design's sub-line is `--muted`. -->
             <div v-if="item.rejectionReason" class="mt-1 sp-reject-reason">

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.79.0",
+  "version": "4.80.1",
   "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

@@ -1823,7 +1823,7 @@ export function commandOutcome(
   kind: unknown,
   reading: { online?: unknown; mode?: unknown; statusName?: unknown; fault?: { message?: unknown } | null } | null | undefined,
   elapsedMs: number,
-  input: { name?: unknown; what?: unknown } = {},
+  input: { name?: unknown; what?: unknown; faultBefore?: unknown } = {},
 ): { ok: boolean; text: string; done: boolean } | null {
   const started = STARTED[String(kind)];
   if (!started || !reading) return null;
@@ -1837,6 +1837,10 @@ export function commandOutcome(
   }
   if (elapsedMs < COMMAND_WATCH_MS) return null;
   const fault = typeof reading.fault?.message === "string" ? reading.fault.message : "";
+  // The fault was already there when this command was sent: it is not this command's result.
+  if (fault && fault === input.faultBefore) {
+    return { ok: false, done: true, text: `${who} is still stopped by an earlier fault (${fault}). Clear it on the robot or in its maker's app, then try again.` };
+  }
   const reason = reading.online === false ? "it stopped reporting" : fault || (said && !RESTING.test(said) ? said : "");
   return {
     ok: false,

package/utils/sp-inviter-row.ts

@@ -19,8 +19,19 @@ export type TSentInvitation = {
   createdAt?: string | null;
   answeredAt?: string | null;
   onSite?: boolean;
+  /** The latest invitation-email attempt, from the server (core 3.134+). */
+  emailStatus?: { state?: "sent" | "failed"; at?: string | null; reason?: string } | null;
 };
 
+/** "30 Sep, 14:14" - when the email went out. */
+export function spDayTime(value?: string | null): string {
+  if (!value) return "";
+  const d = new Date(value);
+  return Number.isNaN(d.getTime())
+    ? ""
+    : d.toLocaleString("en-GB", { day: "numeric", month: "short", hour: "2-digit", minute: "2-digit" });
+}
+
 const ANSWERED: Record<string, string> = {
   complete: "Accepted",
   declined: "Declined",
@@ -91,7 +102,20 @@ export function sentStatusLine(row: TSentInvitation): string {
     return `Accepted${when ? ` on ${when}` : ""} · no longer on this site`;
   }
   if (ANSWERED[status]) return when ? `${ANSWERED[status]} on ${when}` : "";
-  if (status === "awaiting-approval") return "Seven365 checks it before it is sent";
-  if (status === "pending") return "Sent - waiting for their answer";
+  // Who has to act, and that nothing is emailed until they do.
+  if (status === "awaiting-approval") {
+    return "Waiting for a Seven365 Super Admin to approve - the email is sent after approval";
+  }
+  if (status === "pending") {
+    const email = row.emailStatus;
+    if (email?.state === "failed") {
+      return `Email failed: ${email.reason || "could not be sent"} - use Resend`;
+    }
+    if (email?.state === "sent") {
+      const when = spDayTime(email.at);
+      return `Email sent${when ? ` ${when}` : ""} - waiting for their answer`;
+    }
+    return "Sent - waiting for their answer";
+  }
   return "";
 }