@7365admin1/core 3.64.3 → 3.64.4

package/dist/index.mjs

@@ -10981,13 +10981,42 @@ function normaliseModules(modules) {
   }
   return out;
 }
+var ALWAYS_ALLOWED = Object.freeze([
+  "sites",
+  "subscriptions",
+  "customers",
+  "payment-methods",
+  "members",
+  "invitations",
+  "roles",
+  "roles-and-permissions",
+  "site-settings"
+]);
+var SPELLING_GROUPS = Object.freeze(
+  [
+    ["work_orders", "workOrder", "work_order", "work-orders"],
+    ["visitor-mgmt", "visitorManagement"],
+    ["bulletin-board", "bulletin-board-mgmt"],
+    ["facility-booking-mgmt", "facility-booking"],
+    ["feedbacks", "feedback"],
+    ["building-mgmt", "buildingManagement"],
+    ["roles", "roles-and-permissions"],
+    ["service-provider-mgmt", "service-provider"],
+    ["online-form-configuration", "online-forms"]
+  ].map((group) => Object.freeze(group))
+);
+function moduleSpellings(key) {
+  return SPELLING_GROUPS.find((group) => group.includes(key)) ?? [key];
+}
 function orgAllowsModule(modules, resource) {
   if (!Array.isArray(modules) || modules.length === 0)
     return true;
   const key = typeof resource === "string" ? resource.trim() : "";
   if (!key)
     return true;
-  return modules.includes(key);
+  if (ALWAYS_ALLOWED.includes(key))
+    return true;
+  return moduleSpellings(key).some((spelling) => modules.includes(spelling));
 }
 
 // src/models/site.model.ts
@@ -11017,7 +11046,15 @@ function rejectedSiteModules(orgModules, requested) {
   if (!narrows(orgModules))
     return [];
   const org = normaliseModules(orgModules);
-  return normaliseModules(requested).filter((key) => !org.includes(key));
+  return normaliseModules(requested).filter((key) => !orgAllowsModule(org, key));
+}
+function keepStoredSiteModules(metadata, stored) {
+  if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) {
+    return metadata;
+  }
+  const { modules: _sent, ...rest } = metadata;
+  const kept = stored && typeof stored === "object" && !Array.isArray(stored) ? stored.modules : void 0;
+  return kept === void 0 ? rest : { ...rest, modules: kept };
 }
 function rejectedSiteModulesMessage(rejected) {
   return `This organisation has not been given ${rejected.join(", ")}, so a site cannot offer it. Ask Seven365 to add it to the organisation first.`;
@@ -38111,8 +38148,8 @@ function useSiteController() {
       }
       const { _id, ...rest } = value;
       await requireSiteWrite(req, _id);
+      const existing = rest?.metadata ? await _getSiteById(_id) : null;
       if (rest?.metadata?.residentAppModules) {
-        const existing = await _getSiteById(_id);
         const org = existing?.orgId ? await _getOrgById(existing.orgId.toString()).catch(
           () => null
         ) : null;
@@ -38127,6 +38164,12 @@ function useSiteController() {
           return;
         }
       }
+      if (rest?.metadata) {
+        rest.metadata = keepStoredSiteModules(
+          rest.metadata,
+          existing?.metadata
+        );
+      }
       await _updateById(_id, rest);
       res.json({ message: "Successfully updated site." });
       return;
@@ -55185,7 +55228,6 @@ function UseAccessManagementRepo() {
       const type = params.type;
       const search = params.search;
       const typeFilter = type.toLowerCase() === "all" ? [] : [{ $eq: ["$type", type] }];
-      const userIdFilter = params.userId ? [{ $eq: ["$userId", new ObjectId90(params.userId)] }] : [];
       const searchFilter = search ? [
         {
           $or: [
@@ -55260,7 +55302,9 @@ function UseAccessManagementRepo() {
                         { $eq: ["$isActivated", true] },
                         { $eq: ["$userType", userType] },
                         ...typeFilter,
-                        ...userIdFilter
+                        // Cards actually held by a user only - a card sitting
+                        // unassigned on the unit (`userId: null`) is left out.
+                        { $ne: ["$userId", null] }
                       ]
                     },
                     ...searchFilter[0]
@@ -70449,24 +70493,21 @@ function useAccessManagementController() {
         unitId,
         userType,
         type,
-        search = "",
-        userId = ""
+        search = ""
       } = req.query;
       const schema2 = Joi101.object({
         site: Joi101.string().hex().required(),
         unitId: Joi101.string().hex().required(),
         userType: Joi101.string().required(),
         type: Joi101.string().valid("all", ...Object.values(EAccessCardTypes)).required(),
-        search: Joi101.string().optional().allow("", null),
-        userId: Joi101.string().hex().optional().allow("", null)
+        search: Joi101.string().optional().allow("", null)
       });
       const { error } = schema2.validate({
         site,
         unitId,
         userType,
         type,
-        search,
-        userId
+        search
       });
       if (error) {
         return res.status(400).json({ message: error.message });
@@ -70478,8 +70519,7 @@ function useAccessManagementController() {
         unitId,
         userType,
         type,
-        search,
-        userId
+        search
       });
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {