@7365admin1/layer-common 4.97.1-staging.582 → 4.97.1-staging.584

package/components/AreaMain.vue

@@ -759,14 +759,20 @@ const onShowQRAction = () => {
   const id =
     (selectedItem.value as any)?._id || (selectedItem.value as any)?.id;
   const runtimeConfig = useRuntimeConfig ? useRuntimeConfig() : undefined;
-  const origin =
-    runtimeConfig?.public?.APP_HYGIENE ||
-    (typeof window !== "undefined" && window.location?.origin
+  // The QR opens this app's own schedule page (M&E, pest, pool, landscape
+  // pass their route); only Hygiene uses the configured Hygiene host.
+  const scheduleSegment = props.scheduleRoute || "cleaning-schedule";
+  const currentOrigin =
+    typeof window !== "undefined" && window.location?.origin
       ? window.location.origin
-      : "https://hygiene.app.iservice365.org");
+      : "";
+  const origin =
+    (scheduleSegment === "cleaning-schedule" && runtimeConfig?.public?.APP_HYGIENE) ||
+    currentOrigin ||
+    "https://hygiene.app.iservice365.org";
   qrPath.value = `${origin}/${props.orgId}/${
     props.site
-  }/cleaning-schedule?qrcode=true&id=${encodeURIComponent(
+  }/${scheduleSegment}?qrcode=true&id=${encodeURIComponent(
     id
   )}&site=${encodeURIComponent(props.site)}`;
 };

package/components/BillingMain.vue

@@ -1,62 +1,21 @@
 <template>
   <div>
     <!--
-      THE DESIGN'S PAGE SCAFFOLD (same shape as Service Providers).
-
-      Placement only: the same refresh control, the same range text, the same
-      pager bound to the same `page`, and the table, its columns and its cell
-      templates are untouched. The screen simply gains the page title it has
-      never had, and its card + toolbar are the design's rather than Vuetify's.
+      Service-provider billing is not built yet. This screen used to draw an
+      empty table with a refresh button that did nothing, which read as
+      "there are no bills". It now says plainly what is (not) here.
     -->
     <PageHeader title="Billing" />
 
-    <AppCard class="table-card">
-      <CardToolbar :count="pageRange">
-        <template #left>
-          <AppButton variant="icon" icon="mdi-refresh" aria-label="Refresh" />
-        </template>
-
-        <template #right>
-          <local-pagination v-model="page" :length="pages" />
-        </template>
-      </CardToolbar>
-
-      <v-data-table
-          :headers="headers"
-          :items="items"
-          item-value="_id"
-          items-per-page="20"
-          fixed-header
-          hide-default-footer
-          hide-default-header
-          style="max-height: calc(100vh - (180px))"
-        >
-          <template #item.permissions="{ value }">
-            <span class="text-caption font-weight-bold text-capitalize">
-              permissions
-            </span>
-            <StatusChip :dot="false" tone="neutral" :label="`${value.length}`" />
-          </template>
-
-          <template #item.nature="{ item }">
-            <span class="text-capitalize">
-              {{ item.nature }}
-            </span>
-          </template>
-      </v-data-table>
+    <AppCard class="pa-6">
+      <p class="text-body-1 mb-2">
+        Service provider billing is not available yet.
+      </p>
+      <p class="text-body-2 text-medium-emphasis mb-0">
+        Bills from your service providers will appear here once this feature is
+        switched on. For billing questions today, please contact your service
+        provider directly.
+      </p>
     </AppCard>
   </div>
 </template>
-
-<script setup lang="ts">
-const page = ref(1);
-const pages = ref(0);
-const pageRange = ref("-- - -- of --");
-
-const items = ref<Array<Record<string, any>>>([]);
-
-const headers = [
-  { title: "Name", value: "name" },
-  { title: "Nature", value: "nature" },
-];
-</script>

package/components/BulletinBoardManagement.vue

@@ -13,7 +13,7 @@
 
         <TableMain :headers="headers" :items="items" v-model:search="searchInput"
             :loading="getAnnouncementPending" :page="page" :pages="pages" :pageRange="pageRange"
