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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.76.4
+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.4 → django_forms_workflows-0.76.6}/django_forms_workflows/admin.py

@@ -278,8 +278,6 @@ def _render_conditional_rules(rules) -> str:
         [SHOW]    when  ``first_enrollment`` equals ``Yes``
         [REQUIRE] when  ``first_enrollment`` equals ``Yes``
     """
-    import json
-
     if not rules:
         return ""
     if isinstance(rules, str):
@@ -1279,8 +1277,6 @@ class FormDefinitionAdmin(nested_admin.NestedModelAdmin):
                 remote_forms = payload.get("forms", [])
 
                 # Build per-form diffs: remote vs local
-                import json
-
                 from .diff_views import _build_summary
 
                 form_diffs = []

{django_forms_workflows-0.76.4 → django_forms_workflows-0.76.6}/django_forms_workflows/email_backends/gmail_api.py

@@ -72,6 +72,7 @@ def _is_retryable_gmail_error(exc) -> bool:
                 if err.get("reason") in _RETRYABLE_GMAIL_REASONS:
                     return True
         except (ValueError, AttributeError, KeyError, TypeError):
+            # A malformed error payload is not enough evidence to retry safely.
             pass
     return False
 

{django_forms_workflows-0.76.4 → django_forms_workflows-0.76.6}/django_forms_workflows/forms.py

@@ -341,6 +341,8 @@ class DynamicForm(forms.Form):
                 try:
                     self.stashed_files = json.loads(prev)
                 except (json.JSONDecodeError, TypeError):
+                    # Ignore malformed client metadata; uploaded files are rebuilt
+                    # from validated server-side data below.
                     pass
 
         # Build form fields from definition
@@ -1177,8 +1179,6 @@ class DynamicForm(forms.Form):
         Hidden fields are also dropped from ``cleaned_data`` so that their
         values are not persisted in the submission.
         """
-        import json
-
         from .conditions import evaluate_conditions
 
         cleaned_data = super().clean()
@@ -1307,8 +1307,6 @@ class DynamicForm(forms.Form):
         Generate JavaScript configuration for form enhancements.
         Returns a dictionary that can be serialized to JSON.
         """
-        import json
-
         from django.urls import reverse
 
         # Disable auto-save for anonymous users (no drafts without a user)
@@ -1554,8 +1552,6 @@ class ApprovalStepForm(forms.Form):
 
     def _add_field(self, field_def):
         """Add a single field to the form."""
-        is_editable = True
-
         # Get current value from form data.
         # Sub-workflow fields are stored with an index suffix (e.g. payment_dept_code_1);
         # try the indexed key first, then fall back to the bare field name.
@@ -1572,16 +1568,16 @@ class ApprovalStepForm(forms.Form):
             current_value = field_def.default_value
 
         # Auto-fill approver name from current user
-        if is_editable and self._is_approver_name_field(field_def):
+        if self._is_approver_name_field(field_def):
             current_value = self._get_approver_name()
         # Auto-fill date with current date
-        elif is_editable and self._is_date_field(field_def):
+        elif self._is_date_field(field_def):
             current_value = date.today()
 
         # Common field arguments
         field_args = {
             "label": field_def.field_label,
-            "required": field_def.required if is_editable else False,
+            "required": field_def.required,
             "help_text": field_def.help_text,
             "initial": current_value,
         }
@@ -1593,17 +1589,11 @@ class ApprovalStepForm(forms.Form):
         if field_def.css_class:
             widget_attrs["class"] = field_def.css_class
 
-        # Make non-editable fields read-only
-        if not is_editable:
-            widget_attrs["readonly"] = "readonly"
-            widget_attrs["disabled"] = "disabled"
-            field_args["required"] = False
-
         if field_def.field_type in _PM_OPT_OUT_FIELD_TYPES:
             widget_attrs.update(_PM_OPT_OUT_ATTRS)
 
         # Create appropriate field type
-        self._create_field(field_def, field_args, widget_attrs, is_editable)
+        self._create_field(field_def, field_args, widget_attrs)
 
     def _is_approver_name_field(self, field_def):
         """Check if this is an approver name field (to auto-fill)."""
@@ -1629,7 +1619,7 @@ class ApprovalStepForm(forms.Form):
             return self.user.username
         return ""
 
-    def _create_field(self, field_def, field_args, widget_attrs, is_editable):
+    def _create_field(self, field_def, field_args, widget_attrs):
         """Create the appropriate Django form field."""
         if field_def.field_type == "text":
             if widget_attrs:
@@ -2002,8 +1992,6 @@ class ApprovalStepForm(forms.Form):
         validate fields on input/blur instead of waiting for submit, matching
         the behavior of the original submission form.
         """
