@7365admin1/layer-common 4.90.2-staging.491 → 4.90.3

package/components/AccessCardPreviewDialog.vue

@@ -18,108 +18,50 @@
 
       <v-card-text class="pa-4">
         <div class="text-caption text-fontgray mb-4">
-          <!-- The card number is the one fact this dialog is about, so it is
-               not greyed out with the "Card:" label around it. `text-high-emphasis`
-               rather than a literal black: every app has a light/dark toggle
-               (plugins/vuetify.ts), and #000 here would be black text on a dark
-               panel. It resolves to black in the light theme. -->
-          Card:
-          <strong class="text-body-2 font-weight-bold text-high-emphasis">{{
-            selectedCardInUnit?.cardNo
-          }}</strong>
+          Card: <strong class="text-body-2">{{ selectedCardInUnit?.cardNo }}</strong>
         </div>
 
-        <!--
-          WHO the card is being given to. The dialog only ever offered the
-          unit's residents and tenants; Management and Service Providers are
-          the other two groups of people who hold cards on a site. A select
-          rather than a button toggle: three labels this long overflow a 420px
-          dialog, and this stays legible at phone width.
-        -->
-        <InputLabel title="Assign to" required class="mb-1" />
-        <v-select
-          v-model="assignCategory"
-          :items="assignCategories"
+        <!-- Person Type Filter -->
+        <!-- <div class="text-caption font-weight-bold mb-1 text-uppercase text-grey-darken-1">Person Type</div>
+        <v-btn-toggle
+          v-model="assignPersonType"
+          color="primary"
           density="compact"
-          item-title="label"
-          item-value="value"
-          hide-details
+          variant="outlined"
+          rounded="pill"
           class="mb-4"
-          @update:model-value="onAssignCategoryChange"
-        />
+        >
+          <v-btn value="" size="small" class="text-none px-3">All</v-btn>
+          <v-btn value="owner" size="small" class="text-none px-3">Unit Owner</v-btn>
+          <v-btn value="resident" size="small" class="text-none px-3">Resident</v-btn>
+          <v-btn value="tenant" size="small" class="text-none px-3">Tenant</v-btn>
+        </v-btn-toggle> -->
 
         <!-- 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"
+          :items="filteredPeopleItems"
           density="compact"
           item-title="name"
-          item-value="assigneeId"
+          item-value="_id"
           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"
+          no-data-text="No residents or tenants found for this unit"
         >
-          <!--
-            Three lines: who they are, their email, and what they are here -
-            the member's role, or the provider's line of business. `title` is
-            bound rather than left to `itemProps` so the subtitle slot can add
-            the third line under it.
-          -->
           <template #item="{ props: itemProps, item }">
-            <v-list-item v-bind="itemProps" :title="item.raw.name">
-              <template v-if="item.raw.subtitle || item.raw.meta" #subtitle>
-                <div v-if="item.raw.subtitle" class="text-truncate">
-                  {{ item.raw.subtitle }}
-                </div>
-                <div v-if="item.raw.meta" class="text-caption text-medium-emphasis">
-                  {{ item.raw.meta }}
-                </div>
-              </template>
-            </v-list-item>
+            <v-list-item v-bind="itemProps" :subtitle="personTypeLabel(item.raw)" />
           </template>
-          <!--
-            The same two lines once a person is chosen. A member's name is
-            often their email, so a selection showing the name alone would drop
-            the one thing that tells two of them apart - their role.
-          -->
           <template #selection="{ item }">
-            <div class="assign-selection">
-              <div class="text-truncate">{{ item.raw.name }}</div>
-              <div
-                v-if="item.raw.subtitle || item.raw.meta"
-                class="text-caption text-medium-emphasis text-truncate"
-              >
-                {{ [item.raw.subtitle, item.raw.meta].filter(Boolean).join(" · ") }}
-              </div>
-            </div>
+            <span>{{ item.raw.name }}</span>
+            <v-chip size="x-small" class="ml-2" variant="tonal">
+              {{ personTypeLabel(item.raw) }}
+            </v-chip>
           </template>
