@7365admin1/layer-common 4.97.1-staging.570 → 4.97.1-staging.572

package/components/EntryPassInformation.vue

@@ -206,6 +206,13 @@
             </div>
           </div>
         </v-card>
+        <!-- How long the pass lasts, from the site's setting; the same words
+             as the resident app's invite form. -->
+        <div v-if="hidQrUsage" class="text-caption text-primary font-weight-medium mt-2">
+          {{ hidQrUsage === "singleUse"
+            ? "HID: Single use, expires after the first entry"
+            : "HID: Valid all day, until 11:59 pm" }}
+        </div>
         <v-alert
           v-if="!hidPortalName"
           type="warning"
@@ -341,6 +348,12 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  // The site's HID pass usage, for the hint under the HID QR Code card. Null
+  // shows no hint (not loaded, or a caller that does not pass it).
+  hidQrUsage: {
+    type: String as PropType<"wholeDay" | "singleUse" | null>,
+    default: null,
+  },
   excludedCardIds: {
     type: Array as PropType<string[]>,
     default: () => [],

package/components/VisitorForm.vue

@@ -254,6 +254,7 @@
               :loading="entryPassSettingsPending || siteDataPending" :site-id="prop.site"
               :unit-id="visitor.unit || null" :visitor-type="prop.type" :hid-qr-code-enabled="hidQrCodePassAllowed"
               :hid-qr-printer-configured="hasHidQrPrinterConfig"
+              :hid-qr-usage="hidQrUsage"
               :hid-reader-name="hidQrReader?.name || ''"
               :hid-portal-name="hidQrReader?.portalName || ''"
               @update:available-qr-count="(val) => availableQrCount = val" />
@@ -622,7 +623,7 @@ import useSiteEntryPassSettings from "../composables/useSiteEntryPassSettings";
 import useAccessManagement from "../composables/useAccessManagement";
 import usePeople from "../composables/usePeople";
 import useHidAmico from "../composables/useHidAmico";
-import { minutesUntilEndOfDay } from "../utils/hid-qr-validity";
+import { hidQrUsageFromSettings, minutesUntilEndOfDay } from "../utils/hid-qr-validity";
 
 const prop = defineProps({
   type: {
@@ -659,7 +660,7 @@ type AutofillSource = "nric" | "contact" | "vehicleNumber" | null;
 const currentAutofillSource = ref<AutofillSource>(null);
 
 const { requiredRule, debounce, UTCToLocalTIme, maskNRIC } = useUtils();
-const { getSiteById } = useSiteSettings();
+const { getSiteById, getOvernightParkingAvailabilityV2 } = useSiteSettings();
 const { currentUser } = useLocalAuth();
 const { getBlocksSelection, getLevelsSelection, getUnitSelection } =
   useBuilding();
@@ -979,6 +980,12 @@ const hidQrCodePassAllowed = computed(() => {
   );
 });
 
+// The site's Whole day / Single usage choice for HID visitor passes, shown
+// under the HID QR Code card as the resident app's invite form shows it.
+// Null until read, and when it cannot be read: then no hint, not a guess.
+// Loaded by the watcher below `siteData`.
+const hidQrUsage = ref<"wholeDay" | "singleUse" | null>(null);
+
 const showEntryPassInformation = computed(() => {
   return Boolean(
     entryPassSettings.value?.data?.settings?.nfcPass ||
@@ -1591,6 +1598,23 @@ watch(
   { immediate: true },
 );
 
+// Below `siteData` for the same reason as the reader watcher above:
+// `hidQrCodePassAllowed` reads it. Only fetched where HID QR is offered.
+watch(
+  [hidQrCodePassAllowed, () => prop.site],
+  async ([allowed, site]) => {
+    hidQrUsage.value = null;
+    if (!allowed || !site) return;
+    try {
+      const settings = await getOvernightParkingAvailabilityV2(String(site), "site");
+      hidQrUsage.value = hidQrUsageFromSettings(settings);
+    } catch {
+      hidQrUsage.value = null;
+    }
+  },
+  { immediate: true },
+);
+
 const {
   data: blocksListData,
   refresh: refreshBlockListData,

package/package.json

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

package/utils/hid-qr-validity.ts

@@ -4,6 +4,20 @@
  * (`minutesUntilEndOfDay` in its VisitorForm.tsx). Never less than 1: the API
  * refuses a zero validity.
  */
+/**
+ * How long the site's HID visitor pass lasts: the `usage` on the HID entry of
+ * `visitorQrCodes` (Site Settings > Resident Visitors). Anything but
+ * "singleUse" is the whole visit day - the same reading as core's
+ * `getHidVisitorQrUsage` and the resident app's invite form.
+ */
+export function hidQrUsageFromSettings(settings: unknown): "wholeDay" | "singleUse" {
+  const codes = (settings as { visitorQrCodes?: unknown } | null)?.visitorQrCodes;
+  const hid = Array.isArray(codes)
+    ? codes.find((code) => (code as { type?: unknown } | null)?.type === "hid")
+    : undefined;
+  return (hid as { usage?: unknown } | undefined)?.usage === "singleUse" ? "singleUse" : "wholeDay";
+}
+
 export function minutesUntilEndOfDay(now: Date = new Date()) {
   const midnight = new Date(now);
   midnight.setHours(24, 0, 0, 0);

package/utils/robot-setup.ts

@@ -88,6 +88,7 @@ export function offlineReason(robot: Record<string, any>, state: Record<string,
     const why = state.reason ? ` (${state.reason})` : "";
     if (robot?.brand === "ounitech") return `${name}: the Ounitech cloud did not answer${why}. Ask Ounitech to link this robot's serial to our account.`;
     if (robot?.brand === "padbot") return `${name}: the PadBot cloud did not answer${why}. Check the robot's key and token.`;
+    if (robot?.brand === "oneway") return `${name}: OneWay's RMS did not answer${why}. Check the robot's API key and server address, and ask OneWay to put this robot under our company key.`;
     return `${name}: its cloud did not answer${why}.`;
   }
   return `${name}: its cloud says it is offline - switched off, charging dock unplugged or out of Wi-Fi.`;
@@ -129,7 +130,7 @@ export function robotSetupSteps(input: TSetupInput): TSetupStep[] {
   }
 
   // 2. Robots added.
-  const prereq = "Before adding: Ounitech must link each robot's serial to our Seven365 account; for PadBot, save the robot's points (charger, stops) in the PadBot app first.";
+  const prereq = "Before adding: Ounitech must link each robot's serial to our Seven365 account; for PadBot, save the robot's points (charger, stops) in the PadBot app first; for OneWay, get our company API key from OneWay and have the robot's routes and charging point set in OneWay's RMS.";
   if (!robots) {
     steps.push({ key: "robots", title: "Robots added", status: "check", reason: "Could not read this site's robots.", button: { label: "Open fleet", target: "fleet" } });
   } else {