@7365admin1/layer-common 4.35.1-staging.385 → 4.37.0

package/components/ServiceProviderMain.vue

@@ -101,14 +101,9 @@
           style="max-height: calc(100vh - 280px)"
         >
           <template #item.companyName="{ item }">
-            <span
-              class="d-block text-truncate sp-col-company"
-              :class="{ 'sp-muted': item.companyKnown === false }"
-            >{{ item.companyName }}</span>
-            <div v-if="item.contactPhone" class="sp-sub">{{ item.contactPhone }}</div>
-          </template>
-          <template #item.invited="{ item }">
-            <span class="d-block text-truncate">{{ item.invitedLine || "-" }}</span>
+            <span class="d-block text-truncate sp-col-company">{{
+              item.companyName
+            }}</span>
           </template>
           <template #item.email="{ item }">
             <span class="d-block text-truncate sp-col-email">{{
@@ -133,10 +128,9 @@
             -->
             <StatusChip
               class="text-none"
-              :status="item.viewStatus || item.statusRaw || item.status"
+              :status="item.statusRaw || item.status"
               :label="item.status"
             />
-            <div v-if="item.statusLine" class="mt-1 sp-sub">{{ item.statusLine }}</div>
             <!-- Was `text-caption text-medium-emphasis` - Roboto 12px at
                  Vuetify's 60% opacity. The design's sub-line is `--muted`. -->
             <div v-if="item.rejectionReason" class="mt-1 sp-reject-reason">
@@ -163,11 +157,6 @@
                 </v-btn>
               </template>
               <v-list density="compact" min-width="220">
-                <v-list-item
-                  v-if="item.providerOrgId"
-                  title="View provider"
-                  @click="openProvider(item)"
-                />
                 <v-list-item
                   title="Cancel invitation"
                   :disabled="!canCancelInvite(item)"
@@ -189,21 +178,6 @@
                 />
               </v-list>
             </v-menu>
-            <!--
-              A provider on this site through an accepted invitation. Its row is
-              the engagement itself, not a stored service-providers record, so
-              the In-Active move (which acts on that record) does not apply.
-            -->
-            <v-btn
-              v-else-if="item.source === 'engagement'"
-              icon
-              variant="text"
-              density="comfortable"
-              aria-label="View provider"
-              @click="openProvider(item)"
-            >
-              <v-icon>mdi-information-outline</v-icon>
-            </v-btn>
             <v-menu v-else-if="item.source === 'provider'" location="bottom end">
               <template #activator="{ props: menuProps }">
                 <v-btn
@@ -265,26 +239,6 @@
 
     Same members, same two columns, same loading and empty copy, same close.
   -->
-  <!-- The provider, as the organisation that invited it may see it. -->
-  <v-dialog v-model="providerDialog" max-width="480">
-    <v-card class="screen-modal">
-      <v-card-title>{{ providerRow?.companyName }}</v-card-title>
-      <v-card-text class="screen-modal__body">
-        <dl class="sp-details">
-          <template v-for="line in providerLines" :key="line[0]">
-            <dt>{{ line[0] }}</dt>
-            <dd>{{ line[1] }}</dd>
-          </template>
-        </dl>
-      </v-card-text>
-      <div class="screen-modal__footer">
-        <v-btn class="screen-btn-ghost" variant="outlined" @click="providerDialog = false">
-          Close
-        </v-btn>
-      </div>
-    </v-card>
-  </v-dialog>
-
   <v-dialog v-model="viewDialog" max-width="514">
     <v-card class="screen-modal">
       <v-card-title>Members ({{ memberDialogCount }})</v-card-title>
@@ -715,13 +669,6 @@ import useVerification from "../composables/useVerification";
 // import useRole from "../composables/useRole";
 import { errorConverter } from "../utils/data";
 import { pickRouteName } from "../utils/route-name";
-import {
-  sentCompany,
-  sentInvitedLine,
-  sentStatusLine,
-  spDay,
-  spTypeLabel,
-} from "../utils/sp-inviter-row";
 
 type ListTab = "active" | "pending" | "inactive";
 
@@ -734,21 +681,9 @@ type TableRow = {
   type: string;
   members: string;
   status: string;
-  /** provider: a stored row; engagement: on the site through an accepted
-   *  invitation; invite: an invitation this organisation sent. */
-  source: "provider" | "engagement" | "invite";
+  source: "provider" | "invite";
   /** the stored status, for deciding which actions a row may offer */
   statusRaw?: string;
-  /** what the row reads as (a lapsed "pending" is "expired") - the chip tone */
-  viewStatus?: string;
-  statusLine?: string;
-  companyKnown?: boolean;
-  invitedLine?: string;
-  providerOrgId?: string;
-  contactEmail?: string;
-  contactPhone?: string;
-  answeredAt?: string | null;
-  onSite?: boolean;
   /** shown under a "Not approved" row, in Seven365's own words */
   rejectionReason?: string;
   siteName?: string;
@@ -839,7 +774,7 @@ const billingRouteName = pickRouteName(
   "service-provider-mgmt-billing"
 );
 
-const providerHeaders = [
+const headers = [
   {
     title: "Company name",
     value: "companyName",
@@ -862,8 +797,7 @@ const providerHeaders = [
     maxWidth: "180px",
   },
   {
-    // The provider's people assigned to this site - not its whole headcount.
-    title: "Staff on site",
+    title: "Members",
     value: "members",
     sortable: false,
     width: "88px",
@@ -885,20 +819,6 @@ const providerHeaders = [
   },
 ];
 
-/** The Invitations tab: who it went to, who sent it and when, what happened. */
-const inviteHeaders = [
-  { ...providerHeaders[0], title: "Company" },
-  { ...providerHeaders[1], title: "Invited email" },
-  { ...providerHeaders[2], title: "Service" },
-  { title: "Invited", value: "invited", sortable: false, minWidth: "150px" },
-  { ...providerHeaders[4], width: "200px" },
-  providerHeaders[5],
-];
-
-const headers = computed(() =>
-  listTab.value === "pending" ? inviteHeaders : providerHeaders
-);
-
 const { natureOfBusinessV3 } = useLocal();
 const { requiredRule, emailRule, debounce } = useUtils();
 const { getUserByEmail } = useUser();
@@ -907,10 +827,7 @@ const listTab = ref<ListTab>("active");
 /** The same three tabs, in the same order, with the same labels. */
 const listTabs: Array<{ value: ListTab; label: string }> = [
   { value: "active", label: "Service Providers" },
-  // Every invitation this site sent, whatever became of it - including the
-  // accepted ones, so the client can see "Accepted" and not just a row that
-  // vanished (owner request 2026-09-24).
-  { value: "pending", label: "Invitations" },
+  { value: "pending", label: "Pending" },
   { value: "inactive", label: "In-Active" },
 ];
 const page = ref(1);
@@ -1238,40 +1155,19 @@ function rowActionLabel(row: TableRow) {
 }
 
 function typeDisplay(type: string, nature?: string) {
-  return spTypeLabel(type, nature, natureOfBusinessV3);
-}
-
-const providerDialog = ref(false);
-const providerRow = ref<TableRow | null>(null);
-
-function openProvider(row: TableRow) {
-  providerRow.value = row;
-  providerDialog.value = true;
+  if (nature && String(nature).trim()) return String(nature);
+  // useLocal returns a plain array; reading `.value` off it was always
+  // undefined, so every row fell through to the raw stored slug
+  // ("security_agency") instead of "Security".
+  const source = natureOfBusinessV3 as any;
+  const list = (Array.isArray(source) ? source : source?.value) as Array<{
+    title?: string;
+    value?: string;
+  }>;
+  const hit = list?.find((x) => x.value === type);
+  return hit?.title ?? type ?? "-";
 }
 
-/** Only what the inviting organisation needs; nothing about the provider's
- *  own staff or other clients. */
-const providerLines = computed<Array<[string, string]>>(() => {
-  const row = providerRow.value;
-  if (!row) return [];
-  const lines: Array<[string, string]> = [
-    ["Service", row.type],
-    ["Email", row.contactEmail || row.email],
-  ];
-  if (row.contactPhone) lines.push(["Phone", row.contactPhone]);
-  if (row.source === "invite") {
-    lines.push(["Invited", row.invitedLine || "-"]);
-    if (row.answeredAt) lines.push(["Accepted", spDay(row.answeredAt)]);
-    lines.push([
-      "On this site",
-      row.onSite ? "Yes" : "No - removed since it accepted",
-    ]);
-  } else {
-    lines.push(["Staff on this site", row.members]);
-  }
-  return lines.filter((line) => line[1]);
-});
-
 function statusDisplay(raw: string, source: TableRow["source"]) {
   if (source === "invite") return "Pending";
   const s = (raw || "").toLowerCase();
@@ -1329,14 +1225,12 @@ function mapProviderRows(raw: Record<string, any>[]): TableRow[] {
     _id: String(row._id ?? ""),
     userId: String(row.user ?? ""),
     serviceProviderOrgId: String(row.serviceProviderOrgId ?? ""),
-    companyName: row.name || "-",
+    companyName: row.name ?? "-",
     email: formatEmailCell(row.email),
-    contactEmail: String(row.email ?? ""),
-    contactPhone: String(row.contact ?? ""),
     type: typeDisplay(row.type ?? "", row.nature),
     members: formatMembersCell(row.members),
     status: statusDisplay(row.status ?? "active", "provider"),
-    source: row.source === "engagement" ? "engagement" : "provider",
+    source: "provider",
   }));
 }
 
@@ -1350,35 +1244,24 @@ function inviteTypeLabel(t: string) {
 }
 
 function mapInviteRows(raw: Record<string, any>[]): TableRow[] {
-  return raw.map((row) => {
-    const company = sentCompany(row);
-    return {
+  return raw.map((row) => ({
     _id: String(row._id ?? ""),
     userId: String(row.user ?? ""),
-    serviceProviderOrgId: String(row.providerOrgId || row.metadata?.serviceProviderOrgId || ""),
-    companyName: company.text,
-    companyKnown: company.known,
+    serviceProviderOrgId: String(row.metadata?.serviceProviderOrgId ?? ""),
+    companyName: row.metadata?.name || "-",
     email: formatEmailCell(row.email),
     type: row.metadata?.app
       ? typeDisplay(row.metadata.app)
       : inviteTypeLabel(row.type ?? ""),
-    members: "",
-    status:
-      row.statusLabel || serviceProviderInviteLabel(row.viewStatus || row.status),
+    members: "-",
+    // Every invitation used to read "Pending" whatever had happened to it. It
+    // now says which of the seven states it is actually in, in words.
+    status: row.statusLabel || serviceProviderInviteLabel(row.status),
     statusRaw: String(row.status ?? ""),
-    viewStatus: String(row.viewStatus || row.status || ""),
-    statusLine: sentStatusLine(row),
-    invitedLine: sentInvitedLine(row),
-    providerOrgId: String(row.providerOrgId ?? ""),
-    contactEmail: String(row.contactEmail ?? ""),
-    contactPhone: String(row.contactPhone ?? ""),
-    answeredAt: row.answeredAt ?? null,
-    onSite: Boolean(row.onSite),
     rejectionReason: row.rejectionReason ?? "",
     siteName: row.metadata?.siteName ?? "",
     source: "invite",
-    };
-  });
+  }));
 }
 
 async function loadList() {
@@ -1408,10 +1291,8 @@ async function loadList() {
       // cancellation is visible here instead of the row simply vanishing.
       const data = await getInvitations({
         org: props.orgId,
-        // this site's invitations, not every site the organisation has
-        siteId: props.siteId,
         status:
-          "awaiting-approval,pending,complete,rejected,declined,cancelled,expired",
+          "awaiting-approval,pending,rejected,declined,cancelled,expired",
         page: page.value,
         search: searchText.value?.trim() || "",
         limit: pageSize,
@@ -1429,9 +1310,6 @@ async function loadList() {
       search: searchText.value?.trim() || "",
       limit: pageSize,
       status: statusParam,
-      // the active tab also lists providers on this site through an
-      // accepted invitation
-      ...(statusParam === "active" ? { include: "engagements" } : {}),
     });
     items.value = mapProviderRows(rowsOf(data));
     pages.value = data.pages ?? 0;
@@ -1688,32 +1566,6 @@ async function submitServiceProviderInvite() {
 
 /* The design's sub-line: `--muted` at 12px, the same figure batch I's
    `AttachmentsViewer` settled on. There is no `--fs-sub` token. */
-.sp-muted {
-  color: var(--muted);
-}
-
-.sp-sub {
-  font-family: var(--font-sans);
-  font-size: 12px;
-  color: var(--muted);
-}
-
-.sp-details {
-  display: grid;
-  grid-template-columns: max-content 1fr;
-  gap: 8px 16px;
-  margin: 0;
-}
-
-.sp-details dt {
-  color: var(--muted);
-}
-
-.sp-details dd {
-  margin: 0;
-  overflow-wrap: anywhere;
-}
-
 .sp-reject-reason,
 .sp-no-permission,
 .sp-members-note {

package/components/VisitorForm.vue

@@ -910,20 +910,8 @@ const hidQrReaderId = computed(() => (
   hidQrConfiguredReaderId.value || String(hidQrReader.value?._id || "")
 ));
 
-/*
- * Visitor QR passes are hidden at the manager's request (2026-09-23).
- *
- * A flag rather than a deletion: issuing, the preview dialog, printing and the
- * regenerate handler below are all intact and untouched, so bringing the
- * feature back is this one line. Every surface that offers a Visitor QR reads
- * `hidQrCodePassAllowed`, which is why the switch belongs here and not in each
- * of them.
- */
-const HID_VISITOR_QR_ENABLED = false;
-
 const hidQrCodePassAllowed = computed(() => {
   return (
-    HID_VISITOR_QR_ENABLED &&
     hidQrCodePassEnabled.value &&
     ["guest", "contractor", "walk-in"].includes(prop.type)
   );