@7365admin1/layer-common 4.82.1-staging.476 → 4.84.0

package/types/document.d.ts

@@ -3,18 +3,4 @@ declare type TDocument = {
   name: string;
   attachment: string;
   type: string;
-  /**
-   * Set at upload or renewal, absent when the document never expires.
-   *
-   * An ISO instant on the way out of the API and a `YYYY-MM-DD` string on the
-   * way back in, which is what `InputDatePicker` binds to - hence the loose
-   * type rather than `string`.
-   */
-  expiryDate?: string | Date | null;
-  remarks?: string;
-  size?: number;
-  parentId?: string | null;
-  createdAt?: string | Date;
-  updatedAt?: string | Date;
-  status?: string;
 };

package/types/facility.d.ts

@@ -73,10 +73,6 @@ declare type TFacility = {
   hourInterval?: number;
   isBookingFeeEnabled: boolean;
   isGuestEnabled: boolean;
-  /** Residents may complete this facility's checklist themselves. */
-  isResidentChecklistEnabled?: boolean;
-  /** Security may complete it. Mutually exclusive with the above. */
-  isSecurityChecklistEnabled?: boolean;
   bookingAmount: number | null;
   peakBookingFeeAmount?: number | null;
   bookingFeeGuestAmount?: number | null;

package/types/member.d.ts

@@ -10,10 +10,6 @@ declare type TMember = {
   customerOrgId?: string;
   customerSiteId?: string;
   status?: string;
-  email?: string;
-  /** The building unit this member manages (a unit's Management tab). */
-  unit?: string | null;
-  unitName?: string;
   createdAt?: string;
   updatedAt?: string;
   deletedAt?: string;

package/types/people.d.ts

@@ -22,38 +22,11 @@ declare type TPeople = {
   email?: string;
   files?: { name: string, id: string }[];
   isOwner?: boolean;
-  /**
-   * Owner / occupant / person-in-charge, as the BUSINESS people form asks it.
-   * Absent on everyone else - `isOwner` is still the flag that decides unit
-   * ownership, and the server derives it from this when it is sent. See
-   * `OccupancyRoles` in core's `person.model.ts`.
-   */
-  occupancyRole?: TOccupancyRole;
-  // Link to this person's `users` row. Empty for the person types that carry
-  // no login, and empty for a resident whose account was never written.
-  user?: string;
-};
-
-declare type TOccupancyRole = "owner" | "occupant" | "person-in-charge";
-
-/** One standing and everything the product says about it. See `utils/occupancy-role.ts`. */
-declare type TOccupancyRoleOption = {
-  value: TOccupancyRole;
-  /** The label a stored role is printed with. */
-  title: string;
-  /** The row menu's wording. */
-  action: string;
-  /** The confirmation's heading and its sentence. */
-  prompt: string;
-  description: string;
 };
 
 declare type TPlateNumber = { plateNumber: string, recNo?: string, _id?: string, status: TVehicleStatus, type: TVehicleType, anprCameras?: TVehicleAnprCamera[] };
 
 
-// `""` is the FORM's "nothing picked yet" - it is stripped from the payload
-// before it is sent, because absence is what the server reads as "never
-// asked". See `PeopleFormMgmt.vue`.
-declare type TPeoplePayload = Pick<TGuest, "name" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "nric" | "contact" | "remarks" | "org" | "site" | "start" | "end" | "type" | "isOwner"> & { status?: string; user?: string; occupancyRole?: TOccupancyRole | "" }
+declare type TPeoplePayload = Pick<TGuest, "name" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "nric" | "contact" | "remarks" | "org" | "site" | "start" | "end" | "type" | "isOwner"> & { status?: string }
 
 declare type TPeopleType = "guest" | "resident" | "tenant"

package/types/service-provider.d.ts

@@ -7,11 +7,6 @@ declare type TServiceProvider = {
   serviceProviderOrgId: string;
   type: string;
   nature: string;
-  status?: string;
-  email?: string;
-  /** The building unit this provider serves (a unit's Management tab). */
-  unit?: string | null;
-  unitName?: string;
 };
 
 declare type TServiceProviderName = {

package/utils/notification-target.ts

@@ -45,7 +45,7 @@ export type TTargetRow = {
    * (core `withNotificationKind`); `site` stands in for `siteId` on rows kept
    * unscoped on purpose. Older rows have neither and are read from `module`.
    */
-  params?: { id?: string; org?: string; kind?: string; site?: string; storeId?: string } | null;
+  params?: { id?: string; org?: string; kind?: string; site?: string } | null;
 };
 
 /** What the surrounding app knows that the stored row does not. */
@@ -127,26 +127,9 @@ export function notificationKind(item: TTargetRow | null | undefined): string {
     return "";
   }
   if (module === "other") {
-    if (/(accepted|declined) your invitation$/i.test(title)) return "serviceProviderInviteAnswer";
-    // Inventory alerts sent before core had an inventory module were stored as "other".
-    return /request waiting|request (was )?(approved|rejected)|low (on )?stock|stock handed to you|hand-over (confirmed|declined)/i.test(title)
-      ? "inventory"
-      : "";
+    return /(accepted|declined) your invitation$/i.test(title) ? "serviceProviderInviteAnswer" : "";
   }
-  // Older rows spelled the work order module with a hyphen.
-  return module === "work-order" ? "workOrder" : module;
-}
-
-/**
- * Which inventory tab an alert is about. Alerts carry the store id but no tab,
- * so the tab follows the alert's fixed title (API-core inventory-notify.service)
- * - the same rule the mobile apps use. Values are the web tabs' own names.
- */
-export function inventoryTabForAlert(title: string): "requests" | "stock" | "mine" | "" {
-  if (/stock handed to you|hand-over (confirmed|declined)/i.test(title)) return "mine";
-  if (/request waiting|request (was )?(approved|rejected)/i.test(title)) return "requests";
-  if (/low (on )?stock/i.test(title)) return "stock";
-  return "";
+  return module;
 }
 
 /**
@@ -199,8 +182,6 @@ const SITE_PAGES: Record<string, TSitePage[]> = {
     { apps: ["security"], page: () => "virtual-patrol/cctv" },
     { apps: ["property-management"], page: () => "cctv" },
   ],
-  // A robot at the site raised an alarm (core safety alert, category robotAlert).
-  robotAlert: [{ apps: ["security", "property-management", "hygiene"], page: () => "robot-management/alerts" }],
   // hygiene has its Service Providers page too since 2026-09-28
   serviceProviderInviteAnswer: [{ apps: SERVICE_APPS, page: () => "service-providers" }],
 };
@@ -233,12 +214,7 @@ function sitePageTarget(
     const list = apps === "any" ? [home, ...SERVICE_APPS.filter((a) => a !== home)] : apps;
     for (const app of list) candidates.push({ app, path: base + page(id) });
   }
-  if (kind !== "inventory") return { candidates };
-  // Open the alert's own store on the tab it is about (InventoryMain reads ?storeId=&tab=).
-  const storeId = String(item.params?.storeId ?? item.params?.id ?? "").trim();
-  const tab = inventoryTabForAlert(String(item.title ?? ""));
-  const query: Record<string, string> = { ...(storeId ? { storeId } : {}), ...(tab ? { tab } : {}) };
-  return Object.keys(query).length ? { candidates, query } : { candidates };
+  return { candidates };
 }
 
 /** Seven365 staff pages, in the organisation app. */
@@ -318,21 +294,6 @@ export function notificationTarget(
   };
 }
 
-/** Kinds that only the iService365 phone apps can open (residents' own screens). */
-const PHONE_ONLY_KINDS = new Set(["prelovedMarketplace", "marketplace-order"]);
-
-/**
- * What the bell says when a click has nowhere to go, so a click is never a
- * silent nothing. A link grants nothing either way: the page opened still
- * checks the person may see it.
- */
-export function noTargetMessage(item: TTargetRow | null | undefined): string {
-  if (PHONE_ONLY_KINDS.has(notificationKind(item))) {
-    return "This notification opens in the iService365 app on your phone.";
-  }
-  return "There is no page to open for this notification here. It has been marked as read.";
-}
-
 /**
  * The full URL for a target whose page lives in another web app, or "" when
  * there is none to build (no path, or that app's URL is not configured).

package/components/AttendanceProxyDialog.vue

@@ -1,391 +0,0 @@
-<template>
-  <v-dialog v-model="showDialog" max-width="520" persistent>
-    <v-card class="screen-modal" data-test="attendance-proxy-dialog">
-      <v-card-title>
-        {{ action === "checkIn" ? "Check in for someone" : "Check out for someone" }}
-      </v-card-title>
-
-      <v-card-text class="screen-modal__body">
-        <!-- 1. What are we doing? Two big choices. -->
-        <v-btn-toggle
-          v-model="action"
-          mandatory
-          divided
-          class="w-100 mb-4 proxy__toggle"
-          :disabled="submitting"
-        >
-          <v-btn value="checkIn" class="flex-grow-1 text-none" prepend-icon="mdi-login">Check in</v-btn>
-          <v-btn value="checkOut" class="flex-grow-1 text-none" prepend-icon="mdi-logout">Check out</v-btn>
-        </v-btn-toggle>
-
-        <!-- Check-out: today's open check-ins on this device, tap to pick. -->
-        <div v-if="action === 'checkOut'" class="mb-4">
-          <InputLabel title="Checked in today on this device" />
-          <div v-if="openLoading" class="screen-hint">Loading...</div>
-          <div v-else-if="openItems.length === 0" class="screen-hint">
-            Nobody is checked in on this device today. You can still type the name and NRIC below.
-          </div>
-          <v-list v-else density="compact" class="proxy__open" data-test="attendance-proxy-open">
-            <v-list-item
-              v-for="item in openItems"
-              :key="item._id"
-              :active="picked === item._id"
-              @click="pick(item)"
-            >
-              <v-list-item-title>{{ item.name }} · {{ item.nricMasked }}</v-list-item-title>
-              <v-list-item-subtitle>
-                In at {{ formatTime(item.checkInTimestamp) }}<span v-if="item.post"> · {{ item.post }}</span>
-              </v-list-item-subtitle>
-            </v-list-item>
-          </v-list>
-        </div>
-
-        <!-- 2. Live photo (required). -->
-        <InputLabel title="Photo of the person" required />
-        <v-card variant="outlined" class="mb-1 proxy__stage">
-          <video
-            v-show="cameraOn && !photoPreview"
-            ref="videoEl"
-            autoplay
-            playsinline
-            muted
-            class="proxy__media"
-          />
-          <img v-if="photoPreview" :src="photoPreview" class="proxy__media" alt="Captured photo" />
-          <div v-if="!cameraOn && !photoPreview" class="proxy__placeholder">
-            <v-icon size="48" class="mb-2">mdi-camera</v-icon>
-            <span>{{ cameraError || "Starting the camera..." }}</span>
-          </div>
-        </v-card>
-        <div class="d-flex ga-2 mb-4">
-          <v-btn
-            v-if="!photoPreview"
-            class="text-none screen-btn-primary flex-grow-1"
-            variant="flat"
-            prepend-icon="mdi-camera"
-            :disabled="!cameraOn || submitting"
-            data-test="attendance-proxy-capture"
-            @click="capture"
-          >
-            Take photo
-          </v-btn>
-          <v-btn
-            v-else
-            class="text-none screen-btn-ghost flex-grow-1"
-            variant="flat"
-            prepend-icon="mdi-camera-retake"
-            :disabled="submitting"
-            @click="retake"
-          >
-            Retake
-          </v-btn>
-        </div>
-
-        <!-- 3. Who. -->
-        <InputLabel title="Name" required />
-        <v-text-field
-          v-model="name"
-          density="comfortable"
-          placeholder="e.g. Tan Ah Kow"
-          :error-messages="touched ? nameError(name) : ''"
-          :disabled="submitting"
-          data-test="attendance-proxy-name"
-        />
-
-        <InputLabel title="NRIC / FIN" required />
-        <v-text-field
-          v-model="nric"
-          density="comfortable"
-          placeholder="Full number or just the last 4 (e.g. 932P)"
-          autocomplete="off"
-          :error-messages="touched && !parsed.ok ? parsed.error : ''"
-          :hint="parsed.ok ? `Will be saved as ${parsed.masked}` : ''"
-          persistent-hint
-          :disabled="submitting"
-          data-test="attendance-proxy-nric"
-        />
-
-        <template v-if="action === 'checkIn'">
-          <InputLabel title="Shift / post (optional)" class="mt-2" />
-          <v-text-field
-            v-model="post"
-            density="comfortable"
-            placeholder="e.g. Main gate, night shift"
-            :error-messages="touched ? postError(post) : ''"
-            :disabled="submitting"
-          />
-        </template>
-
-        <v-alert type="info" variant="tonal" density="compact" icon="mdi-shield-lock-outline" class="mt-2">
-          Only the last 4 characters of the NRIC are saved. The photo is kept private and
-          only people allowed to see attendance can open it.
-        </v-alert>
-
-        <v-alert v-if="error" type="error" variant="tonal" density="compact" class="mt-3" closable @click:close="error = ''">
-          {{ error }}
-        </v-alert>
-      </v-card-text>
-
-      <div class="screen-modal__footer">
-        <v-btn class="text-none screen-btn-ghost" variant="flat" :disabled="submitting" @click="close">
-          Cancel
-        </v-btn>
-        <v-btn
-          class="text-none screen-btn-primary"
-          variant="flat"
-          :prepend-icon="action === 'checkIn' ? 'mdi-login' : 'mdi-logout'"
-          :loading="submitting"
-          data-test="attendance-proxy-submit"
-          @click="submit"
-        >
-          {{ action === "checkIn" ? "Check in" : "Check out" }}
-        </v-btn>
-      </div>
-    </v-card>
-  </v-dialog>
-</template>
-
-<script setup lang="ts">
-import useAttendance from "../composables/useAttendance";
-import { nameError, parseNric, postError, proxyPayload } from "../utils/attendance-proxy";
-
-const showDialog = defineModel({ type: Boolean, default: false });
-const props = defineProps({
-  site: { type: String, required: true },
-  serviceType: { type: String, default: "" },
-  initialAction: { type: String as () => "checkIn" | "checkOut", default: "checkIn" },
-});
-const emit = defineEmits<{ (e: "saved", message: string): void; (e: "close"): void }>();
-
-const { uploadAttendancePhoto, checkIn, proxyCheckOut, getOpenProxyCheckIns } = useAttendance();
-
-const action = ref<"checkIn" | "checkOut">(props.initialAction);
-const name = ref("");
-const nric = ref("");
-const post = ref("");
-const touched = ref(false);
-const submitting = ref(false);
-const error = ref("");
-const parsed = computed(() => parseNric(nric.value));
-
-const openItems = ref<Array<Record<string, any>>>([]);
-const openLoading = ref(false);
-const picked = ref("");
-
-const videoEl = ref<HTMLVideoElement | null>(null);
-const stream = ref<MediaStream | null>(null);
-const cameraOn = ref(false);
-const cameraError = ref("");
-const photoFile = ref<File | null>(null);
-const photoPreview = ref("");
-
-function formatTime(ts: unknown) {
-  return ts ? new Date(String(ts)).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) : "-";
-}
-
-function pick(item: Record<string, any>) {
-  picked.value = item._id;
-  name.value = item.name ?? "";
-  nric.value = item.nricLast4 ?? "";
-}
-
-async function loadOpen() {
-  openLoading.value = true;
-  try {
-    const res = await getOpenProxyCheckIns(props.site, props.serviceType);
-    openItems.value = res?.items ?? [];
-  } catch {
-    openItems.value = [];
-  } finally {
-    openLoading.value = false;
-  }
-}
-
-async function startCamera() {
-  cameraError.value = "";
-  try {
-    if (!navigator.mediaDevices?.getUserMedia) throw new Error("unsupported");
-    stream.value = await navigator.mediaDevices.getUserMedia({
-      video: { facingMode: "user", width: { ideal: 1280 }, height: { ideal: 720 } },
-      audio: false,
-    });
-    cameraOn.value = true;
-    await nextTick();
-    if (videoEl.value) {
-      videoEl.value.srcObject = stream.value;
-      await videoEl.value.play().catch(() => undefined);
-    }
-  } catch (err: any) {
-    cameraOn.value = false;
-    cameraError.value =
-      err?.name === "NotAllowedError"
-        ? "Camera access is blocked. Allow the camera in your browser settings, then reopen this window."
-        : "No camera could be started on this device.";
-  }
-}
-
-function stopCamera() {
-  stream.value?.getTracks().forEach((t) => t.stop());
-  stream.value = null;
-  cameraOn.value = false;
-}
-
-async function capture() {
-  const video = videoEl.value;
-  if (!video) return;
-  const canvas = document.createElement("canvas");
-  canvas.width = video.videoWidth;
-  canvas.height = video.videoHeight;
-  canvas.getContext("2d")?.drawImage(video, 0, 0);
-  const blob = await new Promise<Blob | null>((r) => canvas.toBlob(r, "image/jpeg", 0.8));
-  if (!blob) return;
-  photoFile.value = new File([blob], "attendance.jpg", { type: "image/jpeg" });
-  photoPreview.value = URL.createObjectURL(blob);
-  stopCamera();
-}
-
-function retake() {
-  if (photoPreview.value) URL.revokeObjectURL(photoPreview.value);
-  photoPreview.value = "";
-  photoFile.value = null;
-  void startCamera();
-}
-
-/** Location if the browser gives one within 4 s; never blocks the check-in. */
-function bestEffortLocation(): Promise<{ latitude: number; longitude: number } | undefined> {
-  return new Promise((resolve) => {
-    if (!navigator.geolocation) return resolve(undefined);
-    const timer = setTimeout(() => resolve(undefined), 4000);
-    navigator.geolocation.getCurrentPosition(
-      (p) => {
-        clearTimeout(timer);
-        resolve({ latitude: p.coords.latitude, longitude: p.coords.longitude });
-      },
-      () => {
-        clearTimeout(timer);
-        resolve(undefined);
-      },
-      { enableHighAccuracy: true, timeout: 4000, maximumAge: 60000 }
-    );
-  });
-}
-
-async function submit() {
-  touched.value = true;
-  error.value = "";
-  if (!photoFile.value) return void (error.value = "Take the person's photo first.");
-  if (nameError(name.value) || !parsed.value.ok || (action.value === "checkIn" && postError(post.value))) return;
-
-  // Masked HERE: from this line on only the last 4 (+ prefix) exist.
-  const proxy = proxyPayload({ name: name.value, nric: nric.value, post: post.value });
-  const shown = parsed.value.ok ? parsed.value.masked : "";
-  nric.value = "";
-
-  submitting.value = true;
-  try {
-    const [{ id: privatePhoto }, location] = await Promise.all([
-      uploadAttendancePhoto(props.site, photoFile.value, props.serviceType),
-      bestEffortLocation(),
-    ]);
-    const timestamp = new Date().toISOString();
-    if (action.value === "checkIn") {
-      await checkIn(
-        props.site,
-        { checkIn: { timestamp, privatePhoto, ...(location ? { location } : {}) }, proxy } as any,
-        props.serviceType
-      );
-    } else {
-      await proxyCheckOut(
-        props.site,
-        {
-          proxy: { name: proxy.name, nricLast4: proxy.nricLast4 },
-          checkOut: { timestamp, privatePhoto, ...(location ? { location } : {}) },
-        },
-        props.serviceType
-      );
-    }
-    emit(
-      "saved",
-      `${proxy.name} (${shown}) ${action.value === "checkIn" ? "checked in" : "checked out"} at ${formatTime(timestamp)}.`
-    );
-    close();
-  } catch (err: any) {
-    error.value = err?.data?.message || "Could not save. Please check the connection and try again.";
-  } finally {
-    submitting.value = false;
-  }
-}
-
-function reset() {
-  name.value = "";
-  nric.value = "";
-  post.value = "";
-  touched.value = false;
-  error.value = "";
-  picked.value = "";
-  if (photoPreview.value) URL.revokeObjectURL(photoPreview.value);
-  photoPreview.value = "";
-  photoFile.value = null;
-}
-
-function close() {
-  stopCamera();
-  reset();
-  showDialog.value = false;
-  emit("close");
-}
-
-watch(showDialog, (open) => {
-  if (open) {
-    action.value = props.initialAction;
-    void startCamera();
-    void loadOpen();
-  } else {
-    stopCamera();
-  }
-});
-
-watch(action, (next) => {
-  if (next === "checkOut") void loadOpen();
-});
-
-onBeforeUnmount(stopCamera);
-</script>
-
-<style scoped>
-.proxy__stage {
-  position: relative;
-  height: 260px;
-  overflow: hidden;
-  border-radius: var(--r-inner);
-  border-color: var(--border);
-}
-.proxy__media {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-  display: block;
-  background: #000;
-}
-.proxy__placeholder {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  padding: 16px;
-  background: var(--thead);
-  color: var(--muted);
-  font-size: var(--fs-cell);
-}
-.proxy__open {
-  border: 1px solid var(--border);
-  border-radius: var(--r-inner);
-  max-height: 200px;
-  overflow-y: auto;
-}
-.proxy__toggle .v-btn {
-  height: 48px;
-}
-</style>