@7365admin1/layer-common 4.2.9 → 4.2.10-staging.280

package/components/VisitorManagement.vue

@@ -742,11 +742,35 @@
                 class="visitor-preview__row"
               >
                 <div class="visitor-preview__label">{{ label }}</div>
-                <div
-                  v-tooltip:top="selectedVisitorObject[key]"
-                  class="visitor-preview__value"
-                >
-                  {{ maskNRIC(selectedVisitorObject[key]) }}
+                <div>
+                  <!-- Was a hover tooltip on the value: the full NRIC only
+                       reachable by hovering, which says nothing is there to
+                       reach and cannot be reached at all on a touch screen.
+                       The eye alone, at the 14px the Incident Report screens
+                       draw it, is a 14px target - the floor is 24px. So the
+                       NUMBER is the control and the eye is its affordance:
+                       the whole masked value is pressable, which makes the
+                       target the width of the digits rather than of a glyph,
+                       and being a real `button` it also takes a tab stop,
+                       which a `v-icon` with a click handler never did. -->
+                  <button
+                    type="button"
+                    class="visitor-preview__reveal"
+                    :aria-label="showVisitorNric ? 'Hide NRIC' : 'Show NRIC'"
+                    :aria-pressed="showVisitorNric"
+                    @click="showVisitorNric = !showVisitorNric"
+                  >
+                    <span class="visitor-preview__value">
+                      {{
+                        showVisitorNric
+                          ? selectedVisitorObject[key]
+                          : maskNRIC(selectedVisitorObject[key])
+                      }}
+                    </span>
+                    <v-icon size="16" class="visitor-preview__eye">
+                      {{ showVisitorNric ? "mdi-eye-off-outline" : "mdi-eye-outline" }}
+                    </v-icon>
+                  </button>
                 </div>
               </div>
 
@@ -796,6 +820,84 @@
                 </div>
               </div>
 
+              <!--
+                THE CONTRACTOR'S PARTY.
+
+                The list row has always said `( +2 members)` beside the name
+                and then had nowhere to send you for the names themselves. The
+                block spans both columns rather than sitting in the 116px
+                value track: a member is a record, not a value, and several of
+                them in a 250px column is unreadable.
+
+                Read off `selectedVisitorDataObject` (the raw row) and not
+                `selectedVisitorObject`, which filters itself down to
+                `typeFieldMap` plus five fixed keys - `members` is on neither
+                list, and widening that computed would change what four other
+                dialogs on this screen see.
+              -->
+              <div
+                v-else-if="key === 'members' && selectedVisitorMembers.length"
+                class="visitor-preview__row visitor-preview__row--block"
+              >
+                <div class="visitor-preview__label">
+                  {{ label }} ({{ selectedVisitorMembers.length }})
+                </div>
+                <div class="visitor-preview__members">
+                  <div
+                    v-for="(member, index) in selectedVisitorMembers"
+                    :key="member?.nric || member?.name || index"
+                    class="visitor-preview__member"
+                  >
+                    <div class="visitor-preview__value">
+                      {{ member?.name || "N/A" }}
+                    </div>
+                    <template v-for="field in memberDetailFields" :key="field.key">
+                      <div
+                        v-if="member?.[field.key]"
+                        class="visitor-preview__member-line"
+                      >
+                        <span class="visitor-preview__member-key">
+                          {{ field.label }}
+                        </span>
+                        <!-- A member's NRIC is the same class of data as the
+                             visitor's, so it gets the same control. Each
+                             member reveals separately - one toggle for the
+                             whole card would show three people's NRICs to
+                             read one. -->
+                        <button
+                          v-if="field.key === 'nric'"
+                          type="button"
+                          class="visitor-preview__reveal"
+                          :aria-label="
+                            isMemberNricShown(index)
+                              ? `Hide NRIC for ${member?.name || 'this member'}`
+                              : `Show NRIC for ${member?.name || 'this member'}`
+                          "
+                          :aria-pressed="isMemberNricShown(index)"
+                          @click="toggleMemberNric(index)"
+                        >
+                          <span>
+                            {{
+                              isMemberNricShown(index)
+                                ? member.nric
+                                : maskNRIC(member.nric)
+                            }}
+                          </span>
+                          <v-icon size="16" class="visitor-preview__eye">
+                            {{
+                              isMemberNricShown(index)
+                                ? "mdi-eye-off-outline"
+                                : "mdi-eye-outline"
+                            }}
+                          </v-icon>
+                        </button>
+                        <span v-else>{{ member[field.key] }}</span>
+                      </div>
+                    </template>
+                  </div>
+                </div>
+              </div>
+
               <div
                 v-else-if="selectedVisitorObject[key]"
                 class="visitor-preview__row"
@@ -1898,6 +2000,71 @@ const isSelectedVisitorPendingApproval = computed(
   () => selectedVisitorStatus.value === "pending"
 );
 
