From 0f7d88700076704abb04ba1bf806ab669fe085be Mon Sep 17 00:00:00 2001 From: David Ichim Date: Tue, 28 Jun 2022 20:01:45 +0300 Subject: [PATCH 1/6] change(pageheader): removed blogger, reddit and stumbleupon sharing links - the EEA doesn't use these services and there was a request to only serve to the pages where EEA has a presence --- src/components/theme/Banner/View.jsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/components/theme/Banner/View.jsx b/src/components/theme/Banner/View.jsx index e755446d..5fc8fa06 100644 --- a/src/components/theme/Banner/View.jsx +++ b/src/components/theme/Banner/View.jsx @@ -161,14 +161,6 @@ const View = (props) => { sharePage(metadata['@id'], 'linkedin'); }} /> - - { - sharePage(metadata['@id'], 'reddit'); - }} - /> - )} From 10aaafc79d03784972b7cf40639077246340eda9 Mon Sep 17 00:00:00 2001 From: David Ichim Date: Tue, 28 Jun 2022 20:10:47 +0300 Subject: [PATCH 2/6] change(pageheader): share dropdown appears below the share icon --- src/components/theme/Banner/View.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/theme/Banner/View.jsx b/src/components/theme/Banner/View.jsx index 5fc8fa06..5690981a 100644 --- a/src/components/theme/Banner/View.jsx +++ b/src/components/theme/Banner/View.jsx @@ -164,7 +164,7 @@ const View = (props) => { )} - position="top center" + position="bottom center" size="small" trigger={ Date: Tue, 28 Jun 2022 20:23:49 +0300 Subject: [PATCH 3/6] change(header): show eea information systems on mobile - as seen in the latest storybook changes, also remove the text from mobile resolution for the official eu website header --- src/customizations/volto/components/theme/Header/Header.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/customizations/volto/components/theme/Header/Header.jsx b/src/customizations/volto/components/theme/Header/Header.jsx index b358c8eb..7af07bbd 100644 --- a/src/customizations/volto/components/theme/Header/Header.jsx +++ b/src/customizations/volto/components/theme/Header/Header.jsx @@ -83,7 +83,7 @@ const EEAHeader = ({ pathname, token, items, history }) => { eea flag { From d87c7be7b7366401b680a174cfb471c90e2c76f7 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Thu, 30 Jun 2022 19:05:16 +0300 Subject: [PATCH 4/6] [JENKINS] - Use Document for cypress sandbox --- Jenkinsfile | 4 ++-- cypress/support/index.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9715a386..ad51462c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -124,8 +124,8 @@ pipeline { node(label: 'docker') { script { try { - sh '''docker pull plone; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg''' - sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" plone/volto-addon-ci cypress''' + sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend''' + sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e VOLTO=alpha plone/volto-addon-ci cypress''' } finally { try { sh '''rm -rf cypress-reports cypress-results cypress-coverage''' diff --git a/cypress/support/index.js b/cypress/support/index.js index 89aab004..32395abb 100644 --- a/cypress/support/index.js +++ b/cypress/support/index.js @@ -27,7 +27,7 @@ coverage-end */ export const setupBeforeEach = () => { cy.autologin(); cy.createContent({ - contentType: 'Folder', + contentType: 'Document', contentId: 'cypress', contentTitle: 'Cypress', }); From deaba389cbe9cefd568eb637a7a2ce179cabc575 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Thu, 30 Jun 2022 16:21:51 +0000 Subject: [PATCH 5/6] Automated release 0.6.14 --- CHANGELOG.md | 10 +++++++++- package.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1f4d335..28177525 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,17 @@ 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). +#### [0.6.14](https://github.com/eea/volto-eea-website-theme/compare/0.6.13...0.6.14) + +- change(header): show eea information systems on mobile [`abdf181`](https://github.com/eea/volto-eea-website-theme/commit/abdf1819465ba1ca582c2a2d82ec02a137c0cf7f) +- change(pageheader): share dropdown appears below the share icon [`10aaafc`](https://github.com/eea/volto-eea-website-theme/commit/10aaafc79d03784972b7cf40639077246340eda9) +- change(pageheader): removed blogger, reddit and stumbleupon sharing links [`0f7d887`](https://github.com/eea/volto-eea-website-theme/commit/0f7d88700076704abb04ba1bf806ab669fe085be) + #### [0.6.13](https://github.com/eea/volto-eea-website-theme/compare/0.6.12...0.6.13) -- Fix double header issue - refs #151713 [`3151229`](https://github.com/eea/volto-eea-website-theme/commit/3151229d27193d6b4a4355419c924d2ddd538e71) +> 23 June 2022 + +- Fix double header issue - refs #151713 [`#45`](https://github.com/eea/volto-eea-website-theme/pull/45) - Customize EventView - copied unchanged from @plone/volto 16.0.0-alpha.7 [`346fc87`](https://github.com/eea/volto-eea-website-theme/commit/346fc87c0834627efa70ed1303c5ee98a5a17ae2) #### [0.6.12](https://github.com/eea/volto-eea-website-theme/compare/0.6.11...0.6.12) diff --git a/package.json b/package.json index 5e14e2c0..1cf7bb78 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-eea-website-theme", - "version": "0.6.13", + "version": "0.6.14", "description": "@eeacms/volto-eea-website-theme: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team", From e993629b30334417c2b56f0088bfb80317b4dd7e Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Thu, 30 Jun 2022 19:43:34 +0300 Subject: [PATCH 6/6] [JENKINS] - Use the latest Volto alpha release --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ad51462c..dddecd49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,7 @@ pipeline { NAMESPACE = "@eeacms" SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu" DEPENDENCIES = "" + VOLTO = "alpha" } stages { @@ -125,7 +126,7 @@ pipeline { script { try { sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend''' - sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e VOLTO=alpha plone/volto-addon-ci cypress''' + sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=development -e VOLTO="$VOLTO" plone/volto-addon-ci cypress''' } finally { try { sh '''rm -rf cypress-reports cypress-results cypress-coverage'''