@7365admin1/layer-common 4.97.1-staging.605 → 4.97.1-staging.606

package/components/Robot/Detail.vue

@@ -255,6 +255,11 @@
         <v-select v-model="jobOpts.levelFlag" :items="CLEAN_POWER_CHOICES" label="Power" density="compact" hide-details class="mb-2" />
         <v-select v-model="jobOpts.cleanTimes" :items="CLEAN_TIMES_CHOICES" label="Times to clean" density="compact" hide-details class="mb-2" />
       </template>
+      <!-- A brand with its own named modes (VIGGO): the robot's list + times. -->
+      <template v-if="offered.modes">
+        <v-select v-model="jobOpts.cleanModeId" :items="robotModeChoices(robotModes)" label="Cleaning mode" density="compact" hide-details class="mb-2" />
+        <v-select v-model="jobOpts.cleanTimes" :items="CLEAN_TIMES_CHOICES" label="Times to clean" density="compact" hide-details class="mb-2" />
+      </template>
       <v-select v-if="offered.rounds" v-model="jobOpts.rounds" :items="PATROL_ROUND_CHOICES" label="Rounds" density="compact" hide-details class="mb-2" />
       <div class="hero-dialog__body">{{ confirming.text.body }}</div>
       <div v-if="optionsLine" class="hero-dialog__body">{{ optionsLine }}</div>
