@7365admin1/layer-common 4.97.1-staging.502 → 4.98.0

package/components/AccessCardDetailsDialog.vue

@@ -68,9 +68,9 @@
           <!-- Visitor / Resident Credentials -->
           <template v-if="details.userCred">
             <v-divider />
-            <!-- <div class="card-details__section">
+            <div class="card-details__section">
               {{ details.userType ?? "Visitor Information" }}
-            </div> -->
+            </div>
 
             <div v-if="details.userCred.email">
               <div class="card-details__label">Email</div>

package/components/AccessCardPreviewDialog.vue

@@ -50,28 +50,18 @@
 
         <!-- Person Selector -->
         <InputLabel title="Person" required class="mb-1" />
-        <!--
-          An autocomplete rather than a select: a unit's Management and provider
-          lists are short, but a site's can run to dozens, and scrolling for a
-          name is slow. `custom-filter` widens the match beyond the title,
-          because the thing an operator remembers is often the email or the role
-          - and a member's name IS frequently their email address.
-        -->
-        <v-autocomplete
+        <v-select
           v-model="assignPerson"
-          v-model:search="personSearch"
           :items="assignPeopleItems"
-          :custom-filter="filterPerson"
           density="compact"
           item-title="name"
           item-value="assigneeId"
           hide-details="auto"
-          placeholder="Search or select person..."
+          placeholder="Select person..."
           persistent-placeholder
           :loading="peopleLoading"
           :disabled="peopleLoading"
           return-object
-          :hide-no-data="false"
           :no-data-text="assignNoDataText"
         >
           <!--
@@ -108,7 +98,7 @@
               </div>
             </div>
           </template>
-        </v-autocomplete>
+        </v-select>
 
         <!--
           A card is assigned by writing the person's USER id onto it, so a row
@@ -465,20 +455,6 @@ const { getEncryptedAcmUrl } = useSiteEntryPassSettings();
 const { getAll: getMembers } = useMember();
 const { getSiteMembers } = useServiceProvider();
 
-/**
- * The member type of whichever app this layer is running in
- * ("property_management_agency", "security_agency", ...), which `/api/members`
- * requires and rejects empty.
- *
- * Read HERE, during setup, not inside the loader that uses it:
- * `useRuntimeConfig` needs the Nuxt instance, and that is only guaranteed
- * synchronously in setup. Called from an async function resumed after an
- * await — which is exactly what the loader is — it throws "nuxt instance
- * unavailable", the loader's catch turns that into an empty list, and the
- * Management group silently shows nothing with no request ever sent.
- */
-const APP = String(useRuntimeConfig().public.APP ?? "");
-
 const historyDialog = ref(false);
 const showAssignForm = ref(false);
 const assignPerson = ref<Record<string, any> | null>(null);
@@ -495,22 +471,10 @@ const assignPerson = ref<Record<string, any> | null>(null);
  */
 type AssignCategory = "residents" | "management" | "providers";
 
