@7365admin1/layer-common 4.73.1-staging.452 → 4.73.1-staging.454

package/components/MemberCrossSiteFix.vue

@@ -0,0 +1,170 @@
+<template>
+  <v-card class="screen-modal" data-test="cross-site-fix">
+    <v-card-title>Fix roles from other sites</v-card-title>
+    <v-card-text class="screen-modal__body">
+      <p class="text-body-2 mb-3">
+        These members hold a role created for another site. Each ticked member gets the role shown, at their own
+        site. Nobody's site changes. Rows with a warning are not ticked - check them first.
+      </p>
+
+      <div v-if="loading" class="py-4 text-center"><v-progress-circular indeterminate /></div>
+      <p v-else-if="loadError" class="text-error">{{ loadError }}</p>
+      <template v-else-if="result">
+        <p class="text-body-2" data-test="cross-site-fix-result">
+          Changed {{ result.applied.length }} member(s).<span v-if="result.skipped.length"> Skipped {{ result.skipped.length }}.</span>
+          <span v-if="undone"> Undone: {{ undone }} restored.</span>
+        </p>
+        <p v-if="result.applied.length" class="text-caption">An undo file was downloaded. Keep it: it puts these roles back.</p>
+        <ul v-if="result.skipped.length" class="text-caption">
+          <li v-for="s in result.skipped" :key="s.member">{{ nameOf(s.member) }}: {{ s.reason }}</li>
+        </ul>
+      </template>
+      <template v-else>
+        <p v-if="!choices.length" class="text-body-2" data-test="cross-site-fix-empty">
+          No members here hold a role from another site.
+        </p>
+        <v-table v-else density="compact">
+          <thead>
+            <tr>
+              <th><span class="d-sr-only">Fix</span></th>
+              <th>Member</th>
+              <th>Site</th>
+              <th>From</th>
+              <th>To</th>
+              <th>Warning</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="(c, i) in choices" :key="c.member" data-test="cross-site-fix-row">
+              <td>
+                <v-checkbox v-model="choices[i].on" density="compact" hide-details :aria-label="`Fix ${c.name || c.email}`" />
+              </td>
+              <td>{{ c.name || c.email }}</td>
+              <td>{{ c.siteName }}</td>
+              <td>{{ c.from.name }}<span class="text-caption"> - {{ c.from.siteName }}</span></td>
+              <td style="min-width: 200px">
+                <span v-if="c.to">{{ c.to.name }}</span>
+                <v-select
+                  v-else
+                  v-model="choices[i].role"
+                  :items="fixRoleOptions(c)"
+                  item-title="name"
+                  item-value="_id"
+                  label="Role"
+                  density="compact"
+                  hide-details
+                />
+              </td>
+              <td class="text-caption" :class="c.status === 'auto' ? '' : 'text-warning'">{{ fixWarning(c) }}</td>
+            </tr>
+          </tbody>
+        </v-table>
+        <p v-if="applyError" class="text-error mt-2">{{ applyError }}</p>
+      </template>
+    </v-card-text>
+    <div class="screen-modal__footer">
+      <template v-if="result">
+        <v-btn class="screen-btn-ghost" variant="outlined" :disabled="!result.applied.length" @click="downloadUndo()">
+          Download undo file
+        </v-btn>
+        <v-btn
+          class="screen-btn-ghost"
+          variant="outlined"
+          :loading="undoing"
+          :disabled="!result.applied.length || undone > 0"
+          @click="runUndo()"
+        >
+          Undo
+        </v-btn>
+        <v-btn class="screen-btn-primary" variant="flat" @click="emit('done')">Close</v-btn>
+      </template>
+      <template v-else>
+        <v-btn class="screen-btn-ghost" variant="outlined" @click="emit('cancel')">Cancel</v-btn>
+        <v-btn
+          class="screen-btn-primary"
+          variant="flat"
+          :loading="applying"
+          :disabled="loading || !changes.length"
+          data-test="cross-site-fix-apply"
+          @click="apply()"
+        >
+          Apply to {{ changes.length }} member(s)
+        </v-btn>
+      </template>
+    </div>
+  </v-card>
+</template>
+
+<script setup lang="ts">
+// Relative import: this layer's `utils/` is not auto-imported into consumers.
+import { fixRoleOptions, fixWarning, initialFixChoices, toFixChanges, type FixChoice } from "../utils/cross-site-fix";
+
+const props = defineProps({ org: { type: String, required: true } });
+const emit = defineEmits<{ (e: "cancel"): void; (e: "done"): void }>();
+
+const { getCrossSiteRoleFix, applyCrossSiteRoleFix, undoCrossSiteRoleFix } = useMember();
+
+type TResult = { applied: any[]; skipped: Array<{ member: string; reason: string }>; undo: any };
+
+const loading = ref(true);
+const loadError = ref("");
+const applying = ref(false);
+const applyError = ref("");
+const undoing = ref(false);
+const undone = ref(0);
+const choices = ref<FixChoice[]>([]);
+const result = ref<TResult | null>(null);
+const changes = computed(() => toFixChanges(choices.value));
+const nameOf = (member: string) => {
+  const c = choices.value.find((x) => x.member === member);
+  return c?.name || c?.email || member;
+};
+
+async function load() {
+  loading.value = true;
+  loadError.value = "";
+  try {
+    const res = await getCrossSiteRoleFix(props.org);
+    choices.value = initialFixChoices(res?.rows ?? []);
+  } catch (e: any) {
+    loadError.value = e?.data?.message || "Could not load. Only the organisation's owner or an organisation admin can do this.";
+  }
+  loading.value = false;
+}
+
+function downloadUndo() {
+  if (!result.value) return;
+  const blob = new Blob([JSON.stringify(result.value.undo, null, 2)], { type: "application/json" });
+  const a = document.createElement("a");
+  a.href = URL.createObjectURL(blob);
+  a.download = `undo-roles-from-other-sites-${new Date().toISOString().slice(0, 16).replace(/[:T]/g, "-")}.json`;
+  a.click();
+  URL.revokeObjectURL(a.href);
+}
+
+async function apply() {
+  applying.value = true;
+  applyError.value = "";
+  try {
+    result.value = (await applyCrossSiteRoleFix(props.org, changes.value)) as TResult;
+    if (result.value?.applied?.length) downloadUndo();
+  } catch (e: any) {
+    applyError.value = e?.data?.message || "The roles could not be changed.";
+  }
+  applying.value = false;
+}
+
+async function runUndo() {
+  if (!result.value) return;
+  undoing.value = true;
+  try {
+    const res: any = await undoCrossSiteRoleFix(result.value.undo);
+    undone.value = res?.restored?.length ?? 0;
+  } catch (e: any) {
+    applyError.value = e?.data?.message || "Undo failed.";
+  }
+  undoing.value = false;
+}
+
+load();
+</script>

