django-forms-workflows 0.76.3__tar.gz → 0.76.4__tar.gz

{django_forms_workflows-0.76.3 → django_forms_workflows-0.76.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.76.3
+Version: 0.76.4
 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.3 → django_forms_workflows-0.76.4}/django_forms_workflows/static/django_forms_workflows/js/form-builder-history.js

@@ -2,32 +2,23 @@
  * Undo/redo history for the Form Builder.
  *
  * Mixed onto FormBuilder.prototype in form-builder.js (Object.assign), not a
- * standalone class of its own — these methods operate on `this.fields`/
- * `this.formSteps`/`this.undoStack`/`this.redoStack`/`this.maxUndoSteps`,
- * and call back into renderCanvas()/renderStepTabs()/updatePreview(), which
- * still live on the single FormBuilder instance.
+ * standalone class of its own — these methods operate on `this.store`
+ * (snapshot/restore) plus `this.undoStack`/`this.redoStack`/
+ * `this.maxUndoSteps`, and call back into
+ * renderCanvas()/renderStepTabs()/updatePreview(), which still live on the
+ * single FormBuilder instance.
  */
 export const historyMethods = {
     pushUndo() {
-        this.undoStack.push(this.snapshotHistoryState());
+        this.undoStack.push(this.store.snapshot());
         if (this.undoStack.length > this.maxUndoSteps) {
             this.undoStack.shift();
         }
         this.redoStack = [];
     },
 
-    // Snapshotting `fields` alone isn't enough: multi-step assignment
-    // (`formSteps`) is keyed by field_name, so restoring `fields` without it
-    // can leave a step referencing a field that no longer exists (or lose
-    // the multi-step layout entirely) after an undo/redo.
-    snapshotHistoryState() {
-        return JSON.stringify({ fields: this.fields, formSteps: this.formSteps });
-    },
-
     restoreHistoryState(snapshot) {
-        const { fields, formSteps } = JSON.parse(snapshot);
-        this.fields = fields;
-        this.formSteps = formSteps;
+        this.store.restore(snapshot);
 
         // Undo/redo previously always called renderCanvas(), even in
         // multi-step mode - restoring formSteps is pointless if the
@@ -43,13 +34,13 @@ export const historyMethods = {
 
     undo() {
         if (this.undoStack.length === 0) return;
-        this.redoStack.push(this.snapshotHistoryState());
+        this.redoStack.push(this.store.snapshot());
         this.restoreHistoryState(this.undoStack.pop());
     },
 
     redo() {
         if (this.redoStack.length === 0) return;
-        this.undoStack.push(this.snapshotHistoryState());
+        this.undoStack.push(this.store.snapshot());
         this.restoreHistoryState(this.redoStack.pop());
     },
 };

django_forms_workflows-0.76.4/django_forms_workflows/static/django_forms_workflows/js/form-builder-store.js

@@ -0,0 +1,54 @@
+/**
+ * Single owner of Form Builder state, shared across extracted modules.
+ * Factory (not a singleton) since admin inlines can put two builders on one
+ * page. Extends EventTarget so modules can react to changes instead of
+ * closing over the whole FormBuilder instance.
+ */
+export class BuilderStore extends EventTarget {
+    constructor({ fields = [], formSteps = [], fieldIdCounter = 1 } = {}) {
+        super();
+        this.fields = fields;
+        this.formSteps = formSteps;
+        this.fieldIdCounter = fieldIdCounter;
+    }
+
+    setFields(fields) {
+        this.fields = fields;
+        this.dispatchEvent(new CustomEvent('fields-changed', { detail: { fields } }));
+    }
+
+    setFormSteps(formSteps) {
+        this.formSteps = formSteps;
+        this.dispatchEvent(new CustomEvent('form-steps-changed', { detail: { formSteps } }));
+    }
+
+    nextFieldId(prefix) {
+        const id = `${prefix}_${this.fieldIdCounter}`;
+        this.fieldIdCounter += 1;
+        return id;
+    }
+
+    // Ports 445790f: seeds past existing field names so newly-generated
+    // ones can't collide (call after loading fields from a form/template).
+    seedFieldIdCounterFromFields(fields) {
+        const highest = fields.reduce((max, field) => {
+            const match = /_(\d+)$/.exec(field.field_name || '');
+            return match ? Math.max(max, parseInt(match[1], 10)) : max;
+        }, 0);
+        this.fieldIdCounter = highest + 1;
+    }
+
+    snapshot() {
+        return JSON.stringify({ fields: this.fields, formSteps: this.formSteps });
+    }
+
+    restore(snapshotJson) {
+        const { fields, formSteps } = JSON.parse(snapshotJson);
+        this.setFields(fields);
+        this.setFormSteps(formSteps);
+    }
+}
+
+export function createBuilderStore(initial) {
+    return new BuilderStore(initial);
+}

{django_forms_workflows-0.76.3 → django_forms_workflows-0.76.4}/django_forms_workflows/static/django_forms_workflows/js/form-builder.js

@@ -6,10 +6,12 @@
  */
 
 import { historyMethods } from './form-builder-history.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;
@@ -25,7 +27,17 @@ export class FormBuilder {
 
         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); }
+
     init() {
         this.setupFieldPalette();
         this.setupCanvas();
@@ -1209,6 +1221,8 @@ export class FormBuilder {
 
             // Move all fields to first step if they're not assigned
             this.organizeFieldsIntoSteps();
+
+            this.updatePreview();
         } else {
             // Switch to single-step mode
             singleCanvas.style.display = 'block';
@@ -1595,6 +1609,7 @@ export class FormBuilder {
 
         // Re-render main canvas
         this.renderCanvas();
+        this.updatePreview();
     }
 
     updateFieldOrderFromSteps() {

{django_forms_workflows-0.76.3 → django_forms_workflows-0.76.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-forms-workflows"
-version = "0.76.3"
+version = "0.76.4"
 description = "Enterprise-grade, database-driven form builder with approval workflows and external data integration"
 license = "LGPL-3.0-only"
 readme = "README.md"