From f928de4c0346e8a643160afe752cf9dc63d9db7f Mon Sep 17 00:00:00 2001
From: Sergio Elvira Perez <sergioelviraperez@gmail.com>
Date: Thu, 10 Mar 2022 13:24:50 +0100
Subject: [PATCH 1/9] OEL-1291: Renamed content types.

---
 composer.json                                 |  3 ++-
 ...ty_view_display.node.oe_sc_event.full.yml} | 20 +++++++++----------
 ..._view_display.node.oe_sc_event.teaser.yml} | 20 +++++++++----------
 .../oe_whitelabel_event.info.yml              |  4 ++--
 .../oe_whitelabel_event.module                |  2 +-
 ... field--node--body--oe-sc-event.html.twig} |  0
 ...node--oe-documents--oe-sc-event.html.twig} |  0
 ...twig => node--oe-sc-event--full.html.twig} |  6 +++---
 ...ig => node--oe-sc-event--teaser.html.twig} |  2 +-
 ...ity_view_display.node.oe_sc_news.full.yml} | 14 ++++++-------
 ...y_view_display.node.oe_sc_news.teaser.yml} | 14 ++++++-------
 .../oe_whitelabel_news.info.yml               |  4 ++--
 .../oe_whitelabel_news.module                 |  2 +-
 ...oe-publication-date--oe-sc-news.html.twig} |  0
 ....twig => node--oe-sc-news--full.html.twig} |  0
 ...wig => node--oe-sc-news--teaser.html.twig} |  0
 16 files changed, 46 insertions(+), 45 deletions(-)
 rename modules/oe_whitelabel_event/config/install/{core.entity_view_display.node.oe_event.full.yml => core.entity_view_display.node.oe_sc_event.full.yml} (78%)
 rename modules/oe_whitelabel_event/config/install/{core.entity_view_display.node.oe_event.teaser.yml => core.entity_view_display.node.oe_sc_event.teaser.yml} (67%)
 rename modules/oe_whitelabel_event/templates/{field--node--body--oe-event.html.twig => field--node--body--oe-sc-event.html.twig} (100%)
 rename modules/oe_whitelabel_event/templates/{field--node--oe-documents--oe-event.html.twig => field--node--oe-documents--oe-sc-event.html.twig} (100%)
 rename modules/oe_whitelabel_event/templates/{node--oe-event--full.html.twig => node--oe-sc-event--full.html.twig} (88%)
 rename modules/oe_whitelabel_event/templates/{node--oe-event--teaser.html.twig => node--oe-sc-event--teaser.html.twig} (80%)
 rename modules/oe_whitelabel_news/config/install/{core.entity_view_display.node.oe_news.full.yml => core.entity_view_display.node.oe_sc_news.full.yml} (79%)
 rename modules/oe_whitelabel_news/config/install/{core.entity_view_display.node.oe_news.teaser.yml => core.entity_view_display.node.oe_sc_news.teaser.yml} (79%)
 rename modules/oe_whitelabel_news/templates/{field--node--oe-publication-date--oe-news.html.twig => field--node--oe-publication-date--oe-sc-news.html.twig} (100%)
 rename modules/oe_whitelabel_news/templates/{node--oe-news--full.html.twig => node--oe-sc-news--full.html.twig} (100%)
 rename modules/oe_whitelabel_news/templates/{node--oe-news--teaser.html.twig => node--oe-sc-news--teaser.html.twig} (100%)

diff --git a/composer.json b/composer.json
index 08461b32..ef137a12 100644
--- a/composer.json
+++ b/composer.json
@@ -32,9 +32,10 @@
         "openeuropa/composer-artifacts": "^1.0.0-alpha1",
         "openeuropa/oe_authentication": "^1.4",
         "openeuropa/oe_contact_forms": "~1.1",
+        "openeuropa/oe_content": "^2.8.0",
         "openeuropa/oe_corporate_blocks": "^4.4",
         "openeuropa/oe_multilingual": "^1.9",
-        "openeuropa/oe_starter_content": "1.x-dev#5a4a77b",
+        "openeuropa/oe_starter_content": "dev-OEL-1290",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
         "phpspec/prophecy-phpunit": "^1 || ^2"
     },
diff --git a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.full.yml b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
similarity index 78%
rename from modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.full.yml
rename to modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
index c09a3832..6b0bd79b 100755
--- a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.full.yml
+++ b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
@@ -3,21 +3,21 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.full
-    - field.field.node.oe_event.body
-    - field.field.node.oe_event.oe_documents
-    - field.field.node.oe_event.oe_event_dates
-    - field.field.node.oe_event.oe_featured_media
-    - field.field.node.oe_event.oe_location
-    - field.field.node.oe_event.oe_summary
-    - node.type.oe_event
+    - field.field.node.oe_sc_event.body
+    - field.field.node.oe_sc_event.oe_documents
+    - field.field.node.oe_sc_event.oe_sc_event_dates
+    - field.field.node.oe_sc_event.oe_featured_media
+    - field.field.node.oe_sc_event.oe_location
+    - field.field.node.oe_sc_event.oe_summary
+    - node.type.oe_sc_event
   module:
     - address
     - datetime_range
     - text
     - user
-id: node.oe_event.full
+id: node.oe_sc_event.full
 targetEntityType: node
-bundle: oe_event
+bundle: oe_sc_event
 mode: full
 content:
   body:
@@ -41,7 +41,7 @@ content:
       link: true
       view_mode: default
     third_party_settings: {  }
-  oe_event_dates:
+  oe_sc_event_dates:
     type: daterange_default
     label: inline
     settings:
diff --git a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.teaser.yml b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
similarity index 67%
rename from modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.teaser.yml
rename to modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
index f174a7f4..c61526d4 100755
--- a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.teaser.yml
+++ b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
@@ -3,24 +3,24 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.teaser
-    - field.field.node.oe_event.body
-    - field.field.node.oe_event.oe_documents
-    - field.field.node.oe_event.oe_event_dates
-    - field.field.node.oe_event.oe_featured_media
-    - field.field.node.oe_event.oe_location
-    - field.field.node.oe_event.oe_summary
-    - node.type.oe_event
+    - field.field.node.oe_sc_event.body
+    - field.field.node.oe_sc_event.oe_documents
+    - field.field.node.oe_sc_event.oe_sc_event_dates
+    - field.field.node.oe_sc_event.oe_featured_media
+    - field.field.node.oe_sc_event.oe_location
+    - field.field.node.oe_sc_event.oe_summary
+    - node.type.oe_sc_event
   module:
     - address
     - datetime_range
     - text
     - user