-const assignCategories: {
-  value: AssignCategory;
-  label: string;
-  /**
-   * What the server stores as the card's `holderType` (core
-   * `EAccessCardHolderTypes`). Sent with the assignment, because `assignees`
-   * alone is ambiguous: it is a `users` id for a resident and a membership id
-   * for a provider, and only the group says which to resolve against. These
-   * strings are a server contract - the labels above are free to change, these
-   * are not.
-   */
-  holderType: "Visitor/Resident" | "Management" | "Service Provider";
-}[] = [
-  { value: "residents", label: "Resident / Tenant", holderType: "Visitor/Resident" },
-  { value: "management", label: "Management", holderType: "Management" },
-  { value: "providers", label: "Service Provider", holderType: "Service Provider" },
+const assignCategories: { value: AssignCategory; label: string }[] = [
+  { value: "residents", label: "Resident / Tenant" },
+  { value: "management", label: "Management" },
+  { value: "providers", label: "Service Provider" },
 ];
 
 const assignCategory = ref<AssignCategory>("residents");
@@ -536,30 +500,6 @@ type AssignRow = {
 };
 
 const assignPeopleItems = ref<AssignRow[]>([]);
-
-/** What is typed in the person picker. Cleared whenever the group changes. */
-const personSearch = ref("");
-
-/**
- * Match a person on everything the row shows, not just the name.
- *
- * Vuetify filters on the title alone by default, which is too narrow here: a
- * Management member's name is often their email address, and two provider
- * people from one company are told apart only by their role. Both of those sit
- * in the second line, so a name-only match would hide the row an operator is
- * actually searching for.
- *
- * The first argument is the title Vuetify matched against; it is ignored in
- * favour of the row itself, which carries all three fields.
- */
-function filterPerson(_title: string, query: string, item: any): boolean {
-  const q = String(query ?? "").trim().toLowerCase();
-  if (!q) return true;
-  const row = item?.raw ?? {};
-  return [row.name, row.subtitle, row.meta].some((field) =>
-    String(field ?? "").toLowerCase().includes(q),
-  );
-}
 const peopleLoading = ref(false);
 const assignLoading = ref(false);
 const assignError = ref("");
@@ -657,7 +597,7 @@ async function loadManagementRows(): Promise<AssignRow[]> {
     org: props.orgId,
     siteId: props.siteId,
     unit: props.unit._id,
-    type: APP,
+    type: String(useRuntimeConfig().public.APP ?? ""),
     status: "active",
     page: 1,
     limit: 50,
@@ -738,19 +678,9 @@ async function loadAssignPeople() {
           : await loadResidentRows();
     if (seq !== assignLoadSeq) return;
     assignPeopleItems.value = rows;
-  } catch (e: any) {
+  } catch {
     if (seq !== assignLoadSeq) return;
     assignPeopleItems.value = [];
-    /*
-     * Say that the list failed rather than showing an empty one.
-     *
-     * This swallowed everything, so a group whose request 400'd, or never got
-     * sent at all, looked exactly like a group with nobody in it - there was
-     * nothing on screen to tell the two apart, and no way to tell from the UI
-     * that anything had gone wrong.
-     */
-    assignError.value =
-      e?.data?.message ?? e?.message ?? "Could not load the list. Please try again.";
   } finally {
     if (seq === assignLoadSeq) peopleLoading.value = false;
   }
@@ -758,9 +688,6 @@ async function loadAssignPeople() {
 
 function onAssignCategoryChange() {
   assignPerson.value = null;
-  // A term typed for the previous group means nothing in the next one, and
-  // leaving it would show an empty list over a list that has people in it.
-  personSearch.value = "";
   assignError.value = "";
   loadAssignPeople();
 }
@@ -768,7 +695,6 @@ function onAssignCategoryChange() {
 async function openAssignForm() {
   showAssignForm.value = true;
   assignPerson.value = null;
-  personSearch.value = "";
   assignCategory.value = "residents";
   assignError.value = "";
   assignPeopleItems.value = [];
@@ -788,7 +714,6 @@ async function openAssignForm() {
 function cancelAssign() {
   showAssignForm.value = false;
   assignPerson.value = null;
-  personSearch.value = "";
   assignCategory.value = "residents";
   assignPeopleItems.value = [];
   assignError.value = "";
@@ -819,8 +744,6 @@ async function confirmAssign() {
       type: selectedCardType.value,
       acm_url: encryptedAcmUrl.value,
       id: props.selectedCardInUnit?._id,
-      holderType: assignCategories.find((c) => c.value === assignCategory.value)
-        ?.holderType,
     });
     emit("assign-to-person", {
       card: props.selectedCardInUnit,

package/components/HidAccessPermissions.vue

@@ -26,9 +26,9 @@
       <template v-else>
         <div class="hid-access-permissions__intro">
           <p class="text-body-2 text-medium-emphasis mb-0">
-            Everybody enrolled on this reader, by type. Enrolling already grants
-            access — switch somebody off to close the door to them without removing
-            their face, card or PIN.
+            Residents enrolled on this reader. Enrolling already grants access — switch
+            somebody off to close the door to them without removing their face, card
+            or PIN.
           </p>
         </div>
 
@@ -45,36 +45,12 @@
             @refresh="loadEnrolled"
             @update:page="goToPage"
           >
-            <!-- WHICH OF THE READER'S PEOPLE TO SHOW.
-                 The reader holds residents, members and contractors; each tab is
-                 one `type`, filtered and paged by the server. The strip is
-                 `TableMain`'s own slot and the shared `.app-tab` markup, the same
-                 as every other tabbed table here - not a `v-tabs`, whose selected
-                 state is drawn from Vuetify's `on-surface` rather than the
-                 design's accent underline.
-                 The count beside each label is the whole reader's, from the
-                 draft, so it follows an unsaved tick. -->
-            <template #tabs>
-              <button
-                v-for="tab in TABS"
-                :key="tab.value"
-                type="button"
-                class="app-tab"
-                :class="{ 'app-tab--active': activeTab === tab.value }"
-                :aria-pressed="activeTab === tab.value"
-                @click="selectTab(tab.value)"
-              >
-                {{ tab.label }}
-                <span class="hid-access-permissions__tab-count">{{ tabCount(tab) }}</span>
-              </button>
-            </template>
-
             <template #extension>
               <div class="app-filter-row">
                 <AppField
                   v-model="search"
                   search
-                  :placeholder="searchPlaceholder"
+                  placeholder="Search name, unit or registration"
                   @keyup.enter="searchFromFirstPage"
                 />
               </div>
@@ -145,7 +121,6 @@ import {
   readCandidatePage,
   seedAssignments,
   setAssignment,
-  subjectOfIdentity,
   toAssignmentPayload,
   type HidAssignmentState,
 } from "../utils/hid-permission-assignments";
@@ -181,52 +156,11 @@ const emit = defineEmits<{
 
 const { getSitePermissions, getIdentities, updateSitePermissions } = useHidAmico();
 
-/**
- * WHO EACH TAB LISTS, AND WHAT A GRANT MADE FROM IT IS FILED UNDER.
- *
- * `type` is the identity's own, filtered by the SERVER (`listIdentities` does an
- * exact match on it), and it is what the enrolment writes and what
- * `permissionIdentityType` re-confirms on every reconcile. `category` is the
- * permission category a NEW grant from this tab belongs to.
- *
- * The two are a pair rather than one derived from the other, because the tab is
- * the only thing on this screen that knows which of them the operator means: a
- * contractor and a property-management member are both a `member` link, and
- * guessing between them from the record is exactly what went wrong before.
- */
-const TABS = [
-  { value: "resident", label: "Resident", noun: "Resident", type: "resident", category: "resident" },
-  { value: "member", label: "Member", noun: "Member", type: "staff", category: "property_management" },
-  {
-    value: "provider",
-    label: "Service provider",
-    noun: "Person",
-    type: "contractor",
-    category: "service_provider_member",
-  },
-] as const satisfies ReadonlyArray<{
-  value: string;
-  label: string;
-  noun: string;
-  type: string;
-  category: THidPermissionCategory;
-}>;
-
-const activeTab = ref<(typeof TABS)[number]["value"]>("resident");
-const currentTab = computed(
-  () => TABS.find((tab) => tab.value === activeTab.value) ?? TABS[0],
-);
-
-/** Granted counts per category, for the tab strip. One call, all three. */
-const counts = ref<Record<string, number>>({});
-const tabCount = (tab: (typeof TABS)[number]) => counts.value[tab.category] ?? 0;
-
-/* Name over unit in one cell rather than a "Unit" column — see `subtitleOf`.
-   The first column follows the tab; "Door access" is the same action for all. */
-const headers = computed(() => [
-  { title: currentTab.value.noun, value: "name", sortable: false },
+/* Name over unit in one cell rather than a "Unit" column — see `subtitleOf`. */
+const headers = [
+  { title: "Resident", value: "name", sortable: false },
   { title: "Door access", value: "selected", sortable: false, width: 190 },
-]);
+];
 
 const search = ref("");
 const page = ref(1);
@@ -253,13 +187,6 @@ const readerLabel = computed(() => {
   return readerLocation.value ? `${name} · ${readerLocation.value}` : name;
 });
 
-/* "unit" only means something for a resident. */
-const searchPlaceholder = computed(() =>
-  activeTab.value === "resident"
-    ? "Search name, unit or registration"
-    : "Search name or registration",
-);
-
 const assignedTotal = computed(() => draft.value.size);
 const dirty = computed(() => hasChanges(savedState.value, draft.value));
 /* The draft is the truth once the dialog is open, so `selected` is recomputed
@@ -272,7 +199,6 @@ watch(
     if (!isOpen || !readerId.value) return;
     search.value = "";
     page.value = 1;
-    activeTab.value = "resident";
     void loadAll();
   },
   { immediate: true },
@@ -295,13 +221,6 @@ async function loadAssignments() {
     const assignments = response?.data?.assignments ?? [];
     savedState.value = seedAssignments(assignments);
     draft.value = seedAssignments(assignments);
-    /*
-     * Counted from the assignments themselves rather than the server's `counts`
-     * block, so the strip follows the DRAFT and a tick updates the number it
-     * sits beside. `countByCategory` is the same helper the candidate screens
-     * use.
-     */
-    counts.value = countByCategory(draft.value);
   } catch (error) {
     showToast(getErrorMessage(error, "Unable to load this reader's permissions."), "error");
   }
@@ -311,6 +230,27 @@ function toRecord(value: unknown): Record<string, unknown> {
   return value && typeof value === "object" ? (value as Record<string, unknown>) : {};
 }
 
+/**
+ * The subject an identity names, in the order `createIdentity` validates them.
+ *
+ * A visitor returns null and is left out of the list: visitor access comes from
+ * `user_access_rules`, not from a group, so there is nothing here to switch
+ * off. An identity linked to nobody — a device user the reader holds that was
+ * never tied to a person — is dropped for the same reason.
+ */
+function subjectOf(identity: Record<string, unknown>) {
+  if (identity.person) {
+    return { subjectId: String(identity.person), category: "resident" as const };
+  }
+  if (identity.member) {
+    return { subjectId: String(identity.member), category: "property_management" as const };
+  }
+  if (identity.serviceProvider) {
+    return { subjectId: String(identity.serviceProvider), category: "service_provider" as const };
+  }
+  return null;
+}
+
 /**
  * Why a row cannot be switched, in words the reader of the screen can act on.
  *
@@ -354,10 +294,10 @@ async function loadEnrolled() {
       page: page.value,
       limit: 10,
       search: search.value.trim(),
-      // THIS TAB's people, and filtered by the SERVER rather than here. The
-      // pager's count comes back from the same query, so narrowing the list on
-      // this side would print a total that never matched the rows under it.
-      type: currentTab.value.type,
+      // Residents only, and filtered by the SERVER rather than here. The pager's
+      // count comes back from the same query, so narrowing the list on this side
+      // would print a total that never matched the rows under it.
+      type: "resident",
     });
     const result = readCandidatePage(response);
     /*
@@ -369,13 +309,11 @@ async function loadEnrolled() {
      */
     enrolled.value = result.items.map((row) => {
       const identity = toRecord(row);
-      const subject = subjectOfIdentity(identity);
+      const subject = subjectOf(identity);
       const metadata = toRecord(identity.metadata);
       return {
         subjectId: subject?.subjectId ?? "",
-        // The record's own category where it has one; otherwise the tab's,
-        // which is the only thing that knows what the operator means.
-        category: subject?.category ?? currentTab.value.category,
+        category: subject?.category ?? "resident",
         // The row's own key. `subjectId` is empty for the rows below, and two
         // empty keys would collapse into one row in the table.
         rowKey: String(identity._id ?? identity.hidUserId ?? Math.random()),
@@ -404,24 +342,6 @@ async function loadEnrolled() {
   }
 }
 
-/**
- * Switching tabs refetches, because the filter is the SERVER's.
- *
- * The draft is untouched: it is the whole reader's, and the save sends all of it
- * whatever tab is in front of you. Clearing it here - or building the payload
- * from the loaded rows - is what would revoke everybody on the other two tabs.
- *
- * Search is cleared with the tab. It is a server-side search within one type, so
- * carrying it across would land on an empty list and look like the tab was empty.
- */
-function selectTab(value: (typeof TABS)[number]["value"]) {
-  if (activeTab.value === value) return;
-  activeTab.value = value;
-  search.value = "";
-  page.value = 1;
-  void loadEnrolled();
-}
-
 function goToPage(value: number) {
   page.value = Number(value) || 1;
   void loadEnrolled();
@@ -432,34 +352,15 @@ function searchFromFirstPage() {
   void loadEnrolled();
 }
 
-/**
- * Grant or revoke one person.
- *
- * The category comes from the row where the server gave it one, and otherwise
- * from the TAB - never from re-reading the identity's links on this side. A
- * contractor and a property-management member are both a `member` link, and the
- * stale local copy of that reading is what used to file contractors as staff: the
- * reconcile then derived `staff` from that category and rewrote the person's
- * type, moving them into the Member tab.
- *
- * An ALREADY GRANTED person keeps the category their assignment holds, so merely
- * visiting a tab and toggling somebody off and on cannot re-file them.
- */
 function toggle(item: THidPermissionCandidate, selected: boolean) {
-  const subjectId = String(item.subjectId ?? "");
-  if (!subjectId) return;
-  const category = savedState.value.get(subjectId)?.category
-    ?? item.category
-    ?? currentTab.value.category;
+  if (!String(item.subjectId ?? "")) return;
   draft.value = setAssignment(
     draft.value,
     savedState.value,
-    subjectId,
-    category,
+    String(item.subjectId ?? ""),
+    item.category,
     selected,
   );
-  // The strip sits beside the rows, so it follows the tick rather than the save.
-  counts.value = countByCategory(draft.value);
 }
 
 async function save() {
@@ -500,15 +401,6 @@ function getErrorMessage(error: unknown, fallback: string) {
 </script>
 
 <style scoped lang="scss">
-/* The granted count beside a tab label. Quieter than the label and set in
-   tabular figures so the three tabs do not shift width as numbers change. */
-.hid-access-permissions__tab-count {
-  margin-left: 6px;
-  color: var(--muted);
-  font-weight: 600;
-  font-variant-numeric: tabular-nums;
-}
-
 .hid-access-permissions {
   &__title { padding-block: 16px; }