From 4572fe6ad9230dd57a8dd488e72e19612c0016c4 Mon Sep 17 00:00:00 2001
From: James Lucas <james@lucas.net.au>
Date: Wed, 22 Nov 2023 11:20:37 +1100
Subject: [PATCH] fix: Ensure subtype attribute is hidden when disabled via
 disableAttr

---
 src/js/form-builder.js     |  9 ++++++---
 tests/form-builder.test.js | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/js/form-builder.js b/src/js/form-builder.js
index 1300db13e..e898f49c7 100644
--- a/src/js/form-builder.js
+++ b/src/js/form-builder.js
@@ -495,7 +495,7 @@ function FormBuilder(opts, element, $) {
       },
       label: () => textAttribute('label', values),
       description: () => textAttribute('description', values),
-      subtype: () => selectAttribute('subtype', values, subtypes[type]),
+      subtype: isHidden => selectAttribute('subtype', values, subtypes[type], isHidden),
       style: () => btnStyles(values.style),
       placeholder: () => textAttribute('placeholder', values),
       rows: () => numberAttribute('rows', values),
@@ -891,9 +891,10 @@ function FormBuilder(opts, element, $) {
    * @param  {string} attribute  attribute name
    * @param  {Object} values     aka attrs
    * @param  {Array} optionData  select field option data
+   * @param  {boolean} [isHidden=false] field should be hidden on the stage
    * @return {string}            select input makrup
    */
-  const selectAttribute = (attribute, values, optionData) => {
+  const selectAttribute = (attribute, values, optionData, isHidden = false) => {
     const selectOptions = optionData.map((option, i) => {
       let optionAttrs = Object.assign(
         {
@@ -917,8 +918,10 @@ function FormBuilder(opts, element, $) {
     const label = m('label', labelText, { for: selectAttrs.id })
     const select = m('select', selectOptions, selectAttrs)
     const inputWrap = m('div', select, { className: 'input-wrap' })
+    const visibility = isHidden ? 'none' : 'block'
     const attrWrap = m('div', [label, inputWrap], {
       className: `form-group ${selectAttrs.name}-wrap`,
+      style: `display: ${visibility}`,
     })
 
     return attrWrap.outerHTML
@@ -928,7 +931,7 @@ function FormBuilder(opts, element, $) {
    * Generate some text inputs for field attributes, **will be replaced**
    * @param  {string} attribute
    * @param  {Object} values
-   * @param  {boolean} isHidden
+   * @param  {boolean} [isHidden=false] field should be hidden on the stage
    * @return {string}
    */
   const textAttribute = (attribute, values, isHidden = false) => {
diff --git a/tests/form-builder.test.js b/tests/form-builder.test.js
index 7ba47f98b..06ed06076 100644
--- a/tests/form-builder.test.js
+++ b/tests/form-builder.test.js
@@ -485,4 +485,41 @@ describe('async loading tests', () => {
     expect(cb2.mock.calls).toHaveLength(1)
   })
 
+})
+
+describe('FormBuilder disabling attributes', () => {
+  test('attributes not on stage when disabled via disableAttr', async () => {
+    const config = {
+      disabledAttrs: ['label','description'],
+    }
+
+    const fbWrap = $('<div>')
+    const fb = await $(fbWrap).formBuilder(config).promise
+    const field = {
+      type: 'text',
+      class: 'form-control'
+    }
+    fb.actions.addField(field)
+    expect(fbWrap.find('.subtype-wrap')).toHaveLength(1)
+    expect(fbWrap.find('.label-wrap')).toHaveLength(0)
+    expect(fbWrap.find('.description-wrap')).toHaveLength(0)
+  })
+
+  test('special attributes hidden when disabled via disableAttr', async () => {
+    const config = {
+      disabledAttrs: ['subtype','name','className'],
+    }
+
+    const fbWrap = $('<div>')
+    const fb = await $(fbWrap).formBuilder(config).promise
+    const field = {
+      type: 'text',
+      class: 'form-control'
+    }
+    fb.actions.addField(field)
+    expect(fbWrap.find('.subtype-wrap').css('display')).toBe('none')
+    expect(fbWrap.find('.name-wrap').css('display')).toBe('none')
+    expect(fbWrap.find('.className-wrap').css('display')).toBe('none')
+    expect(fbWrap.find('.label-wrap').css('display')).toBe('block')
+  })
 })
\ No newline at end of file