-        </v-autocomplete>
-
-        <!--
-          A card is assigned by writing the person's USER id onto it, so a row
-          the list cannot give one for must not be sent - the server stores
-          whatever id it is handed without checking, which would silently bind
-          the card to nobody. Data-driven rather than per-group, so this
-          disappears by itself once the endpoint carries the id.
-        -->
-        <p v-if="assignPerson && !assignPerson.assigneeId" class="text-warning text-caption mt-2">
-          {{ assignUnassignableText }}
-        </p>
+        </v-select>
         <p v-if="assignError" class="text-error text-caption mt-2">{{ assignError }}</p>
       </v-card-text>
 
@@ -134,7 +76,7 @@
         <v-btn
           variant="flat"
           class="text-none screen-btn-primary"
-          :disabled="!assignPerson?.assigneeId || assignLoading"
+          :disabled="!assignPerson || assignLoading"
           :loading="assignLoading"
           @click="confirmAssign"
         >
@@ -462,104 +404,12 @@ const emit = defineEmits<{
 
 const { getResidents, assignUser } = useAccessManagement();
 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 assignPersonType = ref<string>("");
 const assignPerson = ref<Record<string, any> | null>(null);
-
-/**
- * WHO A CARD CAN BE GIVEN TO.
- *
- * The dialog only ever listed the unit's residents and tenants. Management
- * (the site's own members) and Service Providers hold cards on a site too, so
- * the operator picks the group first and then the person.
- *
- * `value` is only ever read here; nothing is sent to the server, which takes a
- * flat list of user ids and does not know about these groups.
- */
-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 assignCategory = ref<AssignCategory>("residents");
-
-/**
- * One row shape for all three groups, so the picker does not care which it is
- * showing.
- *
- * `assigneeId` is the person's USER id - the id `assignUser` sends and the
- * server writes onto the card. Residents already come from the users
- * collection, and a member row carries its `user`. A row that cannot supply
- * one keeps `assigneeId: ""`, which is what disables Assign for it rather than
- * sending an id that binds the card to nobody.
- */
-type AssignRow = {
-  assigneeId: string;
-  name: string;
-  /** Second line - the email, or what kind of resident this is. */
-  subtitle: string;
-  /** Third line, under the subtitle - the member's role or the provider's service. */
-  meta?: string;
-  raw: Record<string, any>;
-};
-
-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 peopleItems = ref<Record<string, any>[]>([]);
 const peopleLoading = ref(false);
 const assignLoading = ref(false);
 const assignError = ref("");
@@ -602,6 +452,12 @@ const isSelectedCardDeletable = computed(() => {
   ].some((c) => c._id === id);
 });
 
