@7365admin1/core 3.64.0 → 3.64.2

package/dist/index.mjs

@@ -13478,7 +13478,6 @@ function useCustomerSiteRepo() {
       cacheOptions.siteScope = scoped.length ? [...scoped].sort().join(",") : "no-site";
     }
     if (search) {
-      query2.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
     const cacheKey = makeCacheKey10(namespace_collection2, cacheOptions);
@@ -13491,8 +13490,20 @@ function useCustomerSiteRepo() {
       const distinctPipeline = [
         { $match: query2 },
         { $sort: sort },
-        { $group: { _id: { name: "$name", site: "$site" }, doc: { $first: "$$ROOT" } } },
+        { $group: { _id: "$site", doc: { $first: "$$ROOT" } } },
         { $replaceRoot: { newRoot: "$doc" } },
+        {
+          $lookup: {
+            from: "sites",
+            localField: "site",
+            foreignField: "_id",
+            as: "_liveSite"
+          }
+        },
+        { $unwind: { path: "$_liveSite", preserveNullAndEmptyArrays: true } },
+        { $set: { name: { $ifNull: ["$_liveSite.name", "$name"] } } },
+        { $unset: "_liveSite" },
+        ...search ? [{ $match: { name: { $regex: search, $options: "i" } } }] : [],
         { $sort: sort }
       ];
       const items = await collection.aggregate(
@@ -13503,14 +13514,7 @@ function useCustomerSiteRepo() {
         ],
         { session }
       ).toArray();
-      const countResult = await collection.aggregate(
-        [
-          { $match: query2 },
-          { $group: { _id: { name: "$name", site: "$site" } } },
-          { $count: "total" }
-        ],
-        { session }
-      ).toArray();
+      const countResult = await collection.aggregate([...distinctPipeline, { $count: "total" }], { session }).toArray();
       const length = countResult[0]?.total ?? 0;
       const data = paginate10(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
@@ -88531,6 +88535,10 @@ function useRoleControllerV2() {
       if (value.org) {
         await requireOrgReach(req, value.org);
       }
+      requireNoPlatformGrant(
+        { type: value.type, org: value.org, permissions: [] },
+        value.permissions
+      );
       requireWithinModules(
         await moduleCeiling(value.org, value.site),
         value.permissions