From 4e030476826e918397b6c029e5cc37cdea07b551 Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Wed, 28 Feb 2024 23:05:50 +0530 Subject: [PATCH 1/6] chore: eslint . --- .../Blocks/CaseStudyExplorer/CaseStudyListing.jsx | 8 ++++---- .../Blocks/CaseStudyExplorer/FeatureDisplay.jsx | 4 ++-- src/components/theme/CaseStudyView/CaseStudyView.jsx | 2 +- src/components/theme/ItemMetadata/ItemMetadata.jsx | 6 +----- src/components/theme/MeasureView/MeasureView.jsx | 2 +- .../volto/components/theme/Header/Header.jsx | 4 ++-- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/components/Blocks/CaseStudyExplorer/CaseStudyListing.jsx b/src/components/Blocks/CaseStudyExplorer/CaseStudyListing.jsx index a8a7100..79c0e0f 100644 --- a/src/components/Blocks/CaseStudyExplorer/CaseStudyListing.jsx +++ b/src/components/Blocks/CaseStudyExplorer/CaseStudyListing.jsx @@ -81,7 +81,7 @@ export default function CaseStudyList(props) {

@@ -110,7 +110,7 @@ export default function CaseStudyList(props) { {measure.title} @@ -154,7 +154,7 @@ export default function CaseStudyList(props) {

@@ -189,7 +189,7 @@ export default function CaseStudyList(props) { {measure.title} diff --git a/src/components/Blocks/CaseStudyExplorer/FeatureDisplay.jsx b/src/components/Blocks/CaseStudyExplorer/FeatureDisplay.jsx index a74b266..85ea637 100644 --- a/src/components/Blocks/CaseStudyExplorer/FeatureDisplay.jsx +++ b/src/components/Blocks/CaseStudyExplorer/FeatureDisplay.jsx @@ -5,7 +5,7 @@ export default function FeatureDisplay({ feature }) {

- + {feature.title} @@ -16,7 +16,7 @@ export default function FeatureDisplay({ feature }) { {feature.nwrms_implemented.map((item, index) => { return (
  • - + {item['title']}
    • diff --git a/src/components/theme/CaseStudyView/CaseStudyView.jsx b/src/components/theme/CaseStudyView/CaseStudyView.jsx index 6568eac..cc7cc03 100644 --- a/src/components/theme/CaseStudyView/CaseStudyView.jsx +++ b/src/components/theme/CaseStudyView/CaseStudyView.jsx @@ -222,7 +222,7 @@ const CaseStudyView = (props) => {
    The in-depth description of the case study (link) diff --git a/src/components/theme/ItemMetadata/ItemMetadata.jsx b/src/components/theme/ItemMetadata/ItemMetadata.jsx index 01d2791..2bae303 100644 --- a/src/components/theme/ItemMetadata/ItemMetadata.jsx +++ b/src/components/theme/ItemMetadata/ItemMetadata.jsx @@ -147,11 +147,7 @@ const ItemMetadata = (props) => { Source - + {original_source} diff --git a/src/components/theme/MeasureView/MeasureView.jsx b/src/components/theme/MeasureView/MeasureView.jsx index ab4faa1..6eca478 100644 --- a/src/components/theme/MeasureView/MeasureView.jsx +++ b/src/components/theme/MeasureView/MeasureView.jsx @@ -115,7 +115,7 @@ const ImageSource = (props) => {
    diff --git a/src/customizations/volto/components/theme/Header/Header.jsx b/src/customizations/volto/components/theme/Header/Header.jsx index df58d76..156cb97 100644 --- a/src/customizations/volto/components/theme/Header/Header.jsx +++ b/src/customizations/volto/components/theme/Header/Header.jsx @@ -120,7 +120,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => { evt.stopPropagation()} > See all EU institutions and bodies @@ -143,7 +143,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => { href={item.href} className="site" target="_blank" - rel="noreferrer" + rel="noopener" onKeyDown={(evt) => evt.stopPropagation()} > {item.title} From acd7f2d502be607e760c26b1cfc1da654ebd3b34 Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Thu, 29 Feb 2024 16:19:48 +0530 Subject: [PATCH 2/6] feat: put blacklist to refrain from prefix --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index 5a1c3cb..98552bf 100644 --- a/src/index.js +++ b/src/index.js @@ -199,6 +199,7 @@ const applyConfig = (config) => { ]; config.settings.openExternalLinkInNewTab = true; + config.settings.blackListUrls = ['/marine']; // Routes config.addonRoutes = [ From 8f3ec2b6862ec0930c0956c8dc6d742ab0f9b13a Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Thu, 29 Feb 2024 17:36:24 +0530 Subject: [PATCH 3/6] eslint . --- .../Blocks/CaseStudyExplorer/CaseStudyListing.jsx | 8 ++++---- .../Blocks/CaseStudyExplorer/FeatureDisplay.jsx | 8 ++++++-- src/components/theme/CaseStudyView/CaseStudyView.jsx | 2 +- src/components/theme/ItemMetadata/ItemMetadata.jsx | 6 +++++- src/components/theme/MeasureView/MeasureView.jsx | 2 +- .../volto/components/theme/Header/Header.jsx | 4 ++-- src/index.js | 2 ++ 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/components/Blocks/CaseStudyExplorer/CaseStudyListing.jsx b/src/components/Blocks/CaseStudyExplorer/CaseStudyListing.jsx index 79c0e0f..364d384 100644 --- a/src/components/Blocks/CaseStudyExplorer/CaseStudyListing.jsx +++ b/src/components/Blocks/CaseStudyExplorer/CaseStudyListing.jsx @@ -81,7 +81,7 @@ export default function CaseStudyList(props) {

    @@ -110,7 +110,7 @@ export default function CaseStudyList(props) { {measure.title} @@ -154,7 +154,7 @@ export default function CaseStudyList(props) {

    @@ -189,7 +189,7 @@ export default function CaseStudyList(props) { {measure.title} diff --git a/src/components/Blocks/CaseStudyExplorer/FeatureDisplay.jsx b/src/components/Blocks/CaseStudyExplorer/FeatureDisplay.jsx index 85ea637..7b76bcf 100644 --- a/src/components/Blocks/CaseStudyExplorer/FeatureDisplay.jsx +++ b/src/components/Blocks/CaseStudyExplorer/FeatureDisplay.jsx @@ -5,7 +5,7 @@ export default function FeatureDisplay({ feature }) {

    - + {feature.title} @@ -16,7 +16,11 @@ export default function FeatureDisplay({ feature }) { {feature.nwrms_implemented.map((item, index) => { return (
  • - + {item['title']}
    • diff --git a/src/components/theme/CaseStudyView/CaseStudyView.jsx b/src/components/theme/CaseStudyView/CaseStudyView.jsx index cc7cc03..60fd401 100644 --- a/src/components/theme/CaseStudyView/CaseStudyView.jsx +++ b/src/components/theme/CaseStudyView/CaseStudyView.jsx @@ -222,7 +222,7 @@ const CaseStudyView = (props) => {
    The in-depth description of the case study (link) diff --git a/src/components/theme/ItemMetadata/ItemMetadata.jsx b/src/components/theme/ItemMetadata/ItemMetadata.jsx index 2bae303..d685b43 100644 --- a/src/components/theme/ItemMetadata/ItemMetadata.jsx +++ b/src/components/theme/ItemMetadata/ItemMetadata.jsx @@ -147,7 +147,11 @@ const ItemMetadata = (props) => { Source - + {original_source} diff --git a/src/components/theme/MeasureView/MeasureView.jsx b/src/components/theme/MeasureView/MeasureView.jsx index 6eca478..ee371ed 100644 --- a/src/components/theme/MeasureView/MeasureView.jsx +++ b/src/components/theme/MeasureView/MeasureView.jsx @@ -115,7 +115,7 @@ const ImageSource = (props) => {
    diff --git a/src/customizations/volto/components/theme/Header/Header.jsx b/src/customizations/volto/components/theme/Header/Header.jsx index 156cb97..aa279a9 100644 --- a/src/customizations/volto/components/theme/Header/Header.jsx +++ b/src/customizations/volto/components/theme/Header/Header.jsx @@ -120,7 +120,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => { evt.stopPropagation()} > See all EU institutions and bodies @@ -143,7 +143,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => { href={item.href} className="site" target="_blank" - rel="noopener" + rel="noopener noreferrer" onKeyDown={(evt) => evt.stopPropagation()} > {item.title} diff --git a/src/index.js b/src/index.js index 98552bf..e115515 100644 --- a/src/index.js +++ b/src/index.js @@ -199,6 +199,8 @@ const applyConfig = (config) => { ]; config.settings.openExternalLinkInNewTab = true; + + //this is required by volto-prefixpath config.settings.blackListUrls = ['/marine']; // Routes From a415cd5b64cb44ef957845a5dc10a43309071b79 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:17:17 +0000 Subject: [PATCH 4/6] Automated release 0.2.8 --- CHANGELOG.md | 14 ++++++++++++-- package.json | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 795368a..26e03bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,11 @@ 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.2.7](https://github.com/eea/volto-freshwater-policy/compare/1.0.0-prefix-path-fixes.1-alpha...0.2.7) - 28 February 2024 +### [0.2.8](https://github.com/eea/volto-freshwater-policy/compare/1.0.0-prefix-path-fixes.1-alpha...0.2.8) - 29 February 2024 #### :rocket: New Features +- feat: put blacklist to refrain from prefix [nileshgulia1 - [`acd7f2d`](https://github.com/eea/volto-freshwater-policy/commit/acd7f2d502be607e760c26b1cfc1da654ebd3b34)] - feat: open externalLink in new tab [nileshgulia1 - [`037ece7`](https://github.com/eea/volto-freshwater-policy/commit/037ece7e5bced5ee9bf8a905165cbb1bf58cc4d5)] #### :bug: Bug Fixes @@ -35,6 +36,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### :house: Internal changes +- chore: eslint . [nileshgulia1 - [`4e03047`](https://github.com/eea/volto-freshwater-policy/commit/4e030476826e918397b6c029e5cc37cdea07b551)] - style: Automated code fix [eea-jenkins - [`6e5eb10`](https://github.com/eea/volto-freshwater-policy/commit/6e5eb108197748584deb3d0f400d105c157b4b81)] - style: Automated code fix [eea-jenkins - [`d0cf5d6`](https://github.com/eea/volto-freshwater-policy/commit/d0cf5d62c9ebe251486f8900e16aff77c3fb8272)] - style: Automated code fix [eea-jenkins - [`1296ee4`](https://github.com/eea/volto-freshwater-policy/commit/1296ee476ddd473cb78d5b82656f352c52749ef0)] @@ -44,6 +46,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### :hammer_and_wrench: Others +- eslint . [nileshgulia1 - [`8f3ec2b`](https://github.com/eea/volto-freshwater-policy/commit/8f3ec2b6862ec0930c0956c8dc6d742ab0f9b13a)] - test: revert jest config [valentinab25 - [`866f1f6`](https://github.com/eea/volto-freshwater-policy/commit/866f1f617b0ec63a3beab0e763ca482eb7d3b83f)] - test: revert eslint configuration [valentinab25 - [`b54c1f8`](https://github.com/eea/volto-freshwater-policy/commit/b54c1f8ab3ea6a927b444e6f3e7be253eee749fc)] - test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c1332e4`](https://github.com/eea/volto-freshwater-policy/commit/c1332e41da9f818fe8bb853bb11b364b342d0c6e)] @@ -90,8 +93,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix: override of volto-call-to-action widget [nileshgulia1 - [`bc613be`](https://github.com/eea/volto-freshwater-policy/commit/bc613be163d32ffd296458c7307ac5fa1c586c9e)] -### [1.0.0-prefix-path-fixes.0-alpha](https://github.com/eea/volto-freshwater-policy/compare/0.2.6...1.0.0-prefix-path-fixes.0-alpha) - 15 January 2024 +### [1.0.0-prefix-path-fixes.0-alpha](https://github.com/eea/volto-freshwater-policy/compare/0.2.7...1.0.0-prefix-path-fixes.0-alpha) - 15 January 2024 +### [0.2.7](https://github.com/eea/volto-freshwater-policy/compare/0.2.6...0.2.7) - 28 February 2024 + +#### :hammer_and_wrench: Others + +- test: revert jest config [valentinab25 - [`866f1f6`](https://github.com/eea/volto-freshwater-policy/commit/866f1f617b0ec63a3beab0e763ca482eb7d3b83f)] +- test: revert eslint configuration [valentinab25 - [`b54c1f8`](https://github.com/eea/volto-freshwater-policy/commit/b54c1f8ab3ea6a927b444e6f3e7be253eee749fc)] +- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c1332e4`](https://github.com/eea/volto-freshwater-policy/commit/c1332e41da9f818fe8bb853bb11b364b342d0c6e)] ### [0.2.6](https://github.com/eea/volto-freshwater-policy/compare/0.2.5...0.2.6) - 27 February 2024 ### [0.2.5](https://github.com/eea/volto-freshwater-policy/compare/0.2.4...0.2.5) - 26 February 2024 diff --git a/package.json b/package.json index 049b458..ca3049c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-freshwater-policy", - "version": "0.2.7", + "version": "0.2.8", "description": "@eeacms/volto-freshwater-policy: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team", From 06a7be030aee43fcc95de5efebd314b79ac1774f Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Thu, 29 Feb 2024 17:47:52 +0530 Subject: [PATCH 5/6] bump 0.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca3049c..8d0db71 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-freshwater-policy", - "version": "0.2.8", + "version": "0.3.0", "description": "@eeacms/volto-freshwater-policy: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team", From 886fa34a22f090729efcf6776f7b0734e8311a64 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:29:03 +0000 Subject: [PATCH 6/6] Automated release 0.3.0 --- CHANGELOG.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26e03bb..111dc0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.2.8](https://github.com/eea/volto-freshwater-policy/compare/1.0.0-prefix-path-fixes.1-alpha...0.2.8) - 29 February 2024 +### [0.3.0](https://github.com/eea/volto-freshwater-policy/compare/1.0.0-prefix-path-fixes.1-alpha...0.3.0) - 29 February 2024 #### :rocket: New Features @@ -46,6 +46,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### :hammer_and_wrench: Others +- bump 0.3.0 [nileshgulia1 - [`06a7be0`](https://github.com/eea/volto-freshwater-policy/commit/06a7be030aee43fcc95de5efebd314b79ac1774f)] - eslint . [nileshgulia1 - [`8f3ec2b`](https://github.com/eea/volto-freshwater-policy/commit/8f3ec2b6862ec0930c0956c8dc6d742ab0f9b13a)] - test: revert jest config [valentinab25 - [`866f1f6`](https://github.com/eea/volto-freshwater-policy/commit/866f1f617b0ec63a3beab0e763ca482eb7d3b83f)] - test: revert eslint configuration [valentinab25 - [`b54c1f8`](https://github.com/eea/volto-freshwater-policy/commit/b54c1f8ab3ea6a927b444e6f3e7be253eee749fc)] @@ -70,7 +71,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - Remove console.log [laszlocseh - [`e6b9cb0`](https://github.com/eea/volto-freshwater-policy/commit/e6b9cb00f24248d9556f54f8b396821b9c54bb87)] - Added variation to country header data block [laszlocseh - [`1a5e9ed`](https://github.com/eea/volto-freshwater-policy/commit/1a5e9ed6b3ea92b166a43090f13aee505ca4e1a3)] - bump 0.2.0 [nileshgulia1 - [`5b876c7`](https://github.com/eea/volto-freshwater-policy/commit/5b876c7fac39922f955592fa74db306844e7f90a)] -- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`c8efdd3`](https://github.com/eea/volto-freshwater-policy/commit/c8efdd3a5c290dc9c0223f0802c32a30181af8c4)] - test: fix duplicated code [kreafox - [`afa5b8a`](https://github.com/eea/volto-freshwater-policy/commit/afa5b8a6ad01c7da2c7180d9186ae30981899014)] - Small fix in country header data block [laszlocseh - [`3d849ca`](https://github.com/eea/volto-freshwater-policy/commit/3d849cae57fcd1c5a80aeceb442b62d69e5d4e06)] - Undo change to apiExpander [laszlocseh - [`5167495`](https://github.com/eea/volto-freshwater-policy/commit/51674955ce95c969c1823b16a0db2ac75677401b)] @@ -186,7 +186,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### :hammer_and_wrench: Others -- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`c8efdd3`](https://github.com/eea/volto-freshwater-policy/commit/c8efdd3a5c290dc9c0223f0802c32a30181af8c4)] ### [0.1.55](https://github.com/eea/volto-freshwater-policy/compare/0.1.54...0.1.55) - 8 February 2024 #### :nail_care: Enhancements @@ -352,8 +351,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix logo [nileshgulia1 - [`24948fd`](https://github.com/eea/volto-freshwater-policy/commit/24948fd0a56a66f8cf9e12a6a3b8184febede801)] - add support for prefixPath refs#144165 [nileshgulia1 - [`595c22e`](https://github.com/eea/volto-freshwater-policy/commit/595c22e734da3dfe45b958818da0df95122fb591)] -- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`7b656fc`](https://github.com/eea/volto-freshwater-policy/commit/7b656fc8ccc3c7d2c3a42cfbcd4874e0502a79c9)] -- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`f6da0ca`](https://github.com/eea/volto-freshwater-policy/commit/f6da0ca013142501a2c4e937dcb029b835e8ae1d)] ### [0.1.34](https://github.com/eea/volto-freshwater-policy/compare/0.1.33...0.1.34) - 14 November 2023 #### :bug: Bug Fixes @@ -378,12 +375,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### :hammer_and_wrench: Others -- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`8b64fda`](https://github.com/eea/volto-freshwater-policy/commit/8b64fdae9bb8b95c1c589f3c9483cb026e7c9b26)] ### [0.1.31](https://github.com/eea/volto-freshwater-policy/compare/0.1.30...0.1.31) - 6 November 2023 #### :house: Internal changes -- chore: [JENKINS] Refactor automated testing [valentinab25 - [`370f49d`](https://github.com/eea/volto-freshwater-policy/commit/370f49dee1f260ab4fd1e2fd16976fb6e01da080)] #### :hammer_and_wrench: Others @@ -394,8 +389,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - Fix modal content scrolling [kreafox - [`fac39fc`](https://github.com/eea/volto-freshwater-policy/commit/fac39fc3f0d1f73d3f2fdafbaaab9c6144b12ae7)] - Add rights widget [kreafox - [`a53bae9`](https://github.com/eea/volto-freshwater-policy/commit/a53bae9393dac1205c62f5049f5cd43698f5ca1e)] - Remove modal for tableau visualization [kreafox - [`eafdc11`](https://github.com/eea/volto-freshwater-policy/commit/eafdc11e76b09b65ae004bef34651d45a0479add)] -- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`d0ca004`](https://github.com/eea/volto-freshwater-policy/commit/d0ca0042b89fa298a0544dd5776d73e7a03a3c6b)] -- test: [JENKINS] Improve cypress time [valentinab25 - [`9a7c42c`](https://github.com/eea/volto-freshwater-policy/commit/9a7c42c9310c9ea3395638d1c83c4f8c53cc592b)] ### [0.1.30](https://github.com/eea/volto-freshwater-policy/compare/0.1.29...0.1.30) - 27 October 2023 #### :house: Internal changes