DP-28040: D10 upgrade packages - conditional fields patch does not apply

massgov · Sep 19, 2023 · ff40bae · ff40bae
1 parent 8945402
commit ff40bae
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -174,7 +174,7 @@
         "drupal/color": "^1",
         "drupal/components": "^3",
         "drupal/composer_deploy": "^1.4",
-        "drupal/conditional_fields": "4.0.0-alpha1",
+        "drupal/conditional_fields": "^4.0@alpha",
         "drupal/config_ignore": "3.x-dev",
         "drupal/core-composer-scaffold": "^9.5",
         "drupal/core-project-message": "^9.5",
@@ -364,7 +364,7 @@
                 "Deletion of field_deleted_data_xxxxxx tables not working (https://www.drupal.org/project/drupal/issues/2836539#comment-13418275)": "https://www.drupal.org/files/issues/2020-01-10/2836539-34.patch"
             },
             "drupal/conditional_fields": {
-                "2902164 - \"Controlled by\" fields inside a Paragraph don't work": "patches/conditional-fields-and-paragraphs-2902164--using-ids--v6.patch"
+                "2902164 - \"Controlled by\" fields inside a Paragraph don't work": "https://www.drupal.org/files/issues/2023-08-11/conditional-fields-controlled-fields-inside-paragraphs-2902164-143.patch"
             },
             "drupal/entity_reference_tree": {
                 "3285499 - Options to automatically select/deselect ancestors/descendants when node is checked/unchecked.": "patches/issue-3285499--automatic-selection-options--3.patch"

diff --git a/composer.lock b/composer.lock
diff --git a/conf/drupal/config/core.entity_form_display.paragraph.iframe.default.yml b/conf/drupal/config/core.entity_form_display.paragraph.iframe.default.yml
@@ -33,12 +33,31 @@ content:
     settings: {  }
     third_party_settings:
       conditional_fields:
-        b426c22e-981a-4f13-bd7b-1aff79fc3621:
+        39f1a71c-9c09-444d-963c-6d3fde701f8c:
+          entity_type: paragraph
+          bundle: iframe
+          dependee: field_iframe_height_config
+          settings:
+            state: required
+            reset: true
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: ratio
+            effect: show
+            effect_options: {  }
+            selector: ''
+        f511f4ed-b385-4cf7-af9e-2ffb1f077ef2:
           entity_type: paragraph
           bundle: iframe
           dependee: field_iframe_height_config
           settings:
             state: visible
+            reset: false
             condition: value
             grouping: AND
             values_set: 1
@@ -58,12 +77,13 @@ content:
       placeholder: ''
     third_party_settings:
       conditional_fields:
-        695b886e-2d9f-4f53-b779-c6e8e59b8dbe:
+        183743d2-a4b9-4c5d-97c8-b4daab909c24:
           entity_type: paragraph
           bundle: iframe
           dependee: field_iframe_height_config
           settings:
-            state: visible
+            state: required
+            reset: true
             condition: value
             grouping: AND
             values_set: 1
@@ -75,17 +95,18 @@ content:
             effect: show
             effect_options: {  }
             selector: ''
-        8d0dc4b4-e8a4-4298-aa4a-7d0ecec45ae2:
+        be6a5edc-f745-4ab7-8c95-195fa7395490:
           entity_type: paragraph
           bundle: iframe
           dependee: field_iframe_height_config
           settings:
             state: empty
+            reset: false
             condition: value
             grouping: AND
             values_set: 1
             value: ''
-            values: {  }
+            values: "ratio\r\n100"
             value_form:
               -
                 value: ratio
@@ -95,6 +116,24 @@ content:
                 value: ''
                 reset: 1
             selector: ''
+        25e04243-8a63-44cf-8d4b-2808ac733948:
+          entity_type: paragraph
+          bundle: iframe
+          dependee: field_iframe_height_config
+          settings:
+            state: visible
+            reset: false
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: fixed
+            effect: show
+            effect_options: {  }
+            selector: ''
   field_iframe_accessibility_title:
     type: string_textfield
     weight: 6
@@ -159,12 +198,31 @@ content:
       display_label: true
     third_party_settings:
       conditional_fields:
-        114064bd-369d-4659-8cb7-868853532ca4:
+        5e461f1a-ef84-4cc4-a68f-0a184e35887c:
+          entity_type: paragraph
+          bundle: iframe
+          dependee: field_iframe_height_config
+          settings:
+            state: required
+            reset: true
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: '100'
+            effect: show
+            effect_options: {  }
+            selector: ''
+        011f6a33-ed88-4cb9-9ebc-7123e9813665:
           entity_type: paragraph
           bundle: iframe
           dependee: field_iframe_height_config
           settings:
             state: visible
+            reset: false
             condition: value
             grouping: AND
             values_set: 1

diff --git a/conf/drupal/config/field.field.paragraph.iframe.field_aspect_ratio.yml b/conf/drupal/config/field.field.paragraph.iframe.field_aspect_ratio.yml
@@ -13,7 +13,7 @@ entity_type: paragraph
 bundle: iframe
 label: 'Set Aspect Ratio'
 description: 'To eliminate scrolling and whitespace within the iframe, make the iframe content fit to the aspect ratio you selected.'
-required: true
+required: false
 translatable: false
 default_value:
   -

diff --git a/conf/drupal/config/field.field.paragraph.iframe.field_height.yml b/conf/drupal/config/field.field.paragraph.iframe.field_height.yml
@@ -11,7 +11,7 @@ entity_type: paragraph
 bundle: iframe
 label: 'Set Fixed Height'
 description: 'Set a fixed height in pixels. Please test the iframe display thoroughly across screen sizes. '
-required: true
+required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/conf/drupal/config/field.field.paragraph.iframe.field_verify_iframe_100_confirm.yml b/conf/drupal/config/field.field.paragraph.iframe.field_verify_iframe_100_confirm.yml
@@ -11,7 +11,7 @@ entity_type: paragraph
 bundle: iframe
 label: 'Verify dynamic height configuration'
 description: "<strong class=\"form-required\">Verify dynamic height script has been added</strong><br>\r\nIf you don't have the ability to add the code, use the aspect ratio or the fixed height option instead. Please test the iframe display thoroughly across screen sizes."
-required: true
+required: false
 translatable: false
 default_value:
   -