Merge pull request #80 from openeuropa/OPENEUROPA-2473

OPENEUROPA-2473: Add Social media follow paragraph to Content row paragraph
openeuropa · Nov 27, 2019 · e414706 · e414706
2 parents 2186ea7 + fe3d15a
commit e414706
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 26 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
@@ -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/...ig/install/field.field.paragraph.oe_social_media_follow.field_oe_social_media_variant.yml b/...ig/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
@@ -74,3 +74,12 @@ function oe_paragraphs_post_update_10002(array &$sandbox): void {
     $entity->save();
   }
 }
+
+/**
+ * Set Variant field required for Social media follow paragraph.
+ */
+function oe_paragraphs_post_update_10003(array &$sandbox): void {
+  $field = FieldConfig::load('paragraph.oe_social_media_follow.field_oe_social_media_variant');
+  $field->setRequired(TRUE);
+  $field->save();
+}
diff --git 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"

diff --git 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          |