@7365admin1/layer-common 4.35.1-staging.431 → 4.35.1-staging.433

package/components/ServiceProviderMain.vue

@@ -106,6 +106,10 @@
               :class="{ 'sp-muted': item.companyKnown === false }"
             >{{ item.companyName }}</span>
             <div v-if="item.contactPhone" class="sp-sub">{{ item.contactPhone }}</div>
+            <!-- A subcontractor another provider brought onto this site. -->
+            <div v-if="item.invitedVia" class="sp-sub" data-test="sp-invited-via">
+              Invited by {{ item.invitedVia }}
+            </div>
           </template>
           <template #item.invited="{ item }">
             <span class="d-block text-truncate">{{ item.invitedLine || "-" }}</span>
@@ -631,7 +635,7 @@
             <template v-if="!existingAccount">
               <v-col cols="12">
                 <v-row no-gutters>
-                  <InputLabel class="text-capitalize" title="App" required />
+                  <InputLabel class="text-capitalize" title="Service" required />
                   <v-col cols="12">
                     <v-select
                       v-model="serviceProviderInvite.app"
@@ -667,6 +671,12 @@
               </v-col>
             </template>
 
+            <v-col cols="12">
+              <div class="sp-sub" data-test="sp-invite-approval-note">
+                Seven365 approves every invitation before the provider receives it.
+              </div>
+            </v-col>
+
             <!-- Error message -->
             <v-col cols="12" class="my-2">
               <v-row no-gutters>
@@ -752,6 +762,8 @@ type TableRow = {
   /** shown under a "Not approved" row, in Seven365's own words */
   rejectionReason?: string;
   siteName?: string;
+  /** a subcontractor: the provider that brought it onto this site */
+  invitedVia?: string;
 };
 
 type ServiceProviderMemberRow = {
@@ -1259,6 +1271,7 @@ const providerLines = computed<Array<[string, string]>>(() => {
     ["Email", row.contactEmail || row.email],
   ];
   if (row.contactPhone) lines.push(["Phone", row.contactPhone]);
+  if (row.invitedVia) lines.push(["Invited by", row.invitedVia]);
   if (row.source === "invite") {
     lines.push(["Invited", row.invitedLine || "-"]);
     if (row.answeredAt) lines.push(["Accepted", spDay(row.answeredAt)]);
@@ -1337,6 +1350,7 @@ function mapProviderRows(raw: Record<string, any>[]): TableRow[] {
     members: formatMembersCell(row.members),
     status: statusDisplay(row.status ?? "active", "provider"),
     source: row.source === "engagement" ? "engagement" : "provider",
+    invitedVia: String(row.invitedVia ?? ""),
   }));
 }
 

package/components/VisitorManagement.vue

@@ -85,7 +85,8 @@
             <v-text-field
               v-model="searchInput"
               density="compact"
-              placeholder="Search"
+              placeholder="Name, plate, phone, unit..."
+              aria-label="Search visitors"
               clearable
               max-width="300"
               append-inner-icon="mdi-magnify"
@@ -592,6 +593,12 @@
           >
         </span>
       </template>
+      <template #no-data>
+        <div class="table-card__empty">
+          <v-icon icon="mdi-magnify-close" size="32" />
+          <span>{{ visitorSearchEmptyText(searchQuery) }}</span>
+        </div>
+      </template>
     </TableMain>
 
     <v-dialog v-model="dialog.showSelection" width="450" persistent>
@@ -1557,6 +1564,11 @@
 <script setup lang="ts">
 import moment from "moment-timezone";
 import QRCode from "qrcode";
+import {
+  VISITOR_SEARCH_DEBOUNCE_MS,
+  visitorSearchEmptyText,
+  visitorSearchQuery,
+} from "../utils/visitor-search";
 
 
 const { downloadPDF } = usePDFDownload();