+/**
+ * The members a contractor brought with them. Not gated on the Guests tab: the
+ * list row's own `( +N members)` count is not either, and a contractor with a
+ * party has one wherever the screen shows it.
+ *
+ * Blank entries are dropped rather than drawn as an empty card - the payload
+ * carries `""` for every detail nobody filled in, so a member with no name and
+ * no details would otherwise render as a bare inset box.
+ */
+const selectedVisitorMembers = computed<Record<string, any>[]>(() => {
+  const members = selectedVisitorDataObject.value?.members;
+  if (!Array.isArray(members)) return [];
+
+  return members.filter(
+    (member: Record<string, any>) =>
+      member?.name || member?.nric || member?.contact || member?.plateNumber
+  );
+});
+
+/**
+ * WHICH NRICs ARE UNCOVERED RIGHT NOW.
+ *
+ * Per member and not per card, so revealing one person's number does not
+ * uncover the rest of the party's. Both are cleared when the dialog closes -
+ * a preview must not open on the next visitor with the last one's NRIC
+ * already showing, and it is the same `selectedVisitorId` that would carry it
+ * across if the same row were reopened.
+ */
+const showVisitorNric = ref(false);
+const shownMemberNrics = ref<number[]>([]);
+
+function isMemberNricShown(index: number) {
+  return shownMemberNrics.value.includes(index);
+}
+
+function toggleMemberNric(index: number) {
+  shownMemberNrics.value = isMemberNricShown(index)
+    ? shownMemberNrics.value.filter((x) => x !== index)
+    : [...shownMemberNrics.value, index];
+}
+
+watch(
+  () => dialog.viewVisitor,
+  (open) => {
+    if (open) return;
+    showVisitorNric.value = false;
+    shownMemberNrics.value = [];
+  }
+);
+
+/**
+ * What a member row prints under the name, in order. `plateNumber` is in here
+ * because the API returns it on `members[]` even though neither
+ * `TMemberInfo` (this package) nor `TContractorMembers` (API-core's visitor
+ * model, name and nric only) declares it - the two types have drifted from the
+ * document and from each other. Reading the key defensively costs nothing and
+ * shows the vehicle a member actually arrived in; the types are somebody's to
+ * reconcile separately.
+ */
+const memberDetailFields = [
+  { key: "nric", label: "NRIC" },
+  { key: "contact", label: "Contact" },
+  { key: "plateNumber", label: "Vehicle" },
+] as const;
+
 const formatType = (item: any) =>
   (item.deliveryType ? item.deliveryType + "-" : "") + item.type;
 
@@ -1911,6 +2078,7 @@ const formattedFields = {
   level: "Level",
   unit: "Unit",
   purpose: "Purpose",
+  members: "Members",
   checkIn: "Check In",
   snapshotEntryImage: "Entry Image",
   checkOut: "Check Out",
@@ -2889,6 +3057,100 @@ watchEffect(async () => {
   word-break: break-word;
 }
 
+/* A row whose value is a set of records rather than a value - it drops the
+   two-column grid and runs the full width of the card body. */
+.visitor-preview__row--block {
+  display: block;
+}
+
+.visitor-preview__members {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin-top: 8px;
+}
+
+/*
+ * An added member reads as an inset on the card it sits in - `--hover` on
+ * `--border` at the inner radius. Those are `Card/MemberInfoSummary`'s three
+ * decisions, unchanged, so a member looks the same in the preview as it does
+ * in the form that created it. Only the TYPE differs: that card still prints
+ * `<strong>Label:</strong> value`, which is the pattern this dialog just moved
+ * off, so the lines below are set on the scale rather than inherited.
+ */
+.visitor-preview__member {
+  padding: 9px 12px;
+  border: 1px solid var(--border);
+  border-radius: var(--r-inner);
+  background: var(--hover);
+}
+
+.visitor-preview__member-line {
+  display: flex;
+  gap: 8px;
+  margin-top: 3px;
+  font-size: var(--fs-breadcrumb);
+  color: var(--text2);
+  word-break: break-word;
+}
+
+.visitor-preview__member-key {
+  flex: 0 0 52px;
+  color: var(--muted);
+}
+
+/*
+ * THE NRIC REVEAL.
+ *
+ * The pressable thing is the masked number, not the glyph beside it: an eye on
+ * its own is a 14-16px target where 24px is the floor, and on a 12.5px member
+ * line an `AppButton variant="icon"` - the layer's 32px icon square - would
+ * make the NRIC line half again the height of the Contact line under it.
+ * Pressing the digits gives a target the width of the value at no cost to the
+ * rhythm, and reads the right way round: the number is what changes.
+ *
+ * It inherits its type rather than setting any, so the visitor's NRIC stays on
+ * `--fs-cell` and a member's on the `--fs-breadcrumb` of the line it sits in.
+ * The negative margin pays back the padding, so a revealed value starts on the
+ * same left edge as every other value in the card.
+ */
+.visitor-preview__reveal {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  margin: -3px -7px;
+  padding: 3px 7px;
+  border: none;
+  border-radius: var(--r-inner-sm);
+  background: transparent;
+  font: inherit;
+  color: inherit;
+  text-align: left;
+  cursor: pointer;
+  transition: background var(--motion) ease;
+}
+
+.visitor-preview__reveal:hover {
+  background: var(--hover);
+}
+
+.visitor-preview__reveal:focus-visible {
+  outline: 2px solid var(--accent);
+  outline-offset: 1px;
+}
+
+/* The design's interactive ink - not Vuetify's fixed blue, which is one colour
+   on both themes. `affectedEntities` gives its NRIC eye the same value. */
+.visitor-preview__eye {
+  color: var(--accent-text);
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .visitor-preview__reveal {
+    transition: none;
+  }
+}
+
 /* The width the type filter carried as `max-width="200"` on the v-select. */
 .visitor-type-filter {
   max-width: 200px;

package/package.json

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