@7365admin1/layer-common 4.61.0 → 4.61.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 4.61.1
+
+### Patch Changes
+
+- 598f6c1: Inventory store switcher: when a person can see several stores of the same kind, each is named with its organisation ("Property store · Margaret Ville"); more than three stores are chosen from a list instead of a row of identical buttons.
+
 ## 4.61.0
 
 ### Minor Changes
@@ -1667,11 +1673,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

@@ -2,8 +2,20 @@
   <div class="inventory">
     <PageHeader :title="store ? store.name : 'Inventory'" :subtitle="subtitle">
       <template #actions>
+        <!-- Many stores (staff of several organisations at one property): a list, not a row of buttons. -->
+        <v-select
+          v-if="stores.length > 3"
+          v-model="storeId"
+          :items="stores"
+          :item-title="(s: TInventoryStore) => inventoryStoreLabel(s, stores)"
+          item-value="_id"
+          label="Store"
+          density="compact"
+          hide-details
+          style="min-width: 300px"
+        />
         <v-btn-toggle
-          v-if="stores.length > 1"
+          v-else-if="stores.length > 1"
           v-model="storeId"
           mandatory
           density="comfortable"
@@ -11,7 +23,7 @@
           divided
         >
           <v-btn v-for="s in stores" :key="s._id" :value="s._id" class="text-none">
-            {{ s.ownerType === "property" ? "Property store" : "Our store" }}
+            {{ inventoryStoreLabel(s, stores) }}
           </v-btn>
         </v-btn-toggle>
       </template>
@@ -102,6 +114,7 @@
 import useInventory from "../composables/useInventory";
 import useSite from "../composables/useSite";
 import useUtils from "../composables/useUtils";
+import { inventoryStoreLabel } from "../utils/inventory-store-label";
 
 const props = defineProps({
   orgId: { type: String, required: true },
@@ -144,7 +157,7 @@ const storeSites = computed(() =>
 const subtitle = computed(() => {
   if (!store.value) return "";
   if (storeSites.value.length > 1) return `Supplies ${storeSites.value.map((s) => s.name).join(", ")}`;
-  return store.value.ownerType === "property" ? "Property store" : "Our own store";
+  return inventoryStoreLabel(store.value, stores.value);
 });
 
 const tabs = computed(() => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.61.0",
+  "version": "4.61.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.",

package/utils/inventory-store-label.ts

@@ -0,0 +1,13 @@
+/**
+ * The store switcher's button text. "Property store" / "Our store" is enough
+ * when each kind appears once; when a person can see several stores of the
+ * same kind (e.g. staff of several organisations at one property), each one
+ * also names its organisation so the buttons can be told apart.
+ */
+type TStoreLike = { ownerType: string; orgName?: string };
+
+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;
+  return sameKind > 1 && store.orgName ? `${kind} · ${store.orgName}` : kind;
+}