django-forms-workflows 0.76.5__tar.gz → 0.76.6__tar.gz

{django_forms_workflows-0.76.5 → django_forms_workflows-0.76.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.76.5
+Version: 0.76.6
 Summary: Enterprise-grade, database-driven form builder with approval workflows and external data integration
 License: LGPL-3.0-only
 License-File: LICENSE

{django_forms_workflows-0.76.5 → django_forms_workflows-0.76.6}/django_forms_workflows/sso_backends.py

@@ -253,6 +253,14 @@ def get_saml_config():
     This helper constructs the SAML settings from Django settings,
     providing sensible defaults for common use cases.
 
+    Compatibility note:
+        The default ``security`` configuration sets
+        ``wantAttributeStatement`` to ``False``. This is intentional to
+        support IdPs (including Google SAML in common configurations) that
+        may authenticate successfully without returning a SAML AttributeStatement.
+        Projects that require attributes can override this through
+        ``FORMS_WORKFLOWS_SAML["security"]``.
+
     Returns:
         dict: SAML configuration for OneLogin's python3-saml
     """

django_forms_workflows-0.76.5/django_forms_workflows/static/django_forms_workflows/js/form-builder.js → django_forms_workflows-0.76.6/django_forms_workflows/static/django_forms_workflows/js/form-builder-canvas.js

@@ -1,65 +1,21 @@
 /**
- * Visual Form Builder
+ * Canvas and drag-drop controller for the Form Builder: the field palette,
+ * the single-step and multi-step canvases (SortableJS wiring, native
+ * HTML5 drag-drop for palette-to-canvas drops), field CRUD, canvas/step
+ * rendering, and the field context menu.
  *
- * Provides drag-and-drop interface for creating and editing forms
- * without code.
+ * Mixed onto FormBuilder.prototype in form-builder.js (Object.assign), not a
+ * standalone class of its own - these methods read/write `this.fields`/
+ * `this.formSteps` (proxied onto `this.store`), plus a number of
+ * FormBuilder-owned DOM/drag-state fields (`this.draggingFieldType`,
+ * `this.dragPlaceholder`, `this.contextMenu`, `this.fieldTypes`/
+ * `this.fieldTypeCategories`), and call back into
+ * pushUndo()/updatePreview()/saveForm()/editField(), which still live on
+ * historyMethods/apiMethods/propertyEditorMethods respectively - all mixed
+ * onto the same FormBuilder instance, so `this.*` resolves regardless of
+ * which module a given method came from.
  */
-
-import { historyMethods } from './form-builder-history.js';
-import { apiMethods } from './form-builder-api.js';
-import { propertyEditorMethods } from './form-builder-property-editor.js';
-import { createBuilderStore } from './form-builder-store.js';
-
-export class FormBuilder {
-    constructor(config) {
-        this.config = config;
-        this.store = createBuilderStore();
-        this.fields = [];
-        this.currentFieldIndex = null;
-        this.fieldIdCounter = 1;
-        this.previewTimeout = null;
-        this.draggingFieldType = null; // Track field type being dragged from palette
-        this.dragPlaceholder = null; // Track the placeholder element
-        this.isNewField = false; // Track if editing a newly created field
-        this.formSteps = []; // Track multi-step configuration
-        this.contextMenu = null; // Track context menu element
-        this.undoStack = []; // Undo history
-        this.redoStack = []; // Redo history
-        this.maxUndoSteps = 50;
-
-        this.init();
-    }
-
-    // fields/formSteps live on this.store now (single source of truth for
-    // history's undo/redo snapshots); these proxy the existing this.fields/
-    // this.formSteps call sites throughout this file so they don't all need
-    // to change in this pass.
-    get fields() { return this.store.fields; }
-    set fields(value) { this.store.setFields(value); }
-
-    get formSteps() { return this.store.formSteps; }
-    set formSteps(value) { this.store.setFormSteps(value); }
-
-    get fieldIdCounter() { return this.store.fieldIdCounter; }
-    set fieldIdCounter(value) { this.store.fieldIdCounter = value; }
-
-    init() {
-        this.setupFieldPalette();
-        this.setupCanvas();
-        this.setupEventListeners();
-
-        // Load existing form if editing
-        if (!this.config.isNew && this.config.formId && this.config.apiUrls.load) {
-            this.loadForm();
-        } else if (this.config.isNew) {
-            // Show template selection modal for new forms
-            this.showTemplateSelection();
-        } else {
-            // Generate initial preview for forms without fields
-            this.updatePreview();
-        }
-    }
-    
+export const canvasMethods = {
     setupFieldPalette() {
         const palette = document.getElementById('fieldPalette');
 
@@ -174,8 +130,8 @@ export class FormBuilder {
                 this.cleanupDragPlaceholder();
             }
         });
-    }
-    
+    },
+
     renderPalette(filter) {
         const palette = document.getElementById('fieldPalette');
         // Remove all items but keep the search (which is in the panel-header)
@@ -208,7 +164,7 @@ export class FormBuilder {
                 palette.appendChild(item);
             });
         });
-    }
+    },
 
     setupCanvas() {
         const canvas = document.getElementById('formCanvas');
@@ -244,6 +200,7 @@ export class FormBuilder {
                     }
                 } else {
                     // Existing field moved - update order
+                    this.pushUndo();
                     const movedField = this.fields.splice(evt.oldIndex, 1)[0];
                     this.fields.splice(evt.newIndex, 0, movedField);
                     this.updateFieldOrders();
@@ -252,6 +209,7 @@ export class FormBuilder {
             },
             onUpdate: (evt) => {
                 // Field reordered within canvas
+                this.pushUndo();
                 const movedField = this.fields.splice(evt.oldIndex, 1)[0];
                 this.fields.splice(evt.newIndex, 0, movedField);
                 this.updateFieldOrders();
@@ -262,7 +220,7 @@ export class FormBuilder {
                 canvas.classList.remove('dragging');
             }
         });
-        
+
         // Allow dropping from palette with visual feedback
         canvas.addEventListener('dragover', (e) => {
             e.preventDefault();
@@ -328,7 +286,7 @@ export class FormBuilder {
 
             this.cleanupDragPlaceholder();
         });
-    }
+    },
 
     getDragAfterElement(container, y) {
         const draggableElements = [...container.querySelectorAll('.canvas-field:not(.drag-placeholder):not(.sortable-drag)')];
@@ -343,7 +301,7 @@ export class FormBuilder {
                 return closest;
             }
         }, { offset: Number.NEGATIVE_INFINITY }).element;
-    }
+    },
 
     cleanupDragPlaceholder() {
         // Remove the drag placeholder and clean up canvas state
@@ -355,15 +313,19 @@ export class FormBuilder {
         if (canvas) {
             canvas.classList.remove('dragging');
         }
-    }
+    },
 
     addFieldAtPosition(fieldType, position) {
         this.pushUndo();
+        // field_name must be read before nextFieldId() advances the counter,
+        // so the id and the name it's derived from carry the same number -
+        // matching handleFieldDroppedToStep's order, which already does this.
+        const fieldName = this.getDefaultName(fieldType);
         const field = {
-            id: `new_${this.fieldIdCounter++}`,
+            id: this.store.nextFieldId('new'),
             order: position + 1,
             field_label: this.getDefaultLabel(fieldType),
-            field_name: this.getDefaultName(fieldType),
+            field_name: fieldName,
             field_type: fieldType,
             required: false,
             help_text: '',
@@ -397,82 +359,18 @@ export class FormBuilder {
 
         // Automatically open property editor for new field
         this.editField(insertIndex, true); // true = isNew
-    }
-    
-    setupEventListeners() {
-        // Save button
-        document.getElementById('btnSave').addEventListener('click', () => {
-            this.saveForm();
-        });
-        
-        // Cancel button
-        document.getElementById('btnCancel').addEventListener('click', () => {
-            if (confirm('Are you sure you want to cancel? Unsaved changes will be lost.')) {
-                window.location.href = '/admin/django_forms_workflows/formdefinition/';
-            }
-        });
-        
-        // Save field button in modal
-        document.getElementById('btnSaveField').addEventListener('click', () => {
-            this.saveFieldProperties();
-        });
-        
-        // Auto-generate slug from name
-        document.getElementById('formName').addEventListener('input', (e) => {
-            const slug = e.target.value
-                .toLowerCase()
-                .replace(/[^a-z0-9]+/g, '-')
-                .replace(/^-+|-+$/g, '');
-            document.getElementById('formSlug').value = slug;
-        });
-
-        // Keyboard shortcuts
-        document.addEventListener('keydown', (e) => {
-            // Ctrl+S / Cmd+S = Save
-            if ((e.ctrlKey || e.metaKey) && e.key === 's') {
-                e.preventDefault();
-                this.saveForm();
-            }
-            // Ctrl+Z / Cmd+Z = Undo
-            if ((e.ctrlKey || e.metaKey) && e.key === 'z' && !e.shiftKey) {
-                e.preventDefault();
-                this.undo();
-            }
-            // Ctrl+Shift+Z / Cmd+Shift+Z = Redo
-            if ((e.ctrlKey || e.metaKey) && e.shiftKey && e.key === 'z') {
-                e.preventDefault();
-                this.redo();
-            }
-        });
+    },
 
-        // Multi-step toggle
-        const multiStepCheckbox = document.getElementById('formEnableMultiStep');
-
-        if (multiStepCheckbox) {
-            multiStepCheckbox.addEventListener('change', (e) => {
-                this.toggleMultiStepMode(e.target.checked);
-            });
-        }
-
-        // Add step tab button
-        const addStepTabBtn = document.getElementById('btnAddStepTab');
-        if (addStepTabBtn) {
-            addStepTabBtn.addEventListener('click', () => {
-                this.addStepTab();
-            });
-        }
-    }
-    
     addField(fieldType) {
         // Add field at the end
         this.addFieldAtPosition(fieldType, this.fields.length);
-    }
+    },
 
     duplicateField(index) {
         this.pushUndo();
         const original = this.fields[index];
         const clone = JSON.parse(JSON.stringify(original));
-        clone.id = `new_${this.fieldIdCounter++}`;
+        clone.id = this.store.nextFieldId('new');
         clone.field_name = original.field_name + '_copy';
         clone.field_label = original.field_label + ' (Copy)';
         clone.order = index + 2;
@@ -499,7 +397,7 @@ export class FormBuilder {
             this.renderCanvas();
         }
         this.updatePreview();
-    }
+    },
 
     getDefaultLabel(fieldType) {
         const labels = {
@@ -536,12 +434,12 @@ export class FormBuilder {
             'slider': 'Slider'
         };
         return labels[fieldType] || 'Field';
-    }
-    
+    },
+
     getDefaultName(fieldType) {
         return fieldType + '_' + this.fieldIdCounter;
-    }
-    
+    },
+
     renderCanvas() {
         const canvas = document.getElementById('formCanvas');
 
@@ -574,8 +472,8 @@ export class FormBuilder {
         canvas.appendChild(dropZone);
 
         document.getElementById('fieldCount').textContent = `${this.fields.length} field${this.fields.length !== 1 ? 's' : ''}`;
-    }
-    
+    },
+
     createFieldElement(field, index) {
         const div = document.createElement('div');
         div.dataset.index = index;
@@ -609,8 +507,8 @@ export class FormBuilder {
             // Regular field
             div.className = 'canvas-field field-item';
             const requiredBadge = field.required ? '<span class="badge bg-danger ms-1" style="font-size: 0.65rem; padding: 0.15rem 0.35rem;">REQ</span>' : '';
-            const fieldInfo = `<span class="text-muted" style="font-size: 0.75rem;">${field.field_name}</span>`;
-            const widthBadge = field.width && field.width !== 'full' ? `<span class="badge bg-secondary ms-1" style="font-size: 0.6rem;">${field.width}</span>` : '';
+            const fieldInfo = `<span class="text-muted" style="font-size: 0.75rem;">${this.escapeHtml(field.field_name)}</span>`;
+            const widthBadge = field.width && field.width !== 'full' ? `<span class="badge bg-secondary ms-1" style="font-size: 0.6rem;">${this.escapeHtml(field.width)}</span>` : '';
 
             div.innerHTML = `
                 <div class="field-header field-drag-handle" style="cursor: move;">
@@ -621,7 +519,7 @@ export class FormBuilder {
                         <span class="ms-2">${fieldInfo}</span>
                     </div>
                     <div class="field-actions">
-                        <span class="field-type-badge">${field.field_type}</span>
+                        <span class="field-type-badge">${this.escapeHtml(field.field_type)}</span>
                         <button class="btn btn-sm btn-outline-primary btn-field-action" onclick="formBuilder.editField(${index})" title="Edit field">
                             <i class="bi bi-pencil"></i>
                         </button>
@@ -643,8 +541,8 @@ export class FormBuilder {
         });
 
         return div;
-    }
-    
+    },
+
     toggleMultiStepMode(enabled) {
         const singleCanvas = document.getElementById('singleStepCanvas');
         const multiCanvas = document.getElementById('multiStepCanvas');
@@ -679,7 +577,7 @@ export class FormBuilder {
             // Move all fields back to main canvas
             this.moveAllFieldsToMainCanvas();
         }
-    }
+    },
 
     renderStepTabs() {
         const contentContainer = document.getElementById('stepTabContent');
@@ -731,7 +629,7 @@ export class FormBuilder {
 
         // Render fields in their respective steps
         this.renderFieldsInSteps();
-    }
+    },
 
     setupStepCanvasSortable(stepIndex) {
         const canvas = document.getElementById(`step-canvas-${stepIndex}`);
@@ -773,7 +671,7 @@ export class FormBuilder {
                 // Field was moved to another step, handled by onAdd of target
             }
         });
-    }
+    },
 
     setupStepCanvasDragDrop(stepIndex) {
         const canvas = document.getElementById(`step-canvas-${stepIndex}`);
@@ -802,7 +700,7 @@ export class FormBuilder {
                 this.handleFieldDroppedToStep(fieldType, stepIndex);
             }
         });
-    }
+    },
 
     handleFieldDroppedToStep(fieldType, stepIndex, position) {
         // Create a new field when dropped from palette
@@ -813,7 +711,7 @@ export class FormBuilder {
 
         const fieldName = this.getDefaultName(fieldType);
         const newField = {
-            id: `new_${this.fieldIdCounter++}`,
+            id: this.store.nextFieldId('new'),
             field_type: fieldType,
             field_name: fieldName,
             field_label: this.getDefaultLabel(fieldType),
@@ -870,7 +768,7 @@ export class FormBuilder {
         // Automatically open property editor for new field
         const fieldIndex = this.fields.findIndex(f => f.field_name === fieldName);
         this.editField(fieldIndex, true); // true = isNew
-    }
+    },
 
     addStepTab() {
         const newIndex = this.formSteps.length;
@@ -879,7 +777,7 @@ export class FormBuilder {
             fields: []
         });
         this.renderStepTabs();
-    }
+    },
 
     removeStepTab(index) {
         if (this.formSteps.length === 1) {
@@ -898,7 +796,7 @@ export class FormBuilder {
             // Re-render
             this.renderStepTabs();
         }
-    }
+    },
 
     updateStepTitle(index, newTitle) {
         if (this.formSteps[index]) {
@@ -911,7 +809,7 @@ export class FormBuilder {
                 tab.innerHTML = `${icon} ${this.escapeHtml(newTitle)} ${deleteBtn}`;
             }
         }
-    }
+    },
 
     handleFieldMovedToStep(fieldElement, stepIndex) {
         const fieldIndex = parseInt(fieldElement.dataset.fieldIndex);
@@ -921,13 +819,6 @@ export class FormBuilder {
 
         this.pushUndo();
 
-        // Find which step the field was in before
-        let sourceStepIndex = -1;
-        this.formSteps.forEach((step, idx) => {
-            if (step.fields && step.fields.includes(field.field_name)) {
-                sourceStepIndex = idx;
-            }
-        });
 
         // Remove field from all steps
         this.formSteps.forEach(step => {
@@ -963,7 +854,7 @@ export class FormBuilder {
 
         // Update preview
         this.updatePreview();
-    }
+    },
 
     updateFieldOrderInStep(stepIndex) {
         const canvas = document.getElementById(`step-canvas-${stepIndex}`);
@@ -991,7 +882,7 @@ export class FormBuilder {
         this.updateFieldOrderFromSteps();
         this.renderFieldsInSteps();
         this.updatePreview();
-    }
+    },
 
     updateStepFieldCount(stepIndex) {
         const panel = document.getElementById(`step-panel-${stepIndex}`);
@@ -1002,7 +893,7 @@ export class FormBuilder {
                 badge.textContent = `${count} fields`;
             }
         }
-    }
+    },
 
     organizeFieldsIntoSteps() {
         // Assign all fields to their respective steps based on formSteps configuration
@@ -1026,14 +917,14 @@ export class FormBuilder {
         });
 
         this.renderFieldsInSteps();
-    }
+    },
 
     renderFieldsInSteps() {
         // Render fields in their respective steps
         this.formSteps.forEach((step, stepIndex) => {
             this.renderSingleStep(stepIndex);
         });
-    }
+    },
 
     renderSingleStep(stepIndex) {
         const step = this.formSteps[stepIndex];
@@ -1062,7 +953,7 @@ export class FormBuilder {
         });
 
         this.updateStepFieldCount(stepIndex);
-    }
+    },
 
     moveAllFieldsToMainCanvas() {
         // Collect all fields from all steps
@@ -1076,7 +967,7 @@ export class FormBuilder {
         // Re-render main canvas
         this.renderCanvas();
         this.updatePreview();
-    }
+    },
 
     updateFieldOrderFromSteps() {
         // Update field order based on step order
@@ -1101,16 +992,14 @@ export class FormBuilder {
         this.fields.forEach((field, index) => {
             field.order = index;
         });
-    }
-
-
+    },
 
     deleteField(index) {
         if (confirm('Are you sure you want to delete this field?')) {
             this.pushUndo();
             this.deleteFieldSilently(index);
         }
-    }
+    },
 
     deleteFieldSilently(index) {
         // Delete field without confirmation (used when canceling new field)
@@ -1142,19 +1031,19 @@ export class FormBuilder {
         }
 
         this.updatePreview();
-    }
-    
+    },
+
     updateFieldOrders() {
         this.fields.forEach((field, index) => {
             field.order = index + 1;
         });
-    }
-    
+    },
+
     escapeHtml(text) {
         const div = document.createElement('div');
         div.textContent = text;
         return div.innerHTML;
-    }
+    },
 
     showFieldContextMenu(event, fieldIndex) {
         // Only show context menu in multi-step mode
@@ -1194,14 +1083,14 @@ export class FormBuilder {
         setTimeout(() => {
             document.addEventListener('click', () => this.hideFieldContextMenu(), { once: true });
         }, 10);
-    }
+    },
 
     hideFieldContextMenu() {
         if (this.contextMenu) {
             this.contextMenu.remove();
             this.contextMenu = null;
         }
-    }
+    },
 
     moveFieldToStepFromMenu(fieldIndex, targetStepIndex) {
         this.hideFieldContextMenu();
@@ -1243,7 +1132,5 @@ export class FormBuilder {
 
         // Update preview
         this.updatePreview();
-    }
-}
-
-Object.assign(FormBuilder.prototype, historyMethods, apiMethods, propertyEditorMethods);
+    },
+};

django_forms_workflows-0.76.6/django_forms_workflows/static/django_forms_workflows/js/form-builder.js

@@ -0,0 +1,129 @@
+/**
+ * Visual Form Builder
+ *
+ * Provides drag-and-drop interface for creating and editing forms
+ * without code.
+ */
+
+import { historyMethods } from './form-builder-history.js';
+import { apiMethods } from './form-builder-api.js';
+import { propertyEditorMethods } from './form-builder-property-editor.js';
+import { canvasMethods } from './form-builder-canvas.js';
+import { createBuilderStore } from './form-builder-store.js';
+
+export class FormBuilder {
+    constructor(config) {
+        this.config = config;
+        this.store = createBuilderStore();
+        this.fields = [];
+        this.currentFieldIndex = null;
+        this.fieldIdCounter = 1;
+        this.previewTimeout = null;
+        this.draggingFieldType = null; // Track field type being dragged from palette
+        this.dragPlaceholder = null; // Track the placeholder element
+        this.isNewField = false; // Track if editing a newly created field
+        this.formSteps = []; // Track multi-step configuration
+        this.contextMenu = null; // Track context menu element
+        this.undoStack = []; // Undo history
+        this.redoStack = []; // Redo history
+        this.maxUndoSteps = 50;
+
+        this.init();
+    }
+
+    // fields/formSteps live on this.store now (single source of truth for
+    // history's undo/redo snapshots); these proxy the existing this.fields/
+    // this.formSteps call sites throughout this file so they don't all need
+    // to change in this pass.
+    get fields() { return this.store.fields; }
+    set fields(value) { this.store.setFields(value); }
+
+    get formSteps() { return this.store.formSteps; }
+    set formSteps(value) { this.store.setFormSteps(value); }
+
+    get fieldIdCounter() { return this.store.fieldIdCounter; }
+    set fieldIdCounter(value) { this.store.fieldIdCounter = value; }
+
+    init() {
+        this.setupFieldPalette();
+        this.setupCanvas();
+        this.setupEventListeners();
+
+        // Load existing form if editing
+        if (!this.config.isNew && this.config.formId && this.config.apiUrls.load) {
+            this.loadForm();
+        } else if (this.config.isNew) {
+            // Show template selection modal for new forms
+            this.showTemplateSelection();
+        } else {
+            // Generate initial preview for forms without fields
+            this.updatePreview();
+        }
+    }
+
+    setupEventListeners() {
+        // Save button
+        document.getElementById('btnSave').addEventListener('click', () => {
+            this.saveForm();
+        });
+
+        // Cancel button
+        document.getElementById('btnCancel').addEventListener('click', () => {
+            if (confirm('Are you sure you want to cancel? Unsaved changes will be lost.')) {
+                window.location.href = '/admin/django_forms_workflows/formdefinition/';
+            }
+        });
+
+        // Save field button in modal
+        document.getElementById('btnSaveField').addEventListener('click', () => {
+            this.saveFieldProperties();
+        });
+
+        // Auto-generate slug from name
+        document.getElementById('formName').addEventListener('input', (e) => {
+            const slug = e.target.value
+                .toLowerCase()
+                .replace(/[^a-z0-9]+/g, '-')
+                .replace(/^-+|-+$/g, '');
+            document.getElementById('formSlug').value = slug;
+        });
+
+        // Keyboard shortcuts
+        document.addEventListener('keydown', (e) => {
+            // Ctrl+S / Cmd+S = Save
+            if ((e.ctrlKey || e.metaKey) && e.key === 's') {
+                e.preventDefault();
+                this.saveForm();
+            }
+            // Ctrl+Z / Cmd+Z = Undo
+            if ((e.ctrlKey || e.metaKey) && e.key === 'z' && !e.shiftKey) {
+                e.preventDefault();
+                this.undo();
+            }
+            // Ctrl+Shift+Z / Cmd+Shift+Z = Redo
+            if ((e.ctrlKey || e.metaKey) && e.shiftKey && e.key === 'z') {
+                e.preventDefault();
+                this.redo();
+            }
+        });
+
+        // Multi-step toggle
+        const multiStepCheckbox = document.getElementById('formEnableMultiStep');
+
+        if (multiStepCheckbox) {
+            multiStepCheckbox.addEventListener('change', (e) => {
+                this.toggleMultiStepMode(e.target.checked);
+            });
+        }
+
+        // Add step tab button
+        const addStepTabBtn = document.getElementById('btnAddStepTab');
+        if (addStepTabBtn) {
+            addStepTabBtn.addEventListener('click', () => {
+                this.addStepTab();
+            });
+        }
+    }
+}
+
+Object.assign(FormBuilder.prototype, historyMethods, apiMethods, propertyEditorMethods, canvasMethods);