@sonicjs-cms/core 2.10.0 → 2.10.1

package/dist/{chunk-JTNUM7JE.js → chunk-SDAGUFOF.js}

@@ -1,10 +1,10 @@
-import { getCacheService, CACHE_CONFIGS, getLogger, SettingsService, getAppInstance, buildRouteList, CATEGORY_INFO } from './chunk-7JMMLHPQ.js';
-import { requireAuth, requireRole, isPluginActive, optionalAuth, rateLimit, AuthManager, logActivity, generateCsrfToken } from './chunk-4TTMQQC7.js';
-import { PluginService } from './chunk-27AOVQTR.js';
-import { MigrationService } from './chunk-6O3RJV3C.js';
+import { getCacheService, CACHE_CONFIGS, getLogger, SettingsService, getAppInstance, buildRouteList, CATEGORY_INFO } from './chunk-VJCLJH3X.js';
+import { requireAuth, requireRole, isPluginActive, optionalAuth, rateLimit, AuthManager, logActivity, generateCsrfToken } from './chunk-JFMBYQTC.js';
+import { PluginService, createContentFromSubmission } from './chunk-BUPNX3ZM.js';
+import { MigrationService } from './chunk-FW5CGNM2.js';
 import { init_admin_layout_catalyst_template, renderDesignPage, renderCheckboxPage, renderTestimonialsList, renderCodeExamplesList, renderAlert, renderTable, renderPagination, renderConfirmationDialog, getConfirmationDialogScript, renderAdminLayoutCatalyst, renderAdminLayout, adminLayoutV2, renderForm } from './chunk-JJS7JZCH.js';
 import { PluginBuilder, TurnstileService } from './chunk-J5WGMRSU.js';
-import { QueryFilterBuilder, getCoreVersion, getBlocksFieldConfig, parseBlocksValue } from './chunk-IZWNIUJI.js';
+import { QueryFilterBuilder, getCoreVersion, getBlocksFieldConfig, parseBlocksValue } from './chunk-YXTFJPMN.js';
 import { metricsTracker } from './chunk-FICTAGD4.js';
 import { escapeHtml, sanitizeRichText, sanitizeInput } from './chunk-TQABQWOP.js';
 import { Hono } from 'hono';
