@eeacms/volto-cca-policy 0.1.47 → 0.1.49

package/CHANGELOG.md

@@ -4,6 +4,40 @@ 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.1.49](https://github.com/eea/volto-cca-policy/compare/0.1.48...0.1.49) - 15 November 2023
+
+#### :house: Internal changes
+
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7b820a6`](https://github.com/eea/volto-cca-policy/commit/7b820a6369c2ddd5203b1a4abe352cb4bb43db7a)]
+- chore: husky, lint-staged use fixed versions [valentinab25 - [`f0a8061`](https://github.com/eea/volto-cca-policy/commit/f0a8061c275c236deb00087c23fac9860a073106)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #259267 - test volto-slate blocks add createParagraph [Tripon Eugen - [`c855b41`](https://github.com/eea/volto-cca-policy/commit/c855b41cb925767a45e1b16e6f79cd7e9c602fc7)]
+- Refs #259267 - test cypress config set multilingual default [Tripon Eugen - [`1d4fd5a`](https://github.com/eea/volto-cca-policy/commit/1d4fd5a712c4f3edcf9cd208b759c2a6d75eefb2)]
+- Refs #259267 - jenkins cypress e2e [Tripon Eugen - [`08ea88e`](https://github.com/eea/volto-cca-policy/commit/08ea88e1e3fcf6b53c347c4a99b0c80a972f17fd)]
+- Refs #259267 - backend_profiles multiple addons separated by space [Tripon Eugen - [`a2e3a85`](https://github.com/eea/volto-cca-policy/commit/a2e3a85992c5513e6d0a2c697e8770f709d70d45)]
+- Refs #259267 - test cypress config [Tripon Eugen - [`1434f26`](https://github.com/eea/volto-cca-policy/commit/1434f2624035572056633c0eb2598585c7e04722)]
+- Refs #259267 - remove multilingual testing version [Tripon Eugen - [`86fd752`](https://github.com/eea/volto-cca-policy/commit/86fd7524680174ac7e34aa415798427dd44b890a)]
+- Refs #259267 - jenkins test add multilingual and set version [Tripon Eugen - [`9611e95`](https://github.com/eea/volto-cca-policy/commit/9611e954879e03b0ebcf95da4ea580e26e3eb765)]
+- Refs #259267 - jenkins test change className condition [Tripon Eugen - [`402832a`](https://github.com/eea/volto-cca-policy/commit/402832a29a83116cd8daa30a1e5296ca54742f02)]
+- Refs #259267 - jenkins test volto version and longer timeout [Tripon Eugen - [`94b042d`](https://github.com/eea/volto-cca-policy/commit/94b042de785baebd1644d5aede93908dbe2035d2)]
+- Refs #259267 - jenkins test [Tripon Eugen - [`cacd31e`](https://github.com/eea/volto-cca-policy/commit/cacd31e7b1afe0983674ed5c7632d2e1d7fa752e)]
+- Refs #259267 - jenkins [Tripon Eugen - [`5b3affe`](https://github.com/eea/volto-cca-policy/commit/5b3affee8401239de10097884c1b7f2349d15ec0)]
+- Refs #259267 - add When, lead image and title to files [Tripon Eugen - [`2cedb23`](https://github.com/eea/volto-cca-policy/commit/2cedb237f898af9057e13fba94b615ef71077204)]
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`4d607a5`](https://github.com/eea/volto-cca-policy/commit/4d607a576e9d0a5c34e48c41b409e7df616ee3d6)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`b7f74d5`](https://github.com/eea/volto-cca-policy/commit/b7f74d53513a6edbfbca5cb6d19687929bb1e5db)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`db65617`](https://github.com/eea/volto-cca-policy/commit/db656173391f65157098d95d388c25f6429753d8)]
+- Refs #259267 - cca event blocks attachments and check not mandatoty fields [Tripon Eugen - [`3138e5a`](https://github.com/eea/volto-cca-policy/commit/3138e5afb5bfbdbed14e27ed457b16867b7fa414)]
+- Refs #256681 - Fix error in CCA Event view menu. ([React Intl] An id must be provided to format a message.) [GhitaB - [`517eeb8`](https://github.com/eea/volto-cca-policy/commit/517eeb817264a47bbfd6b9b7d22aaf22d44ed224)]
+- Refs #161485 - Fix ECDE name conflict. [GhitaB - [`8bfd99f`](https://github.com/eea/volto-cca-policy/commit/8bfd99ff68bb82a04d1c0ed625fa514fcf46289e)]
+### [0.1.48](https://github.com/eea/volto-cca-policy/compare/0.1.47...0.1.48) - 16 October 2023
+
+#### :house: Internal changes
+
+- style: don't apply icon on empty links [kreafox - [`81670eb`](https://github.com/eea/volto-cca-policy/commit/81670ebd6d095d98c19ddffb323486518c3588d3)]
+- style: make external link icon selector more specific [kreafox - [`7a52b81`](https://github.com/eea/volto-cca-policy/commit/7a52b81029842192d7ec2cdfdd5d814b7601d219)]
+
 ### [0.1.47](https://github.com/eea/volto-cca-policy/compare/0.1.46...0.1.47) - 13 October 2023
 
 #### :bug: Bug Fixes

package/cypress.config.js

@@ -2,12 +2,12 @@ const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
   viewportWidth: 1280,
-  defaultCommandTimeout: 5000,
+  defaultCommandTimeout: 8888,
   chromeWebSecurity: false,
   reporter: 'junit',
-  video: true,
+  video: false,
   retries: {
-    runMode: 1,
+    runMode: 2,
     openMode: 0,
   },
   reporterOptions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.47",
+  "version": "0.1.49",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -24,11 +24,13 @@
     "@eeacms/volto-accordion-block",
     "@eeacms/volto-slate-label",
     "@eeacms/volto-eea-design-system",
+    "@eeacms/volto-eea-website-theme",
     "@eeacms/volto-globalsearch"
   ],
   "dependencies": {
     "@eeacms/volto-accordion-block": "*",
     "@eeacms/volto-eea-design-system": "*",
+    "@eeacms/volto-eea-website-theme": "*",
     "@eeacms/volto-globalsearch": "*",
     "@eeacms/volto-openlayers-map": "*",
     "@eeacms/volto-slate-label": "*",
@@ -43,8 +45,8 @@
     "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "cypress-fail-fast": "^5.0.1",
-    "husky": "*",
-    "lint-staged": "*",
+    "husky": "^8.0.3",
+    "lint-staged": "^14.0.1",
     "md5": "^2.3.0"
   },
   "lint-staged": {

package/src/components/manage/Blocks/C3SIndicatorsGlossaryBlock/C3SIndicatorsGlossaryBlockView.jsx

@@ -6,7 +6,7 @@ export default function C3SIndicatorsGlossaryBlockView(props) {
 
   const getIndicatorsData = () => {
     const url =
-      '/++api++/en/knowledge/european-climate-data-explorer/@c3s_indicators_glossary_table';
+      '/++api++/en/knowledge/european-climate-data-explorer/@c3s_indicators_glossary_table_api';
 
     axios
       .get(url)

package/src/components/manage/Blocks/C3SIndicatorsOverviewBlock/C3SIndicatorsOverviewBlockView.jsx

@@ -12,7 +12,7 @@ export default function C3SIndicatorsOverviewBlockView(props) {
     const url =
       '/++api++/en/knowledge/european-climate-data-explorer/' +
       category +
-      '/@c3s_indicators_overview';
+      '/@c3s_indicators_overview_api';
 
     axios
       .get(url)

package/src/components/theme/Header.jsx

@@ -239,7 +239,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
         inverted={isHomePageInverse ? true : false}
         transparency={isHomePageInverse ? true : false}
         logo={
-          <div className={isSubsite && 'logo-wrapper'}>
+          <div className={isSubsite ? 'logo-wrapper' : ''}>
             {subsite?.title ? (
               <>
                 {subsite.subsite_logo ? (

package/src/components/theme/Views/CcaEventView.jsx

@@ -0,0 +1,113 @@
+import React from 'react';
+import { DocumentsList, HTMLField } from '@eeacms/volto-cca-policy/helpers';
+import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
+import { Grid } from 'semantic-ui-react';
+import config from '@plone/volto/registry';
+
+function CcaEventView(props) {
+  const {
+    blocks: { blocksConfig },
+  } = config;
+  const TitleBlockView = blocksConfig.title.view;
+  const { content } = props;
+  // cca_files: [content.agenda_file]}
+  if (content.agenda_file) {
+    content.agenda_file['url'] = content.agenda_file['download'];
+    content.agenda_file['title'] = content.agenda_file['filename'];
+  }
+  if (content.background_documents) {
+    content.background_documents['url'] =
+      content.background_documents['download'];
+    content.background_documents['title'] =
+      content.background_documents['filename'];
+  }
+  const agenda_files = {
+    section_title: 'Download the detailed agenda',
+    cca_files: [content.agenda_file],
+    show_counter: false,
+  };
+  const background_documents = {
+    section_title: 'A background document for the event is available ',
+    cca_files: [content.background_documents],
+    show_counter: false,
+  };
+
+  return (
+    <div className="cca-event-view">
+      {content?.image !== null && (
+        <TitleBlockView
+          {...props}
+          data={{ info: [{ description: '' }] }}
+          metadata={content}
+        />
+      )}
+      <div className="ui container">
+        <Grid columns="12">
+          <div className="row">
+            <Grid.Column
+              mobile={12}
+              tablet={12}
+              computer={9}
+              className="col-left"
+            >
+              {content?.image === null && (
+                <>
+                  <div className="ui label">Climate adapt event</div>
+                  <h1>{content.title}</h1>
+                </>
+              )}
+              <HTMLField value={content.text} className="long_description" />
+              <h2>Agenda and supporting documents</h2>
+              <HTMLField value={content.agenda} className="long_description" />
+              {content?.agenda_file && <DocumentsList content={agenda_files} />}
+              {content?.background_documents && (
+                <DocumentsList content={background_documents} />
+              )}
+
+              <h2>Practical information</h2>
+              <h3>Participation</h3>
+              <HTMLField
+                value={content.participation}
+                className="long_description"
+              />
+
+              <h2>Contact</h2>
+              <p>
+                If you have any further questions you can contact{' '}
+                <a href="mailto:{content.contact_email}">
+                  {content.contact_email}
+                </a>
+              </p>
+            </Grid.Column>
+            <Grid.Column
+              mobile={12}
+              tablet={12}
+              computer={3}
+              className="col-right"
+            >
+              <h3>When</h3>
+              <When
+                start={content.start}
+                end={content.end}
+                whole_day={content.whole_day}
+                open_end={content.open_end}
+              />
+              {content?.location !== null && (
+                <>
+                  <h3>Where</h3>
+                  <p>{content.location}</p>
+                </>
+              )}
+              <h3>Language</h3>
+              <p>{content.language}</p>
+              <h3>Info</h3>
+              <p>{content.contact_email}</p>
+            </Grid.Column>
+          </div>
+        </Grid>
+      </div>
+    </div>
+  );
+}
+
+export default CcaEventView;

package/src/customizations/@plone/volto-slate/utils/blocks.js

@@ -125,6 +125,13 @@ export function createEmptyParagraph() {
   };
 }
 
+export function createParagraph(text) {
+  return {
+    type: config.settings.slate.defaultBlockType,
+    children: [{ text }],
+  };
+}
+
 export const isSingleBlockTypeActive = (editor, format) => {
   const [match] = Editor.nodes(editor, {
     match: (n) => n.type === format,

package/src/helpers/Utils.jsx

@@ -124,9 +124,16 @@ export const DocumentsList = (props) => {
   if (!files || files.length === 0) {
     return null;
   }
+  if (!content.hasOwnProperty('show_counter')) {
+    content.show_counter = true;
+  }
 
   let section_title = 'Documents';
 
+  if (content['section_title']) {
+    section_title = content['section_title'];
+  }
+
   if (content['@type'] === 'eea.climateadapt.casestudy') {
     section_title = 'Case Studies Documents';
   }
@@ -137,7 +144,7 @@ export const DocumentsList = (props) => {
   return (
     <>
       <h5>
-        {section_title} ({files.length})
+        {section_title} {content.show_counter && <>({files.length})</>}
       </h5>
       <ul className="documents-list">
         {files.map((file, index) => (

package/src/index.js

@@ -4,6 +4,7 @@ import loadable from '@loadable/component';
 import { Sitemap } from '@plone/volto/components';
 import AdaptationOptionView from './components/theme/Views/AdaptationOptionView';
 import CaseStudyView from './components/theme/Views/CaseStudyView';
+import CcaEventView from './components/theme/Views/CcaEventView';
 import GuidanceView from './components/theme/Views/GuidanceView';
 import IndicatorView from './components/theme/Views/IndicatorView';
 import InformationPortalView from './components/theme/Views/InformationPortalView';
@@ -220,6 +221,7 @@ const applyConfig = (config) => {
     ...config.views.contentTypesViews,
     'eea.climateadapt.adaptationoption': AdaptationOptionView,
     'eea.climateadapt.casestudy': CaseStudyView,
+    'cca-event': CcaEventView,
     'eea.climateadapt.guidancedocument': GuidanceView,
     'eea.climateadapt.indicator': IndicatorView,
     'eea.climateadapt.informationportal': InformationPortalView,
@@ -231,6 +233,8 @@ const applyConfig = (config) => {
     'eea.climateadapt.c3sindicator': C3SIndicatorView,
   };
 
+  config.views.layoutViewsNamesMapping.view_cca_event = 'CCA Event View';
+
   config.settings.contextNavigationLocations = [
     // {
     //   title: 'Regional Adaptation Support Tool',

package/theme/globals/site.overrides

@@ -25,31 +25,33 @@ p.has--clear--both:empty {
 
 // Add icon for external links
 #page-document {
-  a[rel='noopener noreferrer']:not(.ui.button),
-  a[target='_blank']:not(.ui.button) {
-    &:before {
-      position: relative;
-      top: 2px;
-      margin-right: 3px;
-      color: inherit;
-      content: '\ecaf';
-      font-family: remixicon;
-      font-size: 1em;
-    }
-
-    &:visited {
+  p {
+    a[rel='noopener noreferrer']:not(.ui.button):not(:empty),
+    a[target='_blank']:not(.ui.button):not(:empty) {
       &:before {
-        // fix visited link icon color
-        // doesn't work with color: inherit
-        color: @linkVisitedColor;
+        position: relative;
+        top: 2px;
+        margin-right: 3px;
+        color: inherit;
+        content: '\ecaf';
+        font-family: remixicon;
+        font-size: 1em;
       }
-    }
 
-    &:active {
-      &:before {
-        // fix active link icon color
-        // doesn't work with color: inherit
-        color: @linkActiveColor;
+      &:visited {
+        &:before {
+          // fix visited link icon color
+          // doesn't work with color: inherit
+          color: @linkVisitedColor;
+        }
+      }
+
+      &:active {
+        &:before {
+          // fix active link icon color
+          // doesn't work with color: inherit
+          color: @linkActiveColor;
+        }
       }
     }
   }
@@ -296,6 +298,7 @@ body.subsite-root.section-mission {
       div.items {
         div.listing-item {
           border: none;
+          margin: 0;
         }
 
         .listing-body {