From 0a8439246d08d8e2cb2095e09f42cb9329c669b3 Mon Sep 17 00:00:00 2001
From: Maria Violante <ViolanteM@vanburencountymi.gov>
Date: Thu, 23 Jul 2026 11:27:10 -0400
Subject: [PATCH 1/2] Convert FormBuilder.js to module

---
 .../django_forms_workflows/js/form-builder.js |  2 +-
 .../django_forms_workflows/form_builder.html  |  8 +++++--
 .../form-builder/addFieldAtPosition.test.js   |  4 +---
 .../helpers/loadFormBuilderClass.js           | 23 -------------------
 .../initializePropertyFormTabs.test.js        |  5 +---
 tests_js/form-builder/setupCanvas.test.js     |  4 +---
 6 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 tests_js/form-builder/helpers/loadFormBuilderClass.js

diff --git a/django_forms_workflows/static/django_forms_workflows/js/form-builder.js b/django_forms_workflows/static/django_forms_workflows/js/form-builder.js
index 4084617..6d0841f 100644
--- a/django_forms_workflows/static/django_forms_workflows/js/form-builder.js
+++ b/django_forms_workflows/static/django_forms_workflows/js/form-builder.js
@@ -5,7 +5,7 @@
  * without code.
  */
 
-class FormBuilder {
+export class FormBuilder {
     constructor(config) {
         this.config = config;
         this.fields = [];
diff --git a/django_forms_workflows/templates/admin/django_forms_workflows/form_builder.html b/django_forms_workflows/templates/admin/django_forms_workflows/form_builder.html
index e175241..9450a8b 100644
--- a/django_forms_workflows/templates/admin/django_forms_workflows/form_builder.html
+++ b/django_forms_workflows/templates/admin/django_forms_workflows/form_builder.html
@@ -1072,8 +1072,12 @@ <h1>{form_name}</h1>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
     
     <!-- Form Builder JavaScript -->
-    <script src="{% static 'django_forms_workflows/js/form-builder.js' %}"></script>
-    
+    <script type="module" src="{% static 'django_forms_workflows/js/form-builder.js' %}"></script>
+    <script type="module">
+        import { FormBuilder } from "{% static 'django_forms_workflows/js/form-builder.js' %}";
+        window.FormBuilder = FormBuilder;
+    </script>
+
     <script>
         // Initialize form builder with data
         const formBuilderData = {
diff --git a/tests_js/form-builder/addFieldAtPosition.test.js b/tests_js/form-builder/addFieldAtPosition.test.js
index f286109..2ecb4db 100644
--- a/tests_js/form-builder/addFieldAtPosition.test.js
+++ b/tests_js/form-builder/addFieldAtPosition.test.js
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import { loadFormBuilderClass } from './helpers/loadFormBuilderClass.js';
+import { FormBuilder } from '../../django_forms_workflows/static/django_forms_workflows/js/form-builder.js';
 
 // Build an instance without running the constructor to avoid calling init() ->
 // setupFieldPalette()/setupCanvas()/setupEventListeners()
@@ -19,7 +19,6 @@ function createInstance(FormBuilder) {
 
 describe('FormBuilder#addFieldAtPosition', () => {
   it('inserts correctly on an empty canvas, when SortableJS reports an out-of-range drop position', () => {
-    const FormBuilder = loadFormBuilderClass();
     const instance = createInstance(FormBuilder);
 
     // Empty canvas: SortableJS's reported evt.newIndex can be 1 here (it
@@ -32,7 +31,6 @@ describe('FormBuilder#addFieldAtPosition', () => {
   });
 
   it('inserts at the requested position when it is already in range', () => {
-    const FormBuilder = loadFormBuilderClass();
     const instance = createInstance(FormBuilder);
     instance.fields = [{ field_name: 'existing' }];
 
diff --git a/tests_js/form-builder/helpers/loadFormBuilderClass.js b/tests_js/form-builder/helpers/loadFormBuilderClass.js
deleted file mode 100644
index 920cca3..0000000
--- a/tests_js/form-builder/helpers/loadFormBuilderClass.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { readFileSync } from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const SOURCE_PATH = path.resolve(
-  path.dirname(fileURLToPath(import.meta.url)),
-  '../../../django_forms_workflows/static/django_forms_workflows/js/form-builder.js',
-);
-
-// form-builder.js is loaded by the app as a classic <script> tag (not an ES
-// module), so its class isn't importable directly. Evaluate the real,
-// unmodified source inside a Function body — which gets its own scope we can
-// `return FormBuilder` out of — rather than duplicating its logic in tests.
-//
-// Resolve the path via node:url's fileURLToPath rather than
-// `new URL(..., import.meta.url)` — under the jsdom test environment, the
-// global `URL` constructor is jsdom's own browser-spec implementation, and
-// Node's fs functions don't recognize a URL built from it as a proper
-// file:// URL.
-export function loadFormBuilderClass() {
-  const source = readFileSync(SOURCE_PATH, 'utf-8');
-  return new Function(`${source}\nreturn FormBuilder;`)();
-}
diff --git a/tests_js/form-builder/initializePropertyFormTabs.test.js b/tests_js/form-builder/initializePropertyFormTabs.test.js
index d8c006d..a9b44ab 100644
--- a/tests_js/form-builder/initializePropertyFormTabs.test.js
+++ b/tests_js/form-builder/initializePropertyFormTabs.test.js
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { loadFormBuilderClass } from './helpers/loadFormBuilderClass.js';
+import { FormBuilder } from '../../django_forms_workflows/static/django_forms_workflows/js/form-builder.js';
 
 function createInstance(FormBuilder) {
   const instance = Object.create(FormBuilder.prototype);
@@ -18,7 +18,6 @@ describe('FormBuilder#initializePropertyFormTabs', () => {
   });
 
   it('wires the conditional-logic toggle to show/hide its section', () => {
-    const FormBuilder = loadFormBuilderClass();
     const instance = createInstance(FormBuilder);
     const field = { conditional_rules: null, validation_rules: [], field_dependencies: [] };
 
@@ -37,7 +36,6 @@ describe('FormBuilder#initializePropertyFormTabs', () => {
   });
 
   it("initializes all three tabs' lists with the field's current data", () => {
-    const FormBuilder = loadFormBuilderClass();
     const instance = createInstance(FormBuilder);
     const field = {
       conditional_rules: { conditions: [{ field: 'x', operator: 'equals', value: '1' }] },
@@ -53,7 +51,6 @@ describe('FormBuilder#initializePropertyFormTabs', () => {
   });
 
   it('defaults to empty lists when the field has no rules/dependencies yet', () => {
-    const FormBuilder = loadFormBuilderClass();
     const instance = createInstance(FormBuilder);
     const field = {};
 
diff --git a/tests_js/form-builder/setupCanvas.test.js b/tests_js/form-builder/setupCanvas.test.js
index ebad374..3b2de18 100644
--- a/tests_js/form-builder/setupCanvas.test.js
+++ b/tests_js/form-builder/setupCanvas.test.js
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { loadFormBuilderClass } from './helpers/loadFormBuilderClass.js';
+import { FormBuilder } from '../../django_forms_workflows/static/django_forms_workflows/js/form-builder.js';
 
 // setupCanvas() calls Sortable.create(...) before registering its own drop
 // listener; stub it out rather than pulling in the real SortableJS
@@ -24,7 +24,6 @@ describe('FormBuilder#setupCanvas — drop handler', () => {
   });
 
   it('does not call addFieldAtPosition a second time on drop (Sortable\'s onAdd already handles insertion)', () => {
-    const FormBuilder = loadFormBuilderClass();
     const instance = createInstance(FormBuilder);
     instance.draggingFieldType = 'text';
 
@@ -35,7 +34,6 @@ describe('FormBuilder#setupCanvas — drop handler', () => {
   });
 
   it('still cleans up the drag placeholder and dragging class on drop', () => {
-    const FormBuilder = loadFormBuilderClass();
     const instance = createInstance(FormBuilder);
     instance.draggingFieldType = 'text';
     canvas.classList.add('dragging');

From dba0a91c4f5cafbff567250ed5860851cbfba16b Mon Sep 17 00:00:00 2001
From: Matt Davis <matteius@gmail.com>
Date: Fri, 24 Jul 2026 12:56:53 -0400
Subject: [PATCH 2/2] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../templates/admin/django_forms_workflows/form_builder.html  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/django_forms_workflows/templates/admin/django_forms_workflows/form_builder.html b/django_forms_workflows/templates/admin/django_forms_workflows/form_builder.html
index 9450a8b..85bd7a1 100644
--- a/django_forms_workflows/templates/admin/django_forms_workflows/form_builder.html
+++ b/django_forms_workflows/templates/admin/django_forms_workflows/form_builder.html
@@ -1072,13 +1072,9 @@ <h1>{form_name}</h1>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
     
     <!-- Form Builder JavaScript -->
-    <script type="module" src="{% static 'django_forms_workflows/js/form-builder.js' %}"></script>
     <script type="module">
         import { FormBuilder } from "{% static 'django_forms_workflows/js/form-builder.js' %}";
-        window.FormBuilder = FormBuilder;
-    </script>
 
-    <script>
         // Initialize form builder with data
         const formBuilderData = {
             formId: {% if form_definition %}{{ form_definition.id }}{% else %}null{% endif %},