@@ -748,7 +748,7 @@ apiRoutes.get("/collections", async (c) => {
     }
     c.header("X-Cache-Status", "MISS");
     c.header("X-Cache-Source", "database");
-    const stmt = db.prepare("SELECT * FROM collections WHERE is_active = 1");
+    const stmt = db.prepare("SELECT * FROM collections WHERE is_active = 1 AND (source_type IS NULL OR source_type = 'user')");
     const { results } = await stmt.all();
     const transformedResults = results.map((row) => ({
       ...row,
@@ -1777,7 +1777,7 @@ adminApiRoutes.get("/stats", async (c) => {
     const db = c.env.DB;
     let collectionsCount = 0;
     try {
-      const collectionsStmt = db.prepare("SELECT COUNT(*) as count FROM collections WHERE is_active = 1");
+      const collectionsStmt = db.prepare("SELECT COUNT(*) as count FROM collections WHERE is_active = 1 AND (source_type IS NULL OR source_type = 'user')");
       const collectionsResult = await collectionsStmt.first();
       collectionsCount = collectionsResult?.count || 0;
     } catch (error) {
@@ -1785,7 +1785,7 @@ adminApiRoutes.get("/stats", async (c) => {
     }
     let contentCount = 0;
     try {
-      const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content WHERE deleted_at IS NULL");
+      const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content c JOIN collections col ON c.collection_id = col.id WHERE c.deleted_at IS NULL AND (col.source_type IS NULL OR col.source_type = 'user')");
       const contentResult = await contentStmt.first();
       contentCount = contentResult?.count || 0;
     } catch (error) {
@@ -1927,6 +1927,7 @@ adminApiRoutes.get("/collections", async (c) => {
         SELECT id, name, display_name, description, created_at, updated_at, is_active, managed
         FROM collections
         WHERE ${includeInactive ? "1=1" : "is_active = 1"}
+        AND (source_type IS NULL OR source_type = 'user')
         AND (name LIKE ? OR display_name LIKE ? OR description LIKE ?)
         ORDER BY created_at DESC
       `);
@@ -1937,7 +1938,8 @@ adminApiRoutes.get("/collections", async (c) => {
       stmt = db.prepare(`
         SELECT id, name, display_name, description, created_at, updated_at, is_active, managed
         FROM collections
-        ${includeInactive ? "" : "WHERE is_active = 1"}
+        WHERE (source_type IS NULL OR source_type = 'user')
+        ${includeInactive ? "" : "AND is_active = 1"}
         ORDER BY created_at DESC
       `);
       const queryResults = await stmt.all();
@@ -2281,7 +2283,7 @@ adminApiRoutes.delete("/collections/:id", async (c) => {
 });
 adminApiRoutes.get("/migrations/status", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-N2C2VPJU.js');
+    const { MigrationService: MigrationService2 } = await import('./migrations-ADK6YNM2.js');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const status = await migrationService.getMigrationStatus();
@@ -2306,7 +2308,7 @@ adminApiRoutes.post("/migrations/run", async (c) => {
         error: "Unauthorized. Admin access required."
       }, 403);
     }
-    const { MigrationService: MigrationService2 } = await import('./migrations-N2C2VPJU.js');
+    const { MigrationService: MigrationService2 } = await import('./migrations-ADK6YNM2.js');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const result = await migrationService.runPendingMigrations();
@@ -2325,7 +2327,7 @@ adminApiRoutes.post("/migrations/run", async (c) => {
 });
 adminApiRoutes.get("/migrations/validate", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-N2C2VPJU.js');
+    const { MigrationService: MigrationService2 } = await import('./migrations-ADK6YNM2.js');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const validation = await migrationService.validateSchema();
@@ -9357,7 +9359,7 @@ adminContentRoutes.get("/", async (c) => {
     const status = url.searchParams.get("status") || "all";
     const search = url.searchParams.get("search") || "";
     const offset = (page - 1) * limit;
-    const collectionsStmt = db.prepare("SELECT id, name, display_name FROM collections WHERE is_active = 1 ORDER BY display_name");
+    const collectionsStmt = db.prepare("SELECT id, name, display_name FROM collections WHERE is_active = 1 AND (source_type IS NULL OR source_type = 'user') ORDER BY display_name");
     const { results: collectionsResults } = await collectionsStmt.all();
     const models = (collectionsResults || []).map((row) => ({
       name: row.name,
@@ -9365,6 +9367,7 @@ adminContentRoutes.get("/", async (c) => {
     }));
     const conditions = [];
     const params = [];
+    conditions.push("(col.source_type IS NULL OR col.source_type = 'user')");
     if (status !== "deleted") {
       conditions.push("c.status != 'deleted'");
     }
@@ -9493,7 +9496,7 @@ adminContentRoutes.get("/new", async (c) => {
     const collectionId = url.searchParams.get("collection");
     if (!collectionId) {
       const db2 = c.env.DB;
-      const collectionsStmt = db2.prepare("SELECT id, name, display_name, description FROM collections WHERE is_active = 1 ORDER BY display_name");
+      const collectionsStmt = db2.prepare("SELECT id, name, display_name, description FROM collections WHERE is_active = 1 AND (source_type IS NULL OR source_type = 'user') ORDER BY display_name");
       const { results } = await collectionsStmt.all();
       const collections = (results || []).map((row) => ({
         id: row.id,
@@ -21524,7 +21527,7 @@ router.get("/stats", async (c) => {
     const db = c.env.DB;
     let collectionsCount = 0;
     try {
-      const collectionsStmt = db.prepare("SELECT COUNT(*) as count FROM collections WHERE is_active = 1");
+      const collectionsStmt = db.prepare("SELECT COUNT(*) as count FROM collections WHERE is_active = 1 AND (source_type IS NULL OR source_type = 'user')");
       const collectionsResult = await collectionsStmt.first();
       collectionsCount = collectionsResult?.count || 0;
     } catch (error) {
@@ -21532,7 +21535,7 @@ router.get("/stats", async (c) => {
     }
     let contentCount = 0;
     try {
-      const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content");
+      const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content c JOIN collections col ON c.collection_id = col.id WHERE (col.source_type IS NULL OR col.source_type = 'user')");
       const contentResult = await contentStmt.first();
       contentCount = contentResult?.count || 0;
     } catch (error) {
@@ -23329,6 +23332,7 @@ adminCollectionsRoutes.get("/", async (c) => {
         SELECT id, name, display_name, description, created_at, managed, schema
         FROM collections
         WHERE is_active = 1
+        AND (source_type IS NULL OR source_type = 'user')
         AND (name LIKE ? OR display_name LIKE ? OR description LIKE ?)
         ORDER BY created_at DESC
       `);
@@ -23336,7 +23340,7 @@ adminCollectionsRoutes.get("/", async (c) => {
       const queryResults = await stmt.bind(searchParam, searchParam, searchParam).all();
       results = queryResults.results;
     } else {
-      stmt = db.prepare("SELECT id, name, display_name, description, created_at, managed, schema FROM collections WHERE is_active = 1 ORDER BY created_at DESC");
+      stmt = db.prepare("SELECT id, name, display_name, description, created_at, managed, schema FROM collections WHERE is_active = 1 AND (source_type IS NULL OR source_type = 'user') ORDER BY created_at DESC");
       const queryResults = await stmt.all();
       results = queryResults.results;
     }
@@ -28408,14 +28412,36 @@ publicFormsRoutes.post("/:identifier/submit", async (c) => {
       now
     ).run();
     await db.prepare(`
-      UPDATE forms 
+      UPDATE forms
       SET submission_count = submission_count + 1,
           updated_at = ?
       WHERE id = ?
     `).bind(now, form.id).run();
+    let contentId = null;
+    try {
+      contentId = await createContentFromSubmission(
+        db,
+        sanitizedData,
+        { id: form.id, name: form.name, display_name: form.display_name },
+        submissionId,
+        {
+          ipAddress: c.req.header("cf-connecting-ip") || null,
+          userAgent: c.req.header("user-agent") || null,
+          userEmail: sanitizedData?.email || null,
+          userId: null
+          // anonymous submission
+        }
+      );
+      if (!contentId) {
+        console.warn("[FormSubmit] Content creation returned null for submission:", submissionId);
+      }
+    } catch (contentError) {
+      console.error("[FormSubmit] Error creating content from submission:", contentError);
+    }
     return c.json({
       success: true,
       submissionId,
+      contentId,
       message: "Form submitted successfully"
     });
   } catch (error) {
@@ -28826,5 +28852,5 @@ var ROUTES_INFO = {
 };
 
 export { ROUTES_INFO, adminCheckboxRoutes, adminCollectionsRoutes, adminDesignRoutes, adminFormsRoutes, adminLogsRoutes, adminMediaRoutes, adminPluginRoutes, adminSettingsRoutes, admin_api_default, admin_code_examples_default, admin_content_default, admin_testimonials_default, api_content_crud_default, api_default, api_media_default, api_system_default, auth_default, getConfirmationDialogScript2 as getConfirmationDialogScript, public_forms_default, renderConfirmationDialog2 as renderConfirmationDialog, router, router2, test_cleanup_default, userRoutes };
-//# sourceMappingURL=chunk-JTNUM7JE.js.map
-//# sourceMappingURL=chunk-JTNUM7JE.js.map
+//# sourceMappingURL=chunk-SDAGUFOF.js.map
+//# sourceMappingURL=chunk-SDAGUFOF.js.map