-        import json
-
         stage_id = self.approval_task.workflow_stage_id
         if stage_id is None:
             stage_fields = []

{django_forms_workflows-0.76.4 → django_forms_workflows-0.76.6}/django_forms_workflows/handlers/file_handler.py

@@ -138,7 +138,7 @@ class FileOperationHandler:
                 self.managed_file.file_path = new_path
                 self.managed_file.save(update_fields=["stored_filename", "file_path"])
 
-                logger.info(f"Renamed file from {old_path} to {new_path}")
+                logger.info("Renamed managed file id=%s", self.managed_file.id)
                 return {"success": True, "message": f"Renamed to {new_filename}"}
             return {"success": False, "message": f"File not found: {old_path}"}
 
@@ -174,7 +174,7 @@ class FileOperationHandler:
                 self.managed_file.stored_filename = os.path.basename(new_path)
                 self.managed_file.save(update_fields=["file_path", "stored_filename"])
 
-                logger.info(f"Moved file from {old_path} to {new_path}")
+                logger.info("Moved managed file id=%s", self.managed_file.id)
                 return {"success": True, "message": f"Moved to {new_path}"}
             return {"success": False, "message": f"File not found: {old_path}"}
 
@@ -204,7 +204,7 @@ class FileOperationHandler:
                     content = f.read()
                 self.storage.save(new_path, content)
 
-                logger.info(f"Copied file from {old_path} to {new_path}")
+                logger.info("Copied managed file id=%s", self.managed_file.id)
                 return {"success": True, "message": f"Copied to {new_path}"}
             return {"success": False, "message": f"File not found: {old_path}"}
 
@@ -225,7 +225,7 @@ class FileOperationHandler:
                 self.managed_file.status_changed_at = timezone.now()
                 self.managed_file.save(update_fields=["status", "status_changed_at"])
 
-                logger.info(f"Deleted file: {file_path}")
+                logger.info("Deleted managed file id=%s", self.managed_file.id)
                 return {"success": True, "message": f"Deleted {file_path}"}
             return {"success": False, "message": f"File not found: {file_path}"}
 

{django_forms_workflows-0.76.4 → django_forms_workflows-0.76.6}/django_forms_workflows/migrations/0064_add_reviewer_groups.py

@@ -1,9 +1,7 @@
-import django.db.models.deletion
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("django_forms_workflows", "0063_formdefinition_api_enabled_apitoken"),
     ]
@@ -24,4 +22,3 @@ class Migration(migrations.Migration):
             ),
         ),
     ]
-

