From d3c3b64491118308202829eb2df7377d28b0be57 Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Mon, 25 Nov 2019 09:03:30 +0100 Subject: [PATCH 1/7] OPENEUROPA-2473: Add Social media follow paragraph to Content row. --- ...aph.oe_content_row.field_oe_paragraphs.yml | 45 +++++++++++-------- oe_paragraphs.post_update.php | 26 +++++++++++ 2 files changed, 52 insertions(+), 19 deletions(-) diff --git a/config/install/field.field.paragraph.oe_content_row.field_oe_paragraphs.yml b/config/install/field.field.paragraph.oe_content_row.field_oe_paragraphs.yml index c55d595b..85c62298 100644 --- a/config/install/field.field.paragraph.oe_content_row.field_oe_paragraphs.yml +++ b/config/install/field.field.paragraph.oe_content_row.field_oe_paragraphs.yml @@ -33,32 +33,39 @@ settings: oe_list_item_block: oe_list_item_block oe_quote: oe_quote oe_rich_text: oe_rich_text + oe_social_media_follow: oe_social_media_follow target_bundles_drag_drop: + oe_rich_text: + enabled: true + weight: -22 + oe_list_item_block: + enabled: true + weight: -21 + oe_links_block: + enabled: true + weight: -20 + oe_quote: + enabled: true + weight: -19 + block_reference: + enabled: true + weight: -18 + oe_social_media_follow: + enabled: true + weight: -17 + oe_contextual_navigation: + enabled: true + weight: -16 oe_accordion: enabled: true - weight: 9 + weight: -15 oe_accordion_item: - weight: 10 + weight: -14 enabled: false oe_content_row: - weight: 11 + weight: -13 enabled: false - oe_links_block: - enabled: true - weight: 12 - oe_contextual_navigation: - enabled: true - weight: 13 oe_list_item: - weight: 13 + weight: -12 enabled: false - oe_list_item_block: - enabled: true - weight: 14 - oe_quote: - enabled: true - weight: 15 - oe_rich_text: - enabled: true - weight: 16 field_type: entity_reference_revisions diff --git a/oe_paragraphs.post_update.php b/oe_paragraphs.post_update.php index c4f7bda2..f34746f8 100644 --- a/oe_paragraphs.post_update.php +++ b/oe_paragraphs.post_update.php @@ -74,3 +74,29 @@ function oe_paragraphs_post_update_10002(array &$sandbox): void { $entity->save(); } } + +/** + * Add Social media follow paragraph to Content row paragraph. + */ +function oe_paragraphs_post_update_10003(array &$sandbox): void { + $paragraph_weights = [ + 'oe_social_media_follow' => -17, + 'block_reference' => -18, + 'oe_quote' => -19, + 'oe_links_block' => -20, + 'oe_list_item_block' => -21, + 'oe_rich_text' => -22, + ]; + $field = FieldConfig::load('paragraph.oe_content_row.field_oe_paragraphs'); + $handler_settings = $field->getSetting('handler_settings'); + if (isset($handler_settings['target_bundles'])) { + $handler_settings['target_bundles']['oe_social_media_follow'] = 'oe_social_media_follow'; + } + foreach ($paragraph_weights as $paragraph => $weight) { + if (isset($handler_settings['target_bundles_drag_drop'])) { + $handler_settings['target_bundles_drag_drop'][$paragraph]['weight'] = $weight; + } + } + $field->setSetting('handler_settings', $handler_settings); + $field->save(); +} From 8beff22b3bd1ce88ea5cad9b944dca237afa95cf Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Mon, 25 Nov 2019 09:17:04 +0100 Subject: [PATCH 2/7] OPENEUROPA-2473: Make Variant field of Social media follow paragraph required. --- ...social_media_follow.field_oe_social_media_variant.yml | 2 +- oe_paragraphs.post_update.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config/install/field.field.paragraph.oe_social_media_follow.field_oe_social_media_variant.yml b/config/install/field.field.paragraph.oe_social_media_follow.field_oe_social_media_variant.yml index 996699b8..c030d399 100644 --- a/config/install/field.field.paragraph.oe_social_media_follow.field_oe_social_media_variant.yml +++ b/config/install/field.field.paragraph.oe_social_media_follow.field_oe_social_media_variant.yml @@ -12,7 +12,7 @@ entity_type: paragraph bundle: oe_social_media_follow label: Variant description: '' -required: false +required: true translatable: false default_value: - diff --git a/oe_paragraphs.post_update.php b/oe_paragraphs.post_update.php index f34746f8..f362833f 100644 --- a/oe_paragraphs.post_update.php +++ b/oe_paragraphs.post_update.php @@ -100,3 +100,12 @@ function oe_paragraphs_post_update_10003(array &$sandbox): void { $field->setSetting('handler_settings', $handler_settings); $field->save(); } + +/** + * Set Social media follow Variant field to required. + */ +function oe_paragraphs_post_update_10004(array &$sandbox): void { + $field = FieldConfig::load('paragraph.oe_social_media_follow.field_oe_social_media_variant'); + $field->setRequired(TRUE); + $field->save(); +} From 890d19cf46c685454573a09b165964d56ed835bb Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Mon, 25 Nov 2019 09:59:50 +0100 Subject: [PATCH 3/7] OPENEUROPA-2473: Update test. --- tests/features/content-row.feature | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/features/content-row.feature b/tests/features/content-row.feature index c670e088..54e4c2e7 100644 --- a/tests/features/content-row.feature +++ b/tests/features/content-row.feature @@ -14,12 +14,13 @@ Feature: Content row paragraph. # Verify the fields displayed in the "default" variant. And the following field should not be present "Navigation title" And the "Paragraphs" field in the 1st "Content row" paragraph can reference: - | Accordion | - | Contextual navigation | - | Links block | - | Listing item block | - | Quote | - | Rich text | + | Accordion | + | Contextual navigation | + | Social media follow | + | Links block | + | Listing item block | + | Quote | + | Rich text | When I select "Inpage navigation" from "Variant" in the 1st "Content row" paragraph And I press "Change variant" From 4f783ba67937c53377d084134f5b53974853c26a Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Mon, 25 Nov 2019 10:46:37 +0100 Subject: [PATCH 4/7] OPENEUROPA-2473: Refactor post update hooks. --- oe_paragraphs.post_update.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/oe_paragraphs.post_update.php b/oe_paragraphs.post_update.php index f362833f..24db9b77 100644 --- a/oe_paragraphs.post_update.php +++ b/oe_paragraphs.post_update.php @@ -77,6 +77,8 @@ function oe_paragraphs_post_update_10002(array &$sandbox): void { /** * Add Social media follow paragraph to Content row paragraph. + * + * Set Variant field required. */ function oe_paragraphs_post_update_10003(array &$sandbox): void { $paragraph_weights = [ @@ -87,11 +89,13 @@ function oe_paragraphs_post_update_10003(array &$sandbox): void { 'oe_list_item_block' => -21, 'oe_rich_text' => -22, ]; + // Add Social media follow paragraph to content row. $field = FieldConfig::load('paragraph.oe_content_row.field_oe_paragraphs'); $handler_settings = $field->getSetting('handler_settings'); if (isset($handler_settings['target_bundles'])) { $handler_settings['target_bundles']['oe_social_media_follow'] = 'oe_social_media_follow'; } + // Reorder paragraphs. foreach ($paragraph_weights as $paragraph => $weight) { if (isset($handler_settings['target_bundles_drag_drop'])) { $handler_settings['target_bundles_drag_drop'][$paragraph]['weight'] = $weight; @@ -99,13 +103,16 @@ function oe_paragraphs_post_update_10003(array &$sandbox): void { } $field->setSetting('handler_settings', $handler_settings); $field->save(); + + // Set Variant field required. + $field = FieldConfig::load('paragraph.oe_social_media_follow.field_oe_social_media_variant'); + $field->setRequired(TRUE); + $field->save(); } /** * Set Social media follow Variant field to required. */ function oe_paragraphs_post_update_10004(array &$sandbox): void { - $field = FieldConfig::load('paragraph.oe_social_media_follow.field_oe_social_media_variant'); - $field->setRequired(TRUE); - $field->save(); + } From c52134ab13a7b4c7dd88a77ab3a74728968efef4 Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Tue, 26 Nov 2019 10:57:31 +0100 Subject: [PATCH 5/7] OPENEUROPA-2473: Remove test tag and empty post update hook. --- oe_paragraphs.post_update.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/oe_paragraphs.post_update.php b/oe_paragraphs.post_update.php index 24db9b77..ab393285 100644 --- a/oe_paragraphs.post_update.php +++ b/oe_paragraphs.post_update.php @@ -109,10 +109,3 @@ function oe_paragraphs_post_update_10003(array &$sandbox): void { $field->setRequired(TRUE); $field->save(); } - -/** - * Set Social media follow Variant field to required. - */ -function oe_paragraphs_post_update_10004(array &$sandbox): void { - -} From 14ca0a542d1d4d7f2f8acaff3dbb63cbdd9eb798 Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Tue, 26 Nov 2019 13:50:07 +0100 Subject: [PATCH 6/7] OPENEUROPA-2473: Refactor. --- oe_paragraphs.post_update.php | 8 +++----- tests/features/social-media-follow.feature | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/oe_paragraphs.post_update.php b/oe_paragraphs.post_update.php index ab393285..c4aedba1 100644 --- a/oe_paragraphs.post_update.php +++ b/oe_paragraphs.post_update.php @@ -76,9 +76,7 @@ function oe_paragraphs_post_update_10002(array &$sandbox): void { } /** - * Add Social media follow paragraph to Content row paragraph. - * - * Set Variant field required. + * Set Variant required and add Social media follow to Content row. */ function oe_paragraphs_post_update_10003(array &$sandbox): void { $paragraph_weights = [ @@ -96,8 +94,8 @@ function oe_paragraphs_post_update_10003(array &$sandbox): void { $handler_settings['target_bundles']['oe_social_media_follow'] = 'oe_social_media_follow'; } // Reorder paragraphs. - foreach ($paragraph_weights as $paragraph => $weight) { - if (isset($handler_settings['target_bundles_drag_drop'])) { + if (isset($handler_settings['target_bundles_drag_drop'])) { + foreach ($paragraph_weights as $paragraph => $weight) { $handler_settings['target_bundles_drag_drop'][$paragraph]['weight'] = $weight; } } diff --git a/tests/features/social-media-follow.feature b/tests/features/social-media-follow.feature index 400037b8..794d591a 100644 --- a/tests/features/social-media-follow.feature +++ b/tests/features/social-media-follow.feature @@ -11,6 +11,9 @@ Feature: Social media follow paragraph. And I fill in "Title" with "Social media follow paragraph test page" And I press "Add Social media follow" Then the following fields should be present "Title, URL, Link text, Link type" + And the available options in the Variant select should be: + | Horizontal | + | Vertical | When I press "Save" Then I should see the following error messages: | error messages | From fe3d15a43715182b3e138ef40a41c7762bbda526 Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Tue, 26 Nov 2019 15:57:45 +0100 Subject: [PATCH 7/7] OPENEUROPA-2473: Remove upgrade path for adding new paragraph to content row. --- oe_paragraphs.post_update.php | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/oe_paragraphs.post_update.php b/oe_paragraphs.post_update.php index c4aedba1..8444564d 100644 --- a/oe_paragraphs.post_update.php +++ b/oe_paragraphs.post_update.php @@ -76,33 +76,9 @@ function oe_paragraphs_post_update_10002(array &$sandbox): void { } /** - * Set Variant required and add Social media follow to Content row. + * Set Variant field required for Social media follow paragraph. */ function oe_paragraphs_post_update_10003(array &$sandbox): void { - $paragraph_weights = [ - 'oe_social_media_follow' => -17, - 'block_reference' => -18, - 'oe_quote' => -19, - 'oe_links_block' => -20, - 'oe_list_item_block' => -21, - 'oe_rich_text' => -22, - ]; - // Add Social media follow paragraph to content row. - $field = FieldConfig::load('paragraph.oe_content_row.field_oe_paragraphs'); - $handler_settings = $field->getSetting('handler_settings'); - if (isset($handler_settings['target_bundles'])) { - $handler_settings['target_bundles']['oe_social_media_follow'] = 'oe_social_media_follow'; - } - // Reorder paragraphs. - if (isset($handler_settings['target_bundles_drag_drop'])) { - foreach ($paragraph_weights as $paragraph => $weight) { - $handler_settings['target_bundles_drag_drop'][$paragraph]['weight'] = $weight; - } - } - $field->setSetting('handler_settings', $handler_settings); - $field->save(); - - // Set Variant field required. $field = FieldConfig::load('paragraph.oe_social_media_follow.field_oe_social_media_variant'); $field->setRequired(TRUE); $field->save();