Merge branch 'develop' into feature/DP-35410_collab

changelogs/DP-34883.yml

@@ -0,0 +1,41 @@
+#
+# Write your changelog entry here. Every pull request must have a changelog yml file.
+#
+# Change types:
+# #############################################################################
+# You can use one of the following types:
+#  - Added: For new features.
+#  - Changed: For changes to existing functionality.
+#  - Deprecated: For soon-to-be removed features.
+#  - Removed: For removed features.
+#  - Fixed: For any bug fixes.
+#  - Security: In case of vulnerabilities.
+#
+# Format
+# #############################################################################
+# The format is crucial. Please follow the examples below. For reference, the requirements are:
+#  - All 3 parts are required and you must include "Type", "description" and "issue".
+#  - "Type" must be left aligned and followed by a colon.
+#  - "description" must be indented with 2 spaces followed by a colon
+#  - "issue" must be indented with 4 spaces followed by a colon.
+#  - "issue" is for the Jira ticket number only e.g. DP-1234
+#  - No extra spaces, indents, or blank lines are allowed.
+#
+# Example:
+# #############################################################################
+# Fixed:
+#  - description: Fixes scrolling on edit pages in Safari.
+#    issue: DP-13314
+#
+# You may add more than 1 description & issue for each type using the following format:
+# Changed:
+#  - description: Automating the release branch.
+#    issue: DP-10166
+#  - description: Second change item that needs a description.
+#    issue: DP-19875
+#  - description: Third change item that needs a description along with an issue.
+#    issue: DP-19843
+#
+Added:
+  - description: Modify form content type to accomodate other form types.
+    issue: DP-34883

conf/drupal/config/core.entity_form_display.node.form_page.default.yml

@@ -8,7 +8,9 @@ dependencies:
     - field.field.node.form_page.field_form_embed
     - field.field.node.form_page.field_form_lede
     - field.field.node.form_page.field_form_listing_desc
+    - field.field.node.form_page.field_form_platform
     - field.field.node.form_page.field_form_ref_contacts_3
+    - field.field.node.form_page.field_form_url
     - field.field.node.form_page.field_form_you_will
     - field.field.node.form_page.field_hide_feedback_component
     - field.field.node.form_page.field_intended_audience
@@ -20,10 +22,12 @@ dependencies:
     - node.type.form_page
     - workflows.workflow.editorial
   module:
+    - conditional_fields
     - content_moderation
     - entity_hierarchy
     - entity_reference_tree
     - field_group
+    - link
     - mass_fields
     - maxlength
     - metatag
@@ -36,7 +40,7 @@ third_party_settings:
       label: 'Form page edit form'
       region: content
       parent_name: ''
-      weight: 0
+      weight: 1
       format_type: tabs
       format_settings:
         classes: ''
@@ -50,6 +54,8 @@ third_party_settings:
         - field_form_listing_desc
         - field_form_you_will
         - field_form_ref_contacts_3
+        - field_form_platform
+        - field_form_url
         - field_form_embed
         - field_hide_feedback_component
         - field_primary_parent
@@ -78,7 +84,7 @@ mode: default
 content:
   field_collections:
     type: entity_reference_tree
-    weight: 21
+    weight: 23
     region: content
     settings:
       theme: default
@@ -96,7 +102,7 @@ content:
     third_party_settings: {  }
   field_english_version:
     type: entity_reference_autocomplete
-    weight: 19
+    weight: 21
     region: content
     settings:
       match_operator: CONTAINS
@@ -124,10 +130,47 @@ content:
             selector: ''
   field_form_embed:
     type: form_embed
-    weight: 13
+    weight: 15
     region: content
     settings: {  }
-    third_party_settings: {  }
+    third_party_settings:
+      conditional_fields:
+        7f133b58-2762-4fab-aea2-7cf02fc8ef77:
+          entity_type: node
+          bundle: form_page
+          dependee: field_form_platform
+          settings:
+            state: visible
+            reset: false
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: formstack
+            effect: show
+            effect_options: {  }
+            selector: ''
+        8703e2e2-aceb-432c-b7a5-2a39e92ce045:
+          entity_type: node
+          bundle: form_page
+          dependee: field_form_platform
+          settings:
+            state: required
+            reset: false
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: formstack
+            effect: show
+            effect_options: {  }
+            selector: ''
   field_form_lede:
     type: string_textfield
     weight: 9
@@ -144,6 +187,12 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_form_platform:
+    type: options_select
+    weight: 13
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   field_form_ref_contacts_3:
     type: entity_reference_autocomplete
     weight: 12
