npm - @7365admin1/layer-common - Versions diffs - 4.0.1 → 4.0.3-staging.220 - Mend

@7365admin1/layer-common 4.0.1 → 4.0.3-staging.220

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (41) hide show

package/CHANGELOG.md +101 -0
package/components/AccessCardQrTagging.vue +0 -4
package/components/AccessManagement.vue +0 -4
package/components/BuildingManagement/buildings.vue +0 -4
package/components/BulletinBoardManagement.vue +0 -3
package/components/CameraForm.vue +2 -5
package/components/CameraMain.vue +3 -6
package/components/ClientDetailForm.vue +65 -5
package/components/ClientMain.vue +201 -59
package/components/DashboardMain.vue +27 -8
package/components/DocumentManagement.vue +0 -4
package/components/HidAccessLogDashboard.vue +114 -34
package/components/HidReaderManagement.vue +34 -11
package/components/HidReaderUserRoster.vue +376 -0
package/components/HidUserEnrollment.vue +6 -0
package/components/HidUserMapping.vue +583 -0
package/components/IncidentReport/Authorities.vue +0 -4
package/components/IncidentReport/IncidentInformation.vue +0 -4
package/components/IncidentReport/IncidentInformationDownload.vue +0 -4
package/components/IncidentReport/affectedEntities.vue +0 -4
package/components/MemberMain.vue +20 -2
package/components/RolePermissionFormCreate.vue +6 -1
package/components/RolePermissionFormPreviewUpdate.vue +22 -11
package/components/RolePermissionMain.vue +39 -4
package/components/VehicleManagement.vue +0 -4
package/components/VisitorManagement.vue +0 -3
package/components/VisitorsReportPreview.vue +0 -3
package/composables/useBulletinBoardPermission.ts +6 -1
package/composables/useConsoleTier.ts +73 -0
package/composables/useHidAmico.ts +18 -1
package/composables/useHidNavigation.ts +8 -1
package/composables/useMember.ts +0 -5
package/composables/useSettingsPermission.ts +7 -1
package/package.json +2 -2
package/pages/[org]/[site]/access-mgmt/hid-user-mapping/index.vue +23 -0
package/pages/[org]/[site]/access-mgmt/hid-users/index.vue +1 -1
package/utils/client-subscription.test.ts +95 -0
package/utils/console-tier.test.ts +87 -0
package/utils/console-tier.ts +67 -0
package/utils/data.test.ts +84 -0
package/utils/data.ts +92 -0

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,106 @@
 # @iservice365/layer-common