+const filteredPeopleItems = computed(() => {
+  if (!assignPersonType.value) return peopleItems.value;
+  if (assignPersonType.value === "owner") return peopleItems.value.filter((p) => p.isOwner);
+  return peopleItems.value.filter((p) => p.type === assignPersonType.value && !p.isOwner);
+});
+
 const personTypeLabel = (person: Record<string, any>) => {
   if (person.isOwner) return "Unit Owner";
   if (person.type === "resident") return "Resident";
@@ -609,188 +465,34 @@ const personTypeLabel = (person: Record<string, any>) => {
   return person.type ?? "";
 };
 
-const assignNoDataText = computed(() => {
-  if (peopleLoading.value) return "Loading...";
-  if (assignCategory.value === "management") return "No management members assigned to this unit";
-  if (assignCategory.value === "providers") return "No service provider members assigned to this unit";
-  return "No residents or tenants found for this unit";
-});
-
-const assignUnassignableText = computed(
-  () => "This person has no account on record, so a card cannot be assigned to them.",
-);
-
-/** Residents and tenants of THIS UNIT - the list the dialog has always shown. */
-async function loadResidentRows(): Promise<AssignRow[]> {
-  if (!props.unit?._id || !props.orgId || !props.siteId) return [];
-  const res = await getResidents({
-    orgId: props.orgId,
-    siteId: props.siteId,
-    unitId: props.unit._id,
-  });
-  const rows = res?.data ?? [];
-  return rows.map((person: Record<string, any>) => ({
-    // Already the users collection's own `_id` - see core's residents repo.
-    assigneeId: String(person._id ?? ""),
-    name: person.name ?? "",
-    subtitle: person.email ?? "",
-    meta: personTypeLabel(person),
-    raw: person,
-  }));
-}
-
-/**
- * Management - the site's own members ATTACHED TO THIS UNIT.
- *
- * `unit` comes from core #2515 (Unit Management tab), which gave members a
- * `unit`/`unitName` and taught `GET /api/members` to filter on it. Narrowing
- * to the unit matches what the card is: it belongs to a unit, so the people
- * offered are the ones that unit has.
- *
- * `type` is the member type of whichever app this layer is running in
- * (`property_management_agency`, `security_agency`, ...) - the endpoint
- * requires it and rejects an empty string, and `limit` is capped at 50 there.
- */
-async function loadManagementRows(): Promise<AssignRow[]> {
-  if (!props.orgId || !props.siteId || !props.unit?._id) return [];
-  const res: any = await getMembers({
-    org: props.orgId,
-    siteId: props.siteId,
-    unit: props.unit._id,
-    type: APP,
-    status: "active",
-    page: 1,
-    limit: 50,
-  });
-  const rows: Record<string, any>[] = res?.items ?? res?.data ?? [];
-  return rows.map((member) => ({
-    // `user` is the account; `_id` is the membership record and is NOT it.
-    assigneeId: String(member.user ?? ""),
-    name: member.name ?? member.email ?? "",
-    // One line under the name: "Access Mgmt Only · towefa4573@aghism.com".
-    // The role first, because that is what distinguishes two members of the
-    // same unit from each other. Either half is dropped if the row lacks it,
-    // so the separator never dangles.
-    subtitle: [member.roleName, member.email].filter(Boolean).join(" · "),
-    raw: member,
-  }));
-}
-
-/**
- * Service Providers - the provider PEOPLE attached to this unit.
- *
- * `GET /api/service-providers/site-members?siteId&unit=<id>`. A card is held by
- * a person, so this lists provider staff rather than the companies
- * `GET /api/service-providers` returns, and the `unit` filter keeps it to the
- * people that unit actually has - the same scoping Management uses.
- *
- * The response also carries a `companies` summary; only `items` is people.
- */
-async function loadProviderRows(): Promise<AssignRow[]> {
-  if (!props.siteId || !props.unit?._id) return [];
-  const res = await getSiteMembers(props.siteId, props.unit._id);
-  const rows = res?.items ?? [];
-  return rows.map((member: Record<string, any>) => ({
-    /*
-     * `user` when the endpoint returns it, otherwise the MEMBERSHIP `_id`.
-     *
-     * `site-members` does not carry `user` today (the repository projects it,
-     * the service layer drops it), and the product decision is to assign on
-     * `_id` rather than wait. Worth knowing what that means: the card's
-     * `userId` then holds a `service-provider-members` id, so the card list's
-     * `userId -> users` lookup finds nothing and the holder column reads blank
-     * for these cards. The door access itself is unaffected - the ACM command
-     * is built from the CARD's id, not the assignee's.
-     *
-     * `user` is preferred so that the day it starts arriving, these cards
-     * begin resolving to real people with no change here.
-     */
-    assigneeId: String(member.user ?? member._id ?? ""),
-    name: member.name || member.email || "",
-    subtitle: member.email ?? "",
-    /*
-     * The service the company provides, plus this person's role - two people
-     * from the same company differ only by role ("VMS Access" vs "Security
-     * Access"). `typeLabel` is computed by the endpoint; the local converter is
-     * the fallback for a row that predates it.
-     */
-    meta:
-      [member.typeLabel || serviceTypeLabel(member.type), member.role]
-        .filter(Boolean)
-        .join(" · "),
-    raw: member,
-  }));
-}
-
-/** Load the chosen group, dropping a response that a later switch superseded. */
-let assignLoadSeq = 0;
-async function loadAssignPeople() {
-  const seq = ++assignLoadSeq;
-  const category = assignCategory.value;
-  peopleLoading.value = true;
-  assignPeopleItems.value = [];
-  try {
-    const rows =
-      category === "management"
-        ? await loadManagementRows()
-        : category === "providers"
-          ? await loadProviderRows()
-          : await loadResidentRows();
-    if (seq !== assignLoadSeq) return;
-    assignPeopleItems.value = rows;
-  } catch (e: any) {
-    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;
-  }
-}
-
-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();
-}
-
 async function openAssignForm() {
   showAssignForm.value = true;
   assignPerson.value = null;
-  personSearch.value = "";
-  assignCategory.value = "residents";
+  assignPersonType.value = "";
   assignError.value = "";
-  assignPeopleItems.value = [];
+  peopleItems.value = [];
   encryptedAcmUrl.value = "";
 
   if (!props.unit?._id || !props.orgId || !props.siteId) return;
-
-  // The ACM URL is needed whichever group the card goes to, so it is fetched
-  // once here rather than with each list.
-  getEncryptedAcmUrl(props.siteId)
-    .then((url) => { encryptedAcmUrl.value = url ?? ""; })
-    .catch(() => { encryptedAcmUrl.value = ""; });
-
-  await loadAssignPeople();
+  peopleLoading.value = true;
+  try {
+    const [residentsRes, acmUrl] = await Promise.all([
+      getResidents({ orgId: props.orgId, siteId: props.siteId, unitId: props.unit._id }),
+      getEncryptedAcmUrl(props.siteId),
+    ]);
+    peopleItems.value = residentsRes?.data ?? [];
+    encryptedAcmUrl.value = acmUrl ?? "";
+  } catch {
+    peopleItems.value = [];
+  } finally {
+    peopleLoading.value = false;
+  }
 }
 
 function cancelAssign() {
   showAssignForm.value = false;
   assignPerson.value = null;
-  personSearch.value = "";
-  assignCategory.value = "residents";
-  assignPeopleItems.value = [];
+  assignPersonType.value = "";
   assignError.value = "";
 }
 