@@ -154,6 +203,51 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_form_url:
+    type: link_default
+    weight: 14
+    region: content
+    settings:
+      placeholder_url: ''
+      placeholder_title: ''
+    third_party_settings:
+      conditional_fields:
+        45983f26-adea-428d-86e9-e9edbcaf562a:
+          entity_type: node
+          bundle: form_page
+          dependee: field_form_platform
+          settings:
+            state: visible
+            reset: false
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: gravity_forms
+            effect: show
+            effect_options: {  }
+            selector: ''
+        db5a152d-4798-4b27-82b9-aaa01ec0def3:
+          entity_type: node
+          bundle: form_page
+          dependee: field_form_platform
+          settings:
+            state: required
+            reset: false
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: gravity_forms
+            effect: show
+            effect_options: {  }
+            selector: ''
   field_form_you_will:
     type: text_textarea
     weight: 11
@@ -164,28 +258,28 @@ content:
     third_party_settings: {  }
   field_hide_feedback_component:
     type: boolean_checkbox
-    weight: 14
+    weight: 16
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_intended_audience:
     type: options_buttons
-    weight: 17
+    weight: 19
     region: content
     settings: {  }
     third_party_settings: {  }
   field_metatags:
     type: metatag_firehose
-    weight: 8
+    weight: 2
     region: content
     settings:
       sidebar: true
       use_details: true
     third_party_settings: {  }
   field_organizations:
     type: entity_reference_autocomplete
-    weight: 16
+    weight: 18
     region: content
     settings:
       match_operator: CONTAINS
@@ -195,7 +289,7 @@ content:
     third_party_settings: {  }
   field_primary_parent:
     type: entity_reference_hierarchy_autocomplete
-    weight: 15
+    weight: 17
     region: content
     settings:
       match_operator: CONTAINS
@@ -206,7 +300,7 @@ content:
     third_party_settings: {  }
   field_reusable_label:
     type: entity_reference_autocomplete
-    weight: 20
+    weight: 22
     region: content
     settings:
       match_operator: CONTAINS
@@ -224,14 +318,14 @@ content:
     third_party_settings: {  }
   langcode:
     type: language_select
-    weight: 18
+    weight: 20
     region: content
     settings:
       include_locked: false
     third_party_settings: {  }
   moderation_state:
     type: moderation_state_default
-    weight: 100
+    weight: 8
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -254,20 +348,20 @@ content:
     third_party_settings: {  }
   search:
     type: boolean_checkbox
-    weight: 99
+    weight: 6
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   search_nosnippet:
     type: boolean_checkbox
-    weight: 99
+    weight: 7
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   simple_sitemap:
-    weight: 10
+    weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -306,7 +400,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   url_redirects:
-    weight: 50
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }

conf/drupal/config/core.entity_view_display.node.form_page.default.yml

@@ -8,7 +8,9 @@ dependencies:
     - field.field.node.form_page.field_form_embed
     - field.field.node.form_page.field_form_lede
     - field.field.node.form_page.field_form_listing_desc
+    - field.field.node.form_page.field_form_platform
     - field.field.node.form_page.field_form_ref_contacts_3
+    - field.field.node.form_page.field_form_url
     - field.field.node.form_page.field_form_you_will
     - field.field.node.form_page.field_hide_feedback_component
     - field.field.node.form_page.field_intended_audience
@@ -19,6 +21,7 @@ dependencies:
     - field.field.node.form_page.field_short_title
     - node.type.form_page
   module:
+    - link
     - mass_fields
     - metatag
     - options
@@ -83,6 +86,13 @@ content:
     third_party_settings: {  }
     weight: 7
     region: content
+  field_form_platform:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 16
+    region: content
   field_form_ref_contacts_3:
     type: entity_reference_label
     label: above
@@ -91,6 +101,18 @@ content:
     third_party_settings: {  }
     weight: 4
     region: content
+  field_form_url:
+    type: link
+    label: above
+    settings:
+      trim_length: 80
+      url_only: false
+      url_plain: false
+      rel: ''
+      target: ''
+    third_party_settings: {  }
+    weight: 17
+    region: content
   field_form_you_will:
     type: text_default
     label: above

conf/drupal/config/core.entity_view_display.node.form_page.link_and_description.yml

@@ -9,7 +9,9 @@ dependencies:
     - field.field.node.form_page.field_form_embed
     - field.field.node.form_page.field_form_lede
     - field.field.node.form_page.field_form_listing_desc
+    - field.field.node.form_page.field_form_platform
     - field.field.node.form_page.field_form_ref_contacts_3
+    - field.field.node.form_page.field_form_url
     - field.field.node.form_page.field_form_you_will
     - field.field.node.form_page.field_hide_feedback_component
     - field.field.node.form_page.field_intended_audience
@@ -48,7 +50,9 @@ hidden:
   field_english_version: true
   field_form_embed: true
   field_form_lede: true
+  field_form_platform: true
   field_form_ref_contacts_3: true
+  field_form_url: true
   field_form_you_will: true
   field_hide_feedback_component: true
   field_intended_audience: true