+## 4.0.2
+### Patch Changes
+- ce3ece5: Suspend and reactivate a client from the staff console, owner-only, and fix
+  four controls on the console screens that failed without saying so.
+  ## Suspend / reactivate (owner decision 4 and 9)
+  `ClientMain.vue` already called `PATCH /api/organizations/:id/status`. The
+  backend for it merged as `iservice365-core` #1884 and is now owner-gated
+  (`requirePlatformOwner`), so the screen has to know which tier it is drawing
+  for - and it had no way to tell the owner from ordinary Seven365 staff.
+  `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
+  own rule from two endpoints the console already calls, unprojected:
+      GET /api/members/user/:user/app/admin    the Seven365 staff membership
+      GET /api/roles/id/:role                  that membership's role document
+      owner  = member.type === "admin" && role.type === "admin" && role.default === true
+      staff  = member.type === "admin" && role.type === "admin"
+  `role.default` is the marker because it is the only property of a platform
+  staff role no API caller can set - `role.controller.ts` validates create and
+  update with Joi object schemas that do not list it, `role.repo.ts` never writes
+  it, `MRole` defaults it to `false`, and only `user.service.ts
+createDefaultUser()` sets it at API boot. A role NAME proves nothing: staging
+  carries an ordinary organisation role merely named "Super Admin".
+  **This decides what is DRAWN, and nothing else.** The server re-decides on
+  every call from the session id, so a browser that flips the flag gets a visible
+  button and a 401. Anything the front end cannot positively prove is `none` -
+  it fails closed.
+  The suspend confirmation now says what actually happens in the owner's terms:
+  everyone who belongs to the client is blocked from signing in - staff,
+  residents and guards - nothing is deleted, and it is reversible. Reactivating
+  confirms without a warning. After either, the list re-reads and the row moves
+  to the tab matching its new status; the state shown comes from the existing
+  `utils/client-subscription.ts` derivation, not a second copy of the rule.
+  ## Four controls that failed silently
+  - **`ClientMain.vue` - the row menu had no background.** It teleports to
+    `<body>`, which is outside the element Vuetify puts `v-theme--light` /
+    `v-theme--dark` on, and every token in `tokens.css` is declared under
+    `[class*="v-theme--"]`. `background: var(--card)` therefore resolved to
+    nothing: measured `rgba(0, 0, 0, 0)` in both themes, with the table's own
+    text showing through the menu items. Its border, ink and hover were dead for
+    the same reason. The menu now names its theme on itself.
+  - **`ClientMain.vue` - a refused suspend said nothing.** Both handlers ended in
+    `console.error`, so pressing Suspend looked exactly like pressing nothing -
+    which is what an ordinary staff member now gets from the owner-gated
+    endpoint. The refusal is shown on the dialog, which stays open.
+  - **`ClientDetailForm.vue` - a failed save and a failed load both drew as
+    normal.** `handleSubmit` swallowed the error into `console.error`; the two
+    loaders had no `catch` at all, so a failed request rejected inside the
+    watcher and the drawer drew every field blank and an empty site table - an
+    error shown as "this client has nothing in it". Both now say so. An
+    organisation with no service application says that too, instead of an empty
+    list.
+  - **`MemberMain.vue` - two error paths.** A refused role change set the
+    snackbar's text but never opened it, so it said nothing at all; a failed
+    status change with no `message` on the error drew an empty red snackbar.
+  No endpoint, request shape or response shape changed, and nothing new is called
+  that did not already exist.
+- 6d654d6: Remove a duplicate `:site` attribute on `HidReaderManagement.vue`.
+  `HidReaderForm` was given `:site` twice - `props.site` and then a bare `site`, which is
+  not a name that exists in that component's scope. Vite's Vue plugin treats a duplicate
+  attribute as a compile error, so every consuming application's `nuxt build` failed on
+  this file. The layer's own playground build does not import the component, which is why
+  it was not caught at publish time.
+- c4683d1: Promo codes can be edited, turned off and removed from the staff console.
+  `usePromoCode()` gains `getById`, `update`, `updateStatus` and `remove`, matching the
+  `PUT /api/promo-codes/:id`, `PATCH /api/promo-codes/:id/status` and
+  `DELETE /api/promo-codes/:id` endpoints. `update` never sends `code`, which the server
+  treats as immutable because subscriptions and invoices quote a code by its text.
+  `utils/promo-code-form.ts` holds the editor's rules - loading a record into the form,
+  building the request body, and refusing what the API refuses, in wording a person can
+  act on.
+- 780112d: Stop the Roles & Permissions screen firing an id-less request on every visit, and
+  remove a dead, malformed member-lookup function.
+  `RolePermissionMain.vue` fetched a role by id as soon as the component mounted,
+  before any role had been picked, sending `GET /api/roles/id` with no id on the
+  end. The real fetch already runs correctly once a row is clicked (a `watchEffect`
+  handles that); the mount-time fetch was just extra noise hitting the API for
+  nothing. It now waits for a real id (`immediate: false`).
+  Also removes `useMember.getByMemberId`, which built the malformed path
+  `/api//user/${user}` and had no caller anywhere in this package or the 11 web
+  apps.
 ## 4.0.1
 ### Patch Changes

package/components/AccessCardQrTagging.vue CHANGED Viewed

@@ -180,10 +180,6 @@
 <script setup lang="ts">
 import QrcodeVue from "qrcode.vue";
