From f75986b95ad18fe9426ad075588275dd98e3f923 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Wed, 21 Sep 2022 14:26:48 +0300 Subject: [PATCH 1/3] EWPP-2645: Upgrade ECL version to 3.4.2. --- package.json | 92 ++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index ad2f5e6b7..7bb58511f 100644 --- a/package.json +++ b/package.json @@ -14,54 +14,54 @@ "prepare": "patch-package" }, "dependencies": { - "@ecl/builder": "3.4.1", - "@ecl/preset-ec": "3.4.1", - "@ecl/preset-eu": "3.4.1", - "@ecl/preset-reset": "3.4.1", + "@ecl/builder": "3.4.2", + "@ecl/preset-ec": "3.4.2", + "@ecl/preset-eu": "3.4.2", + "@ecl/preset-reset": "3.4.2", "@ecl/stylelint-config": "0.2.1", - "@ecl/theme-ec": "3.4.1", - "@ecl/theme-eu": "3.4.1", - "@ecl/twig-component-accordion": "3.4.1", - "@ecl/twig-component-blockquote": "3.4.1", - "@ecl/twig-component-breadcrumb": "3.4.1", - "@ecl/twig-component-button": "3.4.1", - "@ecl/twig-component-card": "3.4.1", - "@ecl/twig-component-carousel": "3.4.1", - "@ecl/twig-component-datepicker": "3.4.1", - "@ecl/twig-component-description-list": "3.4.1", - "@ecl/twig-component-expandable": "3.4.1", - "@ecl/twig-component-fact-figures": "3.4.1", - "@ecl/twig-component-featured-item": "3.4.1", - "@ecl/twig-component-file": "3.4.1", - "@ecl/twig-component-gallery": "3.4.1", - "@ecl/twig-component-hero-banner": "3.4.1", - "@ecl/twig-component-icon": "3.4.1", - "@ecl/twig-component-inpage-navigation": "3.4.1", - "@ecl/twig-component-label": "3.4.1", - "@ecl/twig-component-language-list": "3.4.1", - "@ecl/twig-component-link": "3.4.1", - "@ecl/twig-component-list-illustration": "3.4.1", - "@ecl/twig-component-media-container": "3.4.1", - "@ecl/twig-component-menu": "3.4.1", - "@ecl/twig-component-message": "3.4.1", + "@ecl/theme-ec": "3.4.2", + "@ecl/theme-eu": "3.4.2", + "@ecl/twig-component-accordion": "3.4.2", + "@ecl/twig-component-blockquote": "3.4.2", + "@ecl/twig-component-breadcrumb": "3.4.2", + "@ecl/twig-component-button": "3.4.2", + "@ecl/twig-component-card": "3.4.2", + "@ecl/twig-component-carousel": "3.4.2", + "@ecl/twig-component-datepicker": "3.4.2", + "@ecl/twig-component-description-list": "3.4.2", + "@ecl/twig-component-expandable": "3.4.2", + "@ecl/twig-component-fact-figures": "3.4.2", + "@ecl/twig-component-featured-item": "3.4.2", + "@ecl/twig-component-file": "3.4.2", + "@ecl/twig-component-gallery": "3.4.2", + "@ecl/twig-component-hero-banner": "3.4.2", + "@ecl/twig-component-icon": "3.4.2", + "@ecl/twig-component-inpage-navigation": "3.4.2", + "@ecl/twig-component-label": "3.4.2", + "@ecl/twig-component-language-list": "3.4.2", + "@ecl/twig-component-link": "3.4.2", + "@ecl/twig-component-list-illustration": "3.4.2", + "@ecl/twig-component-media-container": "3.4.2", + "@ecl/twig-component-menu": "3.4.2", + "@ecl/twig-component-message": "3.4.2", "@ecl/twig-component-navigation-list": "3.4.0", - "@ecl/twig-component-news-ticker": "3.4.1", - "@ecl/twig-component-page-banner": "3.4.1", - "@ecl/twig-component-page-header": "3.4.1", - "@ecl/twig-component-pagination": "3.4.1", - "@ecl/twig-component-radio": "3.4.1", - "@ecl/twig-component-search-form": "3.4.1", - "@ecl/twig-component-site-footer": "3.4.1", - "@ecl/twig-component-site-header": "3.4.1", - "@ecl/twig-component-skip-link": "3.4.1", - "@ecl/twig-component-social-media-follow": "3.4.1", - "@ecl/twig-component-social-media-share": "3.4.1", - "@ecl/twig-component-table": "3.4.1", - "@ecl/twig-component-tag": "3.4.1", - "@ecl/twig-component-text-input": "3.4.1", - "@ecl/twig-component-timeline": "3.4.1", - "@ecl/vanilla-utility-background": "3.4.1", - "@ecl/vanilla-utility-border": "3.4.1", + "@ecl/twig-component-news-ticker": "3.4.2", + "@ecl/twig-component-page-banner": "3.4.2", + "@ecl/twig-component-page-header": "3.4.2", + "@ecl/twig-component-pagination": "3.4.2", + "@ecl/twig-component-radio": "3.4.2", + "@ecl/twig-component-search-form": "3.4.2", + "@ecl/twig-component-site-footer": "3.4.2", + "@ecl/twig-component-site-header": "3.4.2", + "@ecl/twig-component-skip-link": "3.4.2", + "@ecl/twig-component-social-media-follow": "3.4.2", + "@ecl/twig-component-social-media-share": "3.4.2", + "@ecl/twig-component-table": "3.4.2", + "@ecl/twig-component-tag": "3.4.2", + "@ecl/twig-component-text-input": "3.4.2", + "@ecl/twig-component-timeline": "3.4.2", + "@ecl/vanilla-utility-background": "3.4.2", + "@ecl/vanilla-utility-border": "3.4.2", "chokidar-cli": "1.2.0", "grunt": "^1.4.0", "grunt-contrib-copy": "^1.0.0", From f12a40de1e19d9061c4b2a9b67f23c8651308b29 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Wed, 21 Sep 2022 16:51:10 +0300 Subject: [PATCH 2/3] EWPP-0000: Update CHANGELOG.md for release 3.0.0-beta16. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d4c534ca..6b48ba2f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [3.0.0-beta16](https://github.com/openeuropa/oe_theme/tree/3.0.0-beta16) (2022-09-21) + +[Full Changelog](https://github.com/openeuropa/oe_theme/compare/3.0.0-beta15...3.0.0-beta16) + +**Merged pull requests:** + +- EWPP-2645: Upgrade ECL version to 3.4.2. [\#1166](https://github.com/openeuropa/oe_theme/pull/1166) ([sergepavle](https://github.com/sergepavle)) + ## [3.0.0-beta15](https://github.com/openeuropa/oe_theme/tree/3.0.0-beta15) (2022-09-16) [Full Changelog](https://github.com/openeuropa/oe_theme/compare/3.0.0-beta14...3.0.0-beta15) @@ -10,6 +18,7 @@ **Merged pull requests:** +- Prepare release 3.0.0-beta15. [\#1163](https://github.com/openeuropa/oe_theme/pull/1163) ([imanoleguskiza](https://github.com/imanoleguskiza)) - EWPP-2594: Use selenium 4. [\#1161](https://github.com/openeuropa/oe_theme/pull/1161) ([nagyad](https://github.com/nagyad)) - EWPP-2577: Upgrade to ECL 3.4.1 and update Text with Featured media pattern. [\#1160](https://github.com/openeuropa/oe_theme/pull/1160) ([22Alexandra](https://github.com/22Alexandra)) - EWPP-2539: Fix hreflang attribute in file\_translation and file\_teaser patterns. [\#1159](https://github.com/openeuropa/oe_theme/pull/1159) ([sergepavle](https://github.com/sergepavle)) From bdef19c64ff71ce0cfd0f7e39747991aeb8481ca Mon Sep 17 00:00:00 2001 From: Evgenii Nikitin Date: Fri, 16 Sep 2022 13:12:08 +0200 Subject: [PATCH 3/3] EWPP-2444: Inpage navigation is popping up on language switcher. --- .../FunctionalJavascript/InPageNavigationParagraphTest.php | 2 +- ...graph--oe-content-row--variant-inpage_navigation.html.twig | 2 +- tests/src/Kernel/Paragraphs/ContentRowTest.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/oe_theme_helper/tests/src/FunctionalJavascript/InPageNavigationParagraphTest.php b/modules/oe_theme_helper/tests/src/FunctionalJavascript/InPageNavigationParagraphTest.php index 145d2e72d..8c4c1ea5e 100644 --- a/modules/oe_theme_helper/tests/src/FunctionalJavascript/InPageNavigationParagraphTest.php +++ b/modules/oe_theme_helper/tests/src/FunctionalJavascript/InPageNavigationParagraphTest.php @@ -164,7 +164,7 @@ public function testInpageNavigationInParagraphContentRow(): void { * The inpage navigation container. */ protected function assertInPageNavigation(array $expected, NodeElement $container): void { - $navigation = $this->assertSession()->elementExists('css', '.ecl-col-l-3.ecl-u-z-navigation .ecl-inpage-navigation', $container); + $navigation = $this->assertSession()->elementExists('css', '.ecl-col-l-3 .ecl-inpage-navigation', $container); $inpage_nav_assert = new InPageNavigationAssert(); $inpage_nav_assert->assertPattern($expected, $navigation->getOuterHtml()); } diff --git a/templates/paragraphs/paragraph--oe-content-row--variant-inpage_navigation.html.twig b/templates/paragraphs/paragraph--oe-content-row--variant-inpage_navigation.html.twig index 9e61a35c0..915f66b62 100644 --- a/templates/paragraphs/paragraph--oe-content-row--variant-inpage_navigation.html.twig +++ b/templates/paragraphs/paragraph--oe-content-row--variant-inpage_navigation.html.twig @@ -7,7 +7,7 @@ */ #}
-
+
{{ inpage }}
diff --git a/tests/src/Kernel/Paragraphs/ContentRowTest.php b/tests/src/Kernel/Paragraphs/ContentRowTest.php index 6514b0396..f6a7c21b1 100644 --- a/tests/src/Kernel/Paragraphs/ContentRowTest.php +++ b/tests/src/Kernel/Paragraphs/ContentRowTest.php @@ -109,7 +109,7 @@ public function testRendering(): void { $crawler = new Crawler($this->renderParagraph($paragraph)); // Verify the layout. - $left_column = $crawler->filter('.ecl-row .ecl-col-l-3.ecl-u-z-navigation'); + $left_column = $crawler->filter('.ecl-row .ecl-col-l-3'); $right_column = $crawler->filter('.ecl-row .ecl-col-l-9'); $this->assertCount(1, $left_column); $this->assertCount(1, $right_column); @@ -131,7 +131,7 @@ public function testRendering(): void { $crawler = new Crawler($this->renderParagraph($paragraph, 'en')); // Assert that side-menu is correctly rendered with the default title. - $left_column = $crawler->filter('.ecl-row .ecl-col-l-3.ecl-u-z-navigation'); + $left_column = $crawler->filter('.ecl-row .ecl-col-l-3'); $this->assertStringContainsString('Page contents', $left_column->html()); // The actual inpage navigation links are tested in the