-id: node.oe_event.teaser
+id: node.oe_sc_event.teaser
 targetEntityType: node
-bundle: oe_event
+bundle: oe_sc_event
 mode: teaser
 content:
-  oe_event_dates:
+  oe_sc_event_dates:
     type: daterange_default
     label: hidden
     settings:
diff --git a/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml b/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml
index 474de73c..b45a48f7 100755
--- a/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml
+++ b/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml
@@ -10,6 +10,6 @@ dependencies:
 
 config_devel:
   install:
-    - core.entity_view_display.node.oe_event.full
-    - core.entity_view_display.node.oe_event.teaser
+    - core.entity_view_display.node.oe_sc_event.full
+    - core.entity_view_display.node.oe_sc_event.teaser
     - core.date_format.oe_whitelabel_event_date
diff --git a/modules/oe_whitelabel_event/oe_whitelabel_event.module b/modules/oe_whitelabel_event/oe_whitelabel_event.module
index d3d5842f..685276ca 100755
--- a/modules/oe_whitelabel_event/oe_whitelabel_event.module
+++ b/modules/oe_whitelabel_event/oe_whitelabel_event.module
@@ -17,7 +17,7 @@ use Drupal\Component\Utility\Html;
 /**
  * Implements template_preprocess_node() for the Event node type.
  */