-definePageMeta({
-  middleware: ["01-auth", "02-org"],
-  memberOnly: true,
-});
 const props = defineProps({
   canViewAllQrTagging: {

package/components/AccessManagement.vue CHANGED Viewed

@@ -138,10 +138,6 @@
 // into the consuming apps but not reliably into the layer's own components.
 import { readListPage } from "../utils/list-page";
-definePageMeta({
-  middleware: ["01-auth", "02-org"],
-  memberOnly: true,
-});
 const props = defineProps({
   headers: {
     type: Array as PropType<Array<Record<string, any>>>,

package/components/BuildingManagement/buildings.vue CHANGED Viewed

@@ -162,10 +162,6 @@
 // into the consuming apps but not reliably into the layer's own components.
 import { levelCount } from "../../utils/data";
-definePageMeta({
-  middleware: ["01-auth", "02-org"],
-  memberOnly: true,
-});
 const props = defineProps({
   headers: {

package/components/BulletinBoardManagement.vue CHANGED Viewed

@@ -89,9 +89,6 @@ import { APP_CONSTANTS } from '../constants/app';
 // is a ReferenceError that blanks the screen in every consuming app.
 import { readListPage } from '../utils/list-page';
-definePageMeta({
-    memberOnly: true,
-})
 const props = defineProps({
     siteId: {

package/components/CameraForm.vue CHANGED Viewed

@@ -130,6 +130,7 @@
 <script setup lang="ts">
 import useSiteSettings from "../composables/useSiteSettings";
+import { cameraErrorConverter } from "../utils/data";
 const prop = defineProps({
   title: {
@@ -298,11 +299,7 @@ async function submit() {
     emit("success", `${prop.title} added successfully!`);
   } catch (error: any) {
-    console.log(
-      "error",
-      error.response?._data?.message || "Failed to add camera"
-    );
-    emit("error", error.response?._data?.message || "Failed to add camera");
+    emit("error", cameraErrorConverter(error, prop.type));
   } finally {
     disable.value = false;
   }

package/components/CameraMain.vue CHANGED Viewed

@@ -248,6 +248,7 @@
 <script setup lang="ts">
 import type { PropType } from "vue";
 import useSiteSettings from "../composables/useSiteSettings";
+import { cameraErrorConverter } from "../utils/data";
 const events = defineEmits(["update:value", "row-click"]);
@@ -363,8 +364,7 @@ function openDialogDelete() {
 }
 function handleError(msg: string) {
-  const text = prop.type === "ip" ? "CCTV camera already exist" : msg;
-  showMessage(text, "error");
+  showMessage(msg, "error");
 }
 function handleSuccess() {
@@ -416,10 +416,7 @@ async function submitDelete() {
     await getCameraRefresh();
     dialogDelete.value = false;
   } catch (error: any) {
-    showMessage(
-      error?.response?._data?.message || "Failed to delete camera.",
-      "error"
-    );
+    showMessage(cameraErrorConverter(error, prop.type), "error");
   }
 }
 </script>

package/components/ClientDetailForm.vue CHANGED Viewed

@@ -9,10 +9,15 @@
       <div class="actions">
         <button class="btn-cancel" @click="$emit('cancel')">Cancel</button>
-        <button class="btn-submit" @click="handleSubmit">Submit</button>
+        <button class="btn-submit" :disabled="saving" @click="handleSubmit">
+          {{ saving ? 'Saving...' : 'Submit' }}
+        </button>
       </div>
     </div>
+    <p v-if="loadError" class="form-error" role="alert">{{ loadError }}</p>
+    <p v-else-if="formError" class="form-error" role="alert">{{ formError }}</p>
     <!-- ===== CLIENT INFORMATION ===== -->
     <section class="section">
       <h3>Client Information</h3>
@@ -133,7 +138,12 @@
     <!-- ===== INCLUDED APPLICATION ===== -->
     <section class="section">
       <h3>Included Application</h3>
-      <ul class="app-list">
+      <!-- A plain organisation has no service application of its own, so the
+           list is legitimately empty. An empty <ul> reads as a broken box. -->
+      <p v-if="form.includedApps.length === 0" class="app-none">
+        No service application recorded for this client.
+      </p>
+      <ul v-else class="app-list">
         <li v-for="(app, idx) in form.includedApps" :key="idx">{{ app }}</li>
       </ul>
     </section>
@@ -266,6 +276,10 @@ const errors = reactive({
 const phonePrefix = ref('+65')
 const phoneNumber = ref('')
+const saving     = ref(false)
+const loadError  = ref('')
+const formError  = ref('')
 /* ── FORM STATE ── */
 const form = reactive({
   name: '',
@@ -348,6 +362,9 @@ async function handleSubmit() {
   form.phone = `${phonePrefix.value} ${phoneNumber.value}`
+  saving.value = true
+  formError.value = ''
   try {
     if (userId.value) {
       await userApi.updateUserFieldById(userId.value, 'name', form.name)
@@ -359,8 +376,16 @@ async function handleSubmit() {
     })
     emit('submit', { ...form })
-  } catch (error) {
-    console.error(error)
+  } catch (error: any) {
+    // A failed save used to reach `console.error` and nothing else, so Submit
+    // looked exactly like a button that did nothing - the screen stayed put
+    // with the typed values still in it, which reads as "not saved yet".
+    formError.value =
+      error?.response?._data?.message ??
+      error?.data?.message ??
+      'Could not save this client. Nothing was changed.'
+  } finally {
+    saving.value = false
   }
 }
 const userId = ref('')
@@ -419,7 +444,19 @@ watch(
   async client => {
     if (!client?._id) return
-    await Promise.all([loadOrganization(), loadSites()])
+    loadError.value = ''
+    try {
+      await Promise.all([loadOrganization(), loadSites()])
+    } catch (error: any) {
+      // Neither loader caught anything, so a failed request rejected inside
+      // this watcher and the drawer drew every field blank and an empty site
+      // table - an error shown as "this client has nothing in it".
+      loadError.value =
+        error?.response?._data?.message ??
+        error?.data?.message ??
+        'Could not load this client. Nothing here has been saved or changed.'
+    }
   },
   {
     immediate: true
@@ -654,6 +691,29 @@ watch(
   color: var(--err);
 }
+/* A failed load or a failed save, said once at the top of the form where the
+   reader already is. `--err-bg` fill + `--err` ink, the design's error pair. */
+.form-error {
+  margin: 0 28px 18px;
+  padding: 10px 12px;
+  border-radius: 8px;
+  background: var(--err-bg);
+  color: var(--err);
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1.45;
+}
+.btn-submit:disabled {
+  opacity: 0.7;
+  cursor: not-allowed;
+}
+/* `--text2` is the reading token for secondary copy; `--muted` measures below
+   AA at this size. */
+.app-none {
+  font-size: 13.5px;
+  color: var(--text2);
+}
 /*
  * MEASURED at 360: the form overflowed the viewport by 147px in both themes.
  * Its two-column grid, its 28px side padding and its header row are all fixed,