{django_forms_workflows-0.76.4 → 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.6/django_forms_workflows/static/django_forms_workflows/js/form-builder-api.js

@@ -0,0 +1,411 @@
+/**
+ * API client for the Form Builder: loading/saving the form definition,
+ * generating the live preview, and the template picker.
+ *
+ * Mixed onto FormBuilder.prototype in form-builder.js (Object.assign), not a
+ * standalone class of its own - these methods read/write a large number of
+ * page DOM fields directly, plus `this.fields`/`this.formSteps`/`this.config`,
+ * and call back into canvas-render methods (renderCanvas/renderStepTabs/
+ * toggleMultiStepMode) that still live on the single FormBuilder instance.
+ */
+export const apiMethods = {
+    updatePreview() {
+        // Debounce preview updates to avoid too many API calls
+        if (this.previewTimeout) {
+            clearTimeout(this.previewTimeout);
+        }
+
+        this.previewTimeout = setTimeout(() => {
+            this.generatePreview();
+        }, 500); // Wait 500ms after last change
+    },
+
+    async generatePreview() {
+        const preview = document.getElementById('formPreview');
+
+        // Show loading state
+        preview.innerHTML = `
+            <div class="text-center text-muted py-4">
+                <div class="spinner-border spinner-border-sm" role="status">
+                    <span class="visually-hidden">Loading...</span>
+                </div>
+                <p class="small mt-2">Generating preview...</p>
+            </div>
+        `;
+
+        try {
+            // Gather form data
+            const formData = {
+                name: document.getElementById('formName').value || 'Untitled Form',
+                slug: document.getElementById('formSlug').value || 'untitled-form',
+                description: document.getElementById('formDescription').value || '',
+                instructions: document.getElementById('formInstructions').value || '',
+                is_active: document.getElementById('formIsActive').checked,
+                requires_login: document.getElementById('formRequiresLogin').checked,
+                allow_save_draft: document.getElementById('formAllowDraft').checked,
+                allow_withdrawal: document.getElementById('formAllowWithdrawal').checked,
+                fields: this.fields
+            };
+
+            // Call preview API
+            const response = await fetch(this.config.apiUrls.preview, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-CSRFToken': this.config.csrfToken
+                },
+                body: JSON.stringify(formData)
+            });
+
+            if (!response.ok) {
+                const errorText = await response.text();
+                console.error('Preview API error:', response.status, errorText);
+                throw new Error(`Server error: ${response.status}`);
+            }
+
+            const data = await response.json();
+
+            if (data.success) {
+                preview.innerHTML = data.html;
+            } else {
+                console.error('Preview generation failed:', data.error);
+                throw new Error(data.error || 'Unknown error');
+            }
+
+        } catch (error) {
+            console.error('Preview error:', error);
+
+            // If there are no fields, show a helpful message
+            if (this.fields.length === 0) {
+                preview.innerHTML = `
+                    <div class="alert alert-info small">
+                        <i class="bi bi-info-circle"></i>
+                        <strong>No fields yet</strong><br>
+                        Drag fields from the palette to get started
+                    </div>
+                `;
+            } else {
+                preview.innerHTML = `
+                    <div class="alert alert-warning small">
+                        <i class="bi bi-exclamation-triangle"></i>
+                        <strong>Preview unavailable</strong><br>
+                        ${this.fields.length} field(s) configured<br>
+                        <small class="text-muted">${error.message}</small>
+                    </div>
+                `;
+            }
+        }
+    },
+
+    async loadForm() {
+        try {
+            const response = await fetch(this.config.apiUrls.load, {
+                method: 'GET',
+                headers: {
+                    'X-CSRFToken': this.config.csrfToken
+                }
+            });
+
+            if (!response.ok) {
+                throw new Error('Failed to load form');
+            }
+
+            const data = await response.json();
+
+            // Populate form settings
+            document.getElementById('formName').value = data.name || '';
+            document.getElementById('formSlug').value = data.slug || '';
+            document.getElementById('formDescription').value = data.description || '';
+            document.getElementById('formInstructions').value = data.instructions || '';
+            document.getElementById('formIsActive').checked = data.is_active;
+            document.getElementById('formRequiresLogin').checked = data.requires_login;
+            document.getElementById('formAllowDraft').checked = data.allow_save_draft;
+            document.getElementById('formAllowWithdrawal').checked = data.allow_withdrawal;
+
+            // Load success page settings
+            document.getElementById('formSuccessMessage').value = data.success_message || '';
+            document.getElementById('formSuccessRedirectUrl').value = data.success_redirect_url || '';
+            document.getElementById('formSuccessRedirectRules').value = data.success_redirect_rules ? JSON.stringify(data.success_redirect_rules) : '';
+
+            // Load payment settings
+            document.getElementById('formPaymentEnabled').checked = data.payment_enabled || false;
+            if (data.payment_enabled) document.getElementById('paymentSettings').style.display = '';
+            // Populate provider dropdown
+            const providerSelect = document.getElementById('formPaymentProvider');
+            providerSelect.innerHTML = '<option value="">-- Select --</option>';
+            (this.config.paymentProviders || []).forEach(([val, label]) => {
+                const opt = document.createElement('option');
+                opt.value = val;
+                opt.textContent = label;
+                if (val === data.payment_provider) opt.selected = true;
+                providerSelect.appendChild(opt);
+            });
+            document.getElementById('formPaymentAmountType').value = data.payment_amount_type || 'fixed';
+            if (data.payment_fixed_amount) document.getElementById('formPaymentFixedAmount').value = data.payment_fixed_amount;
+            if (data.payment_amount_field) document.getElementById('formPaymentAmountField').value = data.payment_amount_field;
+            document.getElementById('formPaymentCurrency').value = data.payment_currency || 'usd';
+            if (data.payment_description_template) document.getElementById('formPaymentDescription').value = data.payment_description_template;
+
+            // Load submission controls
+            if (data.close_date) document.getElementById('formCloseDate').value = data.close_date.slice(0, 16);
+            if (data.max_submissions) document.getElementById('formMaxSubmissions').value = data.max_submissions;
+            document.getElementById('formOnePerUser').checked = data.one_per_user || false;
+            document.getElementById('formEnableCaptcha').checked = data.enable_captcha || false;
+            document.getElementById('formEmbedEnabled').checked = data.embed_enabled || false;
+
+            // Load client-side enhancement settings
+            document.getElementById('formEnableAutoSave').checked = data.enable_auto_save !== false;
+            document.getElementById('formAutoSaveInterval').value = data.auto_save_interval || 30;
+            document.getElementById('formEnableMultiStep').checked = data.enable_multi_step || false;
+            this.formSteps = data.form_steps || [];
+
+            // Load fields
+            this.fields = data.fields || [];
+            this.store.seedFieldIdCounterFromFields(this.fields);
+
+            // If multi-step is enabled, switch to multi-step mode
+            if (data.enable_multi_step) {
+                this.toggleMultiStepMode(true);
+            } else {
+                this.renderCanvas();
+            }
+
+            this.updatePreview();
+
+            document.getElementById('saveStatus').textContent = 'Loaded successfully';
+        } catch (error) {
+            console.error('Error loading form:', error);
+            alert('Failed to load form: ' + error.message);
+        }
+    },
+
+    async saveForm() {
+        // Validate form settings
+        const formName = document.getElementById('formName').value.trim();
+        const formSlug = document.getElementById('formSlug').value.trim();
+
+        if (!formName) {
+            alert('Please enter a form name');
+            return;
+        }
+
+        if (!formSlug) {
+            alert('Please enter a form slug');
+            return;
+        }
+
+        // If in multi-step mode, update field order from step canvases
+        const isMultiStep = document.getElementById('formEnableMultiStep').checked;
+        if (isMultiStep) {
+            this.updateFieldOrderFromSteps();
+        }
+
+        // Build form data
+        const formData = {
+            id: this.config.formId,
+            name: formName,
+            slug: formSlug,
+            description: document.getElementById('formDescription').value.trim(),
+            instructions: document.getElementById('formInstructions').value.trim(),
+            is_active: document.getElementById('formIsActive').checked,
+            requires_login: document.getElementById('formRequiresLogin').checked,
+            allow_save_draft: document.getElementById('formAllowDraft').checked,
+            allow_withdrawal: document.getElementById('formAllowWithdrawal').checked,
+            success_message: document.getElementById('formSuccessMessage').value.trim(),
+            success_redirect_url: document.getElementById('formSuccessRedirectUrl').value.trim(),
+            success_redirect_rules: (() => { try { const v = document.getElementById('formSuccessRedirectRules').value.trim(); return v ? JSON.parse(v) : null; } catch(e) { return null; } })(),
+            payment_enabled: document.getElementById('formPaymentEnabled').checked,
+            payment_provider: document.getElementById('formPaymentProvider').value,
+            payment_amount_type: document.getElementById('formPaymentAmountType').value,
+            payment_fixed_amount: document.getElementById('formPaymentFixedAmount').value || null,
+            payment_amount_field: document.getElementById('formPaymentAmountField').value,
+            payment_currency: document.getElementById('formPaymentCurrency').value,
+            payment_description_template: document.getElementById('formPaymentDescription').value,
+            close_date: document.getElementById('formCloseDate').value || null,
+            max_submissions: parseInt(document.getElementById('formMaxSubmissions').value) || null,
+            one_per_user: document.getElementById('formOnePerUser').checked,
+            enable_captcha: document.getElementById('formEnableCaptcha').checked,
+            embed_enabled: document.getElementById('formEmbedEnabled').checked,
+            enable_auto_save: document.getElementById('formEnableAutoSave').checked,
+            auto_save_interval: parseInt(document.getElementById('formAutoSaveInterval').value) || 30,
+            enable_multi_step: isMultiStep,
+            form_steps: this.formSteps || [],
+            fields: this.fields
+        };
+
+        // Show saving status
+        const saveBtn = document.getElementById('btnSave');
+        const originalText = saveBtn.innerHTML;
+        saveBtn.disabled = true;
+        saveBtn.innerHTML = '<i class="bi bi-hourglass-split"></i> Saving...';
+        document.getElementById('saveStatus').textContent = 'Saving...';
+
+        try {
+            const response = await fetch(this.config.apiUrls.save, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-CSRFToken': this.config.csrfToken
+                },
+                body: JSON.stringify(formData)
+            });
+
+            const result = await response.json();
+
+            if (!response.ok || !result.success) {
+                throw new Error(result.error || 'Failed to save form');
+            }
+
+            // Update field IDs with the mapping from backend
+            if (result.field_id_mapping) {
+                this.fields.forEach(field => {
+                    const oldId = String(field.id);
+                    if (result.field_id_mapping[oldId]) {
+                        field.id = result.field_id_mapping[oldId];
+                    }
+                });
+
+                // Re-render to update the UI with new IDs
+                const isMultiStep = document.getElementById('formEnableMultiStep')?.checked;
+                if (isMultiStep) {
+                    this.renderStepTabs();
+                } else {
+                    this.renderCanvas();
+                }
+            }
+
+            document.getElementById('saveStatus').textContent = 'Saved successfully';
+
+            // If this was a new form, redirect to edit mode
+            if (this.config.isNew && result.form_id) {
+                setTimeout(() => {
+                    window.location.href = `/admin/django_forms_workflows/formdefinition/${result.form_id}/builder/`;
+                }, 1000);
+            } else {
+                // Show success message
+                setTimeout(() => {
+                    document.getElementById('saveStatus').textContent = 'All changes saved';
+                }, 2000);
+            }
+        } catch (error) {
+            console.error('Error saving form:', error);
+            alert('Failed to save form: ' + error.message);
+            document.getElementById('saveStatus').textContent = 'Error saving';
+        } finally {
+            saveBtn.disabled = false;
+            saveBtn.innerHTML = originalText;
+        }
+    },
+
+    async showTemplateSelection() {
+        const modal = new bootstrap.Modal(document.getElementById('templateSelectionModal'));
+        const templateList = document.getElementById('templateList');
+
+        // Load templates
+        try {
+            const response = await fetch(this.config.apiUrls.templates);
+            const data = await response.json();
+
+            if (data.success && data.templates.length > 0) {
+                // Group templates by category
+                const grouped = {};
+                data.templates.forEach(template => {
+                    if (!grouped[template.category_display]) {
+                        grouped[template.category_display] = [];
+                    }
+                    grouped[template.category_display].push(template);
+                });
+
+                // Render templates
+                let html = '';
+                for (const [category, templates] of Object.entries(grouped)) {
+                    html += `<div class="col-12"><h6 class="text-muted">${this.escapeHtml(String(category ?? ''))}</h6></div>`;
+                    templates.forEach(template => {
+                        html += `
+                            <div class="col-md-4">
+                                <div class="card template-card h-100" style="cursor: pointer;" data-template-id="${template.id}">
+                                    <div class="card-body">
+                                        <h6 class="card-title">${this.escapeHtml(template.name)}</h6>
+                                        <p class="card-text small text-muted">${this.escapeHtml(template.description)}</p>
+                                        <div class="d-flex justify-content-between align-items-center">
+                                            <small class="text-muted">
+                                                <i class="bi bi-people"></i> Used ${this.escapeHtml(String(template.usage_count ?? 0))} times
+                                            </small>
+                                            <button class="btn btn-sm btn-primary">Use Template</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        `;
+                    });
+                }
+                templateList.innerHTML = html;
+
+                // Add click handlers
+                document.querySelectorAll('.template-card').forEach(card => {
+                    card.addEventListener('click', () => {
+                        const templateId = card.dataset.templateId;
+                        this.loadTemplate(templateId);
+                        modal.hide();
+                    });
+                });
+            } else {
+                templateList.innerHTML = `
+                    <div class="col-12 text-center py-5">
+                        <p class="text-muted">No templates available</p>
+                    </div>
+                `;
+            }
+        } catch (error) {
+            console.error('Error loading templates:', error);
+            templateList.innerHTML = `
+                <div class="col-12 text-center py-5">
+                    <p class="text-danger">Failed to load templates</p>
+                </div>
+            `;
+        }
+
+        // Handle "Start with Blank Form" button
+        document.getElementById('btnStartBlank').onclick = () => {
+            modal.hide();
+        };
+
+        modal.show();
+    },
+
+    async loadTemplate(templateId) {
+        try {
+            const url = this.config.apiUrls.loadTemplate.replace('{id}', templateId);
+            const response = await fetch(url);
+            const data = await response.json();
+
+            if (data.success && data.template_data) {
+                const templateData = data.template_data;
+
+                // Populate form settings
+                document.getElementById('formName').value = templateData.name || '';
+                document.getElementById('formSlug').value = templateData.slug || '';
+                document.getElementById('formDescription').value = templateData.description || '';
+                document.getElementById('formInstructions').value = templateData.instructions || '';
+                document.getElementById('formIsActive').checked = templateData.is_active !== false;
+                document.getElementById('formRequiresLogin').checked = templateData.requires_login !== false;
+                document.getElementById('formAllowDraft').checked = templateData.allow_save_draft !== false;
+                document.getElementById('formAllowWithdrawal').checked = templateData.allow_withdrawal !== false;
+
+                // Load fields
+                this.fields = templateData.fields || [];
+                this.store.seedFieldIdCounterFromFields(this.fields);
+                this.renderCanvas();
+                this.updatePreview();
+
+                // Show success message
+                alert('Template loaded successfully! You can now customize the form.');
+            } else {
+                throw new Error('Invalid template data');
+            }
+        } catch (error) {
+            console.error('Error loading template:', error);
+            alert('Failed to load template: ' + error.message);
+        }
+    },
+};