-function oe_whitelabel_event_preprocess_node__oe_event(&$variables) {
+function oe_whitelabel_event_preprocess_node__oe_sc_event(&$variables) {
   if ($variables['view_mode'] !== 'full' && $variables['view_mode'] !== 'teaser') {
     return;
   }
diff --git a/modules/oe_whitelabel_event/templates/field--node--body--oe-event.html.twig b/modules/oe_whitelabel_event/templates/field--node--body--oe-sc-event.html.twig
similarity index 100%
rename from modules/oe_whitelabel_event/templates/field--node--body--oe-event.html.twig
rename to modules/oe_whitelabel_event/templates/field--node--body--oe-sc-event.html.twig
diff --git a/modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-event.html.twig b/modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-sc-event.html.twig
similarity index 100%
rename from modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-event.html.twig
rename to modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-sc-event.html.twig
diff --git a/modules/oe_whitelabel_event/templates/node--oe-event--full.html.twig b/modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
similarity index 88%
rename from modules/oe_whitelabel_event/templates/node--oe-event--full.html.twig
rename to modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
index b524b69d..705b34a9 100755
--- a/modules/oe_whitelabel_event/templates/node--oe-event--full.html.twig
+++ b/modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
@@ -5,14 +5,14 @@
  */
 #}
 {% set description_items = [] %}
-{% if content.oe_event_dates|field_value is not empty %}
+{% if content.oe_sc_event_dates|field_value is not empty %}
   {% set _event_dates %}
-    {{ content.oe_event_dates|field_value|safe_join(', ') }}
+    {{ content.oe_sc_event_dates|field_value|safe_join(', ') }}
   {% endset %}
   {% set description_items = description_items|merge([
     {
       term:[{
-      'label': content.oe_event_dates|field_label,
+      'label': content.oe_sc_event_dates|field_label,
       'icon': 'calendar-event',
     }],
       definition: _event_dates,
diff --git a/modules/oe_whitelabel_event/templates/node--oe-event--teaser.html.twig b/modules/oe_whitelabel_event/templates/node--oe-sc-event--teaser.html.twig
similarity index 80%
rename from modules/oe_whitelabel_event/templates/node--oe-event--teaser.html.twig
rename to modules/oe_whitelabel_event/templates/node--oe-sc-event--teaser.html.twig
index a92a4959..94b72061 100755
--- a/modules/oe_whitelabel_event/templates/node--oe-event--teaser.html.twig
+++ b/modules/oe_whitelabel_event/templates/node--oe-sc-event--teaser.html.twig
@@ -8,7 +8,7 @@
   <a class="text-underline-hover" href="{{ url }}">{{ label }}</a>
 {% endset %}
 {% set _content %}
-  <span class="text-muted text-nowrap me-4-5">{{ content.oe_event_dates }}</span>
+  <span class="text-muted text-nowrap me-4-5">{{ content.oe_sc_event_dates }}</span>
 {% endset %}
 <article{{attributes}}>
   {{ pattern('card', {
diff --git a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.full.yml b/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
similarity index 79%
rename from modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.full.yml
rename to modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
index c7bd5898..aee775f3 100644
--- a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.full.yml
+++ b/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
@@ -2,19 +2,19 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.node.oe_news.body
-    - field.field.node.oe_news.oe_featured_media
-    - field.field.node.oe_news.oe_publication_date
-    - field.field.node.oe_news.oe_summary
-    - node.type.oe_news
+    - field.field.node.oe_sc_news.body
+    - field.field.node.oe_sc_news.oe_featured_media
+    - field.field.node.oe_sc_news.oe_publication_date
+    - field.field.node.oe_sc_news.oe_summary
+    - node.type.oe_sc_news
   module:
     - datetime
     - text
     - user
 
-id: node.oe_news.full
+id: node.oe_sc_news.full
 targetEntityType: node
-bundle: oe_news
+bundle: oe_sc_news
 mode: full
 content:
   body:
diff --git a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.teaser.yml b/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
similarity index 79%
rename from modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.teaser.yml
rename to modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
index b385718c..54e03626 100644
--- a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.teaser.yml
+++ b/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
@@ -3,19 +3,19 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.teaser
-    - field.field.node.oe_news.body
-    - field.field.node.oe_news.oe_featured_media
-    - field.field.node.oe_news.oe_publication_date
-    - field.field.node.oe_news.oe_summary
-    - node.type.oe_news
+    - field.field.node.oe_sc_news.body
+    - field.field.node.oe_sc_news.oe_featured_media
+    - field.field.node.oe_sc_news.oe_publication_date
+    - field.field.node.oe_sc_news.oe_summary
+    - node.type.oe_sc_news
   module:
     - datetime
     - text
     - user
 
-id: node.oe_news.teaser
+id: node.oe_sc_news.teaser
 targetEntityType: node
-bundle: oe_news
+bundle: oe_sc_news
 mode: teaser
 content:
   body:
diff --git a/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml b/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml
index ec78176a..1d49572d 100644
--- a/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml
+++ b/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml
@@ -11,5 +11,5 @@ dependencies:
 config_devel:
   install:
     - core.date_format.oel_whitelabel_news_date.yml
-    - core.entity_view_display.node.oe_news.full.yml
-    - core.entity_view_display.node.oe_news.teaser.yml
+    - core.entity_view_display.node.oe_sc_news.full.yml
+    - core.entity_view_display.node.oe_sc_news.teaser.yml
diff --git a/modules/oe_whitelabel_news/oe_whitelabel_news.module b/modules/oe_whitelabel_news/oe_whitelabel_news.module
index fc89a07f..c19cef8f 100644
--- a/modules/oe_whitelabel_news/oe_whitelabel_news.module
+++ b/modules/oe_whitelabel_news/oe_whitelabel_news.module
@@ -16,7 +16,7 @@ use Drupal\oe_bootstrap_theme\ValueObject\ImageValueObject;
 /**
  * Implements template_preprocess_node() for the News node type.
  */
-function oe_whitelabel_news_preprocess_node__oe_news(&$variables) {
+function oe_whitelabel_news_preprocess_node__oe_sc_news(&$variables) {
   if ($variables['view_mode'] !== 'full' && $variables['view_mode'] !== 'teaser') {
     return;
   }
diff --git a/modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-news.html.twig b/modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig
similarity index 100%
rename from modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-news.html.twig
rename to modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig
diff --git a/modules/oe_whitelabel_news/templates/node--oe-news--full.html.twig b/modules/oe_whitelabel_news/templates/node--oe-sc-news--full.html.twig
similarity index 100%
rename from modules/oe_whitelabel_news/templates/node--oe-news--full.html.twig
rename to modules/oe_whitelabel_news/templates/node--oe-sc-news--full.html.twig
diff --git a/modules/oe_whitelabel_news/templates/node--oe-news--teaser.html.twig b/modules/oe_whitelabel_news/templates/node--oe-sc-news--teaser.html.twig
similarity index 100%
rename from modules/oe_whitelabel_news/templates/node--oe-news--teaser.html.twig
rename to modules/oe_whitelabel_news/templates/node--oe-sc-news--teaser.html.twig
-- 
GitLab


From 665b5795eca45c7cfdbba646553255d0337c4751 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Perez <sergioelviraperez@gmail.com>
Date: Thu, 10 Mar 2022 13:25:14 +0100
Subject: [PATCH 2/9] OEL-1291: Tests adapted.

---
 tests/src/Functional/ContentEventRenderTest.php |  6 +++---
 tests/src/Functional/ContentNewsRenderTest.php  | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php
index 8738bd32..96286a95 100644
--- a/tests/src/Functional/ContentEventRenderTest.php
+++ b/tests/src/Functional/ContentEventRenderTest.php
@@ -77,11 +77,11 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase {
     $node = \Drupal::entityTypeManager()
       ->getStorage('node')
       ->create([
-        'type' => 'oe_event',
+        'type' => 'oe_sc_event',
         'title' => 'Test event node',
         'oe_summary' => 'http://www.example.org is a web page',
         'body' => 'Event body',
-        'oe_event_dates' => [
+        'oe_sc_event_dates' => [
           'value' => '2022-02-09T20:00:00',
           'end_value' => '2022-02-09T22:00:00',
         ],
@@ -124,7 +124,7 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase {
     // Assert content banner summary.
     $this->assertEquals(
       'http://www.example.org is a web page',
-      trim($content_banner->filter('.oe-event__oe-summary')->text())
+      trim($content_banner->filter('.oe-sc-event__oe-summary')->text())
     );
     // Assert inpage-navigation.
     $this->assertEquals(
diff --git a/tests/src/Functional/ContentNewsRenderTest.php b/tests/src/Functional/ContentNewsRenderTest.php
index 7681b1c7..a6c4ab01 100644
--- a/tests/src/Functional/ContentNewsRenderTest.php
+++ b/tests/src/Functional/ContentNewsRenderTest.php
@@ -60,12 +60,12 @@ class ContentNewsRenderTest extends WhitelabelBrowserTestBase {
     $node = \Drupal::entityTypeManager()
       ->getStorage('node')
       ->create([
-        'type' => 'oe_news',
+        'type' => 'oe_sc_news',
         'title' => 'Test news node',
         'oe_summary' => 'http://www.example.org is a web page',
         'body' => 'News body',
         'oe_publication_date' => [
-          'value' => '2022-02-09T20:00:00',
+          'value' => '2022-02-09',
         ],
         'uid' => 1,
         'status' => 1,
@@ -104,18 +104,18 @@ class ContentNewsRenderTest extends WhitelabelBrowserTestBase {
     );
     // Assert content banner publication date.
     $this->assertEquals(
-      '10 February 2022',
+      '09 February 2022',
       trim($content_banner->filter('.card-body > div.my-4')->text())
     );
     // Assert content banner summary.
     $this->assertEquals(
       'http://www.example.org is a web page',
-      trim($content_banner->filter('.oe-news__oe-summary')->text())
+      trim($content_banner->filter('.oe-sc-news__oe-summary')->text())
     );
     // Assert the news content.
     $this->assertEquals(
       'News body',
-      trim($crawler->filter('.oe-news__body')->text())
+      trim($crawler->filter('.oe-sc-news__body')->text())
     );
   }
 
@@ -149,7 +149,7 @@ class ContentNewsRenderTest extends WhitelabelBrowserTestBase {
     );
     // Assert content banner publication date.
     $this->assertEquals(
-      '10 February 2022',
+      '09 February 2022',
       trim($crawler->filter('div.card-body > span.text-muted')->text())
     );
   }
-- 
GitLab


From e2680d69c617c67b000d3d1b11333434e809db03 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Perez <sergioelviraperez@gmail.com>
Date: Thu, 10 Mar 2022 16:22:09 +0100
Subject: [PATCH 3/9] OEL-1291: Composer updated fo starter content.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ef137a12..c942170a 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "openeuropa/oe_content": "^2.8.0",
         "openeuropa/oe_corporate_blocks": "^4.4",
         "openeuropa/oe_multilingual": "^1.9",
-        "openeuropa/oe_starter_content": "dev-OEL-1290",
+        "openeuropa/oe_starter_content": "1.x-dev",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
         "phpspec/prophecy-phpunit": "^1 || ^2"
     },
-- 
GitLab


From 88ca64fe707d68e899beca00eb4113d80a5d5bd1 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Perez <sergioelviraperez@gmail.com>
Date: Thu, 10 Mar 2022 16:45:57 +0100
Subject: [PATCH 4/9] OEL-1291: Composer updated for starter content oel-1290.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c942170a..ef137a12 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "openeuropa/oe_content": "^2.8.0",
         "openeuropa/oe_corporate_blocks": "^4.4",
         "openeuropa/oe_multilingual": "^1.9",
-        "openeuropa/oe_starter_content": "1.x-dev",
+        "openeuropa/oe_starter_content": "dev-OEL-1290",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
         "phpspec/prophecy-phpunit": "^1 || ^2"
     },
-- 
GitLab


From 62d7537926d96af73a160e751550091800d52bd4 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Perez <sergioelviraperez@gmail.com>
Date: Fri, 11 Mar 2022 10:22:33 +0100
Subject: [PATCH 5/9] OEL-1291: Field oe_location renamed.

---
 .../core.entity_view_display.node.oe_sc_event.full.yml      | 4 ++--
 .../core.entity_view_display.node.oe_sc_event.teaser.yml    | 4 ++--
 .../templates/node--oe-sc-event--full.html.twig             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
index 6b0bd79b..ac925eaf 100755
--- a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
+++ b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.node.oe_sc_event.oe_documents
     - field.field.node.oe_sc_event.oe_sc_event_dates
     - field.field.node.oe_sc_event.oe_featured_media
-    - field.field.node.oe_sc_event.oe_location
+    - field.field.node.oe_sc_event.oe_sc_event_location
     - field.field.node.oe_sc_event.oe_summary
     - node.type.oe_sc_event
   module:
@@ -60,7 +60,7 @@ content:
       link: true
       view_mode: default
     third_party_settings: {  }
-  oe_location:
+  oe_sc_event_location:
     type: oe_whitelabel_helper_address_inline
     label: inline
     settings:
diff --git a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
index c61526d4..5a9ce9cd 100755
--- a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
+++ b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.node.oe_sc_event.oe_documents
     - field.field.node.oe_sc_event.oe_sc_event_dates
     - field.field.node.oe_sc_event.oe_featured_media
-    - field.field.node.oe_sc_event.oe_location
+    - field.field.node.oe_sc_event.oe_sc_event_location
     - field.field.node.oe_sc_event.oe_summary
     - node.type.oe_sc_event
   module:
@@ -30,7 +30,7 @@ content:
     third_party_settings: {  }
     weight: 4
     region: content
-  oe_location:
+  oe_sc_event_location:
     type: address_default
     label: hidden
     settings: {  }
diff --git a/modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig b/modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
index 705b34a9..9df36039 100755
--- a/modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
+++ b/modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
@@ -19,14 +19,14 @@
     }
   ]) %}
 {% endif %}
-{% if content.oe_location|field_value is not empty %}
+{% if content.oe_sc_event_location|field_value is not empty %}
   {% set _event_location %}
-    {{ content.oe_location|field_value|safe_join(', ') }}
+    {{ content.oe_sc_event_location|field_value|safe_join(', ') }}
   {% endset %}
   {% set description_items = description_items|merge([
     {
       term:[{
-      'label': content.oe_location|field_label,
+      'label': content.oe_sc_event_location|field_label,
       'icon': 'geo-alt-fill',
     }],
       definition: _event_location,
-- 
GitLab


From 4d124d2794a1752b0b577bed8cd6253633e75dde Mon Sep 17 00:00:00 2001
From: Sergio Elvira Perez <sergioelviraperez@gmail.com>
Date: Mon, 14 Mar 2022 11:36:49 +0100
Subject: [PATCH 6/9] OEL-1291: Composer updated cause 1290 was merged.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ef137a12..c942170a 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "openeuropa/oe_content": "^2.8.0",
         "openeuropa/oe_corporate_blocks": "^4.4",
         "openeuropa/oe_multilingual": "^1.9",
-        "openeuropa/oe_starter_content": "dev-OEL-1290",
+        "openeuropa/oe_starter_content": "1.x-dev",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
         "phpspec/prophecy-phpunit": "^1 || ^2"
     },
-- 
GitLab


From d54853236fba04e1b6f1144c25755f7c2910e5dc Mon Sep 17 00:00:00 2001
From: Sergio Elvira Perez <sergioelviraperez@gmail.com>
Date: Mon, 14 Mar 2022 19:22:50 +0100
Subject: [PATCH 7/9] OEL-1291: Starter content version changed on
 composer.json

---
 composer.json                                         |  2 +-
 modules/oe_whitelabel_event/README.md                 |  1 -
 modules/oe_whitelabel_news/README.md                  |  1 -
 modules/oe_whitelabel_starter_event/README.md         |  1 +
 ....date_format.oe_whitelabel_starter_event_date.yml} |  2 +-
 ...core.entity_view_display.node.oe_sc_event.full.yml | 11 +++++------
 ...re.entity_view_display.node.oe_sc_event.teaser.yml |  2 +-
 .../oe_whitelabel_starter_event.info.yml}             |  4 ++--
 .../oe_whitelabel_starter_event.module}               | 10 +++++-----
 .../field--node--body--oe-sc-event.html.twig          |  0
 .../field--node--oe-documents--oe-sc-event.html.twig  |  0
 .../templates/node--oe-sc-event--full.html.twig       |  0
 .../templates/node--oe-sc-event--teaser.html.twig     |  0
 modules/oe_whitelabel_starter_news/README.md          |  1 +
 ...e.date_format.oe_whitelabel_starter_news_date.yml} |  2 +-
 .../core.entity_view_display.node.oe_sc_news.full.yml | 11 +++++------
 ...ore.entity_view_display.node.oe_sc_news.teaser.yml | 11 +++++------
 .../oe_whitelabel_starter_news.info.yml}              |  4 ++--
 .../oe_whitelabel_starter_news.module}                |  2 +-
 ...d--node--oe-publication-date--oe-sc-news.html.twig |  0
 .../templates/node--oe-sc-news--full.html.twig        |  0
 .../templates/node--oe-sc-news--teaser.html.twig      |  0
 runner.yml.dist                                       |  4 ++--
 tests/src/Functional/ContentEventRenderTest.php       |  2 +-
 tests/src/Functional/ContentNewsRenderTest.php        |  2 +-
 25 files changed, 35 insertions(+), 38 deletions(-)
 delete mode 100755 modules/oe_whitelabel_event/README.md
 delete mode 100644 modules/oe_whitelabel_news/README.md
 create mode 100755 modules/oe_whitelabel_starter_event/README.md
 rename modules/{oe_whitelabel_event/config/install/core.date_format.oe_whitelabel_event_date.yml => oe_whitelabel_starter_event/config/install/core.date_format.oe_whitelabel_starter_event_date.yml} (74%)
 rename modules/{oe_whitelabel_event => oe_whitelabel_starter_event}/config/install/core.entity_view_display.node.oe_sc_event.full.yml (92%)
 rename modules/{oe_whitelabel_event => oe_whitelabel_starter_event}/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml (95%)
 rename modules/{oe_whitelabel_event/oe_whitelabel_event.info.yml => oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml} (80%)
 rename modules/{oe_whitelabel_event/oe_whitelabel_event.module => oe_whitelabel_starter_event/oe_whitelabel_starter_event.module} (89%)
 rename modules/{oe_whitelabel_event => oe_whitelabel_starter_event}/templates/field--node--body--oe-sc-event.html.twig (100%)
 rename modules/{oe_whitelabel_event => oe_whitelabel_starter_event}/templates/field--node--oe-documents--oe-sc-event.html.twig (100%)
 rename modules/{oe_whitelabel_event => oe_whitelabel_starter_event}/templates/node--oe-sc-event--full.html.twig (100%)
 rename modules/{oe_whitelabel_event => oe_whitelabel_starter_event}/templates/node--oe-sc-event--teaser.html.twig (100%)
 create mode 100644 modules/oe_whitelabel_starter_news/README.md
 rename modules/{oe_whitelabel_news/config/install/core.date_format.oe_whitelabel_news_date.yml => oe_whitelabel_starter_news/config/install/core.date_format.oe_whitelabel_starter_news_date.yml} (75%)
 rename modules/{oe_whitelabel_news => oe_whitelabel_starter_news}/config/install/core.entity_view_display.node.oe_sc_news.full.yml (87%)
 rename modules/{oe_whitelabel_news => oe_whitelabel_starter_news}/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml (87%)
 rename modules/{oe_whitelabel_news/oe_whitelabel_news.info.yml => oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml} (80%)
 rename modules/{oe_whitelabel_news/oe_whitelabel_news.module => oe_whitelabel_starter_news/oe_whitelabel_starter_news.module} (96%)
 rename modules/{oe_whitelabel_news => oe_whitelabel_starter_news}/templates/field--node--oe-publication-date--oe-sc-news.html.twig (100%)
 rename modules/{oe_whitelabel_news => oe_whitelabel_starter_news}/templates/node--oe-sc-news--full.html.twig (100%)
 rename modules/{oe_whitelabel_news => oe_whitelabel_starter_news}/templates/node--oe-sc-news--teaser.html.twig (100%)

diff --git a/composer.json b/composer.json
index c942170a..ef137a12 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "openeuropa/oe_content": "^2.8.0",
         "openeuropa/oe_corporate_blocks": "^4.4",
         "openeuropa/oe_multilingual": "^1.9",
-        "openeuropa/oe_starter_content": "1.x-dev",
+        "openeuropa/oe_starter_content": "dev-OEL-1290",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
         "phpspec/prophecy-phpunit": "^1 || ^2"
     },
diff --git a/modules/oe_whitelabel_event/README.md b/modules/oe_whitelabel_event/README.md
deleted file mode 100755
index 5e84b4a3..00000000
--- a/modules/oe_whitelabel_event/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# OpenEuropa Whitelabel Event
\ No newline at end of file
diff --git a/modules/oe_whitelabel_news/README.md b/modules/oe_whitelabel_news/README.md
deleted file mode 100644
index 8affd80e..00000000
--- a/modules/oe_whitelabel_news/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# OpenEuropa Whitelabel News
\ No newline at end of file
diff --git a/modules/oe_whitelabel_starter_event/README.md b/modules/oe_whitelabel_starter_event/README.md
new file mode 100755
index 00000000..04304eb4
--- /dev/null
+++ b/modules/oe_whitelabel_starter_event/README.md
@@ -0,0 +1 @@
+# OpenEuropa Whitelabel Starter Event
diff --git a/modules/oe_whitelabel_event/config/install/core.date_format.oe_whitelabel_event_date.yml b/modules/oe_whitelabel_starter_event/config/install/core.date_format.oe_whitelabel_starter_event_date.yml
similarity index 74%
rename from modules/oe_whitelabel_event/config/install/core.date_format.oe_whitelabel_event_date.yml
rename to modules/oe_whitelabel_starter_event/config/install/core.date_format.oe_whitelabel_starter_event_date.yml
index 2c399e94..46a62c2b 100644
--- a/modules/oe_whitelabel_event/config/install/core.date_format.oe_whitelabel_event_date.yml
+++ b/modules/oe_whitelabel_starter_event/config/install/core.date_format.oe_whitelabel_starter_event_date.yml
@@ -1,7 +1,7 @@
 langcode: en
 status: true
 dependencies: {  }
-id: oe_whitelabel_event_date
+id: oe_whitelabel_starter_event_date
 label: 'OE Whitelabel Event date'
 locked: false
 pattern: 'd F Y'
diff --git a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
similarity index 92%
rename from modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
rename to modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
index ac925eaf..14cb7b58 100755
--- a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
+++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
@@ -46,20 +46,19 @@ content:
     label: inline
     settings:
       timezone_override: ''
-      format_type: oe_whitelabel_event_date
+      format_type: oe_whitelabel_starter_event_date
       separator: to
     third_party_settings: {  }
     weight: 4
     region: content
   oe_featured_media:
-    type: entity_reference_entity_view
-    weight: 3
-    region: content
-    label: hidden
+    type: oe_featured_media_label
+    label: above
     settings:
       link: true
-      view_mode: default
     third_party_settings: {  }
+    weight: 102
+    region: content
   oe_sc_event_location:
     type: oe_whitelabel_helper_address_inline
     label: inline
diff --git a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
similarity index 95%
rename from modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
rename to modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
index 5a9ce9cd..009b8c67 100755
--- a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
+++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
@@ -25,7 +25,7 @@ content:
     label: hidden
     settings:
       timezone_override: ''
-      format_type: oe_whitelabel_event_date
+      format_type: oe_whitelabel_starter_event_date
       separator: to
     third_party_settings: {  }
     weight: 4
diff --git a/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml
similarity index 80%
rename from modules/oe_whitelabel_event/oe_whitelabel_event.info.yml
rename to modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml
index b45a48f7..29c37b07 100755
--- a/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml
+++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml
@@ -1,4 +1,4 @@
-name: OpenEuropa Whitelabel Event
+name: OpenEuropa Whitelabel Starter Event
 type: module
 description: Adds additional functionality to the Event module
 package: OpenEuropa Whitelabel Theme
@@ -12,4 +12,4 @@ config_devel:
   install:
     - core.entity_view_display.node.oe_sc_event.full
     - core.entity_view_display.node.oe_sc_event.teaser
-    - core.date_format.oe_whitelabel_event_date
+    - core.date_format.oe_whitelabel_starter_event_date
diff --git a/modules/oe_whitelabel_event/oe_whitelabel_event.module b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module
similarity index 89%
rename from modules/oe_whitelabel_event/oe_whitelabel_event.module
rename to modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module
index 685276ca..4f9d92b6 100755
--- a/modules/oe_whitelabel_event/oe_whitelabel_event.module
+++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module
@@ -17,12 +17,12 @@ use Drupal\Component\Utility\Html;
 /**
  * Implements template_preprocess_node() for the Event node type.
  */
-function oe_whitelabel_event_preprocess_node__oe_sc_event(&$variables) {
+function oe_whitelabel_starter_event_preprocess_node__oe_sc_event(&$variables) {
   if ($variables['view_mode'] !== 'full' && $variables['view_mode'] !== 'teaser') {
     return;
   }
-  _oe_whitelabel_event_preprocess_featured_media($variables);
-  _oe_whitelabel_event_preprocess_inpage_nav($variables);
+  _oe_whitelabel_starter_event_preprocess_featured_media($variables);
+  _oe_whitelabel_starter_event_preprocess_inpage_nav($variables);
 }
 
 /**
@@ -31,7 +31,7 @@ function oe_whitelabel_event_preprocess_node__oe_sc_event(&$variables) {
  * @param array $variables
  *   Render array variables.
  */
-function _oe_whitelabel_event_preprocess_featured_media(array &$variables): void {
+function _oe_whitelabel_starter_event_preprocess_featured_media(array &$variables): void {
   /** @var \Drupal\node\NodeInterface $node */
   $node = $variables['node'];
 
@@ -91,7 +91,7 @@ function _oe_whitelabel_event_preprocess_featured_media(array &$variables): void
  * @param array $variables
  *   Render array variables.
  */
-function _oe_whitelabel_event_preprocess_inpage_nav(array &$variables): void {
+function _oe_whitelabel_starter_event_preprocess_inpage_nav(array &$variables): void {
   /** @var \Drupal\node\NodeInterface $node */
   $node = $variables['node'];
 
diff --git a/modules/oe_whitelabel_event/templates/field--node--body--oe-sc-event.html.twig b/modules/oe_whitelabel_starter_event/templates/field--node--body--oe-sc-event.html.twig
similarity index 100%
rename from modules/oe_whitelabel_event/templates/field--node--body--oe-sc-event.html.twig
rename to modules/oe_whitelabel_starter_event/templates/field--node--body--oe-sc-event.html.twig
diff --git a/modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-sc-event.html.twig b/modules/oe_whitelabel_starter_event/templates/field--node--oe-documents--oe-sc-event.html.twig
similarity index 100%
rename from modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-sc-event.html.twig
rename to modules/oe_whitelabel_starter_event/templates/field--node--oe-documents--oe-sc-event.html.twig
diff --git a/modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig b/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--full.html.twig
similarity index 100%
rename from modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
rename to modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--full.html.twig
diff --git a/modules/oe_whitelabel_event/templates/node--oe-sc-event--teaser.html.twig b/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
similarity index 100%
rename from modules/oe_whitelabel_event/templates/node--oe-sc-event--teaser.html.twig
rename to modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
diff --git a/modules/oe_whitelabel_starter_news/README.md b/modules/oe_whitelabel_starter_news/README.md
new file mode 100644
index 00000000..b981788a
--- /dev/null
+++ b/modules/oe_whitelabel_starter_news/README.md
@@ -0,0 +1 @@
+# OpenEuropa Whitelabel Starter News
diff --git a/modules/oe_whitelabel_news/config/install/core.date_format.oe_whitelabel_news_date.yml b/modules/oe_whitelabel_starter_news/config/install/core.date_format.oe_whitelabel_starter_news_date.yml
similarity index 75%
rename from modules/oe_whitelabel_news/config/install/core.date_format.oe_whitelabel_news_date.yml
rename to modules/oe_whitelabel_starter_news/config/install/core.date_format.oe_whitelabel_starter_news_date.yml
index 373d4583..c6fa6312 100644
--- a/modules/oe_whitelabel_news/config/install/core.date_format.oe_whitelabel_news_date.yml
+++ b/modules/oe_whitelabel_starter_news/config/install/core.date_format.oe_whitelabel_starter_news_date.yml
@@ -1,7 +1,7 @@
 langcode: en
 status: true
 dependencies: {  }
-id: oe_whitelabel_news_date
+id: oe_whitelabel_starter_news_date
 label: 'OE Whitelabel News date'
 locked: false
 pattern: 'd F Y'
diff --git a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml b/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
similarity index 87%
rename from modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
rename to modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
index aee775f3..2ac942b4 100644
--- a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
+++ b/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
@@ -30,20 +30,19 @@ content:
     weight: 100
     region: content
   oe_featured_media:
-    type: entity_reference_entity_view
-    label: hidden
+    type: oe_featured_media_label
+    label: above
     settings:
-      view_mode: default
-      link: false
+      link: true
     third_party_settings: {  }
-    weight: 10
+    weight: 102
     region: content
   oe_publication_date:
     type: datetime_default
     label: hidden
     settings:
       timezone_override: ''
-      format_type: oe_whitelabel_news_date
+      format_type: oe_whitelabel_starter_news_date
     third_party_settings: {  }
     weight: 13
     region: content
diff --git a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml b/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
similarity index 87%
rename from modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
rename to modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
index 54e03626..cfbd6480 100644
--- a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
+++ b/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
@@ -31,20 +31,19 @@ content:
     weight: 100
     region: content
   oe_featured_media:
-    type: entity_reference_entity_view
-    label: hidden
+    type: oe_featured_media_label
+    label: above
     settings:
-      view_mode: default
-      link: false
+      link: true
     third_party_settings: {  }
-    weight: 10
+    weight: 102
     region: content
   oe_publication_date:
     type: datetime_default
     label: hidden
     settings:
       timezone_override: ''
-      format_type: oe_whitelabel_news_date
+      format_type: oe_whitelabel_starter_news_date
     third_party_settings: {  }
     weight: 13
     region: content
diff --git a/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml
similarity index 80%
rename from modules/oe_whitelabel_news/oe_whitelabel_news.info.yml
rename to modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml
index 1d49572d..cd71e399 100644
--- a/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml
+++ b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml
@@ -1,4 +1,4 @@
-name: OpenEuropa Whitelabel News
+name: OpenEuropa Whitelabel Starter News
 type: module
 description: Companion module to OE News providing styling to nodes.
 package: OpenEuropa Whitelabel Theme
@@ -10,6 +10,6 @@ dependencies:
 
 config_devel:
   install:
-    - core.date_format.oel_whitelabel_news_date.yml
+    - core.date_format.oe_whitelabel_starter_news_date.yml
     - core.entity_view_display.node.oe_sc_news.full.yml
     - core.entity_view_display.node.oe_sc_news.teaser.yml
diff --git a/modules/oe_whitelabel_news/oe_whitelabel_news.module b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module
similarity index 96%
rename from modules/oe_whitelabel_news/oe_whitelabel_news.module
rename to modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module
index c19cef8f..78143f08 100644
--- a/modules/oe_whitelabel_news/oe_whitelabel_news.module
+++ b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module
@@ -16,7 +16,7 @@ use Drupal\oe_bootstrap_theme\ValueObject\ImageValueObject;
 /**
  * Implements template_preprocess_node() for the News node type.
  */
-function oe_whitelabel_news_preprocess_node__oe_sc_news(&$variables) {
+function oe_whitelabel_starter_news_preprocess_node__oe_sc_news(&$variables) {
   if ($variables['view_mode'] !== 'full' && $variables['view_mode'] !== 'teaser') {
     return;
   }
diff --git a/modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig b/modules/oe_whitelabel_starter_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig
similarity index 100%
rename from modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig
rename to modules/oe_whitelabel_starter_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig
diff --git a/modules/oe_whitelabel_news/templates/node--oe-sc-news--full.html.twig b/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--full.html.twig
similarity index 100%
rename from modules/oe_whitelabel_news/templates/node--oe-sc-news--full.html.twig
rename to modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--full.html.twig
diff --git a/modules/oe_whitelabel_news/templates/node--oe-sc-news--teaser.html.twig b/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
similarity index 100%
rename from modules/oe_whitelabel_news/templates/node--oe-sc-news--teaser.html.twig
rename to modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
diff --git a/runner.yml.dist b/runner.yml.dist
index 80470bb5..782e6c99 100644
--- a/runner.yml.dist
+++ b/runner.yml.dist
@@ -23,8 +23,8 @@ drupal:
     - "./vendor/bin/drush en oe_whitelabel_contact_forms -y"
     - "./vendor/bin/drush en oe_whitelabel_helper -y"
     - "./vendor/bin/drush en oe_whitelabel_search -y"
-    - "./vendor/bin/drush en oe_whitelabel_news -y"
-    - "./vendor/bin/drush en oe_whitelabel_event -y"
+    - "./vendor/bin/drush en oe_whitelabel_starter_news -y"
+    - "./vendor/bin/drush en oe_whitelabel_starter_event -y"
     - "./vendor/bin/drush en toolbar -y"
     - "./vendor/bin/drush theme:enable oe_whitelabel -y"
     - "./vendor/bin/drush theme:enable seven -y"
diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php
index 96286a95..d07596e6 100644
--- a/tests/src/Functional/ContentEventRenderTest.php
+++ b/tests/src/Functional/ContentEventRenderTest.php
@@ -22,7 +22,7 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase {
    * {@inheritdoc}
    */
   public static $modules = [
-    'oe_whitelabel_event',
+    'oe_whitelabel_starter_event',
   ];
 
   /**
diff --git a/tests/src/Functional/ContentNewsRenderTest.php b/tests/src/Functional/ContentNewsRenderTest.php
index a6c4ab01..e7d42ad3 100644
--- a/tests/src/Functional/ContentNewsRenderTest.php
+++ b/tests/src/Functional/ContentNewsRenderTest.php
@@ -22,7 +22,7 @@ class ContentNewsRenderTest extends WhitelabelBrowserTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
-    'oe_whitelabel_news',
+    'oe_whitelabel_starter_news',
   ];
 
   /**
-- 
GitLab


From 7b3bf939b7cc5f25ed42a289afa148a1d44947eb Mon Sep 17 00:00:00 2001
From: Sergio Elvira Perez <sergioelviraperez@gmail.com>
Date: Wed, 16 Mar 2022 14:47:07 +0100
Subject: [PATCH 8/9] OEL-1291: Whitelabel starter news and events entities
 exported.

---
 ...ity_view_display.node.oe_sc_event.full.yml | 38 +++++++++++--------
 ...tity_view_display.node.oe_sc_news.full.yml | 13 +++++--
 ...ty_view_display.node.oe_sc_news.teaser.yml | 12 ++++--
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
index 14cb7b58..a8b91042 100755
--- a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
+++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
@@ -5,14 +5,15 @@ dependencies:
     - core.entity_view_mode.node.full
     - field.field.node.oe_sc_event.body
     - field.field.node.oe_sc_event.oe_documents
-    - field.field.node.oe_sc_event.oe_sc_event_dates
     - field.field.node.oe_sc_event.oe_featured_media
+    - field.field.node.oe_sc_event.oe_sc_event_dates
     - field.field.node.oe_sc_event.oe_sc_event_location
     - field.field.node.oe_sc_event.oe_summary
     - node.type.oe_sc_event
   module:
-    - address
     - datetime_range
+    - oe_content_featured_media_field
+    - oe_whitelabel_helper
     - text
     - user
 id: node.oe_sc_event.full
@@ -22,25 +23,33 @@ mode: full
 content:
   body:
     type: text_default
-    weight: 1
-    region: content
     label: above
     settings: {  }
     third_party_settings: {  }
-  links:
-    weight: 7
+    weight: 1
     region: content
+  links:
     settings: {  }
     third_party_settings: {  }
+    weight: 7
+    region: content
   oe_documents:
     type: entity_reference_entity_view
+    label: above
+    settings:
+      view_mode: default
+      link: true
+    third_party_settings: {  }
     weight: 6
     region: content
+  oe_featured_media:
+    type: oe_featured_media_label
     label: above
     settings:
       link: true
-      view_mode: default
     third_party_settings: {  }
+    weight: 8
+    region: content
   oe_sc_event_dates:
     type: daterange_default
     label: inline
@@ -51,14 +60,6 @@ content:
     third_party_settings: {  }
     weight: 4
     region: content
-  oe_featured_media:
-    type: oe_featured_media_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 102
-    region: content
   oe_sc_event_location:
     type: oe_whitelabel_helper_address_inline
     label: inline
@@ -74,4 +75,9 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
-hidden: {  }
+hidden:
+  langcode: true
+  oe_content_content_owner: true
+  oe_content_legacy_link: true
+  oe_content_navigation_title: true
+  oe_content_short_title: true
diff --git a/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml b/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
index 2ac942b4..df0a5c9d 100644
--- a/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
+++ b/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
@@ -2,6 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - core.entity_view_mode.node.full
     - field.field.node.oe_sc_news.body
     - field.field.node.oe_sc_news.oe_featured_media
     - field.field.node.oe_sc_news.oe_publication_date
@@ -9,9 +10,9 @@ dependencies:
     - node.type.oe_sc_news
   module:
     - datetime
+    - oe_content_featured_media_field
     - text
     - user
-
 id: node.oe_sc_news.full
 targetEntityType: node
 bundle: oe_sc_news
@@ -27,7 +28,7 @@ content:
   links:
     settings: {  }
     third_party_settings: {  }
-    weight: 100
+    weight: 14
     region: content
   oe_featured_media:
     type: oe_featured_media_label
@@ -35,7 +36,7 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 102
+    weight: 15
     region: content
   oe_publication_date:
     type: datetime_default
@@ -47,7 +48,7 @@ content:
     weight: 13
     region: content
   oe_summary:
-    type: basic_string
+    type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
@@ -55,4 +56,8 @@ content:
     region: content
 hidden:
   langcode: true
+  oe_content_content_owner: true
+  oe_content_legacy_link: true
+  oe_content_navigation_title: true
+  oe_content_short_title: true
   search_api_excerpt: true
diff --git a/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml b/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
index cfbd6480..1f8fc4cc 100644
--- a/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
+++ b/modules/oe_whitelabel_starter_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
@@ -10,9 +10,9 @@ dependencies:
     - node.type.oe_sc_news
   module:
     - datetime
+    - oe_content_featured_media_field
     - text
     - user
-
 id: node.oe_sc_news.teaser
 targetEntityType: node
 bundle: oe_sc_news
@@ -28,7 +28,7 @@ content:
   links:
     settings: {  }
     third_party_settings: {  }
-    weight: 100
+    weight: 14
     region: content
   oe_featured_media:
     type: oe_featured_media_label
@@ -36,7 +36,7 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 102
+    weight: 15
     region: content
   oe_publication_date:
     type: datetime_default
@@ -48,7 +48,7 @@ content:
     weight: 13
     region: content
   oe_summary:
-    type: basic_string
+    type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
@@ -56,4 +56,8 @@ content:
     region: content
 hidden:
   langcode: true
+  oe_content_content_owner: true
+  oe_content_legacy_link: true
+  oe_content_navigation_title: true
+  oe_content_short_title: true
   search_api_excerpt: true
-- 
GitLab


From e86d1bfc5f38a80b76956b47c8b0587523a47b8e Mon Sep 17 00:00:00 2001
From: Sergio Elvira Perez <sergioelviraperez@gmail.com>
Date: Thu, 17 Mar 2022 13:22:07 +0100
Subject: [PATCH 9/9] OEL-1291: Composer updated cause starter content was
 merged.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ef137a12..c942170a 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "openeuropa/oe_content": "^2.8.0",
         "openeuropa/oe_corporate_blocks": "^4.4",
         "openeuropa/oe_multilingual": "^1.9",
-        "openeuropa/oe_starter_content": "dev-OEL-1290",
+        "openeuropa/oe_starter_content": "1.x-dev",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
         "phpspec/prophecy-phpunit": "^1 || ^2"
     },
-- 
GitLab