Various fixes

.gitignore

@@ -2,7 +2,6 @@
 .idea
 .vscode
 /node_modules
-/wagtail_advanced_form_builder/static
 npm-debug.log
 /dist
 wagtail_advanced_form_builder.egg-info

build_test/models/home_page.py

@@ -1,4 +1,4 @@
-from wagtail.core.models import Page
+from wagtail.models import Page
 
 
 class HomePage(Page):

build_test/settings/dev.py

@@ -29,7 +29,7 @@
     'wagtail.images',
     'wagtail.search',
     'wagtail.admin',
-    'wagtail.core',
+    'wagtail',
     'wagtail.contrib.modeladmin',
     'wagtail.contrib.settings',
     'wagtail.contrib.routable_page',

build_test/urls.py

@@ -2,7 +2,7 @@
 from django.urls import include, re_path
 
 from wagtail.admin import urls as wagtailadmin_urls
-from wagtail.core import urls as wagtail_urls
+from wagtail import urls as wagtail_urls
 from wagtail.documents import urls as wagtaildocs_urls
 
 urlpatterns = []

wagtail_advanced_form_builder/blocks/base_static_block.py

@@ -1,6 +1,6 @@
 from django.template.loader import render_to_string
 
-from wagtail.core import blocks
+from wagtail import blocks
 
 
 class BaseStaticBlock(blocks.StaticBlock):

wagtail_advanced_form_builder/blocks/fields/base_field_block.py

@@ -1,30 +1,27 @@
 from django import forms
 from django.templatetags.static import static
 
-from wagtail.core import blocks
-from wagtail.core.blocks import RichTextBlock
+from wagtail import blocks
+from wagtail.blocks import RichTextBlock
 
 from .conditional_block import ConditionalBlock
 
 
 class BaseFieldBlock(blocks.StructBlock):
-
     label = blocks.CharBlock(
-        max_length=255,
-        required=True,
-        help_text='The label of the form field.'
+        max_length=255, required=True, help_text="The label of the form field."
     )
 
     required = blocks.BooleanBlock(
         default=False,
         required=False,
-        help_text='Tick this box to make this a required field.'
+        help_text="Tick this box to make this a required field.",
     )
 
     display_checkbox_label = blocks.BooleanBlock(
         default=False,
         required=False,
-        help_text='Do you want the checkbox label to display? If not you should populate help_text.'
+        help_text="Do you want the checkbox label to display? If not you should populate help_text.",
     )
 
     choices = blocks.ListBlock(
@@ -39,14 +36,25 @@ class BaseFieldBlock(blocks.StructBlock):
     )
 
     max_length = blocks.IntegerBlock(
-        required=False,
-        help_text='Set a maximum length for this field. e.g. 100'
+        required=False, help_text="Set a maximum length for this field. e.g. 100"
+    )
+
+    min_length = blocks.IntegerBlock(
+        required=False, help_text="Set a minimum length for this field. e.g. 2"
     )
 
     default_value = blocks.CharBlock(
+        max_length=255, required=False, help_text="Set a default value for this field."
+    )
+    salesforce_object_name = blocks.CharBlock(
+        max_length=255,
+        required=False,
+        help_text="The Salesforce object name that the form field value will be integrated to.",
+    )
+    salesforce_api_field_name = blocks.CharBlock(
         max_length=255,
         required=False,
-        help_text='Set a default value for this field.'
+        help_text="The Salesforce API field name that the form field value will be integrated to.",
     )
 
     # placeholder = blocks.CharBlock(
@@ -58,23 +66,23 @@ class BaseFieldBlock(blocks.StructBlock):
     help_text = blocks.CharBlock(
         max_length=255,
         required=False,
-        help_text='Text to assist the user in populating this field.'
+        help_text="Text to assist the user in populating this field.",
     )
 
     html = RichTextBlock(
         required=False,
     )
 
     display_side_by_side = blocks.BooleanBlock(
-        help_text='Display these items side by side?',
+        help_text="Display these items side by side?",
         required=False,
     )
 
     rules = ConditionalBlock(
         required=False,
-        help_text='Add conditional rules to show or hide fields depending on the value of other fields in the form.'
+        help_text="Add conditional rules to show or hide fields depending on the value of other fields in the form.",
     )
 
     @property
     def media(self):
-        return forms.Media(js=[static('wagtail_advanced_form_builder/js/admin.js')])
+        return forms.Media(js=[static("wagtail_advanced_form_builder/js/admin.js")])

wagtail_advanced_form_builder/blocks/fields/blank_condition_block.py

@@ -1,6 +1,6 @@
 import wagtail_advanced_form_builder.constants as consts
 
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .condition_block import ConditionBlock
 

wagtail_advanced_form_builder/blocks/fields/checkbox_field_block.py

@@ -1,10 +1,9 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
 
 class CheckboxFieldBlock(BaseFieldBlock):