-            @refresh="getAnnouncementsRefresh" :show-header="APP_CONSTANTS.RESIDENT === props.recipients" @update:page="handleUpdatePage" @row-click="handleRowClick">
+            @refresh="getAnnouncementsRefresh" show-header @update:page="handleUpdatePage" @row-click="handleRowClick">
             <!--
                 The tabs move ONTO the toolbar row (the design draws them there)
                 instead of a stacked strip above the table. Same options, same
@@ -83,7 +83,6 @@
 </template>
 <script setup lang="ts">
 import useBulletin from '../composables/useBulletin';
-import { APP_CONSTANTS } from '../constants/app';
 // Imported by relative path, not left to Nuxt's auto-import: this layer's
 // components always import their utils explicitly, and a missing import here
 // is a ReferenceError that blanks the screen in every consuming app.
@@ -141,18 +140,15 @@ const { debounce } = useUtils()
 
 
 const headers = computed(() => {
-    const arr = [
+    // Every app shows when an announcement was posted and when it runs/ends.
+    // These used to appear only for recipients="resident", which no app passes,
+    // so staff saw bare titles with no dates.
+    return [
         { title: "Title", value: "title", align: "start" },
-    ]
-
-    if (props.recipients === APP_CONSTANTS.RESIDENT) {
-        arr.push({ title: "Date Created", value: "createdAt", align: "start" });
-        arr.push({ title: "Start Date/End Date", value: "duration", align: "start" });
-        arr.push({ title: "No Expiration", value: "noExpiration", align: "start" });
-        arr.push({ title: "", value: "actions", align: "center" });
-    }
-
-    return arr;
+        { title: "Date Created", value: "createdAt", align: "start" },
+        { title: "Start Date/End Date", value: "duration", align: "start" },
+        { title: "No Expiration", value: "noExpiration", align: "start" },
+    ];
 
 });
 // THE SERVER PAGES THIS LIST. `getAll` is called with `page`, so `items` is

package/components/ClientMain.vue

@@ -767,10 +767,14 @@ function handleSuccess()    { dialog.value = false; fetchData() }
 
 /* ── CANCEL INVITE ── */
 async function cancelInvite(item: any) {
+  // ponytail: native confirm/alert - this console page has no snackbar of its own.
+  if (!window.confirm(`Cancel the invitation for ${item.email}? They will no longer be able to use the invite link.`)) return
   try {
     cancelLoadingId.value = item._id
     await cancelUserInvitation(item._id)
     await fetchData()
+  } catch (error: any) {
+    window.alert(error?.data?.message || error?.message || 'Could not cancel the invitation. Please try again.')
   } finally {
     cancelLoadingId.value = null
   }

package/components/InvitationMain.vue

@@ -27,6 +27,14 @@
           </template>
 
           <template #right>
+            <AppField
+              v-model="headerSearch"
+              search
+              compact
+              placeholder="Search"
+              aria-label="Search"
+              klass="app-toolbar__search"
+            />
             <AppButton
               variant="icon"
               icon="mdi-refresh"

package/components/MemberMain.vue

@@ -85,6 +85,14 @@
         </template>
 
         <template #right>
+          <AppField
+            v-model="headerSearch"
+            search
+            compact
+            placeholder="Search"
+            aria-label="Search"
+            klass="app-toolbar__search"
+          />
           <AppButton
             variant="icon"
             icon="mdi-refresh"

package/components/RolePermissionMain.vue

@@ -32,6 +32,14 @@
         </template>
 
         <template #right>
+          <AppField
+            v-model="headerSearch"
+            search
+            compact
+            placeholder="Search"
+            aria-label="Search"
+            klass="app-toolbar__search"
+          />
           <local-pagination
             v-model="page"
             :length="pages"
@@ -446,6 +454,11 @@ const {
   }
 );
 
