@7365admin1/layer-common 4.49.0 → 4.51.0

package/components/Robot/MiniMap.vue

@@ -14,12 +14,19 @@
           <path d="M8 3H5a2 2 0 0 0-2 2v3m18 0V5a2 2 0 0 0-2-2h-3m0 18h3a2 2 0 0 0 2-2v-3M3 16v3a2 2 0 0 0 2 2h3" />
         </svg>
       </v-btn>
+      <button v-if="hasRoutes" type="button" class="hero-mini__toggle" :aria-pressed="showRoutes" title="Show the robots' lanes and waypoints" @click="showRoutes = !showRoutes">Routes</button>
       <select v-if="floors.length" :value="floor" class="hero-input hero-select hero-select--sm" aria-label="Floor" @change="chosen = Number(($event.target as HTMLSelectElement).value)">
         <option v-for="f in floors" :key="f" :value="f">{{ floorName(f) }}</option>
       </select>
     </div>
 
     <RobotFloorPlan ref="plan">
+      <template v-if="showRoutes && overlay.lanes.length + overlay.waypoints.length">
+        <svg class="hero-plan__svg" viewBox="0 0 100 100" preserveAspectRatio="none" aria-hidden="true">
+          <line v-for="(l, i) in overlay.lanes" :key="`l${i}`" class="hero-mini__lane" :class="{ 'hero-mini__lane--oneway': l.oneWay }" :x1="l.a.x" :y1="l.a.y" :x2="l.b.x" :y2="l.b.y" vector-effect="non-scaling-stroke" />
+        </svg>
+        <span v-for="(w, i) in overlay.waypoints" :key="`w${i}`" class="hero-mini__wp" :class="`hero-mini__wp--${w.kind}`" :style="{ left: `${w.x}%`, top: `${w.y}%` }" :title="w.name" aria-hidden="true" />
+      </template>
       <RobotPatrolRoutes v-if="type === 'security' && floorRoutes.length" :routes="floorRoutes" />
       <button
         v-for="r in robots"
@@ -40,6 +47,7 @@
     <div class="hero-mini__foot">
       <span>Floor plan from robot (placeholder)</span>
       <span v-if="type === 'security'"><span class="hero-mini__legend" aria-hidden="true" />Patrol routes</span>
+      <span v-if="showRoutes && hasRoutes"><span class="hero-mini__legend hero-mini__legend--lane" aria-hidden="true" />Robot lanes</span>
       <span v-if="floor !== null" class="hero-mini__count">{{ robots.length }} on {{ floorName(floor) }}</span>
     </div>
     <div v-if="unplaced" class="hero-notice">{{ unplaced }}</div>
@@ -48,6 +56,7 @@
 
 <script setup lang="ts">
 import { computed, ref } from "vue";
+import { routeOverlay } from "../../utils/rmf-editor";
 import RobotFloorPlan from "./FloorPlan.vue";
 import RobotPatrolRoutes from "./PatrolRoutes.vue";
 import RobotReconnecting from "./Reconnecting.vue";
@@ -79,8 +88,10 @@ const props = withDefaults(
     brands?: Array<{ brand?: unknown; displayName?: unknown }>;
     /** One telemetry tick; positions glide across it. */
     tickMs?: number;
+    /** The site's building (saved map or live HERO Fleet Core building) - its robot lanes and waypoints can be shown. */
+    map?: Record<string, any> | null;
   }>(),
-  { type: "cleaning", routes: () => ({}), connected: true, brands: () => [], tickMs: 4000 },
+  { type: "cleaning", routes: () => ({}), connected: true, brands: () => [], tickMs: 4000, map: null },
 );
 const emit = defineEmits<{ open: [id: string] }>();
 
@@ -90,6 +101,10 @@ const floors = computed(() => mapFloors(ids.value, props.states));
 const chosen = ref<number | null>(null);
 const floor = computed(() => pickFloor(floors.value, chosen.value, ids.value, props.states));
 const robots = computed(() => mapRobots(props.rows, props.states, floor.value));
+/** The robots' lanes and waypoints on the floor shown (toggle; on by default once the building has any). */
+const overlay = computed(() => (floor.value === null ? { lanes: [], waypoints: [], fiducials: [] } : routeOverlay(props.map, floor.value)));
+const hasRoutes = computed(() => !!props.map && (props.map.rmf?.levels ?? props.map.levels ?? []).some((l: any) => (l.lanes ?? []).length));
+const showRoutes = ref(true);
 const floorName = (f: number) => floorLabel({ floorNo: f, floorKnown: true });
 
 /** The routes walked on this floor, once each. A route with no floor is drawn on its robot's floor. */

package/components/Robot/SiteFleet.vue

@@ -72,6 +72,7 @@
         :routes="routes"
         :connected="connected"
         :brands="brands"
+        :map="routeMap"
         @open="onMapOpen"
       />
     </aside>
@@ -126,7 +127,26 @@ const emit = defineEmits<{
   status: [status: { connected: boolean; faults: number; siteName: string; clientName: string }];
 }>();
 