package/components/MemberMain.vue

@@ -46,9 +46,26 @@
         >
           {{ onlyOtherSite ? "Show all members" : "Show them" }}
         </AppButton>
+        <AppButton
+          v-if="props.orgId"
+          data-test="member-other-site-fix"
+          @click="crossSiteFixDialog = true"
+        >
+          Fix roles from other sites
+        </AppButton>
       </div>
     </v-alert>
 
+    <!-- 2026-09-29: preview -> apply -> undo; the server decides who may. -->
+    <v-dialog v-model="crossSiteFixDialog" max-width="960">
+      <MemberCrossSiteFix
+        v-if="crossSiteFixDialog"
+        :org="props.orgId"
+        @cancel="crossSiteFixDialog = false"
+        @done="onCrossSiteFixDone"
+      />
+    </v-dialog>
+
     <AppCard class="table-card">
       <CardToolbar :count="pageRange">
         <template #tabs>
@@ -551,6 +568,12 @@ watch(otherSiteBanner, (text) => {
   // the last one fixed: back to the full list
   if (!text && onlyOtherSite.value) onlyOtherSite.value = false;
 });
+const crossSiteFixDialog = ref(false);
+function onCrossSiteFixDone() {
+  crossSiteFixDialog.value = false;
+  getAll();
+  refreshOtherSite();
+}
 function toggleOtherSite() {
   page.value = 1;
   onlyOtherSite.value = !onlyOtherSite.value;

package/composables/useMember.ts

@@ -205,7 +205,32 @@ export default function useMember() {
     });
   }
 