+// A new search starts from the first page.
+watch(headerSearch, () => {
+  page.value = 1;
+});
+
 const loading = computed(() => getRoleReqStatus.value === "pending");
 
 watchEffect(() => {

package/components/SiteSettings.vue

@@ -544,11 +544,6 @@ const saveANPRSettings = async () => {
   try {
     isSaving.value = true;
 
-    // Replace this with your actual API endpoint / store action
-    // await $fetch(`/api/sites/${siteId.value}/camera-settings`, {
-    //   method: 'POST',
-    //   body: cameraSettings.value
-    // })
     const data = {
       site: props.siteId,
       ANPRSwitches: ANPRSwitches.value,
@@ -559,6 +554,11 @@ const saveANPRSettings = async () => {
     show("Saved successfully", "success");
   } catch (error) {
     console.error("Failed to save settings:", error);
+    show(
+      (error as any)?.data?.message ||
+        "Could not save the camera (ANPR) settings. Please try again.",
+      "error"
+    );
   } finally {
     isSaving.value = false;
   }

package/composables/useKey.ts

@@ -132,21 +132,25 @@ export default function useKey() {
     keyLog.value = data || new MKeyLog();
   }
 
-  function addKeyLog(_keyLog: TKeyLog) {
+  // Await each request so a failed save reaches the caller's catch instead of showing "success".
+  async function addKeyLog(_keyLog: TKeyLog) {
     isAdding.value = true;
     delete _keyLog._id;
-    const data = useNuxtApp().$api<{
-      message: string | undefined;
-    }>(keyLogApiUrl, {
-      method: "POST",
-      body: JSON.stringify(_keyLog),
-    });
-    isAdding.value = false;
-    return data.message;
+    try {
+      const data = await useNuxtApp().$api<{
+        message: string | undefined;
+      }>(keyLogApiUrl, {
+        method: "POST",
+        body: JSON.stringify(_keyLog),
+      });
+      return data?.message;
+    } finally {
+      isAdding.value = false;
+    }
   }
 
-  function getKeyById(id: string) {
-    const data = useNuxtApp().$api<TKeyLog | undefined>(
+  async function getKeyById(id: string) {
+    const data = await useNuxtApp().$api<TKeyLog | undefined>(
       `${keyLogApiUrl}/${id}`,
       {
         method: "GET",
@@ -158,22 +162,22 @@ export default function useKey() {
     return data;
   }
 
-  function updateKeyById(id: string, payload: TKeyLog) {
+  async function updateKeyById(id: string, payload: TKeyLog) {
     payload.codes =
       payload.codes instanceof Array && payload.codes.length > 0
         ? payload.codes
         : [];
-    const data = useNuxtApp().$api<{
+    const data = await useNuxtApp().$api<{
       message: { acknowledged: boolean };
     }>(`${keyLogApiUrl}/${id}`, {
       method: "PUT",
       body: payload,
     });
-    return data.message;
+    return data?.message;
   }
 
-  function deleteKeyById(id: string) {
-    const data = useNuxtApp().$api<{ message: TKeyLog }>(
+  async function deleteKeyById(id: string) {
+    const data = await useNuxtApp().$api<{ message: TKeyLog }>(
       `${keyLogApiUrl}/${id}`,
       {
         method: "DELETE",

package/package.json

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

@@ -1,5 +1,6 @@
 <!--
-  The "you are not a member of an organization" gate.
+  The "no permission for this page" gate (wording only; non-members use
+  require-organization-membership).
 
   Was Vuetify's chrome: `text-subtitle-1` for the sentence, `text-subtitle-2`
   on the buttons, and `variant="tonal" rounded="xl"` - a 24px-cornered pill in
@@ -12,8 +13,8 @@
 <template>
   <v-row no-gutters class="fill-height" align="center" justify="center">
     <v-col cols="12" lg="6" md="6" sm="6" class="text-center gate-page__message">
-      You must be a member of an organization to view this page. Please join or
-      contact your administrator for access.
+      You don't have permission to open this page. If you need it for your
+      work, ask your administrator to give your role access.
       <v-row no-gutters justify="center" class="mt-2">
         <v-btn
           class="screen-btn-primary"