@7365admin1/layer-common 4.70.1 → 4.71.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 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
+
+- fe27542: Members list and Members → Service Providers: a "Last active" column (last sign-in: "Today, 9:05 AM", "Yesterday, …", or the date; "—" until the person next signs in).
+
 ## 4.70.1
 
 ### Patch Changes
@@ -1855,11 +1867,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/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/components/MemberMain.vue

@@ -113,6 +113,9 @@
           <template #item.dateInvited="{ item }">
             {{ formatDateInvited(item.dateInvited) }}
           </template>
+          <template #item.lastLoginAt="{ item }">
+            <span data-test="member-last-active">{{ formatLastActive(item.lastLoginAt) }}</span>
+          </template>
           <template #item.action-table="{ item }">
             <!--
               `props.assignRole` belongs in this test. The menu's only item that
@@ -331,6 +334,7 @@ import {
   safeReturnTo,
   withCurrentRole,
 } from "../utils/role";
+import { formatLastActive } from "../utils/last-active";
 
 const props = defineProps({
   /** The design's page title. Every app that mounts this screen calls it
@@ -415,6 +419,10 @@ const props = defineProps({
 
         value: "dateInvited",
       },
+      {
+        title: "Last active",
+        value: "lastLoginAt",
+      },
       {
         title: "Action",
         value: "action-table",

package/components/MemberServiceProviders.vue

@@ -111,6 +111,9 @@
           <template #item.addedAt="{ item }">
             {{ spDay(item.addedAt) || "-" }}
           </template>
+          <template #item.lastLoginAt="{ item }">
+            <span data-test="sp-last-active">{{ formatLastActive(item.lastLoginAt) }}</span>
+          </template>
           <template #item.status="{ item }">
             <StatusChip
               :tone="item.status === 'active' ? 'ok' : 'neutral'"
@@ -155,6 +158,7 @@ import {
   serviceTypeOptions,
 } from "../utils/site-provider-members";
 import { spDay } from "../utils/sp-inviter-row";
+import { formatLastActive } from "../utils/last-active";
 import { saveBlob } from "../composables/useInventory";
 
 const props = defineProps({
@@ -195,6 +199,7 @@ const headers = [
   { title: "Service", key: "typeLabel", sortable: true },
   { title: "Role at this site", key: "role", sortable: true },
   { title: "Added", key: "addedAt", sortable: true },
+  { title: "Last active", key: "lastLoginAt", sortable: true },
   { title: "Status", key: "status", sortable: true },
   { title: "", key: "actions", sortable: false, align: "end" as const },
 ];

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/composables/useServiceProvider.ts

@@ -11,6 +11,8 @@ export type TSiteProviderMember = {
   role: string;
   status: string;
   addedAt?: string | null;
+  /** Last sign-in ("Last active"); absent until the next sign-in. */
+  lastLoginAt?: string | null;
   /** a subcontractor: the provider that brought its company onto the site */
   invitedVia?: string;
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.70.1",
+  "version": "4.71.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-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);
+}

package/utils/last-active.ts

@@ -0,0 +1,16 @@
+/**
+ * "Last active" on the Members lists: the last time the person signed in
+ * (server field `lastLoginAt`). Never signed in since the field existed -> "—".
+ */
+export function formatLastActive(value?: string | Date | null, now: Date = new Date()): string {
+  if (!value) return "—";
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return "—";
+
+  const time = date.toLocaleTimeString("en-US", { hour: "numeric", minute: "2-digit", hour12: true });
+  const dayStart = (d: Date) => new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
+  const days = Math.round((dayStart(now) - dayStart(date)) / 86400000);
+  if (days === 0) return `Today, ${time}`;
+  if (days === 1) return `Yesterday, ${time}`;
+  return date.toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" });
+}