@infuro/cms-core 1.0.42 → 1.0.43

package/dist/{chunk-GINYYPXK.cjs → chunk-SCPKMZG5.cjs}

@@ -8635,6 +8635,12 @@ function createUploadHandler(config) {
         parentId
       });
     } catch (err) {
+      console.error("[upload] File upload failed", {
+        error: err instanceof Error ? err.message : String(err),
+        stack: err instanceof Error ? err.stack : void 0,
+        name: err instanceof Error ? err.name : void 0,
+        metadata: err && typeof err === "object" && "$metadata" in err ? err.$metadata : void 0
+      });
       return json({
         error: "File upload failed"
       }, {
@@ -9340,41 +9346,68 @@ function createUsersApiHandlers(config) {
         const page = Math.max(1, parseInt(url.searchParams.get("page") || "1", 10));
         const limit = Math.min(100, parseInt(url.searchParams.get("limit") || "10", 10));
         const skip = (page - 1) * limit;
-        const sortField = url.searchParams.get("sortField") || "createdAt";
+        const sortFieldRaw = url.searchParams.get("sortField") || "createdAt";
+        const allowedSort = /* @__PURE__ */ new Set([
+          "createdAt",
+          "updatedAt",
+          "name",
+          "email",
+          "id",
+          "blocked"
+        ]);
+        const sortField = allowedSort.has(sortFieldRaw) ? sortFieldRaw : "createdAt";
         const sortOrder = url.searchParams.get("sortOrder") === "desc" ? "DESC" : "ASC";
-        const search = url.searchParams.get("search");
-        const where = search ? [
-          {
-            name: typeorm.ILike(`%${search}%`),
-            deleted: false
-          },
-          {
-            email: typeorm.ILike(`%${search}%`),
-            deleted: false
-          }
-        ] : {
+        const search = url.searchParams.get("search")?.trim() || "";
+        const groupName = url.searchParams.get("groupName")?.trim() || "";
+        const qb = userRepo().createQueryBuilder("u").leftJoinAndSelect("u.group", "g").where("u.deleted = :deleted", {
           deleted: false
-        };
-        const [data, total] = await userRepo().findAndCount({
-          skip,
-          take: limit,
-          order: {
-            [sortField]: sortOrder
-          },
-          where,
-          relations: [
-            "group"
-          ],
-          select: [
-            "id",
-            "name",
-            "email",
-            "blocked",
-            "createdAt",
-            "updatedAt",
-            "groupId"
-          ]
-        });
+        }).orderBy(`u.${sortField}`, sortOrder).skip(skip).take(limit).select([
+          "u.id",
+          "u.name",
+          "u.email",
+          "u.blocked",
+          "u.createdAt",
+          "u.updatedAt",
+          "u.groupId",
+          "g.id",
+          "g.name"
+        ]);
+        if (search) {
+          qb.andWhere("(u.name ILIKE :search OR u.email ILIKE :search)", {
+            search: `%${search}%`
+          });
+        }
+        if (groupName) {
+          if (!entityMap.user_groups) {
+            return json({
+              total: 0,
+              page,
+              limit,
+              totalPages: 0,
+              data: []
+            });
+          }
+          const groupRepo = dataSource.getRepository(entityMap.user_groups);
+          const group = await groupRepo.findOne({
+            where: {
+              name: groupName,
+              deleted: false
+            }
+          });
+          if (!group) {
+            return json({
+              total: 0,
+              page,
+              limit,
+              totalPages: 0,
+              data: []
+            });
+          }
+          qb.andWhere("u.groupId = :groupId", {
+            groupId: Number(group.id)
+          });
+        }
+        const [data, total] = await qb.getManyAndCount();
         return json({
           total,
           page,