Merge pull request #79 from eea/develop

Develop
eea · May 8, 2024 · 49a613f · 49a613f
2 parents cba4191 + c22ac46
commit 49a613f
Show file tree

Hide file tree

Showing 6 changed files with 643 additions and 125 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.6.0](https://github.com/eea/advisory-board-frontend/compare/1.5.0...1.6.0) - 8 May 2024
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-eea-design-system@1.23.7 [EEA Jenkins - [`069b2bb`](https://github.com/eea/advisory-board-frontend/commit/069b2bb62c8d313b5451e5526ca1143b6609a42a)]
+- Release @eeacms/volto-eea-kitkat@24.0.1 [EEA Jenkins - [`162921d`](https://github.com/eea/advisory-board-frontend/commit/162921dd8b1f23f8116b6b8ea9c1663c0263682f)]
+- Release @eeacms/volto-resize-helper@2.0.0 [EEA Jenkins - [`539e62a`](https://github.com/eea/advisory-board-frontend/commit/539e62a643f239ec8f5fb62fdd971dd81b153a2b)]
+- Release @eeacms/volto-nextcloud-video-block@1.0.0 [EEA Jenkins - [`ceb4dde`](https://github.com/eea/advisory-board-frontend/commit/ceb4dde4e14f27797649d5f191c9ecc7b2b8ca99)]
+- Release @eeacms/volto-eea-design-system@1.23.6 [EEA Jenkins - [`a85c97d`](https://github.com/eea/advisory-board-frontend/commit/a85c97d6087a03e440454d5a33b27adf496e5cfd)]
+- Release @eeacms/volto-eea-website-theme@1.33.2 [EEA Jenkins - [`efc52e4`](https://github.com/eea/advisory-board-frontend/commit/efc52e45e1da9f3144fb2b09231ed4699fff5952)]
+- Release @eeacms/volto-eea-design-system@1.23.5 [EEA Jenkins - [`57e17b6`](https://github.com/eea/advisory-board-frontend/commit/57e17b6c9ad5d03bebb6cf32b81318dede55a5ad)]
+- Release @eeacms/volto-eea-website-theme@1.33.1 [EEA Jenkins - [`6f79841`](https://github.com/eea/advisory-board-frontend/commit/6f79841eb7c73aed03807799442a47b7dd2bd69b)]
+- Release @eeacms/volto-eea-website-theme@1.33.0 [EEA Jenkins - [`0145e53`](https://github.com/eea/advisory-board-frontend/commit/0145e53d600ca6972a5244e03f90bc9caaed7d8e)]
+- Release @eeacms/volto-eea-kitkat@23.1.0 [EEA Jenkins - [`728e9cd`](https://github.com/eea/advisory-board-frontend/commit/728e9cdbfbaf1b560615a06cf7136f73ad6b8bf6)]
+- Release @eeacms/volto-eea-website-theme@1.32.1 [EEA Jenkins - [`77a6ca7`](https://github.com/eea/advisory-board-frontend/commit/77a6ca7d7ec2108a99458ac8374dbfd864dc4447)]
+- Release @eeacms/volto-eea-design-system@1.23.4 [EEA Jenkins - [`475f88d`](https://github.com/eea/advisory-board-frontend/commit/475f88d890d951f10f7ed2b6dfd889d66f026fc7)]
+- Release @eeacms/volto-eea-website-theme@1.32.0 [EEA Jenkins - [`eb84b38`](https://github.com/eea/advisory-board-frontend/commit/eb84b3879def40c8b9d94fc9a4b1011cb67f1e2c)]
+
+#### :house: Documentation changes
+
+
+#### :hammer_and_wrench: Others
+
+- hide header in cypress since it is sticky and covers some elements [Teodor - [`f89bea2`](https://github.com/eea/advisory-board-frontend/commit/f89bea2e244a6a6ead19712617a32c50277bb0cc)]
+- fix tabs-block visibility [Teodor - [`b42489c`](https://github.com/eea/advisory-board-frontend/commit/b42489cf235867b7ccdc5dd0efb0dc24f0f710a3)]
+- fix element missing in tabs-block [Teodor - [`4e50f68`](https://github.com/eea/advisory-board-frontend/commit/4e50f68eb9864369cc21c012289d32b4efa77a66)]
+- fix tabs-block integration tests [Teodor - [`21e1eb0`](https://github.com/eea/advisory-board-frontend/commit/21e1eb059f58762dee0f8f09c02dde994f972d96)]
+- Update dependencies and resolutions in preparation for Volto17 upgrade [Teodor - [`26d9b4d`](https://github.com/eea/advisory-board-frontend/commit/26d9b4d902b48c9f84ed418d383ec5acc20fe8fb)]
 ### [1.5.0](https://github.com/eea/advisory-board-frontend/compare/1.4.0...1.5.0) - 21 March 2024
 
 #### :rocket: Dependency updates
@@ -69,7 +97,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`69ac1ef`](https://github.com/eea/advisory-board-frontend/commit/69ac1ef9b26bf71d4b0f48becf3bd2b62c3136d6)]
 
 #### :hammer_and_wrench: Others
 
@@ -91,7 +118,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`6f3e8d5`](https://github.com/eea/advisory-board-frontend/commit/6f3e8d52e62adfcbf5b59066e7225699cb0f5d3a)]
 
 #### :hammer_and_wrench: Others
 
@@ -115,7 +141,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`d95c69e`](https://github.com/eea/advisory-board-frontend/commit/d95c69e6e4363756f577a76e881d3883f41656e6)]
 
 ### [1.2.0](https://github.com/eea/advisory-board-frontend/compare/1.1.0...1.2.0) - 20 September 2023
 
@@ -134,13 +159,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`700d891`](https://github.com/eea/advisory-board-frontend/commit/700d89157c2873393ca5bf631177feb51438d79c)]
 
 ### [1.1.0](https://github.com/eea/advisory-board-frontend/compare/1.0.2...1.1.0) - 22 August 2023
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`b77c902`](https://github.com/eea/advisory-board-frontend/commit/b77c90274759aca8528507c3ec8eb83ded1eb1f4)]
 
 ### [1.0.2](https://github.com/eea/advisory-board-frontend/compare/1.0.1...1.0.2) - 21 August 2023
 
@@ -154,12 +177,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [YARN] Automated update of yarn.lock [EEA Jenkins - [`5690794`](https://github.com/eea/advisory-board-frontend/commit/56907943bf28541a5df72f2cf26b7f3a5ee28a51)]
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`5d961c7`](https://github.com/eea/advisory-board-frontend/commit/5d961c77f074434c90905086a55fa24ed7c7dacc)]
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`6c87726`](https://github.com/eea/advisory-board-frontend/commit/6c87726ef580959f78d964ebad8b904254b6ad2c)]
 
 #### :hammer_and_wrench: Others
 
@@ -176,11 +196,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [YARN] Automated update of yarn.lock [EEA Jenkins - [`5690794`](https://github.com/eea/advisory-board-frontend/commit/56907943bf28541a5df72f2cf26b7f3a5ee28a51)]
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`6c87726`](https://github.com/eea/advisory-board-frontend/commit/6c87726ef580959f78d964ebad8b904254b6ad2c)]
 
 ### [0.53.0](https://github.com/eea/advisory-board-frontend/compare/0.52.0...0.53.0) - 8 August 2023
 
@@ -200,7 +218,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`d5e2d63`](https://github.com/eea/advisory-board-frontend/commit/d5e2d6393af7a6f275c9158c1584c833324c7f3c)]
 
 ### [0.52.0](https://github.com/eea/advisory-board-frontend/compare/0.51.0...0.52.0) - 23 June 2023
 
@@ -230,7 +247,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`6f374e2`](https://github.com/eea/advisory-board-frontend/commit/6f374e2df1b040ff41c4b2d2bc165c129e7fe4fd)]
 
 #### :hammer_and_wrench: Others
 

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Release](https://img.shields.io/github/v/release/eea/advisory-board-frontend?sort=semver)](https://github.com/eea/advisory-board-frontend/releases)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/master/lastBuild/display/redirect)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/develop/lastBuild/display/redirect)
-[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2F1.5.0&build=last&subject=release%20v1.5.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/1.5.0/lastBuild/display/redirect/)
+[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2F1.6.0&build=last&subject=release%20v1.6.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/1.6.0/lastBuild/display/redirect/)
 
 
 ## Documentation

diff --git a/cypress/e2e/01-block-tabs.cy.js b/cypress/e2e/01-block-tabs.cy.js
@@ -29,6 +29,8 @@ describe('Blocks Tests', () => {
   });
 
   it('Add Tabs default template', () => {
+    cy.get('.eea.header').invoke('css', 'display', 'none');
+
     cy.clearSlateTitle();
     cy.getSlateTitle().type('Tabs block default template');
 
@@ -53,7 +55,7 @@ describe('Blocks Tests', () => {
     cy.get('.field-wrapper-menuAlign #field-menuAlign').click();
     cy.get('.react-select__menu').contains('Left').click();
     cy.get('.field-wrapper-menuPosition #field-menuPosition').first().click();
-    cy.get('.react-select__menu').contains('Top').click();
+    cy.get('.react-select__menu').contains('Bottom').click();
 
     cy.get('.field-wrapper-menuPosition #field-menuPosition').first().click();
     cy.get('.react-select__menu').contains('Left').click();
@@ -65,10 +67,11 @@ describe('Blocks Tests', () => {
     cy.get('.react-select__menu').contains('Bottom').click();
 
     cy.get('.field-wrapper-menuPosition #field-menuPosition').first().click();
-    cy.get('.react-select__menu').contains('Top').click();
-
+    cy.get('.react-select__menu').contains('Bottom').click();
+    cy.scrollTo('top');
     cy.get('.tabs-block [contenteditable=true]').first().type('Hydrogen');
     cy.get('.tabs-block .ui.left.menu .item').last().click();
+    cy.scrollTo('top');
     cy.get('.tabs-block.edit [contenteditable=true]').first().type('Oxygen');
     cy.get('.tabs-block a.item').first().type(' ');
 
@@ -93,6 +96,7 @@ describe('Blocks Tests', () => {
 
   it('Add Tabs carousel template', () => {
     // Change page title
+    cy.get('.eea.header').invoke('css', 'display', 'none');
     cy.clearSlateTitle();
     cy.getSlateTitle().type('Tabs block carousel template');
 
@@ -111,13 +115,16 @@ describe('Blocks Tests', () => {
     cy.get('.field-wrapper-variation #field-variation').click();
     cy.get('.react-select__menu').contains('Carousel horizontal').click();
     cy.get('.field-wrapper-verticalAlign #field-verticalAlign').click();
-    cy.get('.react-select__menu').contains('Top').click();
+    cy.scrollTo('top');
+    cy.get('.react-select__menu').contains('Bottom').click();
     cy.get('.field-wrapper-theme #field-theme').click();
     cy.get('.react-select__menu').contains('Dark').click();
+    cy.scrollTo('top');
     cy.get('.tabs-block [contenteditable=true]').first().type('Hydrogen');
     cy.get('.tabs-block .ui.menu .item').last().click();
     cy.get('.tabs-block .ui.menu .item').eq(1).click();
     cy.get('.tabs-block').contains('Tab 2').click();
+    cy.scrollTo('top');
     cy.get('.tabs-block.edit [contenteditable=true]').first().type('Oxygen');
 
     // Save
@@ -135,6 +142,7 @@ describe('Blocks Tests', () => {
 
   it('Add Tabs Block Horizontal', () => {
     // Change page title
+    cy.get('.eea.header').invoke('css', 'display', 'none');
     cy.clearSlateTitle();
     cy.getSlateTitle().type('Tabs block horizontal template');
 
@@ -152,14 +160,15 @@ describe('Blocks Tests', () => {
     cy.get('.field-wrapper-title input').last().type('Tab 1');
     cy.get('.field-wrapper-variation #field-variation').click();
     cy.get('.react-select__menu').contains('Horizontal responsive').click();
-
+    cy.scrollTo('top');
     cy.get('.tabs-block [contenteditable=true]')
       .first()
       .type('Horizontal First Item');
     cy.get('.tabs-block .horizontal-responsive .ui.menu .item')
       .last()
       .click({ force: true });
     cy.get('.tabs-block').contains('Tab 2').click();
+    cy.scrollTo('top');
     cy.get('.tabs-block.edit [contenteditable=true]')
       .first()
       .type('Horizontal Second Item');

diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
@@ -22,7 +22,7 @@ import './commands';
 import '@cypress/code-coverage/support';
 
 // Fail Fast
-import "cypress-fail-fast";
+import 'cypress-fail-fast';
 
 export const slateBeforeEach = (contentType = 'Document') => {
   cy.intercept('GET', `/**/*?expand*`).as('content');
@@ -39,13 +39,6 @@ export const slateBeforeEach = (contentType = 'Document') => {
     path: 'cypress',
   });
   cy.visit('/cypress/my-page');
-  // cy.waitForResourceToLoad('@navigation');
-  // The breadcrumb is auto-expanded.
-  // cy.waitForResourceToLoad('@breadcrumbs');
-  // cy.waitForResourceToLoad('@actions');
-  // cy.waitForResourceToLoad('@types');
-  // cy.waitForResourceToLoad('my-page');
-  cy.wait('@content');
   cy.navigate('/cypress/my-page/edit');
 };
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "advisory-board-frontend",
   "description": "A Volto-powered Plone frontend",
   "license": "MIT",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "scripts": {
     "start": "razzle start",
     "postinstall": "make omelette && make patches",
@@ -35,7 +35,6 @@
     "@eeacms/volto-eea-design-system",
     "@eeacms/volto-eea-website-theme",
     "@eeacms/volto-spotlight",
-    "@eeacms/volto-nextcloud-video-block",
     "@eeacms/volto-climate-advisory-board-policy",
     "@plone-collective/volto-authomatic"
   ],
@@ -139,15 +138,56 @@
   "engines": {
     "node": "^14 || ^16"
   },
+  "resolutions": {
+    "@eeacms/volto-eea-kitkat": "<25.0.0",
+    "@eeacms/volto-eea-website-theme": "<2.0.0",
+    "@eeacms/volto-controlpanel": "<1.0.0",
+    "@eeacms/volto-nextcloud-video-block": "<1.0.0",
+    "@eeacms/volto-anchors": "<1.0.0",
+    "@eeacms/volto-quote-block": "<2.0.0",
+    "@eeacms/volto-statistic-block": "<5.0.0",
+    "@eeacms/volto-tags-block": "<2.0.0",
+    "@eeacms/volto-call-to-action-block": "<5.0.0",
+    "@eeacms/volto-hero-block": "<7.0.0",
+    "@eeacms/volto-timeline-block": "<2.0.0",
+    "@eeacms/volto-description-block": "<2.0.0",
+    "@eeacms/volto-slate-label": "<1.0.0",
+    "@plone-collective/volto-sentry": "^0.3.1",
+    "@eeacms/volto-accordion-block": "<11.0.0",
+    "@eeacms/volto-banner": "<4.0.0",
+    "@eeacms/volto-block-divider": "<7.0.0",
+    "@eeacms/volto-block-image-cards": "<2.0.0",
+    "@eeacms/volto-block-style": "<7.0.0",
+    "@eeacms/volto-columns-block": "<8.0.0",
+    "@eeacms/volto-corsproxy": "<4.0.0",
+    "@eeacms/volto-group-block": "<7.0.0",
+    "@eeacms/volto-listing-block": "<8.0.0",
+    "@eeacms/volto-matomo": "<5.0.0",
+    "@eeacms/volto-metadata-block": "<7.0.0",
+    "@eeacms/volto-object-widget": "<7.0.0",
+    "@eeacms/volto-resize-helper": "<2.0.0",
+    "@eeacms/volto-sentry-rancher-config": "<5.0.0",
+    "@eeacms/volto-slate-footnote": "<7.0.0",
+    "@eeacms/volto-slate-metadata-mentions": "<8.0.0",
+    "@eeacms/volto-slate-zotero": "<6.0.0",
+    "@eeacms/volto-tabs-block": "<8.0.0",
+    "@eeacms/volto-taxonomy": "<5.0.0",
+    "@eeacms/volto-toolbar-actions": "<2.0.0",
+    "@eeacms/volto-block-data-table": "<1.0.0",
+    "@eeacms/volto-widget-geolocation": "<6.0.0",
+    "@eeacms/volto-widget-dataprovenance": "<1.0.0",
+    "@eeacms/volto-widget-temporal-coverage": "<6.0.0",
+    "@eeacms/volto-widget-toggle": "<4.0.0",
+    "@eeacms/volto-widget-theme-picker": "<2.0.0",
+    "@eeacms/countup": "^2.0.6"
+  },
   "dependencies": {
     "@eeacms/volto-climate-advisory-board-policy": "0.1.45",
-    "@eeacms/volto-eea-design-system": "1.23.3",
-    "@eeacms/volto-eea-kitkat": "23.0.1",
-    "@eeacms/volto-eea-website-theme": "1.31.0",
-    "@eeacms/volto-newsletter-block": "0.1.14",
-    "@eeacms/volto-nextcloud-video-block": "0.4.8",
-    "@eeacms/volto-resize-helper": "1.3.4",
-    "@eeacms/volto-spotlight": "2.0.10",
+    "@eeacms/volto-eea-design-system": "1.23.7",
+    "@eeacms/volto-eea-kitkat": "<25.0.0",
+    "@eeacms/volto-eea-website-theme": "<2.0.0",
+    "@eeacms/volto-newsletter-block": "^0.1.14",
+    "@eeacms/volto-spotlight": "^2.0.10",
     "@plone-collective/volto-authomatic": "1.3.0",
     "@plone/volto": "16.31.4"
   },