@7365admin1/core 3.134.0 → 3.135.0

package/dist/index.mjs

@@ -4286,7 +4286,7 @@ function useMemberRepo() {
       throw error;
     }
   }
-  async function updateRoleById(_id, role) {
+  async function updateRoleById(_id, role, createdBy) {
     try {
       _id = new ObjectId14(_id);
     } catch (error) {
@@ -4302,6 +4302,9 @@ function useMemberRepo() {
         role,
         updatedAt: /* @__PURE__ */ new Date()
       };
+      if (createdBy && ObjectId14.isValid(String(createdBy))) {
+        updateValue.createdBy = new ObjectId14(String(createdBy));
+      }
       const res = await collection.updateOne({ _id }, { $set: updateValue });
       if (res.modifiedCount === 0) {
         throw new InternalServerError6("Unable to update feedback status.");
@@ -8833,11 +8836,27 @@ async function siteInvitedPins(db2, userId, memberships) {
   const keys = /* @__PURE__ */ new Set();
   if (!pinned.length || !ObjectId26.isValid(userId))
     return keys;
+  const both3 = (ids2) => [...new Set(ids2.map(String))].flatMap((v) => [v, new ObjectId26(v)]);
+  const wanted = new Set(pinned.map((m) => pinKey(m.org, m.siteId)));
+  const placed = await db2.collection("members").find(
+    {
+      user: new ObjectId26(userId),
+      status: { $ne: "deleted" },
+      org: { $in: both3(pinned.map((m) => m.org)) },
+      siteId: { $in: both3(pinned.map((m) => m.siteId)) },
+      createdBy: { $type: "objectId", $ne: new ObjectId26(userId) }
+    },
+    { projection: { org: 1, siteId: 1 } }
+  ).toArray();
+  for (const row of placed) {
+    const key = pinKey(row.org, row.siteId);
+    if (wanted.has(key))
+      keys.add(key);
+  }
   const user = await db2.collection("users").findOne({ _id: new ObjectId26(userId) }, { projection: { email: 1 } });
   const email = String(user?.email ?? "").trim();
   if (!email)
     return keys;
-  const both3 = (ids2) => [...new Set(ids2.map(String))].flatMap((v) => [v, new ObjectId26(v)]);
   const invites = await db2.collection("verifications").find(
     {
       email,
@@ -8853,7 +8872,6 @@ async function siteInvitedPins(db2, userId, memberships) {
       collation: { locale: "en", strength: 2 }
     }
   ).toArray();
-  const wanted = new Set(pinned.map((m) => pinKey(m.org, m.siteId)));
   for (const invite of invites) {
     const key = pinKey(invite.metadata?.org, invite.metadata?.siteId);
     if (wanted.has(key))
@@ -24813,7 +24831,8 @@ function useRoleRepo() {
     sort = {},
     type = "",
     org = "",
-    site = ""
+    site = "",
+    scope = ""
   }) {
     page2 = page2 > 0 ? page2 - 1 : 0;
     if (org && typeof org === "string" && org.length === 24) {
@@ -24835,6 +24854,9 @@ function useRoleRepo() {
     if (site) {
       query2.$or = [{ site }, { site: "" }, { site: null }];
       cacheOptions.site = site.toString();
+    } else if (scope === "organisation") {
+      query2.site = { $in: ["", null] };
+      cacheOptions.scope = scope;
     }
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     cacheOptions.sort = JSON.stringify(sort);
@@ -27290,7 +27312,9 @@ function useRoleController() {
       limit: Joi28.number().integer().min(1).max(100).allow("", null).default(10),
       type: Joi28.string().optional().allow("", null),
       org: Joi28.string().hex().optional().allow("", null),
-      site: Joi28.string().hex().optional().allow("", null)
+      site: Joi28.string().hex().optional().allow("", null),
+      // "organisation": only the roles with no site (Organization app, service roles made once)
+      scope: Joi28.string().valid("organisation").optional().allow("", null)
     });
     const query2 = { ...req.query };
     const { error } = validation.validate(query2);
@@ -27305,18 +27329,19 @@ function useRoleController() {
     const type = req.query.type ?? "";
     const org = req.query.org ?? "";
     const site = req.query.site ?? "";
+    const scope = req.query.scope ?? "";
     try {
       if (org) {
         await requireOrgReach(req, org);
       }
-      let data = await _getRoles({ search, page: page2, limit, type, org, site });
-      const listIsWholeOrg = org && !search && !site && page2 === 1;
+      let data = await _getRoles({ search, page: page2, limit, type, org, site, scope });
+      const listIsWholeOrg = org && !search && !site && !scope && page2 === 1;
       const listed = data?.items;
       if (listIsWholeOrg && listed?.length === 0) {
         const seeded = await healDefaultRoles(org).catch(() => 0);
         if (seeded > 0) {
           try {
-            data = await _getRoles({ search, page: page2, limit, type, org, site });
+            data = await _getRoles({ search, page: page2, limit, type, org, site, scope });
           } catch (error2) {
             logger42.log({ level: "error", message: error2.message });
           }
@@ -27768,7 +27793,8 @@ function useMemberService() {
         }
       }
     }
-    await _updateRoleById(id, role);
+    const placedBy = member.siteId && !newRole?.site && callerId5 && ObjectId60.isValid(callerId5) && String(member.user ?? "") !== callerId5 ? callerId5 : void 0;
+    await _updateRoleById(id, role, placedBy);
     return { message: "Member role updated successfully." };
   }
   async function updateSiteById(id, siteId, siteName) {
@@ -27816,6 +27842,7 @@ function useMemberService() {
 import { BadRequestError as BadRequestError56, UnauthorizedError as UnauthorizedError7, useAtlas as useAtlas44 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId61 } from "mongodb";
 var EXCLUDED_TYPES = ["resident", PLATFORM_STAFF_MEMBER_TYPE];
+var ORG_ROLE_EXCLUDED = [...EXCLUDED_TYPES, "organization"];
 var both = (id) => [id, new ObjectId61(id)];
 function useMemberSiteAccessService() {
   const { add, updateMemberStatus, updateRoleById } = useMemberRepo();
@@ -27855,10 +27882,13 @@ function useMemberSiteAccessService() {
     const roles = await db2().collection("roles").find({
       $or: [
         { _id: { $in: roleIds.map((r) => new ObjectId61(r)) } },
-        { org: { $in: both(org) }, site: { $in: [...sites.keys()].flatMap(both) }, status: "active" }
+        { org: { $in: both(org) }, site: { $in: [...sites.keys()].flatMap(both) }, status: "active" },
+        // organisation-level service roles (no site; never the org-console type)
+        { org: { $in: both(org) }, site: { $in: ["", null] }, status: "active", type: { $nin: ORG_ROLE_EXCLUDED } }
       ]
     }).project({ name: 1, type: 1, site: 1, org: 1, status: 1 }).toArray();
     const byId = new Map(roles.map((r) => [String(r._id), r]));
+    const orgRoles = roles.filter((r) => !String(r.site ?? "") && String(r.org ?? "") === org && r.status === "active" && !ORG_ROLE_EXCLUDED.includes(r.type)).map((r) => ({ _id: String(r._id), name: r.name ?? "", type: r.type ?? "", scope: "organisation" })).sort((a, b) => a.name.localeCompare(b.name));
     const view = (m) => ({
       _id: String(m._id),
       role: String(m.role ?? ""),
@@ -27872,7 +27902,7 @@ function useMemberSiteAccessService() {
         ...s,
         membership: here[0] ?? null,
         memberships: here,
-        roles: roles.filter((r) => String(r.site ?? "") === s.site && String(r.org ?? "") === org && r.status === "active" && !EXCLUDED_TYPES.includes(r.type)).map((r) => ({ _id: String(r._id), name: r.name ?? "", type: r.type ?? "" }))
+        roles: roles.filter((r) => String(r.site ?? "") === s.site && String(r.org ?? "") === org && r.status === "active" && !EXCLUDED_TYPES.includes(r.type)).map((r) => ({ _id: String(r._id), name: r.name ?? "", type: r.type ?? "", scope: "site" })).concat(orgRoles)
       };
     }).sort((a, b) => a.name.localeCompare(b.name));
     const orgWide = members.filter((m) => !String(m.siteId ?? "")).map(view);
@@ -27898,7 +27928,7 @@ function useMemberSiteAccessService() {
         throw new BadRequestError56("A site is listed twice.");
       seen2.add(choice.site);
       if (!row.roles.some((r) => r._id === choice.role)) {
-        throw new BadRequestError56(`Choose a role created for ${row.name || "that site"}.`);
+        throw new BadRequestError56(`Choose a role created for ${row.name || "that site"}, or one of the organisation's service roles.`);
       }
     }
     const userDoc = await db2().collection("users").findOne({ _id: new ObjectId61(user) }, { projection: { email: 1, name: 1 } });
@@ -27912,10 +27942,11 @@ function useMemberSiteAccessService() {
       const choice = sites.find((c) => c.site === row.site);
       const role = choice ? row.roles.find((r) => r._id === choice.role) : null;
       const keep = role ? row.memberships.find((m) => m.type === role.type) : void 0;
-      if (role && keep && keep.role !== role._id) {
+      if (role && keep && (keep.role !== role._id || role.scope === "organisation")) {
         reroles.push(async () => {
-          await updateRoleById(keep._id, role._id);
-          applied.changed.push(row.site);
+          await updateRoleById(keep._id, role._id, actor);
+          if (keep.role !== role._id)
+            applied.changed.push(row.site);
         });
       } else if (role && !keep) {
         adds.push(async () => {
@@ -27924,7 +27955,7 @@ function useMemberSiteAccessService() {
             { projection: { _id: 1 } }
           );
           if (old) {
-            await updateRoleById(old._id, role._id);
+            await updateRoleById(old._id, role._id, actor);
             await updateMemberStatus(old._id, { status: suspended ? "suspended" : "active" });
           } else {
             await add({
@@ -27938,6 +27969,8 @@ function useMemberSiteAccessService() {
               siteId: row.site,
               siteName: row.name,
               dateInvited: (/* @__PURE__ */ new Date()).toISOString(),
+              // "placed at this site by the editor": confines an organisation role to it (siteInvitedPins)
+              createdBy: actor,
               ...suspended ? { status: "suspended" } : {}
             });
           }