@7365admin1/layer-common 4.51.1 → 4.52.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 4.52.0
+
+### Minor Changes
+
+- a983a42: Add / Edit robot: Ounitech credential fields read "AppID" / "Secret" (demo: "any value"); a Robot picker lists the robots the company credential covers (Find robots) so the serial is picked, and adding with no pair typed reuses the client's saved Ounitech credentials.
+
 ## 4.51.1
 
 ### Patch Changes
@@ -1551,11 +1557,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/Form.vue

@@ -2,7 +2,10 @@
   <!--
     Add / edit robot (HERO README §8): a 520px dialog - Name · Type (only when
     the account presents both types) · Brand (filtered by type; each option
-    shows its capability) · Site · App key · Token (password fields), the
+    shows its capability) · Site · App key · Token (password fields; named in
+    the brand's own words - Ounitech: AppID · Secret), Robot (Ounitech: pick the
+    serial from the company account; with no pair typed, the client's saved
+    pair is reused server-side), the
     credentials note with the brand's capability, Cancel / Save robot.
 
     Credentials are write-only: the stored pair never reaches the browser, so
@@ -46,7 +49,7 @@
         </select>
       </div>
       <div class="hero-field">
-        <label :for="`${uid}-key`">App key</label>
+        <label :for="`${uid}-key`">{{ labels.key }}</label>
         <input
           :id="`${uid}-key`"
           v-model="appKey"
@@ -59,7 +62,7 @@
         />
       </div>
       <div class="hero-field">
-        <label :for="`${uid}-token`">Token</label>
+        <label :for="`${uid}-token`">{{ labels.token }}</label>
         <input
           :id="`${uid}-token`"
           v-model="appToken"
@@ -71,6 +74,18 @@
           :disabled="saving"
         />
       </div>
+      <!-- One company credential covers many robots: pick the machine by serial. -->
+      <div v-if="discoverable" class="hero-field hero-form-grid__full">
+        <label :for="`${uid}-serial`">Robot</label>
+        <div class="d-flex ga-2 align-center">
+          <select :id="`${uid}-serial`" v-model="robotSn" class="hero-input" :disabled="saving || !found.length">
+            <option value="">{{ found.length ? "Choose the robot" : robotSn || findHint }}</option>
+            <option v-if="robotSn && !found.some((o) => o.value === robotSn)" :value="robotSn">{{ robotSn }}</option>
+            <option v-for="o in found" :key="o.value" :value="o.value" :disabled="o.disabled">{{ o.label }}</option>
+          </select>
+          <v-btn variant="outlined" :loading="finding" :disabled="saving || (!editing && !site)" @click="find">Find robots</v-btn>
+        </div>
+      </div>
     </div>
     <div class="hero-dialog__note">{{ credentialsNote(credentialsEncrypted) }} Capability: {{ note }}</div>
     <div v-if="error" class="hero-notice hero-notice--error" role="alert">{{ error }}</div>
@@ -93,6 +108,7 @@ import {
   type TRobotType,
 } from "../../utils/robot-display";
 import { credentialsNote } from "../../utils/robot-floorplan";
+import { credentialLabels, credentialMissingMessage, discoveredRobotOptions } from "../../utils/robot-credential-form";
 
 const props = withDefaults(
   defineProps<{
@@ -119,7 +135,7 @@ const emit = defineEmits<{
   "update:client": [org: string];
 }>();
 
-const { createRobot, updateRobot, getRobotBrands } = useRobots();
+const { createRobot, updateRobot, getRobotBrands, discoverRobots } = useRobots();
 const uid = useId();
 const titleId = `${uid}-title`;
 const editing = computed(() => !!props.robot?._id);
@@ -133,6 +149,23 @@ const org = ref(props.organization);
 const site = ref(String(props.robot?.site?._id ?? props.site ?? ""));
 const appKey = ref("");
 const appToken = ref("");
+const savedSn = String(props.robot?.robotSn ?? "");
+const robotSn = ref(savedSn);
+const found = ref<Array<{ value: string; label: string; disabled: boolean }>>([]);
+const finding = ref(false);
+const labels = computed(() => credentialLabels(brand.value));
+const typed = computed(() => !!appKey.value.trim() && !!appToken.value.trim());
+// Ounitech: one AppID/Secret per company, so the robot is picked from its list.
+const discoverable = computed(() => brand.value === "ounitech");
+const findHint = computed(() =>
+  editing.value || typed.value
+    ? "Press Find robots"
+    : `Press Find robots to use this client's saved ${labels.value.key} and ${labels.value.token}, or enter them first`,
+);
+watch([brand, site], () => {
+  found.value = [];
+  if (!editing.value) robotSn.value = "";
+});
 const saving = ref(false);
 const error = ref("");
 
@@ -184,15 +217,47 @@ onMounted(async () => {
   }
 });
 
+async function find() {
+  error.value = "";
+  if (!!appKey.value.trim() !== !!appToken.value.trim()) {
+    return void (error.value = `Enter both the ${labels.value.key} and the ${labels.value.token}.`);
+  }
+  finding.value = true;
+  try {
+    const pair = typed.value ? { appKey: appKey.value.trim(), appToken: appToken.value.trim() } : null;
+    const body = pair
+      ? { site: site.value, brand: brand.value, ...pair }
+      : editing.value
+        ? { robot: String(props.robot!._id) }
+        : { site: site.value, brand: brand.value };
+    const res = await discoverRobots(body);
+    found.value = discoveredRobotOptions(res?.items);
+    const free = found.value.filter((o) => !o.disabled);
+    if (!found.value.length) error.value = "No robots are on this account.";
+    else if (!robotSn.value && free.length === 1) robotSn.value = free[0]!.value;
+  } catch (e) {
+    found.value = [];
+    error.value = robotErrorMessage(e, "Could not list the robots.");
+  } finally {
+    finding.value = false;
+  }
+}
+
 async function submit() {
   error.value = "";
   if (!name.value.trim()) return void (error.value = "Give the robot a name.");
-  const creds = credentialPatch(appKey.value, appToken.value, editing.value);
-  if (!creds.ok) return void (error.value = creds.message);
+  // Adding with no pair typed = reuse this client's saved one; needs the picked robot.
+  const useSaved = !editing.value && discoverable.value && !appKey.value.trim() && !appToken.value.trim();
+  if (useSaved && !robotSn.value) {
+    return void (error.value = `Enter the ${labels.value.key} and ${labels.value.token}, or press Find robots to use this client's saved ones and pick the robot.`);
+  }
+  const creds = useSaved ? ({ ok: true, body: {} } as const) : credentialPatch(appKey.value, appToken.value, editing.value);
+  if (!creds.ok) return void (error.value = credentialMissingMessage(labels.value, editing.value));
+  const serial = robotSn.value && robotSn.value !== savedSn ? { robotSn: robotSn.value } : {};
   saving.value = true;
   try {
     if (editing.value) {
-      await updateRobot(String(props.robot!._id), { name: name.value.trim(), ...creds.body });
+      await updateRobot(String(props.robot!._id), { name: name.value.trim(), ...creds.body, ...serial });
       emit("saved", name.value.trim());
     } else {
       if (!brand.value) throw new Error("Choose the robot's brand.");
@@ -201,8 +266,8 @@ async function submit() {
         name: name.value.trim(),
         brand: brand.value,
         type: type.value,
-        appKey: creds.body.appKey!,
-        appToken: creds.body.appToken!,
+        ...(useSaved ? { useClientCredentials: true } : { appKey: creds.body.appKey!, appToken: creds.body.appToken! }),
+        ...serial,
         metadata: { orgId: org.value, siteId: site.value },
       });
       emit("created", { name: name.value.trim(), site: site.value });

package/composables/useRobots.ts

@@ -86,8 +86,10 @@ export default function useRobots() {
   function createRobot(payload: {
     name: string;
     brand?: string;
-    appKey: string;
-    appToken: string;
+    /** Omitted with `useClientCredentials` - the server copies the client's saved pair. */
+    appKey?: string;
+    appToken?: string;
+    useClientCredentials?: boolean;
     type?: "cleaning" | "security";
     robotSn?: string;
     metadata: { orgId: string; siteId: string; administratorId?: string };
@@ -111,6 +113,19 @@ export default function useRobots() {
     });
   }
 
+  /**
+   * The robots a company credential covers (Ounitech: one AppID/Secret per
+   * company), for the serial picker. Pass a typed pair, a saved robot's id
+   * (`robot`, when editing), or just the site to use the client's saved pair.
+   * POST so a typed secret never goes in a URL; the answer holds no credential.
+   */
+  function discoverRobots(body: { site?: string; brand?: string; robot?: string; appKey?: string; appToken?: string }) {
+    return useNuxtApp().$api<{ items: Array<{ robotSn: string; name: string; online: boolean; statusName: string; added: boolean }> }>(
+      "/api/robots/discover",
+      { method: "POST", body },
+    );
+  }
+
   /** Remove a robot. It stops listing and answering; the record is kept. */
   function deleteRobot(id: string) {
     return useNuxtApp().$api<Record<string, any>>(`/api/robots/${id}`, {
@@ -498,6 +513,7 @@ export default function useRobots() {
     createRobot,
     updateRobot,
     deleteRobot,
+    discoverRobots,
     getRobotState,
     getRobotMaps,
     getRobotMapImages,

package/package.json

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

@@ -0,0 +1,40 @@
+/**
+ * Add / Edit robot: the credential fields in each brand's own words, and the
+ * company-account robot picker. Kept out of `robot-display.ts` because that file
+ * is vendored into the mobile apps, which have no Add robot.
+ */
+
+/**
+ * Ounitech issues an "AppID" and a "Secret" (one pair per company - vendor
+ * answer of 2026-09-26); the stored fields are still `appKey` / `appToken`.
+ * The demo brand accepts anything.
+ */
+export function credentialLabels(brand: unknown): { key: string; token: string } {
+  if (brand === "ounitech") return { key: "AppID", token: "Secret" };
+  if (brand === "demo") return { key: "App key (any value)", token: "Token (any value)" };
+  return { key: "App key", token: "Token" };
+}
+
+/** "Enter the AppID and the Secret ..." - `credentialPatch`'s refusal, in the brand's words. */
+export function credentialMissingMessage(labels: { key: string; token: string }, editing: boolean): string {
+  return editing
+    ? `Enter both the ${labels.key} and the ${labels.token} to replace them, or leave both empty.`
+    : `Enter the ${labels.key} and the ${labels.token} from the brand portal.`;
+}
+
+/**
+ * Discovered robots as picker options: "Lobby Q3 · OT-SN-A", marking ones this
+ * client already added (disabled - one serial, one record) and offline ones.
+ */
+export function discoveredRobotOptions(
+  items: Array<{ robotSn?: unknown; name?: unknown; online?: unknown; added?: unknown }> | null | undefined,
+): Array<{ value: string; label: string; disabled: boolean }> {
+  return (items ?? [])
+    .filter((r) => typeof r?.robotSn === "string" && r.robotSn)
+    .map((r) => {
+      const sn = String(r.robotSn);
+      const name = typeof r.name === "string" && r.name.trim() ? `${r.name.trim()} · ${sn}` : sn;
+      const tags = [r.added === true ? "already added" : "", r.online === false ? "offline" : ""].filter(Boolean);
+      return { value: sn, label: tags.length ? `${name} (${tags.join(", ")})` : name, disabled: r.added === true };
+    });
+}