+  /** "Fix roles from other sites": preview (read only), apply, undo. */
+  function getCrossSiteRoleFix(org: string) {
+    return useNuxtApp().$api<Record<string, any>>("/api/members/cross-site-roles/fix", {
+      method: "GET",
+      query: { org },
+    });
+  }
+
+  function applyCrossSiteRoleFix(org: string, changes: Array<{ member: string; to: string }>) {
+    return useNuxtApp().$api<Record<string, any>>("/api/members/cross-site-roles/fix", {
+      method: "POST",
+      body: { org, changes },
+    });
+  }
+
+  function undoCrossSiteRoleFix(body: { org: string; changes: Array<{ member: string; from: string; to: string }> }) {
+    return useNuxtApp().$api<Record<string, any>>("/api/members/cross-site-roles/undo", {
+      method: "POST",
+      body,
+    });
+  }
+
   return {
+    getCrossSiteRoleFix,
+    applyCrossSiteRoleFix,
+    undoCrossSiteRoleFix,
     getSiteAccess,
     saveSiteAccess,
     updateMemberUnit,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.73.1-staging.452",
+  "version": "4.73.1-staging.454",
   "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/cross-site-fix.ts

@@ -0,0 +1,45 @@
+/**
+ * "Fix roles from other sites" (owner request 2026-09-29, Aigle Security: 17
+ * members still held The Loft's "Security" role although each site has its
+ * own). The server proposes one role per member (`GET
+ * /api/members/cross-site-roles/fix`); these are the dialog's rules.
+ *
+ * Only "auto" rows start ticked. A "review" row (the new role grants FEWER
+ * permissions) and a "choose"/"none" row (several or no candidates) are never
+ * applied unless somebody ticks them and, for choose/none, picks a role.
+ */
+export type FixRole = { _id: string; name: string };
+export type FixRow = {
+  member: string;
+  name?: string;
+  email?: string;
+  siteName?: string;
+  from: { _id: string; name: string; siteName?: string };
+  to: FixRole | null;
+  status: "auto" | "review" | "choose" | "none";
+  lost?: string[];
+  options?: Array<FixRole | null>;
+};
+export type FixChoice = FixRow & { on: boolean; role: string };
+
+export function initialFixChoices(rows: FixRow[]): FixChoice[] {
+  return (rows ?? []).map((r) => ({ ...r, on: r.status === "auto", role: r.to?._id ?? "" }));
+}
+
+/** The roles offered for a row: the proposal, else the options the server listed. */
+export function fixRoleOptions(row: FixRow): FixRole[] {
+  return row.to ? [row.to] : (row.options ?? []).filter((o): o is FixRole => !!o);
+}
+
+/** What one row's warning says, in plain words ("" when none). */
+export function fixWarning(row: FixRow): string {
+  if (row.status === "review") return `Fewer permissions: loses ${(row.lost ?? []).join(", ")}`;
+  if (row.status === "choose") return "Several roles match - choose one";
+  if (row.status === "none") return "No matching role at this site - choose one, or create it first";
+  return "";
+}
+
+/** The POST body's changes: ticked rows with a role. */
+export function toFixChanges(choices: FixChoice[]): Array<{ member: string; to: string }> {
+  return choices.filter((c) => c.on && c.role).map((c) => ({ member: c.member, to: c.role }));
+}

package/utils/robot-display.ts

@@ -877,20 +877,25 @@ export function mapRobots(
   });
 }
 
-/** Robots that answer but cannot report a floor - listed, never placed (a guessed floor is worse than none). */
+/**
+ * Robots that answer but cannot be drawn: no floor (a guessed floor is worse
+ * than none), or a floor but no position on the plan (Ounitech reports its
+ * floor since the 2025.10 API, but not a plan position). Listed, never placed.
+ * An offline robot with a plan position is simply not drawn (never a frozen dot).
+ */
 export function unplacedRobots<T extends { _id?: unknown }>(rows: T[], states: Record<string, TLiveRobotState>): T[] {
   return rows.filter((r) => {
     const live = states[String(r?._id ?? "")];
-    return !!live?.ok && live.monitorable !== false && live.floorKnown !== true;
+    return !!live?.ok && live.monitorable !== false && (live.floorKnown !== true || !planPoint(live as any));
   });
 }
 
-/** "2 robots (Ounitech) can't report a floor, so they are listed but not placed on the map." */
+/** "2 robots (Ounitech) can't be placed on the map, so they are listed but not drawn." */
 export function unplacedText(brandNames: string[]): string {
   const n = brandNames.length;
   if (!n) return "";
   const brands = [...new Set(brandNames)].join(", ");
-  return `${n} ${n === 1 ? "robot" : "robots"} (${brands}) can't report a floor, so ${n === 1 ? "it is" : "they are"} listed but not placed on the map.`;
+  return `${n} ${n === 1 ? "robot" : "robots"} (${brands}) can't be placed on the map, so ${n === 1 ? "it is" : "they are"} listed but not drawn.`;
 }
 
 /* -------------------------------------------------------- patrol routes */