@eeacms/volto-eea-design-system 1.12.1 → 1.13.1

package/CHANGELOG.md

@@ -4,6 +4,45 @@ 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.13.1](https://github.com/eea/volto-eea-design-system/compare/1.13.0...1.13.1) - 12 June 2023
+
+#### :rocket: New Features
+
+- feat: a11y accessibility footer logos - refs #254122 [dobri1408 - [`1e40f36`](https://github.com/eea/volto-eea-design-system/commit/1e40f364aab3208d2ccfbbd5f1d51a1b12f5be0d)]
+
+#### :hammer_and_wrench: Others
+
+- test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`7b011a9`](https://github.com/eea/volto-eea-design-system/commit/7b011a9e883db93fc7a24ac4db3e6e28068171c3)]
+### [1.13.0](https://github.com/eea/volto-eea-design-system/compare/1.12.1...1.13.0) - 8 June 2023
+
+#### :boom: Breaking Change
+
+- breaking(footer): use url parameter instead of link for footer actions [David Ichim - [`5b9cc2c`](https://github.com/eea/volto-eea-design-system/commit/5b9cc2c8a2979f3d49d69841a57684b3f80d5ea2)]
+- breaking(footer): renamed contact-block to contact-wrapper [David Ichim - [`2fbb7df`](https://github.com/eea/volto-eea-design-system/commit/2fbb7df66eb37e17ab5391feb46d7ce2cfdfcbf3)]
+
+#### :rocket: New Features
+
+- feat(search):  added matchpath to specify search location #352 from eea/searchpopup_update [ichim-david - [`7c236d5`](https://github.com/eea/volto-eea-design-system/commit/7c236d52f5de620f77b820387181fe1d902247d3)]
+
+#### :nail_care: Enhancements
+
+- change(footer): add dedicated classes for theme sites logos [David Ichim - [`adebd04`](https://github.com/eea/volto-eea-design-system/commit/adebd04bcf5dc5b28b90db540816384fc60b4073)]
+- change(footer): header can now be added anywhere in the footer section [David Ichim - [`6ae4872`](https://github.com/eea/volto-eea-design-system/commit/6ae48728dd961d783c6a8120c8a88dc38f63eed6)]
+
+#### :house: Internal changes
+
+- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`fb2b166`](https://github.com/eea/volto-eea-design-system/commit/fb2b166d64f95a1c183901abfe0fe0254d1bbc7a)]
+
+#### :house: Documentation changes
+
+- docs: Update and rename Corporate-site-templates to 2-corporate-site-templates.md [Antonio De Marinis - [`41ffc55`](https://github.com/eea/volto-eea-design-system/commit/41ffc5545def9034e3955bf967a2b0b947023528)]
+
+#### :hammer_and_wrench: Others
+
+- test: Fix test config, coverage Refs #253277 [valentinab25 - [`12f31a2`](https://github.com/eea/volto-eea-design-system/commit/12f31a2018d8c73173fc7ff091c5c3ddd3b29f64)]
+- bump package version due to breaking changes [David Ichim - [`75c83f0`](https://github.com/eea/volto-eea-design-system/commit/75c83f024dc40388086faeaec449f04da68c0d9b)]
+- Rename to eea-storybook Refs #251478 [valentinab25 - [`bc4e753`](https://github.com/eea/volto-eea-design-system/commit/bc4e753a8e604ab323a32a1315c46fc5827aadbd)]
+- added matchpath, we can independently specify on which location to apply a rule for the search popup [Zoltan Szabo - [`f4a40e0`](https://github.com/eea/volto-eea-design-system/commit/f4a40e04f50e87f5b0383a1b28d3459a2b91199b)]
 ### [1.12.1](https://github.com/eea/volto-eea-design-system/compare/1.12.0...1.12.1) - 24 May 2023
 
 #### :bug: Bug Fixes

package/jest-addon.config.js

@@ -5,19 +5,19 @@ module.exports = {
     '!src/**/*.d.ts',
   ],
   moduleNameMapper: {
+    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
     '@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
     '@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
     '@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     '@package/(.*)$': '<rootDir>/src/$1',
     '@root/(.*)$': '<rootDir>/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
-    '@eeacms/(.*?)/(.*)$': '<rootDir>/src/addons/$1/src/$2',
+    '@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
     '@plone/volto-slate':
       '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
-    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
   },
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-design-system",
-  "version": "1.12.1",
+  "version": "1.13.1",
   "description": "@eeacms/volto-eea-design-system: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/ui/Footer/Contact.jsx

@@ -8,16 +8,16 @@ const Contact = ({ children, contacts }) =>
   children?.length ? (
     children
   ) : (
-    <div className="contact-block">
+    <div className="contact-wrapper">
       {contacts?.map((contact, index) => (
         <div className="contact" key={index}>
-          {isInternalURL(contact.link) ? (
-            <Link to={contact.link} className="bold">
+          {isInternalURL(contact.url) ? (
+            <Link to={contact.url} className="bold">
               {contact.text}
             </Link>
           ) : (
             <a
-              href={contact.link}
+              href={contact.url}
               target={'_blank'}
               rel="noopener noreferrer"
               className={'bold'}
@@ -28,21 +28,21 @@ const Contact = ({ children, contacts }) =>
           {contact.children && (
             <div className="subcontact">
               {contact.children.map((child, index) => (
-                <>
-                  {isInternalURL(child.link) ? (
-                    <Link to={child.link} key={index}>
+                <React.Fragment key={index}>
+                  {isInternalURL(child.url) ? (
+                    <Link to={child.url} key={index}>
                       {child.text}
                     </Link>
                   ) : (
                     <a
-                      href={child.link}
+                      href={child.url}
                       target={'_blank'}
                       rel="noopener noreferrer"
                     >
                       {child.text}
                     </a>
                   )}
-                </>
+                </React.Fragment>
               ))}
             </div>
           )}

package/src/ui/Footer/Footer.stories.js

@@ -33,64 +33,82 @@ Default.args = {
   header: 'Environmental information systems',
   description: '',
   actions: [
-    { link: '/privacy', title: 'Privacy' },
-    { link: '/sitemap', title: 'Sitemap' },
-    { link: 'https://www.eea.europa.eu/en/login', title: 'CMS Login' },
+    { url: '/privacy', title: 'Privacy' },
+    { url: '/sitemap', title: 'Sitemap' },
+    { url: 'https://www.eea.europa.eu/en/login', title: 'CMS Login' },
   ],
   copyright: [
-    { link: 'https://status.eea.europa.eu/', title: 'System status' },
+    { url: 'https://status.eea.europa.eu/', title: 'System status' },
     {
-      link: '/copyright',
+      url: '/copyright',
       title: '© Copyright 2023 EEA',
     },
   ],
   sites: [
-    { link: 'https://water.europa.eu/marine', src: Marine, alt: 'WISE marine' },
     {
-      link: 'https://water.europa.eu/freshwater',
+      url: 'https://water.europa.eu/marine',
+      src: Marine,
+      alt: 'WISE marine',
+      className: 'marine logo',
+    },
+    {
+      url: 'https://water.europa.eu/freshwater',
       src: Freshwater,
       alt: 'WISE freshwater',
+      className: 'freshwater logo',
+    },
+    {
+      url: 'https://biodiversity.europa.eu/',
+      src: Bise,
+      alt: 'Biodiversity',
+      className: 'biodiversity logo',
     },
-    { link: 'https://biodiversity.europa.eu/', src: Bise, alt: 'Biodiversity' },
     {
-      link: 'https://forest.eea.europa.eu/',
+      url: 'https://forest.eea.europa.eu/',
       src: Fise,
       alt: 'Forest information system for europe',
+      className: 'fise logo',
     },
     {
-      link: 'https://climate-adapt.eea.europa.eu/observatory',
+      url: 'https://climate-adapt.eea.europa.eu/observatory',
       src: ClimateHealth,
       alt: 'Information platform for chemical monitoring',
+      className: 'climate logo',
     },
     {
-      link: 'https://climate-adapt.eea.europa.eu/',
+      url: 'https://climate-adapt.eea.europa.eu/',
       src: Cca,
       alt: 'Climate adapt',
+      className: 'cca logo',
     },
     {
-      link: 'https://industry.eea.europa.eu/',
+      url: 'https://industry.eea.europa.eu/',
       src: Industry,
       alt: 'European industrial emissions portal',
+      className: 'industry logo',
     },
     {
-      link: 'https://climate-energy.eea.europa.eu/',
+      url: 'https://climate-energy.eea.europa.eu/',
       src: Energy,
       alt: 'Climate and energy in the EU',
+      className: 'energy logo',
     },
     {
-      link: 'https://land.copernicus.eu/',
+      url: 'https://land.copernicus.eu/',
       src: Copernicus,
       alt: 'Copernicus land monitoring service',
+      className: 'copernicus logo',
     },
     {
-      link: 'https://insitu.copernicus.eu/',
+      url: 'https://insitu.copernicus.eu/',
       src: Insitu,
       alt: 'Copernicus in situ',
+      className: 'insitu logo',
     },
   ],
   managedBy: [
     {
-      link: 'https://www.eea.europa.eu/',
+      url: 'https://www.eea.europa.eu/',
       src: EEA,
       alt: 'EEA Logo',
       className: 'site logo',
@@ -101,7 +119,7 @@ Default.args = {
       },
     },
     {
-      link: 'https://www.eionet.europa.eu/',
+      url: 'https://www.eionet.europa.eu/',
       src: Eionet,
       alt: 'EIONET Logo',
       className: 'eionet logo',
@@ -116,40 +134,40 @@ Default.args = {
     {
       name: 'twitter',
       icon: 'ri-twitter-fill',
-      link: 'https://twitter.com/euenvironment',
+      url: 'https://twitter.com/euenvironment',
     },
     {
       name: 'facebook',
       icon: 'ri-facebook-box-fill',
-      link: 'https://www.facebook.com/European.Environment.Agency',
+      url: 'https://www.facebook.com/European.Environment.Agency',
     },
     {
       name: 'linkedin',
       icon: 'ri-linkedin-fill',
-      link: 'https://www.linkedin.com/company/european-environment-agency',
+      url: 'https://www.linkedin.com/company/european-environment-agency',
     },
     {
       name: 'youtube',
       icon: 'ri-youtube-fill',
-      link: 'https://www.youtube.com/user/EEAvideos',
+      url: 'https://www.youtube.com/user/EEAvideos',
     },
     {
       name: 'instagram',
       icon: 'ri-instagram-fill',
-      link: 'https://www.instagram.com/ourplanet_eu',
+      url: 'https://www.instagram.com/ourplanet_eu',
     },
-    { name: 'rss', icon: 'ri-rss-fill', link: '/subscription/news-feeds' },
+    { name: 'rss', icon: 'ri-rss-fill', url: '/subscription/news-feeds' },
   ],
   contacts: [
     {
       text: 'About us',
-      link: '/about',
+      url: '/about',
       children: [
-        { text: 'FAQs', link: 'http://external.site' },
-        { text: 'Careers', link: '/careers' },
+        { text: 'FAQs', url: 'http://external.site' },
+        { text: 'Careers', url: '/careers' },
       ],
     },
-    { text: 'Contact us', link: '/contact-us' },
-    { text: 'Sign up to our newsletter', link: '/newsletter' },
+    { text: 'Contact us', url: '/contact-us' },
+    { text: 'Sign up to our newsletter', url: '/newsletter' },
   ],
 };

package/src/ui/Footer/FooterActions.jsx

@@ -15,13 +15,13 @@ const FooterActions = (props) => {
           <div className="actions">
             {props.actions &&
               props.actions.map((action, index) =>
-                isInternalURL(action.link) ? (
-                  <Link to={action.link} key={index}>
+                isInternalURL(action.url) ? (
+                  <Link to={action.url} key={index}>
                     {action.title}
                   </Link>
                 ) : (
                   <a
-                    href={action.link}
+                    href={action.url}
                     key={index}
                     target={'_blank'}
                     rel={'noreferrer'}
@@ -37,13 +37,13 @@ const FooterActions = (props) => {
           <div className="copyright">
             {props.copyright &&
               props.copyright.map((copyright, index) =>
-                isInternalURL(copyright.link) ? (
-                  <Link to={copyright.link} key={index}>
+                isInternalURL(copyright.url) ? (
+                  <Link to={copyright.url} key={index}>
                     {copyright.title}
                   </Link>
                 ) : (
                   <a
-                    href={copyright.link}
+                    href={copyright.url}
                     key={index}
                     target={'_blank'}
                     rel={'noreferrer'}

package/src/ui/Footer/FooterHeader.jsx

@@ -1,10 +1,8 @@
 import React from 'react';
 
 const FooterHeader = (props) => {
-  return (
-    <div className="theme-sites">
-      <h3 className="header text-center">{props.children}</h3>
-    </div>
-  );
+  return props.children ? (
+    <h2 className="footer-header text-center">{props.children}</h2>
+  ) : null;
 };
 export default FooterHeader;

package/src/ui/Footer/FooterSites.jsx

@@ -12,14 +12,22 @@ const Sites = (props) => {
       const nextItem = logos[i + 1];
       column.push(
         <Grid.Column className="logo" key={i}>
-          <a className="logo" href={item.link}>
+          <a className="logo" href={item.url}>
             <LazyLoadComponent>
-              <Image src={item.src} alt={item.alt}></Image>
+              <Image
+                className={item.className}
+                src={item.src}
+                alt={item.alt}
+              ></Image>
             </LazyLoadComponent>
           </a>
-          <a className="logo" href={nextItem.link}>
+          <a className="logo" href={nextItem.url}>
             <LazyLoadComponent>
-              <Image src={nextItem.src} alt={nextItem.alt}></Image>
+              <Image
+                className={nextItem.className}
+                src={nextItem.src}
+                alt={nextItem.alt}
+              ></Image>
             </LazyLoadComponent>
           </a>
         </Grid.Column>,

package/src/ui/Footer/Social.jsx

@@ -11,7 +11,7 @@ const Social = (props) => {
     <Grid.Row>
       <div className="social">
         {props.social?.map((item, index) => (
-          <a href={item.link} aria-label={`${item.name} link`} key={index}>
+          <a href={item.url} aria-label={`${item.name} link`} key={index}>
             <Icon className={item.icon}></Icon>
           </a>
         ))}

package/src/ui/Footer/SubFooter.jsx

@@ -23,7 +23,7 @@ const SubFooter = (props) => {
             >
               <div className="item">
                 <div className={manager.className}>
-                  <a href={manager.link}>
+                  <a href={manager.url}>
                     <LazyLoadComponent>
                       <Image src={manager.src} alt={manager.alt}></Image>
                     </LazyLoadComponent>
@@ -55,7 +55,7 @@ const SubFooter = (props) => {
             >
               <div className="item">
                 <div className={manager.className}>
-                  <a href={manager.link}>
+                  <a href={manager.url}>
                     <LazyLoadComponent>
                       <Image src={manager.src} alt={manager.alt}></Image>
                     </LazyLoadComponent>

package/src/ui/Header/HeaderSearchPopUp.js

@@ -23,7 +23,7 @@ function HeaderSearchPopUp({
   const headerSearchViews = headerSearchBox || [];
   const defaultView = headerSearchViews.filter((v) => v.isDefault);
   const localView = headerSearchViews.filter((v) =>
-    location.pathname.includes(v.path),
+    location.pathname.match(v.matchpath ? v.matchpath : v.path),
   );
   const activeView = localView.length > 0 ? localView[0] : defaultView[0];
 

package/theme/themes/eea/extras/footer.less

@@ -37,16 +37,37 @@ footer .theme-sites {
   .logos .logo img {
     margin: @mobileThemeSitesLogoMargin;
   }
-
-  .header {
-    font-size: @mobileFooterTitleFontSize;
+  .logos .logo:focus-visible {
+    outline: @outlineBorder;
+    outline: @outlineBorderWebkit;
+  }
+}
+footer .footer-header {
+  font-size: @mobileFooterTitleFontSize;
+  .logo:focus-visible {
+    outline: @outlineBorder;
+    outline: @outlineBorderWebkit;
   }
 }
 
+.theme-sites .logo.freshwater {
+  max-width: @freshwaterLogoMaxWidth;
+}
+.subfooter .item {
+  display: @subFooterItemDisplay;
+  justify-content: @subFooterItemJustifyContent;
+  width: @subFooterItemWidth;
+  height: @subFooterItemHeight;
+  align-items: @subFooterItemAlignItems;
+}
 .subfooter .item .ui.grid {
   align-items: center;
 }
 
+.subfooter .logo a:focus-visible {
+  outline: @outlineBorder !important;
+  outline: @outlineBorderWebkit !important;
+}
 .subfooter .item {
   .header {
     margin-bottom: @mobileItemHeaderMarginBottom;
@@ -54,11 +75,11 @@ footer .theme-sites {
   }
 }
 
-.subfooter .contact-block {
+.subfooter .contact-wrapper {
   margin-bottom: @tabletContactBlockMarginBottom;
 }
 
-.contact-block .subcontact a {
+.contact-wrapper .subcontact a {
   font-size: @computerSubContactIconFontSize;
   margin-right: @computerSubContactIconMarginRight;
   font-weight: @computerSubContactIconFontWeight;
@@ -149,7 +170,7 @@ footer .footer-wrapper .menu {
     font-weight: @mobileMenuCopyrightFontWeight;
   }
 
-  .contact-block .subcontact {
+  .contact-wrapper .subcontact {
     margin-top: @mobileSubcontactBlockMarginTop;
   }
 }
@@ -159,7 +180,7 @@ footer .footer-wrapper .menu {
     background: @computerFooterBackgroundGradient;
   }
 
-  footer .theme-sites .header {
+  footer .footer-header {
     font-size: @tabletFooterTitleFontSize;
   }
 
@@ -167,14 +188,6 @@ footer .footer-wrapper .menu {
     .logo img {
       max-height: 100px;
     }
-
-    .site.logo img {
-      padding-right: @siteLogoPaddingRight;
-    }
-
-    .contact-block {
-      padding-left: @siteLogoPaddingRight;
-    }
   }
 
   .subfooter .contact {
@@ -184,11 +197,11 @@ footer .footer-wrapper .menu {
     gap: @tabletContactGap;
   }
 
-  .subfooter .contact-block {
+  .subfooter .contact-wrapper {
     margin-inline: @tabletContactBlockMarginInline;
   }
 
-  .contact-block .subcontact a {
+  .contact-wrapper .subcontact a {
     font-size: @tabletSubContactIconFontSize;
     margin-right: @tabletSubContactIconMarginRight;
   }
@@ -239,7 +252,7 @@ footer .footer-wrapper .menu {
       }
     }
 
-    .contact-block .subcontact a {
+    .contact-wrapper .subcontact a {
       font-size: @computerSubContactIconFontSize;
       margin-right: @computerSubContactIconMarginRight;
     }

package/theme/themes/eea/extras/footer.variables

@@ -23,15 +23,22 @@
 @computerThemeSitesLogoMargin       : 0 auto @rem-space-10;
 @mobileFooterTitleFontSize          : @mobileH4;
 @tabletFooterTitleFontSize          : @h3;
+@freshwaterLogoMaxWidth             : 122px;
+
+/* Sub-footer Item */
+@subFooterItemDisplay: flex;
+@subFooterItemJustifyContent: center;
+@subFooterItemAlignItems: center;
+@subFooterItemWidth: 100%;
+@subFooterItemHeight: 100%;
+@outlineBorder: 1px dotted #212121;
+@outlineBorderWebkit: 5px auto -webkit-focus-ring-color;
 
 /* Sub-footer Item Header */
 @mobileItemHeaderMarginBottom       : @space-5;
 @computerItemHeaderMarginBottom     : @space-12;
 @computerLogoHeaderMarginLeft       : -50px;
 
-/* Site Logo */
-@siteLogoPaddingRight : 20%;
-
 /* Contact Info */
 @tabletContactBlockMarginInline     : 0;
 @tabletContactBlockMarginBottom     : @space-4;