@7365admin1/layer-common 4.0.3-staging.231 → 4.0.3-staging.233

package/components/SubscriptionPlanTable.vue

@@ -181,15 +181,20 @@
       </v-data-table>
     </AppCard>
 
-    <!-- Create / Edit Dialog -->
+    <!--
+      Create / Edit Dialog. The form component renders its OWN `.screen-modal`
+      card, so it has to be the dialog's DIRECT child: Vuetify only makes
+      `.v-overlay__content > .v-card` a capped flex column. Wrapping it in a
+      second `v-card` handed that treatment to the wrapper and left the real
+      card a plain `overflow: hidden` block - it grew past the viewport and
+      clipped its own Cancel/Save footer, with no scrollbar to reach it.
+    -->
     <v-dialog v-model="showModal" max-width="600px" persistent>
-      <v-card class="pa-4">
-        <CreateSubscriptionPlan
-          :initial-plan="editingPlan"
-          @cancel="closeModal"
-          @submit="handleSubmit"
-        />
-      </v-card>
+      <CreateSubscriptionPlan
+        :initial-plan="editingPlan"
+        @cancel="closeModal"
+        @submit="handleSubmit"
+      />
     </v-dialog>
 
     <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />

package/components/VisitorForm.vue

@@ -922,7 +922,7 @@ const hidQrValidityMinutes = computed(() => {
   return Number.isFinite(value) && value > 0 ? value : 60;
 });
 
-const hidQrReaderId = computed(() => String(hidQrCodePassConfig.value?.readerId || ""));
+const hidQrConfiguredReaderId = computed(() => String(hidQrCodePassConfig.value?.readerId || ""));
 type HidQrReaderSummary = {
   _id: string;
   name?: string;
@@ -930,6 +930,9 @@ type HidQrReaderSummary = {
   portalName?: string;
 };
 const hidQrReader = ref<HidQrReaderSummary | null>(null);
+const hidQrReaderId = computed(() => (
+  hidQrConfiguredReaderId.value || String(hidQrReader.value?._id || "")
+));
 
 const hidQrCodePassAllowed = computed(() => {
   return (
@@ -1541,26 +1544,38 @@ const {
   getSiteById(prop.site)
 );
 
-// Has to sit BELOW `siteData`, not beside `hidQrReaderId` up at the HID block.
-// `hidQrReaderId` reads `hidQrCodePassConfig`, which reads `siteData`, and Vue
+// Has to sit BELOW `siteData`, not beside `hidQrConfiguredReaderId` up at the HID block.
+// `hidQrConfiguredReaderId` reads `hidQrCodePassConfig`, which reads `siteData`, and Vue
 // runs a watcher's source getter the moment `watch()` is called - so declared
 // any earlier this throws `Cannot access 'siteData' before initialization` and
 // the whole form fails to mount.
 watch(
-  [hidQrReaderId, () => prop.site],
-  async ([readerId, site]) => {
+  [hidQrConfiguredReaderId, () => prop.site],
+  async ([configuredReaderId, site]) => {
     hidQrReader.value = null;
-    if (!readerId || !site) return;
+    if (!site) return;
     try {
       const response = await getReaders({ site, page: 1, limit: 100 });
       const readers: unknown = response?.items ?? response?.data?.items ?? response?.data?.readers ?? [];
-      hidQrReader.value = Array.isArray(readers)
-        ? readers.find((reader: unknown): reader is HidQrReaderSummary => (
+      const availableReaders = Array.isArray(readers)
+        ? readers.filter((reader: unknown): reader is HidQrReaderSummary => (
             typeof reader === "object"
             && reader !== null
-            && String((reader as Record<string, unknown>)._id || "") === readerId
-          )) || null
+            && Boolean(String((reader as Record<string, unknown>)._id || ""))
+          ))
+        : [];
+      const configuredReader = configuredReaderId
+        ? availableReaders.find((reader) => reader._id === configuredReaderId) || null
         : null;
+      const portalReadyReaders = availableReaders.filter((reader) => (
+        Boolean(reader.portalId && reader.portalName)
+      ));
+      hidQrReader.value = configuredReader
+        // Preserve an explicit choice. Only infer a reader for existing sites
+        // when exactly one reader with a portal is available.
+        || (!configuredReaderId && portalReadyReaders.length === 1
+          ? portalReadyReaders[0]
+          : null);
     } catch {
       hidQrReader.value = null;
     }

package/composables/useHidAmico.ts

@@ -270,6 +270,7 @@ export default function useHidAmico() {
     search?: string;
     status?: "mapped" | "unmapped" | "";
     includeVisitors?: boolean;
+    userType?: "all" | "user" | "visitor";
   } = {}) {
     return useNuxtApp().$api<HidCollectionResponse>(`${basePath}/readers/${readerId}/users`, {
       method: "GET",

package/composables/useHidNavigation.ts

@@ -29,13 +29,6 @@ export default function useHidNavigation() {
             params: { org, site },
           },
         },
-        {
-          title: "HID User Mapping",
-          route: {
-            name: "org-site-access-mgmt-hid-user-mapping",
-            params: { org, site },
-          },
-        },
         {
           title: "HID Cards",
           route: {

package/package.json

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