@7365admin1/layer-common 3.2.1 → 3.2.2-staging.76

package/pages/[org]/[site]/access-mgmt/intercom/index.vue

@@ -5,7 +5,7 @@
       :org="orgId"
       message="Enable HID as a service for this site before configuring HID intercom."
     >
-      <HidIntercomManagement :site="siteId" />
+      <HidIntercomManagement :site="siteId" :org="orgId" />
     </HidEnabledGate>
   </v-container>
 </template>

package/plugins/secure-member.client.ts

@@ -12,75 +12,40 @@ export default defineNuxtPlugin(() => {
 
   const { userAppRole, id, orgNature } = useLocalSetup();
 
-  router.afterEach(async (to) => {
+  router.beforeEach(async (to) => {
     const isMember = to.meta?.memberOnly;
 
     if (!isMember) return;
 
     const APP = useRuntimeConfig().public.APP;
-    const org = computed(
-      () =>
-        (to.params.org as string) || (to.params.organization as string) || ""
-    );
+    const org =
+      (to.params.org as string) || (to.params.organization as string) || "";
 
-    console.log('[secure-member-plugin', 'org', org.value)
-
-    if (!hexSchema.safeParse(org.value).success) {
-      return router.replace({ name: "require-organization-membership" });
+    if (!hexSchema.safeParse(org).success) {
+      return { name: "require-organization-membership" };
     }
 
-    const userId = computed(() => useCookie("user").value ?? "");
-
-    const { data: userMemberData, error: userMemberError } =
-      await useLazyAsyncData(
-        "plugin-get-member-by-id-" + userId.value + "-" + APP + "-" + org.value,
-        () => getByUserType(userId.value, APP, org.value),
-        { watch: [userId] }
-      );
-
-    watchEffect(() => {
-      if (userMemberError.value) {
-        console.log('running-secure-member-redirect-plugin')
-        navigateTo(
-          {
-            name: "index",
-          },
-          { replace: true }
-        );
-      }
-    });
-
-    const roleId = ref("roleId");
+    const userId = useCookie("user").value ?? "";
+    if (!userId) return { name: "index" };
 
-    watchEffect(() => {
-      if (userMemberData.value) {
-        id.value = userMemberData.value.org ?? "";
-        roleId.value = userMemberData.value.role ?? "roleId";
-      }
-    });
+    try {
+      const userMemberData = await getByUserType(userId, APP, org);
+      id.value = userMemberData.org ?? "";
 
-    const { data: getOrgByIdReq } = await useLazyAsyncData(
-      "plugin-get-org-by-id-" + org.value,
-      () => getById(org.value),
-      { watch: [org] }
-    );
+      const [orgResult, roleResult] = await Promise.allSettled([
+        getById(org),
+        userMemberData.role ? getRoleById(userMemberData.role) : null,
+      ]);
 
-    watchEffect(() => {
-      if (getOrgByIdReq.value) {
-        orgNature.value = getOrgByIdReq.value.nature ?? "";
+      if (orgResult.status === "fulfilled" && orgResult.value) {
+        orgNature.value = orgResult.value.nature ?? "";
       }
-    });
 
-    const { data: getRoleByIdReq } = await useLazyAsyncData(
-      "plugin-get-role-by-id-" + roleId.value,
-      () => getRoleById(roleId.value),
-      { watch: [roleId] }
-    );
-
-    watchEffect(() => {
-      if (getRoleByIdReq.value) {
-        userAppRole.value = getRoleByIdReq.value;
+      if (roleResult.status === "fulfilled" && roleResult.value) {
+        userAppRole.value = roleResult.value;
       }
-    });
+    } catch (error) {
+      return { name: "index" };
+    }
   });
 });

package/plugins/vuetify.ts

@@ -42,6 +42,8 @@ import {
 } from "vuetify-pro-tiptap";
 import "vuetify-pro-tiptap/style.css";
 
+import { LIGHT_THEME, DARK_THEME } from "../utils/theme";
+
 export default defineNuxtPlugin((app) => {
   const vuetify = createVuetify({
     defaults: {
@@ -69,17 +71,43 @@ export default defineNuxtPlugin((app) => {
       //   hint: "This field is required",
       // },
     },
+    /**
+     * THE PRODUCT HAS TWO THEMES, AND UNTIL NOW ONLY ONE OF THEM WAS OURS.
+     *
+     * Every app shows a light/dark toggle in the app bar (Layout/Header.vue),
+     * and it sets Vuetify's built-in "light" and "dark" themes. Those were left
+     * at Vuetify's factory values, so one click on any screen in any of the
+     * eleven apps threw the brand away: `primary` stopped being the Seven365
+     * navy and became Material blue #2196F3 - and `primary` is the navigation
+     * drawer's fill - while `primary-button` and `text-primary`, used in around
+     * eighty places across the layer and the apps, do not exist in a stock
+     * theme at all, so those components lost their colour to an undefined CSS
+     * variable. There was also no way back to the brand: the toggle only ever
+     * flipped between the two stock themes.
+     *
+     * The fix is to make the stock names OURS rather than to add new names.
+     * Several components already branch on `theme.global.name === "dark"` (this
+     * layer's FormDialog, property-management's facility icons), so a
+     * differently-named dark theme would have left every one of them silently
+     * on their light branch inside a dark app. Overriding `light` and `dark`
+     * means the toggle, `v-theme-provider theme="light"`, the `plain-dark`
+     * layout and all of those comparisons keep working, and start being right.
+     *
+     * The colours themselves, and every ratio they were chosen for, are in
+     * `utils/theme.ts`, which `utils/theme.test.ts` measures on every run.
+     */
     theme: {
-      defaultTheme: "iservice365",
+      defaultTheme: "light",
       themes: {
-        iservice365: {
-          dark: false,
-          colors: {
-            primary: "#042134",
-            "primary-button": "#1867C0",
-            "text-primary": "#052439",
-          },
-        },
+        light: LIGHT_THEME,
+        dark: DARK_THEME,
+        /**
+         * The name this product booted on before the two above carried the
+         * brand. Kept, and identical to `light`, so anything that asks for it
+         * by name - in an app that is not in this repository - still gets a
+         * theme rather than a blank one.
+         */
+        iservice365: LIGHT_THEME,
       },
     },
     icons: {

package/test/visitor-socket.test.mjs

@@ -0,0 +1,36 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+
+import { cameraAlertMessage } from "./.build/useVisitorSocket.mjs";
+
+/*
+ * The reported symptom was one camera raising a red toast every 10 seconds on
+ * an unrelated page. API-core now paces the alert; this side has to make sure
+ * several cameras failing at once still cannot become several snackbars.
+ */
+
+test("nothing is shown when no camera is down", () => {
+  assert.equal(cameraAlertMessage([]), "");
+});
+
+test("one failing camera shows the server's own message, which names it", () => {
+  const text = "The entry and exit ANPR camera at Seventh Condominium is not responding.";
+  assert.equal(cameraAlertMessage([text]), text);
+});
+
+test("several failing cameras collapse into a single line", () => {
+  const many = ["camera one is down", "camera two is down", "camera three is down"];
+  const text = cameraAlertMessage(many);
+  assert.match(text, /^3 cameras at this site are not responding/);
+  for (const message of many) assert.doesNotMatch(text, new RegExp(message));
+});
+
+test("the collapsed line points at the page that lists them", () => {
+  assert.match(cameraAlertMessage(["a", "b"]), /Site Settings > Cameras/);
+});
+
+test("no camera message tells the operator to deactivate anything", () => {
+  for (const messages of [["a camera is down"], ["a", "b"]]) {
+    assert.doesNotMatch(cameraAlertMessage(messages), /inactive|deactivat/i);
+  }
+});

package/types/site.d.ts

@@ -1,5 +1,76 @@
 declare type TSiteCreate = Pick<TSite, "name" | "description" | "orgId">;
 
+declare type THidQrCodeFormat = "0" | "1" | "2";
+
+declare type THidPermissionCategory =
+  | "resident"
+  | "property_management"
+  | "service_provider";
+
+declare type THidPermissionAssignment = {
+  subjectId: string;
+  category: THidPermissionCategory;
+  name: string;
+  subtitle?: string;
+  intercom: boolean;
+  readerId?: string;
+  location?: string;
+  locationKey?: string;
+};
+
+declare type THidSitePermissions = {
+  orgId: string;
+  site: string;
+  readerId: string;
+  location: string;
+  assignments: THidPermissionAssignment[];
+  counts: {
+    resident: number;
+    propertyManagement: number;
+    serviceProvider: number;
+    intercom: number;
+  };
+};
+
+declare type THidPermissionCandidate = THidPermissionAssignment & {
+  selected: boolean;
+};
+
+declare type THidQrCodePassConfig = {
+  enabled: boolean;
+  onlineMode?: boolean;
+  readerId: string;
+  qrFormat: THidQrCodeFormat;
+  identificationMethods?: {
+    facial: boolean;
+    card: boolean;
+    qrCode: boolean;
+    idPassword: boolean;
+    pin: boolean;
+    bluetooth: boolean;
+  };
+  printer: {
+    vendorId: string;
+    productId: string;
+  };
+  template: {
+    header: string;
+    subtext: string;
+  };
+  validityMinutes: number | null;
+  updatedAt?: string;
+};
+
+declare type TSiteMetadata = {
+  block?: number;
+  guardPosts?: number;
+  gracePeriod?: number;
+  incidentCounter?: number;
+  incidentLogo?: string;
+  services?: Record<string, unknown>[];
+  hidQrCodePass?: THidQrCodePassConfig;
+};
+
 
 declare type TSite = {
   _id?: string;