-const { getSiteFleet, getSiteSummary, getRobotBrands, getPatrolRoutes } = useRobots();
+const { getSiteFleet, getSiteSummary, getRobotBrands, getPatrolRoutes, listSiteBuildingMaps, getBuildingMap, getFleetCoreBuilding } = useRobots();
+
+/**
+ * The site's building for the mini-map's robot lanes: the live HERO Fleet
+ * Core building at a fleet site, else the newest saved map. Read once per
+ * site (lanes do not move); a failure just leaves the lanes off.
+ */
+const routeMap = ref<Record<string, any> | null>(null);
+async function loadRouteMap() {
+  const site = props.site;
+  try {
+    const fleetSite = rows.value.some((r) => r?.brand === "fleet-core");
+    const found = fleetSite
+      ? await getFleetCoreBuilding(site).catch(() => null)
+      : await listSiteBuildingMaps(site, { limit: 1 }).then((res: any) => (res?.items?.[0]?._id ? getBuildingMap(String(res.items[0]._id)) : null));
+    if (site === props.site) routeMap.value = found ?? null;
+  } catch {
+    if (site === props.site) routeMap.value = null;
+  }
+}
 
 const headers = [
   { title: "Name", key: "name", sortable: false },
@@ -253,6 +273,8 @@ watch(
   { immediate: true },
 );
 watch(ids, loadRoutes);
+// The mini-map's lanes: once per site, again if the site turns out to have fleet robots.
+watch([() => props.site, () => rows.value.some((r) => r?.brand === "fleet-core")], loadRouteMap, { immediate: true });
 getRobotBrands().then(
   (res) => (brands.value = res?.items ?? []),
   () => undefined,

package/composables/useMember.ts

@@ -69,10 +69,13 @@ export default function useMember() {
     type = "",
     status = "active",
     siteId = "",
+    roleState = "",
   } = {}) {
     const query: Record<string, any> = { page, limit, type, status };
 
     if (search) query.search = search;
+    // "other-site": only members holding a role pinned to another site.
+    if (roleState) query.roleState = roleState;
     if (user) query.user = user;
     if (org) query.org = org;
     if (siteId) query.siteId = siteId;

package/composables/useRobots.ts

@@ -385,6 +385,19 @@ export default function useRobots() {
     });
   }
 
+  /**
+   * Read a building file (traffic-editor / rmf_site building.yaml) or one
+   * route (nav graph) file into the editor. Nothing is saved: the result is
+   * the map's `rmf` part, which the editor shows until it is saved.
+   */
+  function importBuildingFile(body: { format: "building" | "nav"; text: string; graph?: number }) {
+    return useNuxtApp().$api<Record<string, any>>("/api/robots/building-maps/import", {
+      method: "POST",
+      query: { appSlug },
+      body,
+    });
+  }
+
   /**
    * One floor's plan image. A Blob, not a URL: the image sits behind the
    * session like the map itself, and an <img src> cannot carry the header.
@@ -400,7 +413,7 @@ export default function useRobots() {
   function saveFloorPlan(
     mapId: string,
     floorNo: number,
-    body: { version: number; image?: string; widthPx: number; heightPx: number; metersPerPixel: number; tx: number; ty: number },
+    body: { version: number; image?: string; widthPx: number; heightPx: number; metersPerPixel: number; tx: number; ty: number; yawRad?: number; space?: "world" },
   ) {
     return useNuxtApp().$api<Record<string, any>>(`/api/robots/building-maps/${mapId}/floor-plans/${floorNo}`, {
       method: "PUT",
@@ -467,6 +480,7 @@ export default function useRobots() {
     deleteBuildingMap,
     getFleetCoreBuildingData,
     exportBuildingMap,
+    importBuildingFile,
     getFloorPlanImage,
     saveFloorPlan,
     removeFloorPlan,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.49.0",
+  "version": "4.51.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.",
@@ -36,7 +36,7 @@
     "build": "nuxt build .playground",
     "generate": "nuxt generate .playground",
     "preview": "nuxt preview .playground",
-    "test": "esbuild composables/useANPRSettings.ts --format=esm --outfile=test/.build/useANPRSettings.mjs --log-level=error && esbuild composables/useVisitorSocket.ts --format=esm --outfile=test/.build/useVisitorSocket.mjs --log-level=error && esbuild composables/usePlateToastWindow.ts --format=esm --outfile=test/.build/usePlateToastWindow.mjs --log-level=error && esbuild utils/client-invite-modules.ts --bundle --platform=node --format=esm --outfile=test/.build/client-invite-modules.mjs --log-level=error && esbuild utils/robot-display.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-display.mjs --log-level=error && esbuild utils/building-map.ts --bundle --platform=node --format=esm --outfile=test/.build/building-map.mjs --log-level=error && esbuild utils/robot-building.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-building.mjs --log-level=error && esbuild utils/robot-fleet-core.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-fleet-core.mjs --log-level=error && node --experimental-strip-types --test \"test/*.test.mjs\" && yarn test:units",
+    "test": "esbuild composables/useANPRSettings.ts --format=esm --outfile=test/.build/useANPRSettings.mjs --log-level=error && esbuild composables/useVisitorSocket.ts --format=esm --outfile=test/.build/useVisitorSocket.mjs --log-level=error && esbuild composables/usePlateToastWindow.ts --format=esm --outfile=test/.build/usePlateToastWindow.mjs --log-level=error && esbuild utils/client-invite-modules.ts --bundle --platform=node --format=esm --outfile=test/.build/client-invite-modules.mjs --log-level=error && esbuild utils/robot-display.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-display.mjs --log-level=error && esbuild utils/building-map.ts --bundle --platform=node --format=esm --outfile=test/.build/building-map.mjs --log-level=error && esbuild utils/robot-building.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-building.mjs --log-level=error && esbuild utils/robot-fleet-core.ts --bundle --platform=node --format=esm --outfile=test/.build/robot-fleet-core.mjs --log-level=error && esbuild utils/rmf-editor.ts --bundle --platform=node --format=esm --outfile=test/.build/rmf-editor.mjs --log-level=error && node --experimental-strip-types --test \"test/*.test.mjs\" && yarn test:units",
     "test:units": "node --experimental-strip-types --test \"utils/*.test.ts\"",
     "release": "yarn run build && changeset publish"
   },