@7365admin1/layer-common 4.71.0 → 4.71.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.71.2
+
+### Patch Changes
+
+- 99042e0: Building Management → Units import dialog: the instructions no longer ask for a block number (the import takes it from the chosen building).
+
+## 4.71.1
+
+### Patch Changes
+
+- 0a25e73: Inventory: show "Copy from old Equipment list" only when the store's sites have old Equipment records not yet copied.
+
 ## 4.71.0
 
 ### Minor Changes
@@ -1861,11 +1873,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/BuildingManagement/units.vue

@@ -31,7 +31,7 @@
         title="Import Blocks, Levels and Units from Excel"
         noun="rows"
         name-label="Building / Level / Unit"
-        fill-hint="One row per unit: block number, building name, level and unit. Building Name and Level have dropdowns with this property's own values."
+        fill-hint="One row per unit: building name, level and unit. Pick Building Name and Level from the dropdowns (type a new name for a new building). No block number needed — an existing building keeps its own and a new one gets the next free number."
         duplicate-note="Units already on that level are skipped and left unchanged."
         template-file-name="units-import-template.xlsx"
         :download-template="() => downloadTemplate('building-units', { site })"

package/components/InventoryStockTab.vue

@@ -32,7 +32,7 @@
         <v-list density="compact">
           <v-list-item prepend-icon="mdi-plus" title="Add one item" @click="editItem(null)" />
           <v-list-item prepend-icon="mdi-file-excel-outline" title="Import from Excel" @click="showImport = true" />
-          <v-list-item prepend-icon="mdi-content-copy" title="Copy from old Equipment list" @click="showLegacy = true" />
+          <v-list-item v-if="legacyToCopy" prepend-icon="mdi-content-copy" title="Copy from old Equipment list" @click="showLegacy = true" />
         </v-list>
       </v-menu>
       <v-spacer />
@@ -104,6 +104,7 @@ import useFile from "../composables/useFile";
 import useUtils from "../composables/useUtils";
 import { inventoryItemMeta } from "../utils/inventory-store-label";
 import { inventoryControls } from "../utils/inventory-presets";
+import { hasLegacyEquipmentToCopy } from "../utils/inventory-legacy";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -113,7 +114,7 @@ const props = defineProps({
 const ctl = computed(() => inventoryControls(props.store.access));
 const emit = defineEmits(["changed"]);
 
-const { getItems } = useInventory();
+const { getItems, getLegacyEquipment } = useInventory();
 const { getFileUrl } = useFile();
 const { debounce } = useUtils();
 
@@ -179,15 +180,26 @@ function openItem(item: TInventoryItem) {
 const showImport = ref(false);
 const showReceiveImport = ref(false);
 const showLegacy = ref(false);
+// Offer the old Equipment copy only where this store's sites have old records not yet copied.
+const legacyToCopy = ref(false);
+async function checkLegacy() {
+  if (!props.store.access.canManage) return (legacyToCopy.value = false);
+  try {
+    legacyToCopy.value = hasLegacyEquipmentToCopy(await getLegacyEquipment(props.store._id));
+  } catch {
+    legacyToCopy.value = false;
+  }
+}
 
 function done() {
   load();
+  checkLegacy();
   emit("changed");
 }
 
 watch(page, load);
 watch(lowOnly, () => (page.value === 1 ? load() : (page.value = 1)));
 watch(search, debounce(() => (page.value === 1 ? load() : (page.value = 1)), 400));
-watch(() => props.store._id, () => (page.value === 1 ? load() : (page.value = 1)));
-onMounted(load);
+watch(() => props.store._id, () => (checkLegacy(), page.value === 1 ? load() : (page.value = 1)));
+onMounted(() => (load(), checkLegacy()));
 </script>

package/composables/useInventory.ts

@@ -65,7 +65,7 @@ export default function useInventory() {
       api<Blob>(`/stores/${store}/reports/${report}/export`, { query, responseType: "blob" }),
     checkUsage: (store: string, ids: string[], checked: boolean) =>
       api<{ updated: number }>(`/stores/${store}/usage/check`, { method: "POST", body: { ids, checked } }),
-    getLegacyEquipment: (store: string) => api<{ serviceType: string; count: number }[]>(`/stores/${store}/legacy-equipment`),
+    getLegacyEquipment: (store: string) => api<{ serviceType: string; count: number; pending?: number }[]>(`/stores/${store}/legacy-equipment`),
     importLegacyEquipment: (store: string, serviceType: string, commit: boolean) =>
       api<{ committed: boolean; ready: number; skipped: number; errors: number; rows: { row: number; name: string; status: string; message: string }[] }>(
         `/stores/${store}/legacy-equipment/import`,

package/package.json

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

@@ -0,0 +1,10 @@
+type TLegacyGroup = { count: number; pending?: number };
+
+/**
+ * Whether "Copy from old Equipment list" has anything to bring in: false for a
+ * site that never had an old Equipment list, and false once every old name is
+ * already in the store. An API without `pending` falls back to `count`.
+ */
+export function hasLegacyEquipmentToCopy(groups: TLegacyGroup[] | null | undefined) {
+  return (groups ?? []).some((g) => (g.pending ?? g.count) > 0);
+}