@@ -1750,6 +1762,20 @@ watch(hidQrDialog, (open) => {
 
 //filter states
 const searchInput = ref("");
+// What is actually searched: the box, trimmed, from 2 characters, sent
+// VISITOR_SEARCH_DEBOUNCE_MS after the last keystroke (cleared at once). The
+// list used to refetch on every keystroke, and a burst of typing (or a paste,
+// or a scanner) could leave the table showing the FIRST letter's results.
+const searchQuery = ref("");
+// Reads the box when it fires, so a clear that lands inside the wait is not
+// overwritten by the text that was there before it.
+const applySearch = debounce(() => {
+  searchQuery.value = visitorSearchQuery(searchInput.value);
+}, VISITOR_SEARCH_DEBOUNCE_MS);
+watch(searchInput, (value) => {
+  if (!visitorSearchQuery(value)) searchQuery.value = "";
+  else applySearch();
+});
 
 const today = new Date();
 const oneMonthAgo = new Date();
@@ -2322,7 +2348,7 @@ const {
     const params: any = {
       page: page.value,
       site: siteId,
-      search: searchInput.value,
+      search: searchQuery.value,
       dateTo: dateTo.value
         ? moment(dateTo.value).endOf("day").toISOString()
         : undefined,
@@ -2363,7 +2389,9 @@ const {
     // }
 
     try {
-      return await getVisitors(params);
+      const res = await getVisitors(params);
+      // Remember which search this answers, so a late reply is not shown.
+      return res ? { ...res, _search: params.search } : res;
     } catch (error: any) {
       // Refused by the server: say so with its own message, hide the tab and
       // go back to Registered - no empty "No data available" table.
@@ -2380,7 +2408,7 @@ const {
   {
     watch: [
       page,
-      searchInput,
+      searchQuery,
       dateFrom,
       dateTo,
       filterTypes,
@@ -2392,6 +2420,11 @@ const {
 );
 
 watch(getVisitorReq, (newData: any) => {
+  // An answer for an older search: ask again for the current one.
+  if (newData && newData._search !== searchQuery.value) {
+    getVisitorRefresh();
+    return;
+  }
   if (newData) {
     items.value = newData.items ?? [];
     pages.value = newData.pages ?? 0;
@@ -2890,7 +2923,7 @@ async function handleNfcCheckout() {
 function buildReportParams(): any {
   const params: any = {
     site: siteId,
-    search: searchInput.value,
+    search: searchQuery.value,
     dateTo: dateTo.value
       ? moment(dateTo.value).endOf("day").toISOString()
       : undefined,
@@ -2934,7 +2967,7 @@ async function handleDownloadPDFReport() {
 
     // Build URL with query parameters
     const queryParams = new URLSearchParams();
-    if (searchInput.value) queryParams.append("search", searchInput.value);
+    if (searchQuery.value) queryParams.append("search", searchQuery.value);
     if (dateFrom.value) queryParams.append("dateFrom", dateFrom.value);
     if (dateTo.value) queryParams.append("dateTo", dateTo.value);
     if (filterTypes.value.length > 0)
@@ -3083,7 +3116,7 @@ const updateRouteQuery = debounce(
 );
 
 watch(
-  [searchInput, dateFrom, dateTo, filterTypes, activeTab, displayNotCheckedOut],
+  [searchQuery, dateFrom, dateTo, filterTypes, activeTab, displayNotCheckedOut],
   ([search, from, to, types, tab, checkedOut]) => {
     const normalizedFrom = normalizeDateOnly(from);
     const normalizedTo = normalizeDateOnly(to);
@@ -3103,7 +3136,7 @@ watch(
   },
   { deep: true }
 );
-watch([searchInput, dateFrom, dateTo, filterTypes, activeTab], () => {
+watch([searchQuery, dateFrom, dateTo, filterTypes, activeTab], () => {
   page.value = 1;
 });
 
@@ -3123,9 +3156,13 @@ const syncVisitorFiltersFromRoute = () => {
     activeTab.value = nextTab;
   }
 
-  const nextSearch = (route.query.search as string) || "";
-  if (searchInput.value !== nextSearch) {
+  // Compared with the SEARCHED text, not the box: the route only ever holds
+  // what was searched, so comparing with the box put back an older value over
+  // letters typed since. A different value is an outside link (e.g. ?search=).
+  const nextSearch = visitorSearchQuery(route.query.search);
+  if (searchQuery.value !== nextSearch) {
     searchInput.value = nextSearch;
+    searchQuery.value = nextSearch;
   }
 
   if (route.query.dateFrom) {

package/package.json

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

@@ -182,9 +182,8 @@ const SITE_PAGES: Record<string, TSitePage[]> = {
     { apps: ["security"], page: () => "virtual-patrol/cctv" },
     { apps: ["property-management"], page: () => "cctv" },
   ],
-  serviceProviderInviteAnswer: [
-    { apps: SERVICE_APPS.filter((a) => a !== "hygiene"), page: () => "service-providers" },
-  ],
+  // hygiene has its Service Providers page too since 2026-09-28
+  serviceProviderInviteAnswer: [{ apps: SERVICE_APPS, page: () => "service-providers" }],
 };
 SITE_PAGES.myVisitors = SITE_PAGES.visitors;
 
@@ -196,6 +195,7 @@ export const WEB_TARGET_KINDS = [
   "robot",
   "client",
   "clientInvitation",
+  "spApproval",
 ];
 
 function sitePageTarget(
@@ -221,6 +221,10 @@ function sitePageTarget(
 function staffTarget(kind: string, item: TTargetRow): TNotificationTarget | null {
   const id = String(item.params?.id ?? "").trim();
   if (kind === "robot") return { candidates: [{ app: "org", path: "/super-admin/robots" }] };
+  // A service-provider invitation waiting in SP Approvals.
+  if (kind === "spApproval") {
+    return { candidates: [{ app: "org", path: "/super-admin/sp-approvals" }] };
+  }
   if (kind === "clientInvitation") {
     return { candidates: [{ app: "org", path: "/super-admin/client-list" }] };
   }

package/utils/visitor-search.ts

@@ -0,0 +1,23 @@
+/**
+ * Visitor Management search box rules (VisitorManagement.vue). The server does
+ * the matching (name, plate, phone, NRIC, company, purpose, block/unit - see
+ * @7365admin1/core visitor-search.util); this only decides WHEN to ask.
+ * Browser-safe: no Node globals. Tested by utils/visitor-search.test.ts.
+ */
+
+/** Characters needed before a search is sent; shorter means "no search". */
+export const VISITOR_SEARCH_MIN_LENGTH = 2;
+
+/** Wait after the last keystroke before searching. */
+export const VISITOR_SEARCH_DEBOUNCE_MS = 350;
+
+/** The text to send for what is in the box: trimmed, or "" when too short. */
+export function visitorSearchQuery(raw: unknown): string {
+  const text = typeof raw === "string" ? raw.replace(/\s+/g, " ").trim() : "";
+  return text.length >= VISITOR_SEARCH_MIN_LENGTH ? text : "";
+}
+
+/** The empty-table sentence: names the search when there is one. */
+export function visitorSearchEmptyText(query: string): string {
+  return query ? `No visitors match '${query}'` : "No data available";
+}