@7365admin1/layer-common 4.63.1 → 4.64.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.64.1
+
+### Patch Changes
+
+- bcc3b37: useSite().getSites lists an organisation's sites from GET /api/sites?org= (the old /api/sites/organization/:org route does not exist and returned 404), so Inventory's "Properties this store supplies" and the set-up form offer every property of the organisation again.
+
+## 4.64.0
+
+### Minor Changes
+
+- 6553a23: Inventory: a store that supplies several properties names them all ("Supplies Winsland House I and Winsland House II") for every viewer, including service providers; requests show which property they are for; the Stock Movement report can be filtered to one property.
+
 ## 4.63.1
 
 ### Patch Changes
@@ -1691,11 +1703,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/InventoryMain.vue

@@ -115,7 +115,7 @@ import useInventory from "../composables/useInventory";
 import useWorkerTerm from "../composables/useWorkerTerm";
 import useSite from "../composables/useSite";
 import useUtils from "../composables/useUtils";
-import { inventoryStoreLabel } from "../utils/inventory-store-label";
+import { inventoryStoreLabel, inventorySuppliesText } from "../utils/inventory-store-label";
 
 const props = defineProps({
   orgId: { type: String, required: true },
@@ -152,12 +152,21 @@ const isStaff = computed(() => {
 });
 
 const storeSites = computed(() =>
-  (store.value?.sites ?? []).map((id) => ({ _id: id, name: orgSites.value.find((s) => s._id === id)?.name ?? "This property" })),
+  (store.value?.sites ?? []).map((id) => ({
+    _id: id,
+    name:
+      store.value?.siteNames?.find((s) => s._id === id)?.name ||
+      orgSites.value.find((s) => s._id === id)?.name ||
+      (id === props.siteId ? "This property" : "Another property"),
+  })),
 );
 
 const subtitle = computed(() => {
   if (!store.value) return "";
-  if (storeSites.value.length > 1) return `Supplies ${storeSites.value.map((s) => s.name).join(", ")}`;
+  if (storeSites.value.length > 1) {
+    const supplies = inventorySuppliesText(storeSites.value.map((s) => s.name));
+    return stores.value.length > 1 ? `${inventoryStoreLabel(store.value, stores.value)} · ${supplies}` : supplies;
+  }
   return inventoryStoreLabel(store.value, stores.value);
 });
 

package/components/InventoryReportsTab.vue

@@ -20,7 +20,7 @@
       />
       <v-text-field v-model="month" type="month" :label="report === 'purchases' && span === 'year' ? 'Up to month' : 'Month'" density="compact" hide-details style="max-width: 180px" />
       <v-select
-        v-if="report === 'usage' && sites.length > 1"
+        v-if="(report === 'usage' || report === 'movement') && sites.length > 1"
         v-model="site"
         :items="[{ _id: '', name: 'All properties' }, ...sites]"
         item-title="name"
@@ -49,6 +49,9 @@
     </div>
 
     <p class="text-caption text-medium-emphasis mb-2">{{ help[report] }}</p>
+    <p v-if="report === 'movement' && siteName" class="text-caption text-medium-emphasis mb-2">
+      Start, received and end are the whole store's (shared by {{ sites.map((s) => s.name).join(" and ") }}). The last columns show what was issued for {{ siteName }} and used there.
+    </p>
 
     <div v-if="report === 'usage' && rows.length" class="d-flex flex-wrap align-center ga-3 mb-2">
       <div class="text-body-2 font-weight-medium">
@@ -95,7 +98,7 @@
 
     <v-data-table
       v-model="selected"
-      :headers="headers[report]"
+      :headers="tableHeaders"
       :items="rows"
       :loading="loading"
       :show-select="report === 'usage' && canCheck"
@@ -111,6 +114,7 @@
       <template #item.totalCost="{ value }">{{ money(value) }}</template>
       <template #item.receivedCost="{ value }">{{ money(value) }}</template>
       <template #item.usedCost="{ value }">{{ money(value) }}</template>
+      <template #item.siteUsedCost="{ value }">{{ money(value) }}</template>
       <!-- The supervisor checks usage against the technician's before/after photos. -->
       <template #item.photos="{ item }">
         <div v-if="usagePhotos(item).length" class="d-flex ga-1 py-1">
@@ -238,6 +242,18 @@ const headers: Record<string, any[]> = {
   ],
 };
 
+const siteName = computed(() => (site.value ? props.sites.find((s) => s._id === site.value)?.name ?? "" : ""));
+const tableHeaders = computed(() =>
+  report.value === "movement" && siteName.value
+    ? [
+        ...headers.movement,
+        { title: `Issued for ${siteName.value}`, key: "siteIssued" },
+        { title: `Used at ${siteName.value}`, key: "siteUsed" },
+        { title: `Usage cost at ${siteName.value}`, key: "siteUsedCost" },
+      ]
+    : headers[report.value],
+);
+
 function period(): TInventoryPeriod & { unchecked?: boolean } {
   const [y, m] = month.value.split("-").map(Number);
   const to = new Date(y, m, 0, 23, 59, 59, 999);
@@ -245,7 +261,7 @@ function period(): TInventoryPeriod & { unchecked?: boolean } {
   return {
     from: from.toISOString(),
     to: to.toISOString(),
-    ...(report.value === "usage" && site.value ? { site: site.value } : {}),
+    ...((report.value === "usage" || report.value === "movement") && site.value ? { site: site.value } : {}),
     ...(report.value === "usage" && locationType.value ? { locationType: locationType.value } : {}),
     ...(report.value === "usage" && uncheckedOnly.value ? { unchecked: true } : {}),
   };

package/components/InventoryRequestsTab.vue

@@ -23,6 +23,8 @@
         <div class="font-weight-medium">{{ r.requestedByName || "Someone" }}</div>
         <div class="text-caption text-medium-emphasis">{{ standardFormatDateTime(r.createdAt) }}</div>
         <v-chip size="small" :color="chip[r.status].color" variant="tonal">{{ chip[r.status].label }}</v-chip>
+        <!-- One store can supply several properties: say which one this request is for. -->
+        <v-chip v-if="store.sites.length > 1 && r.siteName" size="small" variant="outlined" prepend-icon="mdi-office-building-outline">For {{ r.siteName }}</v-chip>
         <v-spacer />
         <template v-if="r.status === 'pending'">
           <v-btn v-if="store.access.canApprove" class="text-none screen-btn-primary" variant="flat" @click="openDecision(r)">Review</v-btn>

package/composables/useSite.ts

@@ -41,13 +41,13 @@ export default function useSite() {
     try {
       const organizationId = orgId || currentUser.value?.defaultOrg;
 
-      const response = await useNuxtApp().$api<Record<string, any>>(
-        `/api/sites/organization/${organizationId}`,
-        {
-          method: "GET",
-          query: { page: requestPage, search: searchQuery, limit, sort, order },
-        }
-      );
+      // API-core lists an organisation's sites at GET /api/sites?org= (core
+      // `getSites`); there is no /api/sites/organization/:org route, so the old
+      // path 404'd and Inventory never offered a second property to supply.
+      const response = await useNuxtApp().$api<Record<string, any>>(`/api/sites`, {
+        method: "GET",
+        query: { org: organizationId, page: requestPage, search: searchQuery, limit, sort, order },
+      });
 
       sites.value = response.items;
       page.value = requestPage;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.63.1",
+  "version": "4.64.1",
   "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 && 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": "esbuild composables/useANPRSettings.ts --format=esm --outfile=test/.build/useANPRSettings.mjs --log-level=error && esbuild composables/useSite.ts --format=esm --outfile=test/.build/useSite.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"
   },

package/types/inventory.d.ts

@@ -12,6 +12,8 @@ declare type TInventoryStore = {
   ownerType: "property" | "service_provider";
   name: string;
   sites: string[];
+  /** Names of `sites`, from the server (a provider cannot list the owner's sites). */
+  siteNames?: { _id: string; name: string }[];
   showInResidentApp: boolean;
   showCostInResidentApp: boolean;
   access: TInventoryAccess;
@@ -40,6 +42,7 @@ declare type TInventoryRequest = {
   _id: string;
   store: string;
   site: string;
+  siteName?: string;
   requestedBy: string;
   requestedByName: string;
   lines: { item: string; itemName: string; unit: string; qty: number; issuedQty: number }[];

package/utils/inventory-store-label.ts

@@ -6,6 +6,13 @@
  */
 type TStoreLike = { ownerType: string; orgName?: string };
 
+/** "Supplies Winsland House I and Winsland House II" for a store that supplies several sites. */
+export function inventorySuppliesText(names: string[]) {
+  const named = names.map((n) => n || "another property");
+  if (named.length < 2) return "";
+  return `Supplies ${named.slice(0, -1).join(", ")} and ${named[named.length - 1]}`;
+}
+
 export function inventoryStoreLabel(store: TStoreLike, all: TStoreLike[]) {
   const kind = store.ownerType === "property" ? "Property store" : "Our store";
   const sameKind = all.filter((s) => s.ownerType === store.ownerType).length;