@7365admin1/layer-common 4.82.1-staging.474 → 4.82.1-staging.475

package/components/InventoryMain.vue

@@ -149,6 +149,9 @@ const props = defineProps({
 });
 
 const movedFromEquipment = useRoute().query.moved === "equipment";
+// A notification link (`?storeId=&tab=`, NotificationBell): open that store on that tab, once.
+const linkQuery = useRoute().query;
+const linked = { storeId: String(linkQuery.storeId ?? ""), tab: String(linkQuery.tab ?? "") };
 
 const { getStores, createStore: apiCreateStore, getRequests, getReport } = useInventory();
 const { getSites } = useSite();
@@ -227,7 +230,10 @@ async function loadStores() {
   loadError.value = "";
   try {
     stores.value = (await getStores(props.siteId)) ?? [];
-    if (!stores.value.some((s) => s._id === storeId.value)) {
+    const fromLink = stores.value.find((s) => s._id === linked.storeId);
+    linked.storeId = "";
+    if (fromLink) storeId.value = fromLink._id;
+    else if (!stores.value.some((s) => s._id === storeId.value)) {
       // A service provider working at a property store sees it first.
       storeId.value = stores.value[0]?._id ?? "";
     }
@@ -295,7 +301,10 @@ async function createStore() {
 }
 
 watch(storeId, () => {
-  tab.value = "stock";
+  // The linked tab only when this person has it (tabs are hidden, never greyed).
+  const wanted = linked.tab;
+  linked.tab = "";
+  tab.value = wanted && tabs.value.some((t) => t.value === wanted) ? wanted : "stock";
   refreshCounts();
   probeCompanyUsage();
 });

package/components/NotificationBell.vue

@@ -127,6 +127,13 @@
         <v-btn variant="text" class="text-none" @click="viewFromToast">View</v-btn>
       </template>
     </v-snackbar>
+
+    <v-snackbar v-model="nowhere.show" location="top right" :timeout="6000" color="surface">
+      <div class="d-flex align-center ga-3">
+        <v-icon icon="mdi-information-outline" color="primary" />
+        <div class="text-body-2">{{ nowhere.text }}</div>
+      </div>
+    </v-snackbar>
   </div>
 </template>
 
@@ -137,7 +144,7 @@ import {
   timeAgo,
   type TInboxItem,
 } from "../utils/notification-inbox";
-import { appUrlsFrom, chooseNavigation, notificationTarget } from "../utils/notification-target";
+import { appUrlsFrom, chooseNavigation, noTargetMessage, notificationTarget } from "../utils/notification-target";
 
 /**
  * The top-bar notification feed for the web, in every signed-in app.
@@ -180,6 +187,8 @@ const markingAll = ref(false);
 const items = ref<Array<Record<string, any>>>([]);
 const unread = ref(0);
 const toast = reactive({ show: false, title: "", body: "" });
+/** Said when a clicked row has no page to open - a click is never a silent nothing. */
+const nowhere = reactive({ show: false, text: "" });
 
 const userId = computed(() => String(currentUser.value?._id ?? ""));
 const badgeLabel = computed(() => badgeText(unread.value));
@@ -341,7 +350,10 @@ async function goToSubject(item: Record<string, any>) {
     hasPage: hasLocalPage,
     appUrls: appUrls(),
   });
-  if (!nav) return;
+  if (!nav) {
+    Object.assign(nowhere, { show: true, text: noTargetMessage(item as any) });
+    return;
+  }
 
   open.value = false;
   if (nav.type === "href") {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.82.1-staging.474",
+  "version": "4.82.1-staging.475",
   "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/notification-target.ts

@@ -45,7 +45,7 @@ export type TTargetRow = {
    * (core `withNotificationKind`); `site` stands in for `siteId` on rows kept
    * unscoped on purpose. Older rows have neither and are read from `module`.
    */
-  params?: { id?: string; org?: string; kind?: string; site?: string } | null;
+  params?: { id?: string; org?: string; kind?: string; site?: string; storeId?: string } | null;
 };
 
 /** What the surrounding app knows that the stored row does not. */
@@ -127,9 +127,26 @@ export function notificationKind(item: TTargetRow | null | undefined): string {
     return "";
   }
   if (module === "other") {
-    return /(accepted|declined) your invitation$/i.test(title) ? "serviceProviderInviteAnswer" : "";
+    if (/(accepted|declined) your invitation$/i.test(title)) return "serviceProviderInviteAnswer";
+    // Inventory alerts sent before core had an inventory module were stored as "other".
+    return /request waiting|request (was )?(approved|rejected)|low (on )?stock|stock handed to you|hand-over (confirmed|declined)/i.test(title)
+      ? "inventory"
+      : "";
   }
-  return module;
+  // Older rows spelled the work order module with a hyphen.
+  return module === "work-order" ? "workOrder" : module;
+}
+
+/**
+ * Which inventory tab an alert is about. Alerts carry the store id but no tab,
+ * so the tab follows the alert's fixed title (API-core inventory-notify.service)
+ * - the same rule the mobile apps use. Values are the web tabs' own names.
+ */
+export function inventoryTabForAlert(title: string): "requests" | "stock" | "mine" | "" {
+  if (/stock handed to you|hand-over (confirmed|declined)/i.test(title)) return "mine";
+  if (/request waiting|request (was )?(approved|rejected)/i.test(title)) return "requests";
+  if (/low (on )?stock/i.test(title)) return "stock";
+  return "";
 }
 
 /**
@@ -182,6 +199,8 @@ const SITE_PAGES: Record<string, TSitePage[]> = {
     { apps: ["security"], page: () => "virtual-patrol/cctv" },
     { apps: ["property-management"], page: () => "cctv" },
   ],
+  // A robot at the site raised an alarm (core safety alert, category robotAlert).
+  robotAlert: [{ apps: ["security", "property-management", "hygiene"], page: () => "robot-management/alerts" }],
   // hygiene has its Service Providers page too since 2026-09-28
   serviceProviderInviteAnswer: [{ apps: SERVICE_APPS, page: () => "service-providers" }],
 };
@@ -214,7 +233,12 @@ function sitePageTarget(
     const list = apps === "any" ? [home, ...SERVICE_APPS.filter((a) => a !== home)] : apps;
     for (const app of list) candidates.push({ app, path: base + page(id) });
   }
-  return { candidates };
+  if (kind !== "inventory") return { candidates };
+  // Open the alert's own store on the tab it is about (InventoryMain reads ?storeId=&tab=).
+  const storeId = String(item.params?.storeId ?? item.params?.id ?? "").trim();
+  const tab = inventoryTabForAlert(String(item.title ?? ""));
+  const query: Record<string, string> = { ...(storeId ? { storeId } : {}), ...(tab ? { tab } : {}) };
+  return Object.keys(query).length ? { candidates, query } : { candidates };
 }
 
 /** Seven365 staff pages, in the organisation app. */
@@ -294,6 +318,21 @@ export function notificationTarget(
   };
 }
 
+/** Kinds that only the iService365 phone apps can open (residents' own screens). */
+const PHONE_ONLY_KINDS = new Set(["prelovedMarketplace", "marketplace-order"]);
+
+/**
+ * What the bell says when a click has nowhere to go, so a click is never a
+ * silent nothing. A link grants nothing either way: the page opened still
+ * checks the person may see it.
+ */
+export function noTargetMessage(item: TTargetRow | null | undefined): string {
+  if (PHONE_ONLY_KINDS.has(notificationKind(item))) {
+    return "This notification opens in the iService365 app on your phone.";
+  }
+  return "There is no page to open for this notification here. It has been marked as read.";
+}
+
 /**
  * The full URL for a target whose page lives in another web app, or "" when
  * there is none to build (no path, or that app's URL is not configured).