@eeacms/volto-eea-website-theme 1.18.0 → 1.19.0

package/CHANGELOG.md

@@ -4,6 +4,28 @@ 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.19.0](https://github.com/eea/volto-eea-website-theme/compare/1.18.1...1.19.0) - 17 August 2023
+
+#### :bug: Bug Fixes
+
+- fix(filter): switch arrows for closed and opened states as before the refactoring [David Ichim - [`e228390`](https://github.com/eea/volto-eea-website-theme/commit/e228390bdcd675360b9edd61b550dc1c382d7010)]
+- fix: align token widget to EEA DS - refs #256406 [Alin Voinea - [`f936549`](https://github.com/eea/volto-eea-website-theme/commit/f9365495b7ffb748429751c47ecc70daa33a25af)]
+
+#### :nail_care: Enhancements
+
+- refactor: Rename ThemesWidget to TopicsWidget and register it on topics id - refs #256408 [Alin Voinea - [`7648b3d`](https://github.com/eea/volto-eea-website-theme/commit/7648b3d47f1a59a5f570465503014792b3f8ed85)]
+
+#### :house: Documentation changes
+
+- docs: Cleanup Makefile, update DEVELOP documentation, i18n - refs #254894 [valentinab25 - [`5e25196`](https://github.com/eea/volto-eea-website-theme/commit/5e2519698c2720e36e63723879518d972fcaad7a)]
+
+#### :hammer_and_wrench: Others
+
+- bump package release version [David Ichim - [`19ecef9`](https://github.com/eea/volto-eea-website-theme/commit/19ecef9a61025fc7b3095d09aff62c67d3e36b36)]
+- Undo previous commit [laszlocseh - [`65db1ac`](https://github.com/eea/volto-eea-website-theme/commit/65db1acef78ecbc0a72add0bef01a5deb7cd4051)]
+- Added renderLinkElement to volto-slate/editor/render.jsx customization [laszlocseh - [`21799ec`](https://github.com/eea/volto-eea-website-theme/commit/21799ecd2dca868ebcdd4c8e12b56207f1a578ac)]
+### [1.18.1](https://github.com/eea/volto-eea-website-theme/compare/1.18.0...1.18.1) - 26 June 2023
+
 ### [1.18.0](https://github.com/eea/volto-eea-website-theme/compare/1.17.2...1.18.0) - 20 June 2023
 
 #### :rocket: New Features
@@ -22,6 +44,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Release 1.18.0 #154 from eea/develop [ichim-david - [`9e47abb`](https://github.com/eea/volto-eea-website-theme/commit/9e47abb88ec371b142caf177d114ccff49a53082)]
 - Refs #254132 - Bump to 1.18.0. [GhitaB - [`51f483b`](https://github.com/eea/volto-eea-website-theme/commit/51f483b3dba6cff13471fc512d372b577991f6f4)]
 - Refs #254132 - Do not initialize actions with []. Make sure actions in footerOpts are used if set. [GhitaB - [`8c0afb5`](https://github.com/eea/volto-eea-website-theme/commit/8c0afb539b0c96928545bc9a6974a189c9e886b8)]
 - test: Fix sonarqube - Convert the conditional to a boolean to avoid leaked value [Alin Voinea - [`195eb19`](https://github.com/eea/volto-eea-website-theme/commit/195eb19b8aa40a95bca6aafc7720bdc6b8e02340)]

package/DEVELOP.md

@@ -2,6 +2,28 @@
 
 ## Develop
 
+1. Make sure you have `docker` and `docker compose` installed and running on your machine:
+
+    ```Bash
+    git clone https://github.com/eea/volto-eea-website-theme.git
+    cd volto-eea-website-theme
+    git checkout -b bugfix-123456 develop
+    make
+    make start
+    ```
+
+1. Wait for `Volto started at 0.0.0.0:3000` meesage
+
+1. Go to http://localhost:3000
+
+1.  Happy hacking!
+
+    ```Bash
+    cd src/addons/volto-eea-website-theme/
+    ```
+
+### Or add @eeacms/volto-eea-website-theme to your Volto project
+
 Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
 
 1.  Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`
@@ -49,3 +71,37 @@ Before starting make sure your development environment is properly set. See [Vol
 1.  Happy hacking!
 
         cd src/addons/volto-eea-website-theme/
+
+## Cypress
+
+To run cypress locally, first make sure you don't have any Volto/Plone running on ports `8080` and `3000`.
+
+You don't have to be in a `clean-volto-project`, you can be in any Volto Frontend
+project where you added `volto-eea-website-theme` to `mrs.developer.json`
+
+Go to:
+
+  ```BASH
+  cd src/addons/volto-eea-website-theme/
+  ```
+
+Start:
+
+  ```Bash
+  make
+  make start
+  ```
+
+This will build and start with Docker a clean `Plone backend` and `Volto Frontend` with `volto-eea-website-theme` block installed.
+
+Open Cypress Interface:
+
+  ```Bash
+  make cypress-open
+  ```
+
+Or run it:
+
+  ```Bash
+  make cypress-run
+  ```

package/README.md

@@ -23,10 +23,23 @@ EEA Website [Volto](https://github.com/plone/volto) Theme
 
 ## Getting started
 
+### Try volto-eea-website-theme with Docker
+
+      git clone https://github.com/eea/volto-eea-website-theme.git
+      cd volto-eea-website-theme
+      make
+      make start
+
+Go to http://localhost:3000
+
 ### Add volto-eea-website-theme to your Volto project
 
 1. Make sure you have a [Plone backend](https://plone.org/download) up-and-running at http://localhost:8080/Plone
 
+   ```Bash
+   docker compose up backend
+   ```
+
 1. Start Volto frontend
 
 * If you already have a volto project, just update `package.json`:

package/docker-compose.yml

@@ -0,0 +1,28 @@
+version: "3"
+services:
+  backend:
+    image: plone/plone-backend:${PLONE_VERSION:-6}
+    ports:
+      - "8080:8080"
+    environment:
+      SITE: "Plone"
+
+  frontend: 
+    build:
+      context: ./
+      dockerfile: ./Dockerfile
+      args:
+        ADDON_NAME: "${ADDON_NAME}"
+        ADDON_PATH: "${ADDON_PATH}"
+        VOLTO_VERSION: ${VOLTO_VERSION:-16}
+    ports:
+    - "3000:3000"
+    - "3001:3001"
+    depends_on:
+      - backend
+    volumes:
+      - ./:/app/src/addons/${ADDON_PATH}
+    environment:
+      RAZZLE_INTERNAL_API_PATH: "http://backend:8080/Plone"
+      RAZZLE_DEV_PROXY_API_PATH: "http://backend:8080/Plone"
+      HOST: "0.0.0.0"

package/locales/de/LC_MESSAGES/volto.po

@@ -0,0 +1,14 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language: \n"
+"Language-Team: \n"
+"Content-Type: \n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+

package/locales/it/LC_MESSAGES/volto.po

@@ -0,0 +1,14 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language: \n"
+"Language-Team: \n"
+"Content-Type: \n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+

package/locales/ro/LC_MESSAGES/volto.po

@@ -0,0 +1,14 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language: \n"
+"Language-Team: \n"
+"Content-Type: \n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+

package/locales/volto.pot

@@ -0,0 +1,16 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Plone\n"
+"POT-Creation-Date: 2023-06-28T10:48:22.678Z\n"
+"Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
+"Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language-Code: en\n"
+"Language-Name: English\n"
+"Preferred-Encodings: utf-8\n"
+"Domain: volto\n"
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/theme/Widgets/TokenWidget.jsx

@@ -4,7 +4,7 @@ import Tag from '@eeacms/volto-eea-design-system/ui/Tag/Tag';
 
 export const TokenWidget = ({ value, children, className }) =>
   value ? (
-    <span className={cx(className, 'token', 'widget')}>
+    <div className={cx(className, 'token', 'widget', 'tags-content')}>
       {value.map((tag) => (
         <Tag
           href={`https://www.eea.europa.eu/en/advanced-search?q=${tag}`}
@@ -13,7 +13,7 @@ export const TokenWidget = ({ value, children, className }) =>
           {children ? children(tag) : tag}
         </Tag>
       ))}
-    </span>
+    </div>
   ) : (
     ''
   );

package/src/components/theme/Widgets/{ThemesWidget.jsx → TopicsWidget.jsx}

@@ -2,18 +2,18 @@ import React from 'react';
 import cx from 'classnames';
 import Tag from '@eeacms/volto-eea-design-system/ui/Tag/Tag';
 
-export const ThemesWidget = ({ value, children, className }) => {
+export const TopicsWidget = ({ value, children, className }) => {
   return value ? (
-    <span className={cx(className, 'token', 'widget')}>
+    <div className={cx(className, 'token', 'widget', 'tags-content')}>
       {value.map((tag) => (
         <Tag
-          href={`https://www.eea.europa.eu/en/advanced-search?filters[0][field]=topic&filters[0][values][0]=${tag.title}&filters[0][type]=any&filters[1][field]=language&filters[1][type]=any&filters[1][values][0]=en&sort-field=issued.date&sort-direction=desc`}
+          href={`https://www.eea.europa.eu/en/advanced-search?filters[0][field]=topic&filters[0][values][0]=${tag.title}&filters[0][type]=any&filters[1][field]=language&filters[1][type]=any&filters[1][values][0]=en&filters[2][field]=issued.date&filters[2][values][0]=Last 5 years&filters[2][type]=any&sort-field=issued.date&sort-direction=desc`}
           key={tag.token}
         >
           {children ? children(tag.title) : tag.title}
         </Tag>
       ))}
-    </span>
+    </div>
   ) : (
     ''
   );

package/src/index.js

@@ -7,7 +7,7 @@ import CustomCSS from '@eeacms/volto-eea-website-theme/components/theme/CustomCS
 import NotFound from '@eeacms/volto-eea-website-theme/components/theme/NotFound/NotFound';
 import DraftBackground from '@eeacms/volto-eea-website-theme/components/theme/DraftBackground/DraftBackground';
 import { TokenWidget } from '@eeacms/volto-eea-website-theme/components/theme/Widgets/TokenWidget';
-import { ThemesWidget } from '@eeacms/volto-eea-website-theme/components/theme/Widgets/ThemesWidget';
+import { TopicsWidget } from '@eeacms/volto-eea-website-theme/components/theme/Widgets/TopicsWidget';
 import SubsiteClass from './components/theme/SubsiteClass';
 import HomePageView from '@eeacms/volto-eea-website-theme/components/theme/Homepage/HomePageView';
 import HomePageInverseView from '@eeacms/volto-eea-website-theme/components/theme/Homepage/HomePageInverseView';
@@ -83,7 +83,26 @@ const applyConfig = (config) => {
   };
   // Apply accordion block customization
   if (config.blocks.blocksConfig.accordion) {
-    config.blocks.blocksConfig.accordion.semanticIcon = 'ri-arrow-down-s-line';
+    config.blocks.blocksConfig.accordion.titleIcons = {
+      closed: {
+        leftPosition: 'ri-arrow-down-s-line',
+        rightPosition: 'ri-arrow-down-s-line',
+      },
+      opened: {
+        leftPosition: 'ri-arrow-up-s-line',
+        rightPosition: 'ri-arrow-up-s-line',
+      },
+      unfiltered: {
+        leftPosition: 'ri-filter-3-line',
+        rightPosition: 'ri-filter-3-line',
+      },
+      filtered: {
+        leftPosition: 'ri-close-line',
+        rightPosition: 'ri-close-line',
+      },
+      iconComponent: 'SemanticIcon',
+    };
+
     config.blocks.blocksConfig.accordion.options = {};
     config.blocks.blocksConfig.accordion.defaults.theme = 'secondary';
   }
@@ -113,7 +132,7 @@ const applyConfig = (config) => {
   }
 
   // Custom Widgets
-  config.widgets.views.id.taxonomy_themes = ThemesWidget;
+  config.widgets.views.id.topics = TopicsWidget;
   config.widgets.views.id.subjects = TokenWidget;
   config.widgets.views.widget.tags = TokenWidget;
 
@@ -227,6 +246,27 @@ const applyConfig = (config) => {
     },
   ];
 
+  // mega menu layout settings
+  config.settings.menuItemsLayouts = {
+    '/en/topics': {
+      menuItemChildrenListColumns: [1, 4],
+      menuItemColumns: [
+        'at-a-glance three wide column',
+        'topics-right-column nine wide column',
+      ],
+      hideChildrenFromNavigation: false,
+    },
+    '/en/countries': {
+      menuItemColumns: ['eight wide column', 'four wide column'],
+      menuItemChildrenListColumns: [5, 2],
+      appendExtraMenuItemsToLastColumn: true,
+      hideChildrenFromNavigation: false,
+    },
+    '/en/about': {
+      hideChildrenFromNavigation: false,
+    },
+  };
+
   // layout settings
   config = [installLayoutSettingsBlock].reduce(
     (acc, apply) => apply(acc),

package/src/slate.js

@@ -17,6 +17,8 @@ import clearIcon from './icons/eraser.svg';
 
 const toggleBlockClassFormat = (editor, format) => {
   const levels = Array.from(Editor.levels(editor, editor.selection));
+  // TODO: someone fix this
+  if (levels.length < 2) return false;
   const [, [, path]] = levels;
   Transforms.setNodes(
     editor,
@@ -30,7 +32,9 @@ const toggleBlockClassFormat = (editor, format) => {
 
 const isBlockClassActive = (editor, format) => {
   if (!editor.selection) return false;
+  // TODO: someone fix this
   const levels = Array.from(Editor.levels(editor, editor.selection));
+  if (levels.length < 2) return false;
   const [, [node]] = levels;
   return node.styleName === format;
 };

package/.i18n.babel.config.js

@@ -1 +0,0 @@
-module.exports = require('@plone/volto/babel');