@7365admin1/layer-common 4.75.0 → 4.76.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.76.0
+
+### Minor Changes
+
+- 5fafd9a: Robot detail: a cleaning robot whose brand reports them (Ounitech) now shows Clean water and Dirty water (Low / Medium / High with the %), a "Tanks and covers" line ("Tanks and covers OK", or which cover is open / tank not fitted) and, while it cleans, "This job" (% done and m² cleaned of planned). Warning tags for clean water low, dirty water full and any open cover or missing tank. Nothing is shown for brands that do not report them. The rule (`cleaningReadings`) is part of the robot rules synced to the mobile apps; "What this robot can do" lists "water levels and tanks".
+
+## 4.75.1
+
+### Patch Changes
+
+- b84da6e: Organization Members: keep the "Fix roles from other sites" banner at organisation level, worded for the organisation ("N members hold a role created for one particular site…"), without the per-site "Show them" filter. 4.75.0 had hidden the whole banner there.
+
 ## 4.75.0
 
 ### Minor Changes
@@ -1902,11 +1914,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/assets/css/robot-hero.css

@@ -806,6 +806,7 @@
 .hero-strip { grid-template-columns: repeat(auto-fit, minmax(128px, 1fr)); }
 .hero-strip .hero-fact { padding: 8px 12px; }
 .hero-strip .hero-fact__value { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.hero-cleaning-warnings { display: flex; flex-wrap: wrap; gap: 6px; margin: 8px 0; }
 .hero-detail__main { display: grid; grid-template-columns: minmax(0, 11fr) minmax(0, 9fr); gap: 20px; align-items: start; }
 .hero-detail__main--single { grid-template-columns: minmax(0, 1fr); }
 .hero-detail__cam, .hero-detail__map { display: flex; flex-direction: column; gap: 10px; min-width: 0; }

package/components/MemberMain.vue

@@ -31,7 +31,7 @@
          their access; the company assigns each one a role for this site.
          Shown while any remain (server count), gone at 0. -->
     <v-alert
-      v-if="props.assignRole && otherSiteBanner && !orgLevel"
+      v-if="props.assignRole && otherSiteBanner"
       type="warning"
       variant="tonal"
       density="compact"
@@ -41,6 +41,7 @@
       <div class="d-flex align-center flex-wrap ga-2">
         <span class="flex-grow-1">{{ otherSiteBanner }}</span>
         <AppButton
+          v-if="!orgLevel"
           data-test="member-other-site-filter"
           @click="toggleOtherSite()"
         >
@@ -578,7 +579,7 @@ const {
 const { data: otherSiteReq, refresh: refreshOtherSite } = useAsyncData(
   `members-other-site-${props.type}-${props.orgId}-${props.siteId}-${props.status}`,
   () =>
-    props.assignRole && props.orgId && !orgLevel.value
+    props.assignRole && props.orgId
       ? _getAll({
           status: props.status,
           org: props.orgId,
@@ -591,8 +592,10 @@ const { data: otherSiteReq, refresh: refreshOtherSite } = useAsyncData(
       : Promise.resolve(null),
   { watch: [() => props.status, () => props.orgId, () => props.siteId] }
 );
+// At organisation level there is no "this site": the count says what is wrong
+// and points to "Fix roles from other sites" (no per-site filter there).
 const otherSiteBanner = computed(() =>
-  otherSiteBannerText(otherSiteReq.value?.total)
+  otherSiteBannerText(otherSiteReq.value?.total, orgLevel.value)
 );
 watch(otherSiteBanner, (text) => {
   // the last one fixed: back to the full list

package/components/Robot/Detail.vue

@@ -56,6 +56,17 @@
     </div>
   </div>
 
+  <!-- A scrubber's water, tanks and current job (brands that report them); warnings as tags. -->
+  <div v-if="cleaning.warnings.length" class="hero-cleaning-warnings" role="status" aria-label="Needs attention">
+    <span v-for="w in cleaning.warnings" :key="w" class="hero-tag hero-tag--outline">{{ w }}</span>
+  </div>
+  <div v-if="cleaning.facts.length" class="hero-facts hero-strip" role="list" aria-label="Water and tanks">
+    <div v-for="f in cleaning.facts" :key="f.label" class="hero-fact" role="listitem">
+      <div class="hero-fact__label">{{ f.label }}</div>
+      <div class="hero-fact__value" :title="f.value">{{ f.value }}</div>
+    </div>
+  </div>
+
   <!-- Above the fold: camera | map, with the commands under the map they act on. -->
   <div v-if="!noInterface" class="hero-detail__main" :class="{ 'hero-detail__main--single': !hasCamera }">
     <section v-if="hasCamera" class="hero-detail__cam" aria-label="Camera">
@@ -305,6 +316,7 @@ import {
   robotAbilities,
   robotErrorMessage,
   robotFacts,
+  cleaningReadings,
   robotStatus,
   showSpotClean,
   sinceText,
@@ -420,6 +432,7 @@ const stripFacts = computed(() =>
     .filter((f): f is NonNullable<typeof f> => !!f)
     .map((f) => (f.label === "Robot reports" ? { ...f, label: "Doing now" } : f)),
 );
+const cleaning = computed(() => cleaningReadings(live.value as any));
 const identity = computed(() => {
   const model = facts.value.find((f) => f.label === "Model")?.value;
   const serial = facts.value.find((f) => f.label === "Serial")?.value;

package/package.json

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

@@ -626,6 +626,8 @@ export type TLiveRobotState = {
   capabilities?: Record<string, unknown>;
   /** Plain-words facts for this brand + model (core `robotManifest`). */
   profile?: TRobotProfile;
+  /** A scrubber's water, tank and job readings (core `TRobotCleaning`, brands with `waterTanks`). */
+  cleaning?: TRobotCleaning | null;
   lastSeenAt?: string | null;
   /** Epoch ms of the last answer that was read (set by `mergeLiveStates`). */
   readAt?: number;
@@ -1358,6 +1360,71 @@ export function lastKnownLabel(at: unknown, now: number = Date.now()): string {
 
 export type TRobotFact = { label: string; value: string; dim: boolean };
 
+/** Core's `TRobotCleaning`: levels are "low" | "medium" | "high"; parts ok=false = open / not fitted. */
+export type TRobotCleaning = {
+  cleanWater?: { level?: string; percent?: number | null } | null;
+  dirtyWater?: { level?: string; percent?: number | null } | null;
+  parts?: Array<{ part?: string; ok?: boolean }> | null;
+  job?: { percent?: number | null; areaDone?: number | null; areaPlanned?: number | null } | null;
+};
+
+export type TCleaningReadings = {
+  /** Clean water · Dirty water · Tanks and covers · Job - only the ones the robot reported. */
+  facts: TRobotFact[];
+  /** Warning chips: "Clean water low", "Dirty water full", "Top cover open". */
+  warnings: string[];
+};
+
+const LEVEL_TEXT: Readonly<Record<string, string>> = { low: "Low", medium: "Medium", high: "High" };
+const PART_PROBLEM: Readonly<Record<string, string>> = {
+  "top cover": "Top cover open",
+  "clean-water tank": "Clean-water tank not fitted",
+  "dirty-water tank": "Dirty-water tank not fitted",
+  "dust box": "Dust box not fitted",
+};
+const m2 = (n: number) => `${Number.isInteger(n) ? n : n.toFixed(1)} m²`;
+
+/**
+ * A cleaning robot's water, tanks and current job in plain words, for the
+ * detail screen (web and phones). Capability-driven: nothing unless the brand +
+ * model reports `waterTanks` and the robot answered online; a reading the robot
+ * did not send is left out (hide, never grey).
+ *
+ * Clean water low and dirty water full (high) are warnings, as is any open
+ * cover or missing tank. The job line shows only while it cleans.
+ */
+export function cleaningReadings(live: TLiveRobotState | null | undefined): TCleaningReadings {
+  const none: TCleaningReadings = { facts: [], warnings: [] };
+  if (!live?.ok || live.online === false || live.capabilities?.waterTanks !== true) return none;
+  const c = live.cleaning;
+  if (!c || typeof c !== "object") return none;
+  const facts: TRobotFact[] = [];
+  const warnings: string[] = [];
+  const water = (label: string, w: TRobotCleaning["cleanWater"]) => {
+    const text = LEVEL_TEXT[String(w?.level ?? "")];
+    if (!text) return "";
+    const pct = finite(w?.percent) ? ` · ${Math.round(w!.percent as number)}%` : "";
+    facts.push({ label, value: `${text}${pct}`, dim: false });
+    return String(w!.level);
+  };
+  if (water("Clean water", c.cleanWater) === "low") warnings.push("Clean water low");
+  if (water("Dirty water", c.dirtyWater) === "high") warnings.push("Dirty water full");
+  const parts = (Array.isArray(c.parts) ? c.parts : []).filter((p) => p && typeof p.part === "string" && typeof p.ok === "boolean");
+  if (parts.length) {
+    const problems = parts.filter((p) => !p.ok).map((p) => PART_PROBLEM[p.part as string] ?? `${firstUp(String(p.part))} not fitted`);
+    facts.push({ label: "Tanks and covers", value: problems.length ? problems.join(" · ") : "Tanks and covers OK", dim: false });
+    warnings.push(...problems);
+  }
+  const j = c.job;
+  if (j && typeof j === "object") {
+    const bits: string[] = [];
+    if (finite(j.percent)) bits.push(`${Math.round(j.percent as number)}% done`);
+    if (finite(j.areaDone)) bits.push(finite(j.areaPlanned) ? `${m2(j.areaDone as number)} of ${m2(j.areaPlanned as number)}` : `${m2(j.areaDone as number)} cleaned`);
+    if (bits.length) facts.push({ label: "This job", value: bits.join(" · "), dim: false });
+  }
+  return { facts, warnings };
+}
+
 /**
  * The detail screen's facts grid (README §3): Connection · Battery · Floor ·
  * Live position · Robot reports · Model · Serial · Last seen. A fact the brand
@@ -1625,6 +1692,7 @@ export function robotAbilities(input: {
     on("floorReporting") && "floor",
     on("readLocation") && "live position",
     on("thermalCamera") && "heat readings",
+    on("waterTanks") && "water levels and tanks",
     on("patrolHistory") && (on("thermalCamera") ? "past patrols with photos and temperatures" : "past patrols with photos"),
   ].filter(Boolean) as string[];
   const p = input?.profile ?? {};

package/utils/role.ts

@@ -82,9 +82,14 @@ export function memberRoleChip(
  * re-assign a role for the right site, nobody's access is cut). `null` at 0 so
  * the banner disappears once every member here has this site's role.
  */
-export function otherSiteBannerText(count: unknown): string | null {
+export function otherSiteBannerText(count: unknown, orgLevel = false): string | null {
   const n = typeof count === "number" && Number.isFinite(count) ? Math.floor(count) : 0;
   if (n <= 0) return null;
+  if (orgLevel) {
+    return n === 1
+      ? "1 member holds a role created for one particular site. Fix roles from other sites gives them the right role."
+      : `${n} members hold a role created for one particular site. Fix roles from other sites gives each one the right role.`;
+  }
   return n === 1
     ? "1 member here has a role from another site. Assign them a role for this site."
     : `${n} members here have a role from another site. Assign each one a role for this site.`;