@infuro/cms-core 1.0.22 → 1.0.23

package/dist/index.cjs

@@ -4388,12 +4388,14 @@ function createDashboardStatsHandler(config) {
       const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1e3);
       const repo = (name) => entityMap[name] ? dataSource.getRepository(entityMap[name]) : void 0;
       const [contactsCount, formsCount, formSubmissionsCount, usersCount, blogsCount, recentContacts, recentSubmissions, contactTypeRows] = await Promise.all([
-        repo("contacts")?.count() ?? 0,
+        repo("contacts")?.count({ where: { deleted: false } }) ?? 0,
         repo("forms")?.count({ where: { deleted: false } }) ?? 0,
         repo("form_submissions")?.count() ?? 0,
         repo("users")?.count({ where: { deleted: false } }) ?? 0,
         repo("blogs")?.count({ where: { deleted: false } }) ?? 0,
-        repo("contacts")?.count({ where: { createdAt: (0, import_typeorm6.MoreThanOrEqual)(sevenDaysAgo) } }) ?? 0,
+        repo("contacts")?.count({
+          where: { deleted: false, createdAt: (0, import_typeorm6.MoreThanOrEqual)(sevenDaysAgo) }
+        }) ?? 0,
         repo("form_submissions")?.count({ where: { createdAt: (0, import_typeorm6.MoreThanOrEqual)(sevenDaysAgo) } }) ?? 0,
         repo("contacts")?.createQueryBuilder("c").select("COALESCE(NULLIF(TRIM(c.type), ''), 'unknown')", "type").addSelect("COUNT(*)", "count").where("c.deleted = :deleted", { deleted: false }).groupBy("COALESCE(NULLIF(TRIM(c.type), ''), 'unknown')").getRawMany() ?? []
       ]);
