domma-cms 0.1.0 → 0.2.1

package/plugins/form-builder/admin/views/form-submissions.js

@@ -5,7 +5,7 @@
  * Search/filter by text + date range with live count.
  * Row click opens a detail modal.
  */
-import { apiRequest } from '/admin/js/api.js';
+import {apiRequest} from '/admin/js/api.js';
 
 let currentSlug   = null;
 let currentFields = [];
@@ -169,7 +169,7 @@ function renderTable(submissions, $container) {
     // Build dynamic columns from form field definitions (excludes page-break fields)
     const fieldCols = currentFields.map(field => ({
         key:    `data.${field.name}`,
-        label:  field.label || field.name,
+      title: field.label || field.name,
         render: (val, row) => {
             const raw = row.data?.[field.name] ?? '';
             const str = String(raw);
@@ -184,12 +184,12 @@ function renderTable(submissions, $container) {
         ...fieldCols,
         {
             key:    'meta',
-            label:  'Date',
+          title: 'Date',
             render: (val) => D(val?.createdAt).format('DD MMM YYYY HH:mm')
         },
         {
             key:    'id',
-            label:  '',
+          title: '',
             render: (val) => {
                 const btn = document.createElement('button');
                 btn.className        = 'btn btn-sm btn-danger js-delete-submission';

package/plugins/form-builder/admin/views/forms-list.js

@@ -92,7 +92,7 @@ async function loadForms($container) {
         columns: [
             {
                 key:    'title',
-                label:  'Title',
+              title: 'Title',
                 render: (val, row) => {
                     const a = document.createElement('a');
                     a.href        = `#/plugins/form-builder/edit/${esc(row.slug)}`;
@@ -103,18 +103,18 @@ async function loadForms($container) {
             },
             {
                 key:    'slug',
-                label:  'Slug',
+              title: 'Slug',
                 render: val => {
                     const code = document.createElement('code');
                     code.textContent = val;
                     return code.outerHTML;
                 }
             },
-            { key: 'fields', label: 'Fields', render: val => String(val?.length ?? 0) },
-            { key: 'submissionCount', label: 'Submissions', render: val => String(val ?? 0) },
+          {key: 'fields', title: 'Field Count', render: val => String(val?.length ?? 0)},
+          {key: 'submissionCount', title: 'Submission Count', render: val => String(val ?? 0)},
             {
                 key:    'slug',
-                label:  '',
+              title: 'Actions',
                 render: (val) => {
                     const wrap = document.createElement('div');
                     wrap.style.cssText = 'display:flex;gap:.4rem;justify-content:flex-end;';

package/plugins/form-builder/data/forms/consent.json

@@ -0,0 +1,104 @@
+{
+    "slug": "consent",
+    "title": "Consent",
+    "description": "",
+    "fields": [
+        {
+            "name": "right_to_work",
+            "type": "radio",
+            "label": "Right To Work",
+            "required": true,
+            "placeholder": "Right to work within the UK and Ireland",
+            "helper": "Do you have the right to work within the UK and Ireland",
+            "options": [
+                {
+                    "value": "yes",
+                    "label": "Yes"
+                },
+                {
+                    "value": "no",
+                    "label": "No"
+                },
+                {
+                    "value": "visa",
+                    "label": "Visa/Sponsorship Required"
+                }
+            ]
+        },
+        {
+            "name": "availability",
+            "type": "radio",
+            "label": "Availability",
+            "required": true,
+            "placeholder": "Are You Available Immediately?",
+            "helper": "",
+            "options": [
+                {
+                    "value": "yes",
+                    "label": "Yes"
+                },
+                {
+                    "value": "no",
+                    "label": "No"
+                }
+            ],
+            "logic": {
+                "visibility": {
+                    "default": "hidden",
+                    "conditions": [
+                        {
+                            "when": {
+                                "all": [
+                                    {
+                                        "field": "right_to_work",
+                                        "operator": "equals",
+                                        "value": "yes"
+                                    }
+                                ]
+                            },
+                            "then": "visible"
+                        }
+                    ]
+                },
+                "requirement": {
+                    "default": false,
+                    "conditions": [
+                        {
+                            "when": {
+                                "all": [
+                                    {
+                                        "field": "right_to_work",
+                                        "operator": "equals",
+                                        "value": "yes"
+                                    }
+                                ]
+                            },
+                            "then": true
+                        }
+                    ]
+                }
+            }
+        }
+    ],
+    "settings": {
+        "submitText": "Submit",
+        "successMessage": "Thank you for your submission.",
+        "layout": "stacked",
+        "honeypot": true,
+        "rateLimitPerMinute": 3
+    },
+    "actions": {
+        "email": {
+            "enabled": true,
+            "recipients": "pinpointzero@gmail.com",
+            "subjectPrefix": "pinpointzero@gmail.com"
+        },
+        "webhook": {
+            "enabled": false,
+            "url": "",
+            "method": "POST"
+        }
+    },
+    "createdAt": "2026-03-04T14:06:34.797Z",
+    "updatedAt": "2026-03-04T15:46:24.896Z"
+}

package/plugins/form-builder/data/forms/contacts.json

@@ -0,0 +1,66 @@
+{
+    "slug": "contacts",
+    "title": "Contacts",
+    "description": "Contact Information",
+    "fields": [
+        {
+            "name": "full_name",
+            "type": "string",
+            "label": "Full Name",
+            "required": false,
+            "placeholder": "Full Name",
+            "helper": "Full Name",
+            "minLength": 8,
+            "maxLength": 255
+        },
+        {
+            "type": "spacer"
+        },
+        {
+            "name": "phone_number",
+            "type": "tel",
+            "label": "Phone Number",
+            "required": false,
+            "placeholder": "Phone Number",
+            "helper": "Primary Phone Number"
+        },
+        {
+            "type": "spacer"
+        },
+        {
+            "name": "email_address",
+            "type": "string",
+            "label": "Email Address",
+            "required": false,
+            "placeholder": "Email Address",
+            "helper": "Email Address",
+            "minLength": 8,
+            "maxLength": 255
+        }
+    ],
+    "settings": {
+        "submitText": "Submit",
+        "successMessage": "Thank you for your submission.",
+        "layout": "stacked",
+        "honeypot": true,
+        "rateLimitPerMinute": 3
+    },
+    "actions": {
+        "email": {
+            "enabled": false,
+            "recipients": "",
+            "subjectPrefix": "[Contacts]"
+        },
+        "webhook": {
+            "enabled": false,
+            "url": "",
+            "method": "POST"
+        },
+        "collection": {
+            "enabled": true,
+            "slug": "contacts"
+        }
+    },
+    "createdAt": "2026-03-05T12:21:03.667Z",
+    "updatedAt": "2026-03-05T14:12:38.789Z"
+}

package/plugins/form-builder/data/submissions/consent.json

@@ -0,0 +1,13 @@
+[
+  {
+    "id": "0152b2f3-98b7-4cea-bcd1-88e0c697a609",
+    "data": {
+      "right_to_work": "yes",
+      "availability": "yes"
+    },
+    "meta": {
+      "ip": "127.0.0.1",
+      "createdAt": "2026-03-04T16:50:34.493Z"
+    }
+  }
+]

package/plugins/form-builder/data/submissions/contacts.json

@@ -0,0 +1,26 @@
+[
+  {
+    "id": "5f8a7059-f93e-4612-a764-7646fcac8162",
+    "data": {
+      "full_name": "Jane Smith",
+      "phone_number": "07700900123",
+      "email_address": "jane@example.com"
+    },
+    "meta": {
+      "ip": "127.0.0.1",
+      "createdAt": "2026-03-05T14:17:26.612Z"
+    }
+  },
+  {
+    "id": "57c8f836-34d5-4cab-af7b-8fd8be2c89c8",
+    "data": {
+      "full_name": "Live Test",
+      "phone_number": "07700900001",
+      "email_address": "live@test.com"
+    },
+    "meta": {
+      "ip": "127.0.0.1",
+      "createdAt": "2026-03-05T14:18:47.698Z"
+    }
+  }
+]

package/plugins/form-builder/plugin.js

@@ -21,10 +21,16 @@
 import fs from 'fs/promises';
 import path from 'path';
 import crypto from 'crypto';
-import { fileURLToPath } from 'url';
-import { getPluginSettings, savePluginState } from '../../server/services/plugins.js';
-import { getConfig } from '../../server/config.js';
-import { createTransport, sendFormEmail } from './email.js';
+import {fileURLToPath} from 'url';
+import {createRequire} from 'module';
+import {getPluginSettings, savePluginState} from '../../server/services/plugins.js';
+import {getConfig} from '../../server/config.js';
+import {createTransport, sendFormEmail} from './email.js';
+import {createEntry, getCollection} from '../../server/services/collections.js';
+
+// Load shared logic engine (UMD/CJS) from browser-compatible public file
+const _require = createRequire(import.meta.url);
+const FormLogicEngine = _require('./public/form-logic-engine.js');
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const FORMS_DIR       = path.join(__dirname, 'data', 'forms');
@@ -337,12 +343,42 @@ export default async function formBuilderPlugin(fastify, options) {
             return { ok: true, message: settings.successMessage };
         }
 
-        // Validate required fields
-        const missingFields = (form.fields || [])
-            .filter(f => f.required && !body[f.name]?.toString().trim())
-            .map(f => f.label || f.name);
-        if (missingFields.length) {
-            return reply.status(400).send({ error: `Required fields missing: ${missingFields.join(', ')}.` });
+        // Build form values for engine evaluation (trim strings, default to '')
+        const formValues = {};
+        for (const field of form.fields || []) {
+          if (field.type === 'page-break' || field.type === 'spacer') continue;
+            const val = body[field.name];
+            formValues[field.name] = val !== undefined ? (typeof val === 'string' ? val.trim() : val) : '';
+        }
+
+        // Evaluate conditional logic — visibility, requirement, validation
+        const missingFields    = [];
+        const validationErrors = [];
+        const visibleFieldNames = new Set();
+
+        for (const field of form.fields || []) {
+          if (field.type === 'page-break' || field.type === 'spacer') continue;
+            const vis = FormLogicEngine.evaluateFieldVisibility(field, formValues);
+            if (vis === 'hidden') continue;
+            visibleFieldNames.add(field.name);
+
+            const value   = formValues[field.name];
+            const isEmpty = !value?.toString().trim();
+            const required = FormLogicEngine.evaluateFieldRequirement(field, formValues);
+            if (required && isEmpty) {
+                missingFields.push(field.label || field.name);
+            }
+            if (!isEmpty) {
+                const errors = FormLogicEngine.validateField(field, value, formValues);
+                if (errors.length) validationErrors.push(errors[0].message);
+            }
+        }
+
+        if (missingFields.length || validationErrors.length) {
+            const parts = [];
+            if (missingFields.length) parts.push(`Required fields missing: ${missingFields.join(', ')}`);
+            if (validationErrors.length) parts.push(validationErrors.join('; '));
+            return reply.status(400).send({ error: `${parts.join('. ')}.` });
         }
 
         // Rate limit by IP
@@ -352,9 +388,11 @@ export default async function formBuilderPlugin(fastify, options) {
             return reply.status(429).send({ error: 'Too many submissions. Please try again later.' });
         }
 
-        // Build generic submission data map from defined fields
+        // Build submission data — only include visible fields
         const data = {};
         for (const field of form.fields || []) {
+          if (field.type === 'page-break' || field.type === 'spacer') continue;
+            if (!visibleFieldNames.has(field.name)) continue;
             const val = body[field.name];
             if (val !== undefined) {
                 data[field.name] = typeof val === 'string' ? val.trim() : val;
@@ -405,6 +443,19 @@ export default async function formBuilderPlugin(fastify, options) {
             }
         }
 
+        // Collection action
+        const collectionAction = form.actions?.collection;
+        if (collectionAction?.enabled && collectionAction.slug) {
+            try {
+                const col = await getCollection(collectionAction.slug);
+                if (col) {
+                    await createEntry(collectionAction.slug, data, { source: `form:${slug}` });
+                }
+            } catch (err) {
+                fastify.log.warn(`[form-builder] Collection write failed for "${slug}": ${err.message}`);
+            }
+        }
+
         return { ok: true, message: settings.successMessage || 'Thank you for your submission.' };
     });
 

package/plugins/form-builder/plugin.json

@@ -14,21 +14,13 @@
                 "icon": "layout",
                 "url": "#/plugins/form-builder",
                 "section": "#/plugins/form-builder"
-            },
-            {
-                "id": "form-builder-settings",
-                "text": "Form Settings",
-                "icon": "settings",
-                "url": "#/plugins/form-builder/settings",
-                "section": "#/plugins/form-builder/settings"
             }
         ],
         "routes": [
-            { "path": "/plugins/form-builder",             "view": "plugin-fb-forms-list",     "title": "Forms - Domma CMS" },
-            { "path": "/plugins/form-builder/new",         "view": "plugin-fb-form-editor",    "title": "New Form - Domma CMS" },
-            { "path": "/plugins/form-builder/edit/:slug",  "view": "plugin-fb-form-editor",    "title": "Edit Form - Domma CMS" },
-            { "path": "/plugins/form-builder/:slug/submissions", "view": "plugin-fb-form-submissions", "title": "Submissions - Domma CMS" },
-            { "path": "/plugins/form-builder/settings",    "view": "plugin-fb-form-settings",  "title": "Form Builder Settings - Domma CMS" }
+            { "path": "/plugins/form-builder",             "view": "plugin-fb-forms-list",      "title": "Forms - Domma CMS" },
+            { "path": "/plugins/form-builder/new",         "view": "plugin-fb-form-editor",     "title": "New Form - Domma CMS" },
+            { "path": "/plugins/form-builder/edit/:slug",  "view": "plugin-fb-form-editor",     "title": "Edit Form - Domma CMS" },
+            { "path": "/plugins/form-builder/:slug/submissions", "view": "plugin-fb-form-submissions", "title": "Submissions - Domma CMS" }
         ],
         "views": {
             "plugin-fb-forms-list": {
@@ -42,15 +34,19 @@
             "plugin-fb-form-submissions": {
                 "entry": "form-builder/admin/views/form-submissions.js",
                 "exportName": "formSubmissionsView"
-            },
-            "plugin-fb-form-settings": {
-                "entry": "form-builder/admin/views/form-settings.js",
-                "exportName": "formSettingsView"
             }
         }
     },
     "inject": {
         "head": "public/inject-head.html",
         "bodyEnd": "public/inject-body.html"
+    },
+    "scaffold": {
+        "reset": [
+            {
+                "path": "data/submissions/contact.json",
+                "content": "[]"
+            }
+        ]
     }
 }