@@ -805,28 +507,20 @@ const selectedCardType = computed(() => {
 });
 
 async function confirmAssign() {
-  // `assigneeId` rather than `_id`: the rows now come from three different
-  // lists and only this field is the user account the card is written to. The
-  // Assign button is already disabled without one; this is the guard behind it.
-  const assigneeId = assignPerson.value?.assigneeId;
-  if (!assigneeId || !props.unit?._id) return;
+  if (!assignPerson.value || !props.unit?._id) return;
   assignLoading.value = true;
   assignError.value = "";
   try {
     await assignUser({
-      assignees: [assigneeId],
+      assignees: [assignPerson.value._id],
       unit: props.unit._id,
       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,
-      // The original record, not the picker's row, so listeners see the same
-      // shape they always have.
-      person: assignPerson.value?.raw ?? assignPerson.value,
+      person: assignPerson.value,
     });
     showToast("Card assigned successfully.", "success");
     cancelAssign();
@@ -850,15 +544,3 @@ function toggleCard(card: Record<string, any>) {
   );
 }
 </script>
-
-<style scoped>
-/* The chosen person, two lines inside the field. `min-width: 0` is what lets
-   `text-truncate` work at all here - the selection sits in a flex row, and a
-   flex child will not shrink below its content without it, so a long email
-   would push the field wide instead of ellipsing. */
-.assign-selection {
-  min-width: 0;
-  line-height: 1.25;
-  padding-block: 2px;
-}
-</style>