@@ -5026,11 +5028,14 @@ function createFormSubmissionHandler(config) {
           const contactRepo = dataSource.getRepository(entityMap.contacts);
           let contact = await contactRepo.findOne({ where: { email: contactData.email } });
           if (!contact) {
+            const createdAt = /* @__PURE__ */ new Date();
             contact = await contactRepo.save(
               contactRepo.create({
                 name: contactData.name,
                 email: contactData.email,
-                phone: contactData.phone
+                phone: contactData.phone,
+                createdAt,
+                updatedAt: createdAt
               })
             );
           }
@@ -5186,12 +5191,13 @@ function createUsersApiHandlers(config) {
         const gid = body.groupId ?? null;
         const isCustomer = !!(customerG && gid === customerG.id);
         const adminAccess = isCustomer ? false : body.adminAccess === false ? false : true;
+        const blocked = body.blocked === true || body.blocked === "true" || body.blocked === 1 || body.blocked === "1";
         const newUser = await userRepo().save(
           userRepo().create({
             name: body.name,
             email: body.email,
             password: null,
-            blocked: true,
+            blocked,
             groupId: gid,
             adminAccess
           })
@@ -5206,7 +5212,14 @@ function createUsersApiHandlers(config) {
           inviteLink,
           newUser.name ?? ""
         );
-        return json({ message: "User created successfully (blocked until password is set)", user: newUser, inviteLink }, { status: 201 });
+        return json(
+          {
+            message: blocked ? "User created successfully (blocked until password is set)" : "User created successfully",
+            user: newUser,
+            inviteLink
+          },
+          { status: 201 }
+        );
       } catch {
         return json({ error: "Server Error" }, { status: 500 });
       }
@@ -5508,7 +5521,10 @@ function createChatHandlers(config) {
         const existing = await repo.findOne({ where: { email } });
         let contact;
         if (!existing) {
-          contact = await repo.save(repo.create({ name, email, phone }));
+          const createdAt = /* @__PURE__ */ new Date();
+          contact = await repo.save(
+            repo.create({ name, email, phone, createdAt, updatedAt: createdAt })
+          );
         } else {
           const row = existing;
           if (row.deleted) {
@@ -8707,6 +8723,40 @@ function logCrudClientError(op, detail) {
 function logCrudServerError(op, detail) {
   console.error(CRUD_LOG, op, detail);
 }
+async function aggregateMediaFolderFileSizes(dataSource, folderIds) {
+  const map = /* @__PURE__ */ new Map();
+  if (folderIds.length === 0) return map;
+  try {
+    const rows = await dataSource.query(
+      `
+      WITH RECURSIVE walk AS (
+        SELECT m."parentId" AS root_id, m.id, m.kind, m.size
+        FROM media m
+        WHERE m."parentId" = ANY($1) AND m.deleted = false
+        UNION ALL
+        SELECT w.root_id, m.id, m.kind, m.size
+        FROM walk w
+        INNER JOIN media m ON m."parentId" = w.id AND m.deleted = false
+      )
+      SELECT root_id AS "rootId", COALESCE(SUM(size) FILTER (WHERE kind = 'file'), 0)::bigint AS "totalSize"
+      FROM walk
+      GROUP BY root_id
+      `,
+      [folderIds]
+    );
+    for (const r of rows) {
+      map.set(Number(r.rootId), Number(r.totalSize));
+    }
+    for (const id of folderIds) {
+      if (!map.has(id)) map.set(id, 0);
+    }
+  } catch (err) {
+    logCrudServerError("media folder size aggregate failed", {
+      message: err instanceof Error ? err.message : String(err)
+    });
+  }
+  return map;
+}
 var DATE_COLUMN_TYPES = /* @__PURE__ */ new Set([
   "date",
   "datetime",
@@ -8771,6 +8821,16 @@ function mergeDeletedFalseWhere(repo, where) {
   }
   return Object.keys(where).length > 0 ? { ...where, ...d } : d;
 }
+function normalizeProductSku(value) {
+  if (value == null) return null;
+  const s = String(value).trim();
+  return s === "" ? null : s;
+}
+async function assertProductSkuUnique(repo, sku, excludeId) {
+  const where = excludeId != null ? { sku, deleted: false, id: (0, import_typeorm46.Not)(excludeId) } : { sku, deleted: false };
+  const row = await repo.findOne({ where });
+  return row == null;
+}
 function buildSoftDeletePayload(meta, deletedBy) {
   const payload = { deleted: true };
   if (meta.columns.some((c) => c.propertyName === "deletedAt")) {
@@ -8993,19 +9053,36 @@ function createCrudHandler(dataSource, entityMap, options) {
           qb.andWhere("m.filename ILIKE :search", { search: `%${search.trim()}%` });
         }
         if (typeFilter) {
-          qb.andWhere(
-            new import_typeorm46.Brackets((sq) => {
-              sq.where("m.kind = :folderKind", { folderKind: "folder" }).orWhere("m.mimeType LIKE :mtp", {
-                mtp: `${typeFilter}/%`
-              });
-            })
-          );
+          if (typeFilter === "folder") {
+            qb.andWhere("m.kind = :folderKind", { folderKind: "folder" });
+          } else if (typeFilter === "file") {
+            qb.andWhere("m.kind = :fileKind", { fileKind: "file" });
+          } else if (typeFilter === "image") {
+            qb.andWhere("m.mimeType LIKE :imageMimeType", { imageMimeType: "image/%" });
+          } else if (typeFilter === "video") {
+            qb.andWhere("m.mimeType LIKE :videoMimeType", { videoMimeType: "video/%" });
+          } else if (typeFilter === "audio") {
+            qb.andWhere("m.mimeType LIKE :audioMimeType", { audioMimeType: "audio/%" });
+          } else if (typeFilter === "Document") {
+            qb.andWhere("m.mimeType LIKE :documentMimeType", { documentMimeType: "application/pdf" });
+          } else if (typeFilter === "application") {
+            qb.andWhere("m.kind = :folderKind", { folderKind: "folder" });
+          }
         }
         const allowedSort = ["filename", "createdAt", "id"];
         const sf = allowedSort.includes(sortFieldRaw) ? sortFieldRaw : "filename";
         const so = sortOrder === "DESC" ? "DESC" : "ASC";
-        qb.orderBy("CASE WHEN m.kind = :fk THEN 0 ELSE 1 END", "ASC").addOrderBy(`m.${sf}`, so).setParameter("fk", "folder").skip(skip).take(limit);
-        const [data2, total2] = await qb.getManyAndCount();
+        qb.orderBy(`m.${sf}`, so).skip(skip).take(limit);
+        const [rows, total2] = await qb.getManyAndCount();
+        const mediaRows = rows;
+        const folderIds = mediaRows.filter((m) => m.kind === "folder").map((m) => m.id);
+        let data2 = rows;
+        if (folderIds.length > 0) {
+          const sizeMap = await aggregateMediaFolderFileSizes(dataSource, folderIds);
+          data2 = mediaRows.map(
+            (m) => m.kind === "folder" ? { ...m, size: sizeMap.get(m.id) ?? 0 } : m
+          );
+        }
         return json({ total: total2, page, limit, totalPages: Math.ceil(total2 / limit), data: data2 });
       }
       const sortField = columnNames.has(sortFieldRaw) ? sortFieldRaw : "createdAt";
@@ -9116,6 +9193,20 @@ function createCrudHandler(dataSource, entityMap, options) {
         });
         return json({ error: "Invalid request payload" }, { status: 400 });
       }
+      if (resource === "products") {
+        if ("sku" in persistBody) {
+          const skuNorm = normalizeProductSku(persistBody.sku);
+          if (skuNorm) {
+            const ok = await assertProductSkuUnique(repo, skuNorm);
+            if (!ok) {
+              return json({ error: "SKU already exists. Please use a unique SKU." }, { status: 400 });
+            }
+            persistBody.sku = skuNorm;
+          } else {
+            persistBody.sku = null;
+          }
+        }
+      }
       sanitizeBodyForEntity(repo, persistBody);
       let created;
       try {
@@ -9310,7 +9401,20 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           relations: ["order", "order.contact", "contact"]
         });
         if (!payment) return json({ message: "Not found" }, { status: 404 });
-        return json(payment);
+        const p = payment;
+        const order = p.order;
+        const orderContact = order?.contact;
+        const contact = p.contact;
+        const customer = orderContact ?? contact;
+        return json({
+          ...p,
+          order: order ? {
+            id: order.id,
+            orderNumber: order.orderNumber,
+            contact: orderContact ? { name: orderContact.name, email: orderContact.email } : null
+          } : null,
+          contact: customer ? { id: customer.id, name: customer.name, email: customer.email } : null
+        });
       }
       if (resource === "blogs") {
         const blog = await repo.findOne({
@@ -9425,6 +9529,23 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
         delete u.parentId;
         delete u.kind;
       }
+      if (resource === "products") {
+        const currentRow = await repo.findOne({
+          where: { id: numericId, deleted: false }
+        });
+        if (!currentRow) return json({ message: "Not found" }, { status: 404 });
+        const merged = { ...currentRow, ...updatePayload };
+        const effSku = normalizeProductSku(merged.sku);
+        if (effSku) {
+          const ok = await assertProductSkuUnique(repo, effSku, numericId);
+          if (!ok) {
+            return json({ error: "SKU already exists. Please use a unique SKU." }, { status: 400 });
+          }
+        }
+        if ("sku" in updatePayload) {
+          updatePayload.sku = effSku;
+        }
+      }
       if (Object.keys(updatePayload).length > 0) {
         sanitizeBodyForEntity(repo, updatePayload);
         await repo.update(numericId, updatePayload);
@@ -9454,6 +9575,11 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           where: { id: numericId, deleted: false }
         });
         if (!existing) return json({ message: "Not found" }, { status: 404 });
+        if (resource === "contacts") {
+          const result2 = await repo.delete(numericId);
+          if (result2.affected === 0) return json({ message: "Not found" }, { status: 404 });
+          return json({ message: "Deleted successfully" }, { status: 200 });
+        }
         let deletedBy = null;
         if (getDeletedByUserId) {
           try {
@@ -12263,7 +12389,7 @@ var DEFAULT_ADMIN_NAV = [
 ];
 
 // src/index.ts
-console.log("\u{1F525} USING LOCAL CMS CORE (index.ts loaded) \u{1F525}");
+console.log("\u{1F525} USING LOCAL CMS (index.ts loaded) \u{1F525}");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ADMIN_GROUP_NAME,