@7365admin1/layer-common 4.97.1-staging.580 → 4.97.1-staging.581

package/components/RolePermissionFormCreate.vue

@@ -284,6 +284,7 @@ import useUtils from "../composables/useUtils";
 import useSite from "../composables/useSite";
 import { readApiError } from "../utils/subscription-form";
 import { withSecurityMarker } from "../utils/security-catalogue";
+import { isTradeCatalogue, withTradeMarker } from "../utils/trade-catalogue";
 import { applyRolePreset, ROLE_PRESETS, type TRolePreset } from "../utils/inventory-presets";
 
 /** Shown after "Couldn't save:" when the server gave no reason (network, timeout). */
@@ -534,10 +535,13 @@ async function submit() {
   try {
     await createRole({
       name: name.value,
-      // Security catalogue only (it carries `offline-data`): stamp the v2 marker.
+      // Security catalogue (it carries `offline-data`) / trade catalogue (it
+      // offers See calendar): stamp that catalogue's v2 marker.
       permissions: "offline-data" in (props.permissions || {})
         ? withSecurityMarker(permState.value.selected)
-        : permState.value.selected,
+        : isTradeCatalogue(props.permissions)
+          ? withTradeMarker(permState.value.selected)
+          : permState.value.selected,
       type: props.type,
       org: props.org,
       site: props.siteId,

package/components/RolePermissionFormPreviewUpdate.vue

@@ -277,6 +277,11 @@ import {
   securityV2PreTicks,
   withSecurityMarker,
 } from "../utils/security-catalogue";
+import {
+  isTradeCatalogue as isTradeCatalogueOf,
+  tradeV2PreTicks,
+  withTradeMarker,
+} from "../utils/trade-catalogue";
 import {
   holdsPermission,
   withoutPermission,
@@ -651,12 +656,21 @@ const isSecurityCatalogue = computed(
   () => "offline-data" in (props.permissions as Record<string, unknown>)
 );
 
-// Opening an UNMARKED security role for edit: pre-tick the new boxes the role
+/** Trade catalogue only: the five trade trees offer Task Calendar -> See calendar. */
+const isTradeCatalogue = computed(() =>
+  isTradeCatalogueOf(props.permissions as Record<string, any>)
+);
+
+// Opening an UNMARKED security (or trade) role for edit: pre-tick the new boxes the role
 // already effectively has (legacy fallback), so an unrelated save never strips
 // access. Cancel restores the original list.
 watch(edit, (on) => {
-  if (!on || !isSecurityCatalogue.value) return;
-  const add = securityV2PreTicks(definedModel.value ?? []);
+  if (!on) return;
+  const add = isSecurityCatalogue.value
+    ? securityV2PreTicks(definedModel.value ?? [])
+    : isTradeCatalogue.value
+      ? tradeV2PreTicks(definedModel.value ?? [])
+      : [];
   if (add.length) definedModel.value = [...definedModel.value, ...add];
 });
 
@@ -735,7 +749,9 @@ async function submit() {
       props.id,
       isSecurityCatalogue.value
         ? withSecurityMarker(definedModel.value)
-        : definedModel.value
+        : isTradeCatalogue.value
+          ? withTradeMarker(definedModel.value)
+          : definedModel.value
     );
     emit("success");
   } catch (error: any) {

package/composables/useCleaningPermission.ts

@@ -13,6 +13,7 @@ export default function useCleaningPermission() {
     bulletinBoardPermissions,
  
     inventoryPermissions,
+    taskCalendarPermissions,
     robotPermissions,
   } = useCommonPermissions();
   const permissions: TPermissions = {
@@ -309,6 +310,8 @@ export default function useCleaningPermission() {
       },
     },
     "robot-mgmt": robotPermissions,
+    // Task Calendar -> See calendar (trade catalogue v2, 2026-10-21).
+    "event-mgmt": taskCalendarPermissions,
   };
 
   return {

package/composables/useCommonPermission.ts

@@ -391,7 +391,19 @@ export function useCommonPermissions() {
     },
   };
 
+  // Trade catalogue v2 (owner 2026-10-21): Task Calendar per role. Grants
+  // nothing alone; a role without `catalogue:trade-v2` keeps the calendar
+  // (utils/trade-catalogue.ts).
+  const taskCalendarPermissions: Record<string, TPermission> = {
+    "see-task-calendar": {
+      check: true,
+      label: "See calendar",
+      description: "Allows the user to open the Task Calendar.",
+    },
+  };
+
   return {
+    taskCalendarPermissions,
     robotPermissions,
     inventoryPermissions,
     invitationPermissions,

package/composables/useLandscapingPermission.ts

@@ -31,9 +31,11 @@ export default function useLandscapingPermission() {
     serviceProviderPermissions,
   
     inventoryPermissions,
+    taskCalendarPermissions,
   } = useCommonPermissions();
   const permissions: TPermissions = {
     inventory: inventoryPermissions,
+    "event-mgmt": taskCalendarPermissions,
     members: memberPermissions,
     roles: rolePermissions,
     invitations: invitationPermissions,

package/composables/useMechanicalElectricalPermission.ts

@@ -31,6 +31,7 @@ export default function useMechanicalElectricalPermission() {
     bulletinBoardPermissions,
 
     inventoryPermissions,
+    taskCalendarPermissions,
   } = useCommonPermissions();
   const { permissions: schedulePermissions } = useCleaningPermission();
 
@@ -66,6 +67,8 @@ export default function useMechanicalElectricalPermission() {
     // same seven actions Cleaning offers (decision 3A) -- taken from it, like
     // the keys above, so the two cannot drift. Catalogue-only: grants nothing.
     "emergency-contact": schedulePermissions["emergency-contact"],
+    // Task Calendar -> See calendar (trade catalogue v2, 2026-10-21).
+    "event-mgmt": taskCalendarPermissions,
 
   };
 

package/composables/usePestControlPermission.ts

@@ -31,9 +31,11 @@ export default function usePestControlPermission() {
     serviceProviderPermissions,
 
     inventoryPermissions,
+    taskCalendarPermissions,
   } = useCommonPermissions();
   const permissions: TPermissions = {
     inventory: inventoryPermissions,
+    "event-mgmt": taskCalendarPermissions,
     members: memberPermissions,
     roles: rolePermissions,
     invitations: invitationPermissions,

package/composables/usePoolMaintenancePermission.ts

@@ -31,9 +31,11 @@ export default function usePoolMaintenancePermission() {
     serviceProviderPermissions,
 
     inventoryPermissions,
+    taskCalendarPermissions,
   } = useCommonPermissions();
   const permissions: TPermissions = {
     inventory: inventoryPermissions,
+    "event-mgmt": taskCalendarPermissions,
     members: memberPermissions,
     roles: rolePermissions,
     invitations: invitationPermissions,

package/constants/permissions.ts

@@ -304,6 +304,8 @@ export const PERMISSIONS = {
     "delete-emergency-contact-category",
   ],
   "event-mgmt": [
+    // Trade catalogue v2 (2026-10-21): Task Calendar -> See calendar.
+    "see-task-calendar",
     "see-all-event",
     "add-event",
     "update-event",
@@ -416,7 +418,7 @@ export const PERMISSIONS = {
   // Security catalogue v2 (2026-10-20). `catalogue:security-v2` is the marker the
   // role editor stamps on save; it grants nothing (see utils/security-catalogue.ts).
   "offline-data": ["see-offline-data"],
-  catalogue: ["security-v2"],
+  catalogue: ["security-v2", "trade-v2"],
   "visitor-mgmt": [
     "invite-visitor",
     "see-all-visitor",

package/package.json

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

@@ -259,7 +259,10 @@ const GRANT_COVERS: Readonly<Record<string, readonly string[]>> = {
   "visitor:create": ["visitor-mgmt:invite-visitor"],
 };
 
+// Trade v2 See calendar: open to every trade role before the box, so no owner
+// grant names it (core `boundToOwnerGrant` never refuses it either).
 const grantHolds = (grant: readonly string[], key: string) =>
+  key === "event-mgmt:see-task-calendar" ||
   grant.includes(key) || grant.some((g) => GRANT_COVERS[g]?.includes(key));
 
 /**

package/utils/permission-labels.ts

@@ -68,6 +68,12 @@ export const RESOURCE_LABELS: Record<string, string> = {
 export const RESOURCE_LABELS_BY_TYPE: Record<string, Record<string, string>> = {
   property_management_agency: { "virtual-patrol": "CCTV" },
   real_estate_developer: { "virtual-patrol": "CCTV" },
+  // Trade catalogue v2: the trade apps call `event-mgmt` the Task Calendar.
+  cleaning_services: { "event-mgmt": "Task Calendar" },
+  mechanical_electrical_services: { "event-mgmt": "Task Calendar" },
+  pest_control_services: { "event-mgmt": "Task Calendar" },
+  pool_maintenance_services: { "event-mgmt": "Task Calendar" },
+  landscaping_services: { "event-mgmt": "Task Calendar" },
 };
 
 /**

package/utils/security-catalogue.ts

@@ -25,7 +25,7 @@ export const isSecurityV2Marked = (perms?: readonly string[] | null) =>
 
 /** Real keys = anything that is not the marker or the wildcard. */
 export const countRealPermissions = (perms?: readonly string[] | null) =>
-  (perms ?? []).filter((p) => p !== SECURITY_CATALOGUE_MARKER).length;
+  (perms ?? []).filter((p) => !p.startsWith("catalogue:")).length; // every catalogue marker (security-v2, trade-v2)
 
 /**
  * Effective grant for a v2 key. Empty list / "*" = allowed (same as

package/utils/trade-catalogue.ts

@@ -0,0 +1,43 @@
+import { holdsPermission } from "./permission-spellings.ts";
+
+/**
+ * Trade catalogue v2 (hygiene, M&E, pest control, pool, landscape), owner
+ * 2026-10-21: "Task Calendar -> See calendar" per role, and "keep access until
+ * changed". The role editor stamps the marker when it saves a trade role. A role
+ * without it was never saved with the box and keeps the calendar (it was open
+ * to every role). The marker grants nothing. Mirrors core
+ * `trade-catalogue.util.ts`; keep the two in step.
+ */
+export const TRADE_CATALOGUE_MARKER = "catalogue:trade-v2";
+export const TASK_CALENDAR_KEY = "event-mgmt:see-task-calendar";
+
+export const isTradeV2Marked = (perms?: readonly string[] | null) =>
+  !!perms?.includes(TRADE_CATALOGUE_MARKER);
+
+/** Is this editor catalogue a trade one (it offers the See calendar box)? */
+export const isTradeCatalogue = (catalogue?: Record<string, any> | null) =>
+  !!catalogue?.["event-mgmt"]?.["see-task-calendar"];
+
+/**
+ * May this role open the Task Calendar? No role = no. Empty list / "*" = yes
+ * (empty means all). Unmarked = yes (keeps today's access). Marked = the box.
+ */
+export function canSeeTaskCalendar(perms: readonly string[] | null | undefined): boolean {
+  if (!perms) return false;
+  if (!perms.length || perms.includes("*")) return true;
+  if (!isTradeV2Marked(perms)) return true;
+  return holdsPermission(perms, TASK_CALENDAR_KEY);
+}
+
+/** Marker to append on save: only when the list has a real key and no "*". */
+export function withTradeMarker(perms: readonly string[]): string[] {
+  const keys = perms.filter((p) => p !== TRADE_CATALOGUE_MARKER);
+  if (!keys.some((p) => !p.startsWith("catalogue:")) || keys.includes("*")) return keys;
+  return [...keys, TRADE_CATALOGUE_MARKER];
+}
+
+/** Box to pre-tick when opening an UNMARKED trade role in the editor. */
+export function tradeV2PreTicks(perms: readonly string[]): string[] {
+  if (!perms.length || perms.includes("*") || isTradeV2Marked(perms)) return [];
+  return perms.includes(TASK_CALENDAR_KEY) ? [] : [TASK_CALENDAR_KEY];
+}