-
     choices = None
 
     help_text = blocks.CharBlock(
@@ -14,18 +13,15 @@ class CheckboxFieldBlock(BaseFieldBlock):
 
     html = None
 
-    default_value = None
-
     display_side_by_side = None
 
     empty_label = None
 
     max_length = None
+    min_length = None
 
     placeholder = None
 
-
     class Meta:
-
-        form_classname = 'waf--field'
-        icon = 'extraicons--checkbox'
+        form_classname = "waf--field"
+        icon = "extraicons--checkbox"

wagtail_advanced_form_builder/blocks/fields/checkboxes_field_block.py

@@ -1,22 +1,21 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
 
 class CheckboxesFieldBlock(BaseFieldBlock):
-
     choices = blocks.ListBlock(
         blocks.TextBlock(
             required=True,
-            icon='extraicons--heading-icon',
+            icon="extraicons--heading-icon",
         ),
     )
 
     default_value = blocks.ListBlock(
         blocks.TextBlock(
             required=False,
-            icon='extraicons--heading-icon',
-            help_text='Enter a value that matches a checkbox choice above to have it ticked by default.'
+            icon="extraicons--heading-icon",
+            help_text="Enter a value that matches a checkbox choice above to have it ticked by default.",
         ),
     )
 
@@ -25,11 +24,12 @@ class CheckboxesFieldBlock(BaseFieldBlock):
     empty_label = None
 
     max_length = None
+    min_length = None
 
     placeholder = None
 
     display_checkbox_label = None
 
     class Meta:
-        form_classname = 'waf--field'
-        icon = 'extraicons--checkboxes'
+        form_classname = "waf--field"
+        icon = "extraicons--checkboxes"

wagtail_advanced_form_builder/blocks/fields/condition_block.py

@@ -1,6 +1,6 @@
 import wagtail_advanced_form_builder.constants as consts
 
-from wagtail.core import blocks
+from wagtail import blocks
 
 
 class ConditionBlock(blocks.StructBlock):

wagtail_advanced_form_builder/blocks/fields/conditional_block.py

@@ -1,6 +1,6 @@
 import wagtail_advanced_form_builder.constants as consts
 
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .condition_block import ConditionBlock
 from .blank_condition_block import BlankConditionBlock

wagtail_advanced_form_builder/blocks/fields/dropdown_field_block.py

@@ -1,20 +1,20 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
 
 class DropdownFieldBlock(BaseFieldBlock):
-
     choices = blocks.ListBlock(
         blocks.TextBlock(
             required=True,
-            icon='extraicons--heading-icon',
+            icon="extraicons--heading-icon",
         ),
     )
 
     html = None
 
     max_length = None
+    min_length = None
 
     placeholder = None
 
@@ -23,5 +23,5 @@ class DropdownFieldBlock(BaseFieldBlock):
     display_checkbox_label = None
 
     class Meta:
-        form_classname = 'waf--field'
-        icon = 'extraicons--dropdown'
+        form_classname = "waf--field"
+        icon = "extraicons--dropdown"

wagtail_advanced_form_builder/blocks/fields/field_toggle_block.py

@@ -0,0 +1,12 @@
+from wagtail import blocks
+
+from .checkbox_field_block import CheckboxFieldBlock
+
+
+class FieldToggleBlock(CheckboxFieldBlock):
+    name = blocks.CharBlock(
+        max_length=255, required=False, help_text="The field name to be used in the code"
+    )
+    toggled_label = blocks.CharBlock(
+        max_length=255, required=False, help_text="The label to display when toggled"
+    )

wagtail_advanced_form_builder/blocks/fields/hidden_field_block.py

@@ -1,15 +1,14 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
 
 class HiddenFieldBlock(BaseFieldBlock):
-
     default_value = blocks.CharBlock(
         max_length=255,
         required=True,
-        label='Value',
-        help_text='The value to go into the hidden field.'
+        label="Value",
+        help_text="The value to go into the hidden field.",
     )
 
     choices = None
@@ -25,6 +24,7 @@ class HiddenFieldBlock(BaseFieldBlock):
     empty_label = None
 
     max_length = None
+    min_length = None
 
     display_side_by_side = None
 
@@ -33,6 +33,5 @@ class HiddenFieldBlock(BaseFieldBlock):
     rules = None
 
     class Meta:
-        form_classname = 'waf--field'
-        icon = 'extraicons--hidden'
-
+        form_classname = "waf--field"
+        icon = "extraicons--hidden"

wagtail_advanced_form_builder/blocks/fields/html_field_block.py

@@ -1,16 +1,15 @@
-from wagtail.core import blocks
-from wagtail.core.blocks import RichTextBlock
+from wagtail import blocks
+from wagtail.blocks import RichTextBlock
 
 from .base_field_block import BaseFieldBlock
 
 
 class HTMLFieldBlock(BaseFieldBlock):
-
     label = blocks.CharBlock(
         max_length=255,
         required=True,
-        help_text='A unique reference for this html block',
-        label='Unique reference name',
+        help_text="A unique reference for this html block",
+        label="Unique reference name",
     )
 
     html = RichTextBlock(
@@ -20,6 +19,7 @@ class HTMLFieldBlock(BaseFieldBlock):
     help_text = None
 
     max_length = None
+    min_length = None
 
     required = None
 
@@ -36,7 +36,5 @@ class HTMLFieldBlock(BaseFieldBlock):
     display_checkbox_label = None
 
     class Meta:
-        form_classname = 'waf--field waf--html-field'
-        icon = 'extraicons--paragraph'
-
-
+        form_classname = "waf--field waf--html-field"
+        icon = "extraicons--paragraph"

wagtail_advanced_form_builder/blocks/fields/multi_line_field_block.py

@@ -2,7 +2,6 @@
 
 
 class MultiLineFieldBlock(BaseFieldBlock):
-
     choices = None
 
     html = None
@@ -14,11 +13,12 @@ class MultiLineFieldBlock(BaseFieldBlock):
     empty_label = None
 
     max_length = None
+    min_length = None
 
     display_side_by_side = None
 
     placeholder = None
 
     class Meta:
-        form_classname = 'waf--field'
-        icon = 'extraicons--text-box'
+        form_classname = "waf--field"
+        icon = "extraicons--text-box"