@@ -390,8 +395,10 @@ import {
   PATROL_ROUND_CHOICES,
   jobOptionsLine,
   jobOptionsOffered,
+  robotModeChoices,
   withJobOptions,
   type TJobOptions,
+  type TRobotCleanMode,
 } from "../../utils/robot-display";
 
 const props = withDefaults(
@@ -431,6 +438,7 @@ const {
   resolveRobotAlerts,
   getPatrolHistory,
   getSiteFaults,
+  getRobotRecords,
 } = useRobots();
 
 const record = ref<Record<string, any> | null>(null);
@@ -824,10 +832,21 @@ function pickRoute(id: unknown) {
 }
 /* Job options on a start: reset each time the confirm opens. */
 const jobOpts = ref<TJobOptions>({ ...JOB_OPTION_DEFAULTS });
-const offered = computed(() => jobOptionsOffered(confirming.value?.kind, robotType.value, caps.value));
-const optionsLine = computed(() => jobOptionsLine(offered.value, jobOpts.value));
-watch(confirmOpen, (open) => {
-  if (open) jobOpts.value = { ...JOB_OPTION_DEFAULTS };
+/** The robot's own cleaning modes (VIGGO reports them in its records), read when a start is confirmed. */
+const robotModes = ref<TRobotCleanMode[]>([]);
+const offered = computed(() => jobOptionsOffered(confirming.value?.kind, robotType.value, caps.value, robotModes.value));
+const optionsLine = computed(() => jobOptionsLine(offered.value, jobOpts.value, robotModes.value));
+watch(confirmOpen, async (open) => {
+  if (!open) return;
+  jobOpts.value = { ...JOB_OPTION_DEFAULTS };
+  const kind = confirming.value?.kind;
+  if (record.value?.brand !== "viggo" || (kind !== "full" && kind !== "area")) return;
+  try {
+    const rec = await getRobotRecords(props.robotId);
+    robotModes.value = Array.isArray(rec?.cleanModes) ? rec.cleanModes : [];
+  } catch {
+    robotModes.value = []; // the job still goes, in the robot's default mode
+  }
 });
 function confirmSend(stayHere = false) {
   const c = confirming.value;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.97.1-staging.605",
+  "version": "4.97.1-staging.606",
   "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-credential-form.ts

@@ -16,6 +16,8 @@ export function credentialLabels(brand: unknown): { key: string; token: string }
   if (brand === "demo") return { key: "App key (any value)", token: "Token (any value)" };
   // OneWay (Anbot RMS): one API key per company; the second field is the RMS server's address.
   if (brand === "oneway") return { key: "API key", token: "Server address" };
+  // VIGGO (Velobotics): an OAuth access token; its API has no robot list, so the robots' VIN numbers are the second field.
+  if (brand === "viggo") return { key: "Access token", token: "Robot VIN numbers (comma separated)" };
   return { key: "App key", token: "Token" };
 }
 
@@ -29,12 +31,12 @@ export function credentialTokenDefault(brand: unknown): string {
 
 /** False when the second field is not a secret (OneWay's server address): shown as plain text. */
 export function credentialTokenIsSecret(brand: unknown): boolean {
-  return brand !== "oneway";
+  return brand !== "oneway" && brand !== "viggo";
 }
 
 /** Brands whose one company credential lists its robots, so Add robot picks the serial (Find robots). */
 export function credentialDiscoverable(brand: unknown): boolean {
-  return brand === "ounitech" || brand === "padbot" || brand === "oneway";
+  return brand === "ounitech" || brand === "padbot" || brand === "oneway" || brand === "viggo";
 }
 
 /** "Enter the AppID and the Secret ..." - `credentialPatch`'s refusal, in the brand's words. */

package/utils/robot-display.ts

@@ -1968,33 +1968,51 @@ export const PATROL_ROUND_CHOICES = [
   { title: "Until stopped", value: 0 },
 ];
 
-export type TJobOptions = { modeFlag: number; subModeFlag: number; levelFlag: number; cleanTimes: number; rounds: number };
-export const JOB_OPTION_DEFAULTS: TJobOptions = { modeFlag: 1, subModeFlag: 0, levelFlag: 1, cleanTimes: 1, rounds: 1 };
+export type TJobOptions = { modeFlag: number; subModeFlag: number; levelFlag: number; cleanTimes: number; rounds: number; cleanModeId: number | null };
+export const JOB_OPTION_DEFAULTS: TJobOptions = { modeFlag: 1, subModeFlag: 0, levelFlag: 1, cleanTimes: 1, rounds: 1, cleanModeId: null };
+
+/** A cleaning mode from the robot's OWN list (VIGGO 1.1 clean_mode, via records `cleanModes`). */
+export type TRobotCleanMode = { id: number; name: string };
+
+/** The robot's own modes as picker choices, its default first (null = whatever the robot uses). */
+export function robotModeChoices(modes: TRobotCleanMode[] | null | undefined) {
+  const list = (Array.isArray(modes) ? modes : []).filter((m) => Number.isInteger(m?.id) && typeof m?.name === "string" && m.name.trim());
+  return [{ title: "The robot's default", value: null as number | null }, ...list.map((m) => ({ title: m.name.trim(), value: m.id as number | null }))];
+}
 
 /**
  * Which job options the confirm offers: clean options for a cleaning robot whose
  * brand declares `cleanOptions`, rounds for a security robot whose brand declares
  * `patrolRounds` - only on a start (full / area), never on any other command.
  */
-export function jobOptionsOffered(kind: unknown, type: unknown, capabilities: Record<string, unknown> | null | undefined) {
+export function jobOptionsOffered(
+  kind: unknown,
+  type: unknown,
+  capabilities: Record<string, unknown> | null | undefined,
+  /** The robot's own mode list (a brand without our fixed three, e.g. VIGGO): mode + times are offered from it. */
+  robotModes?: TRobotCleanMode[] | null,
+) {
   const start = kind === "full" || kind === "area";
+  const clean = start && type !== "security" && capabilities?.cleanOptions === true;
   return {
-    clean: start && type !== "security" && capabilities?.cleanOptions === true,
+    clean,
     rounds: start && type === "security" && capabilities?.patrolRounds === true,
+    modes: start && type !== "security" && !clean && robotModeChoices(robotModes).length > 1,
   };
 }
 
 /** The command body with the picked options (only the offered ones; vacuum-while-washing only for wash). */
-export function withJobOptions(body: Record<string, unknown>, offered: { clean: boolean; rounds: boolean }, o: TJobOptions) {
+export function withJobOptions(body: Record<string, unknown>, offered: { clean: boolean; rounds: boolean; modes?: boolean }, o: TJobOptions) {
   if (offered.clean) {
     return { ...body, modeFlag: o.modeFlag, subModeFlag: o.modeFlag === 2 ? o.subModeFlag : 0, levelFlag: o.levelFlag, cleanTimes: o.cleanTimes };
   }
   if (offered.rounds) return { ...body, cleanTimes: o.rounds };
+  if (offered.modes) return { ...body, cleanTimes: o.cleanTimes, ...(o.cleanModeId !== null ? { cleanModeId: o.cleanModeId } : {}) };
   return body;
 }
 
 /** One line under the confirm saying what the options mean for this job. */
-export function jobOptionsLine(offered: { clean: boolean; rounds: boolean }, o: TJobOptions): string {
+export function jobOptionsLine(offered: { clean: boolean; rounds: boolean; modes?: boolean }, o: TJobOptions, robotModes?: TRobotCleanMode[] | null): string {
   if (offered.clean) {
     const mode = CLEAN_MODE_CHOICES.find((c) => c.value === o.modeFlag)?.title ?? "Vacuum";
     const power = CLEAN_POWER_CHOICES.find((c) => c.value === o.levelFlag)?.title ?? "Standard";
@@ -2002,5 +2020,9 @@ export function jobOptionsLine(offered: { clean: boolean; rounds: boolean }, o:
     return `${mode}, ${power.toLowerCase()} power, ${o.cleanTimes === 1 ? "once" : `${o.cleanTimes} times`}${wet}.`;
   }
   if (offered.rounds) return o.rounds === 0 ? "It keeps patrolling until someone presses Cancel." : `It patrols the route ${o.rounds === 1 ? "once" : `${o.rounds} times`}.`;
+  if (offered.modes) {
+    const mode = robotModeChoices(robotModes).find((c) => c.value === o.cleanModeId)?.title ?? "The robot's default";
+    return `${mode} mode, ${o.cleanTimes === 1 ? "once" : `${o.cleanTimes} times`}.`;
+  }
   return "";
 }

package/utils/robot-setup.ts

@@ -89,6 +89,7 @@ export function offlineReason(robot: Record<string, any>, state: Record<string,
     if (robot?.brand === "ounitech") return `${name}: the Ounitech cloud did not answer${why}. Ask Ounitech to link this robot's serial to our account.`;
     if (robot?.brand === "padbot") return `${name}: the PadBot cloud did not answer${why}. Check the robot's key and token.`;
     if (robot?.brand === "oneway") return `${name}: OneWay's RMS did not answer${why}. Check the robot's API key and server address, and ask OneWay to put this robot under our company key.`;
+    if (robot?.brand === "viggo") return `${name}: VIGGO's cloud did not answer${why}. Check the robot's access token (it may have expired) and that its VIN is in the saved VIN list.`;
     return `${name}: its cloud did not answer${why}.`;
   }
   return `${name}: its cloud says it is offline - switched off, charging dock unplugged or out of Wi-Fi.`;