@eeacms/volto-clms-theme 1.0.159 → 1.0.161

package/CHANGELOG.md

@@ -4,6 +4,24 @@ 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.0.161](https://github.com/eea/volto-clms-theme/compare/1.0.160...1.0.161) - 11 January 2023
+
+#### :rocket: New Features
+
+- feat: add Download full dataset text to Dataset View [ionlizarazu - [`9f2e55b`](https://github.com/eea/volto-clms-theme/commit/9f2e55b12aa553c47ee770f727947004e65540e4)]
+- feat: add FAQ to filters [ionlizarazu - [`934b771`](https://github.com/eea/volto-clms-theme/commit/934b771c7beb197b142407c72a582464e75faf2c)]
+
+#### :bug: Bug Fixes
+
+- fix:slugify profile tabs ids [ionlizarazu - [`6a736a1`](https://github.com/eea/volto-clms-theme/commit/6a736a1972e74ddc0d4ef2a814b9b2a4f8adbad0)]
+
+#### :hammer_and_wrench: Others
+
+- CLMS-1624 picture for prepackages files [Unai - [`302c527`](https://github.com/eea/volto-clms-theme/commit/302c527afebb3a53305f1b30e923b693bc50a1f8)]
+- use cases bug fix [Unai - [`73ba75b`](https://github.com/eea/volto-clms-theme/commit/73ba75bb5d225dde1c3e1982d35efeac0a4c3ff5)]
+- Update README.md [UnaiEtxaburu - [`07a2c59`](https://github.com/eea/volto-clms-theme/commit/07a2c59dcc438b82462b1ca0b3c3a025a0f76842)]
+### [1.0.160](https://github.com/eea/volto-clms-theme/compare/1.0.159...1.0.160) - 23 December 2022
+
 ### [1.0.159](https://github.com/eea/volto-clms-theme/compare/1.0.158...1.0.159) - 22 December 2022
 
 #### :hammer_and_wrench: Others
@@ -629,7 +647,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - related products and datasets added to news and meeting views and login-plone route created [Unai - [`5704a1a`](https://github.com/eea/volto-clms-theme/commit/5704a1a766148746162b60efaf232ea90dc20cf4)]
-- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`46eb694`](https://github.com/eea/volto-clms-theme/commit/46eb69415280a3c982405299135027ae4221426a)]
 - sort items according to the lowercased label and put those with special meaning at the end [Mikel Larreategi - [`6410abe`](https://github.com/eea/volto-clms-theme/commit/6410abe096f60dcad54dced2026c9df9b7946d68)]
 - lint fix [Unai - [`1264a7a`](https://github.com/eea/volto-clms-theme/commit/1264a7adfe8d679fea1bd821ad087add20f4271d)]
 - footer newsletter subscription change, global search maxLength change from 8000 to 200 and /login design change [Unai - [`a09d24a`](https://github.com/eea/volto-clms-theme/commit/a09d24adbb6fa053fb2a2cc0071506b906593b42)]
@@ -780,7 +797,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - search block new features [ionlizarazu - [`8e814cb`](https://github.com/eea/volto-clms-theme/commit/8e814cbd359782540c21fe37b37ef146d331f0d6)]
 - language selector cookie management [ionlizarazu - [`1385ac9`](https://github.com/eea/volto-clms-theme/commit/1385ac95795702206d3623ba6e780faa43a89e0a)]
 - toolbar cookie management [ionlizarazu - [`5c23200`](https://github.com/eea/volto-clms-theme/commit/5c23200790b20e1d4f1bc966463c37bf4c808f47)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0316a0d`](https://github.com/eea/volto-clms-theme/commit/0316a0d8b6fb0fa14af13002415f3c95d9f8ede3)]
 ### [1.0.84](https://github.com/eea/volto-clms-theme/compare/1.0.83...1.0.84) - 18 March 2022
 
 #### :hammer_and_wrench: Others
@@ -1685,13 +1701,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - replace @collective/volto-dropdownmenu with volto-dropdownmenu [ionlizarazu - [`07f004f`](https://github.com/eea/volto-clms-theme/commit/07f004fe0219e403fb51bc045c83d34f3b981f76)]
-- yarn.lock [ionlizarazu - [`fe1ca04`](https://github.com/eea/volto-clms-theme/commit/fe1ca04889d29fe7b653db4c69af2751b84b8a1a)]
 - add NODE_ENV parameter [ionlizarazu - [`101f27c`](https://github.com/eea/volto-clms-theme/commit/101f27c25b8fbd192e1b11865e95cf5ffee08c1b)]
 - upgrade volto-dropdownmenu version [ionlizarazu - [`2081855`](https://github.com/eea/volto-clms-theme/commit/2081855301f4c708776e0dbab39db143cee00dbc)]
 - HomeSearch block missing url behaviour [ionlizarazu - [`d20a378`](https://github.com/eea/volto-clms-theme/commit/d20a378ce3f254b8343692348f314bf281974542)]
 - babel configuration [ionlizarazu - [`203ea2d`](https://github.com/eea/volto-clms-theme/commit/203ea2de07f99ca3403e4ca220ca74d7ce69b61d)]
 - prettier [ionlizarazu - [`e79e26b`](https://github.com/eea/volto-clms-theme/commit/e79e26bf2fa40ba7b4eb53a24dabd87928221c28)]
-- add yarn lock [ionlizarazu - [`e1ab28b`](https://github.com/eea/volto-clms-theme/commit/e1ab28b060d5a74431c368b0de82a68dabce1eab)]
 - Jenkinsfile cypress test [ionlizarazu - [`b385d65`](https://github.com/eea/volto-clms-theme/commit/b385d65986f717c60f8c434a08fc11b829d08eb4)]
 - cypress [ionlizarazu - [`a243cf0`](https://github.com/eea/volto-clms-theme/commit/a243cf0182fa3dd113c16ff495c71e310252d83b)]
 - some fixes [ionlizarazu - [`046279b`](https://github.com/eea/volto-clms-theme/commit/046279b9d05bea8a64eca03eed493e02621534c9)]

package/README.md

@@ -53,6 +53,17 @@
 
 1. Happy editing!
 
+## Things to keep in mind before migrating to Volto 16
+1. Remove the volto-slate override. This override is a patch to clean up duplicate SlateContextToolbar buttons. This is not necessary in Volto 16.
+
+   ````bash
+   rm -rf src/customizations/volto-slate
+   ````
+2. Remove ArrayWidget override. https://github.com/eea/volto-clms-theme/commit/7cf72aba7b1d69cf1b310a89410aa3a3753f01f3
+
+   ````bash
+   rm -rf src/customizations/volto/components/manage/Widgets/ArrayWidget.jsx
+   ````
 ## Release
 
 ### Automatic release using Jenkins

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.159",
+  "version": "1.0.161",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/rewriteOptions.js

@@ -8,6 +8,7 @@ export const portal_types_labels = {
   Tender: 'Tender',
   TechnicalLibrary: 'Product documentation',
   Document: 'Other content',
+  FAQ: 'FAQ',
 };
 
 export const category_labels = {
@@ -50,6 +51,7 @@ const rewriteOptions = (name, choices) => {
     'Tender',
     'WorkOpportunity',
     'Document',
+    'FAQ',
   ];
 
   const dataset_geographical_classification = [

package/src/components/CLMSDatasetDetailView/CLMSDatasetDetailView.jsx

@@ -64,11 +64,13 @@ const CLMSDatasetDetailView = ({ content, token }) => {
   const [open, setOpen] = React.useState({});
   const locale = useSelector((state) => state.intl.locale);
 
-  const isAuxiliary = content.mapviewer_viewservice
-    .toLowerCase()
-    .startsWith(
-      'https://trial.discomap.eea.europa.eu/arcgis/services/clms/worldcountries/mapserver/wmsserver',
-    );
+  const isAuxiliary = content?.mapviewer_viewservice
+    ? content?.mapviewer_viewservice
+        .toLowerCase()
+        .startsWith(
+          'https://trial.discomap.eea.europa.eu/arcgis/services/clms/worldcountries/mapserver/wmsserver',
+        )
+    : false;
 
   return (
     <div className="ccl-container ">

package/src/components/CLMSDatasetDetailView/DownloadDataSetContent.jsx

@@ -6,6 +6,7 @@ import { useLocation } from 'react-router-dom';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 import CclDownloadTable from '@eeacms/volto-clms-theme/components/CclDownloadTable/CclDownloadTable';
 import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
+import { UniversalLink } from '@plone/volto/components';
 
 const DownloadDataSetContent = (data, token) => {
   const location = useLocation();
@@ -53,6 +54,17 @@ const DownloadDataSetContent = (data, token) => {
               )}
             />
           )}
+          <br />
+          <br />
+          <br />
+          <h2>Download full dataset</h2>
+          <p>
+            If you want to download the full dataset, click{' '}
+            <UniversalLink href="/en/how-to-guides/how-to-download-spatial-data/how-to-download-m2m">
+              here
+            </UniversalLink>{' '}
+            to learn more
+          </p>
           {/* {data.token === '' ? (
             <CclButton
               url={location.pathname + '/download-by-area'}

package/src/components/CLMSProfileView/CLMSApiTokensView.jsx

@@ -2,24 +2,33 @@
  * CLMSProfileView container.
  * @module components/CLMSProfileView/CLMSProfileView
  */
-
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+import { defineMessages, injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import qs from 'query-string';
 import { compose } from 'redux';
-import { defineMessages, injectIntl } from 'react-intl';
-import jwtDecode from 'jwt-decode';
+import { Container } from 'semantic-ui-react';
+
 import { getUser, updateUser } from '@plone/volto/actions';
 import { getBaseUrl } from '@plone/volto/helpers';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
-import { Container } from 'semantic-ui-react';
 import CclModal from '@eeacms/volto-clms-theme/components/CclModal/CclModal';
+
 import {
   getTokens,
   createTokens,
   deleteTokens,
 } from '../../actions/tokens/tokens';
+import { slugify } from '../Blocks/utils';
+
+import jwtDecode from 'jwt-decode';
+import PropTypes from 'prop-types';
+import qs from 'query-string';
+
+/**
+ * CLMSProfileView class.
+ * @class CLMSProfileView
+ * @extends Component
+ */
 
 const messages = defineMessages({
   ApiTokens: {
@@ -91,11 +100,6 @@ const messages = defineMessages({
   },
 });
 
-/**
- * CLMSProfileView class.
- * @class CLMSProfileView
- * @extends Component
- */
 class CLMSApiTokensView extends Component {
   /**
    * Property types.
@@ -271,7 +275,12 @@ class CLMSApiTokensView extends Component {
                     <CclModal
                       onClick={() => this.onClose}
                       trigger={
-                        <CclButton mode={'filled'} to="profile#API-tokens">
+                        <CclButton
+                          mode={'filled'}
+                          to={`profile#${slugify(
+                            this.props.intl.formatMessage(messages.ApiTokens),
+                          )}`}
+                        >
                           {this.props.intl.formatMessage(messages.deleteButton)}
                         </CclButton>
                       }
@@ -284,7 +293,9 @@ class CLMSApiTokensView extends Component {
                       </p>
                       <CclButton
                         mode={'filled'}
-                        to="profile#API-tokens"
+                        to={`profile#${slugify(
+                          this.props.intl.formatMessage(messages.ApiTokens),
+                        )}`}
                         onClick={() => {
                           this.deleteToken(item.key_id);
                         }}
@@ -301,7 +312,9 @@ class CLMSApiTokensView extends Component {
                 <CclButton
                   mode={'filled'}
                   onClick={this.handleClick}
-                  to="profile#API-tokens"
+                  to={`profile#${slugify(
+                    this.props.intl.formatMessage(messages.ApiTokens),
+                  )}`}
                 >
                   {this.props.intl.formatMessage(messages.createTitle)}
                 </CclButton>
@@ -310,7 +323,12 @@ class CLMSApiTokensView extends Component {
                 <CclModal
                   onClick={() => this.onClose}
                   trigger={
-                    <CclButton mode={'filled'} to="profile#API-tokens">
+                    <CclButton
+                      mode={'filled'}
+                      to={`profile#${slugify(
+                        this.props.intl.formatMessage(messages.ApiTokens),
+                      )}`}
+                    >
                       {this.props.intl.formatMessage(messages.createTitle)}
                     </CclButton>
                   }
@@ -402,7 +420,11 @@ class CLMSApiTokensView extends Component {
                                       <br />
                                       <CclButton
                                         mode={'filled'}
-                                        to="profile#API-tokens"
+                                        to={`profile#${slugify(
+                                          this.props.intl.formatMessage(
+                                            messages.ApiTokens,
+                                          ),
+                                        )}`}
                                         onClick={() => {
                                           navigator.clipboard.writeText(
                                             JSON.stringify(item),
@@ -423,7 +445,11 @@ class CLMSApiTokensView extends Component {
                             <CclButton
                               mode={'filled'}
                               onClick={this.onClose}
-                              to="profile#API-tokens"
+                              to={`profile#${slugify(
+                                this.props.intl.formatMessage(
+                                  messages.ApiTokens,
+                                ),
+                              )}`}
                             >
                               {this.props.intl.formatMessage(
                                 messages.goBackButton,

package/src/components/CLMSProfileView/CLMSDeleteProfileView.jsx

@@ -56,7 +56,7 @@ export const CLMSDeleteProfileView = (props) => {
             }}
             open={open['delete-profile']}
             trigger={
-              <CclButton mode={'filled'} to="profile#Delete-profile">
+              <CclButton mode={'filled'} to="profile#delete_profile">
                 <FormattedMessage
                   id="Delete my account"
                   defaultMessage="Delete my account"
@@ -100,7 +100,7 @@ export const CLMSDeleteProfileView = (props) => {
                       setOpen({ ...open, 'delete-profile': false });
                     }}
                     mode="filled"
-                    to="profile#Delete-profile"
+                    to="profile#delete_profile"
                   >
                     <FormattedMessage
                       id="Yes, I want to delete my account"
@@ -112,7 +112,7 @@ export const CLMSDeleteProfileView = (props) => {
                       setOpen({ ...open, 'delete-profile': false });
                     }}
                     mode="filled"
-                    to="profile#Delete-profile"
+                    to="profile#delete_profile"
                   >
                     <FormattedMessage
                       id="No, I want to keep my account"

package/src/components/CLMSUseCasesView/CLMSUseCasesView.jsx

@@ -74,7 +74,7 @@ const CLMSUseCaseView = (props) => {
                 ))}
               </List>
             )}
-            <p>
+            <div className="usecase-list">
               <List celled horizontal className="usecase-other-values-list">
                 <List.Item>
                   {content?.submittingProducionYear && (
@@ -100,7 +100,7 @@ const CLMSUseCaseView = (props) => {
                   )}
                 </List.Item>
               </List>
-            </p>
+            </div>
             <div className="usecase-body-text">
               {content?.text && <StringToHTML string={content?.text?.data} />}
             </div>

package/src/components/CLMSUseCasesView/usecases.less

@@ -19,3 +19,7 @@ div.ui.celled.list span.usecase-year {
 div.usecase-body-text {
   padding-left: 0.5em;
 }
+
+.usecase-list {
+  margin-bottom: 1rem;
+}

package/src/components/CclDownloadTable/CclDownloadTable.jsx

@@ -1,5 +1,7 @@
-import './download-table.less';
-
+import React, { useState } from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+import { useSelector } from 'react-redux';
+import { toast } from 'react-toastify';
 import {
   Button,
   Checkbox,
@@ -7,19 +9,26 @@ import {
   Pagination,
   Segment,
 } from 'semantic-ui-react';
-import React, { useState } from 'react';
 
-import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 import { Icon, Toast } from '@plone/volto/components';
-import PropTypes from 'prop-types';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import paginationLeftSVG from '@plone/volto/icons/left-key.svg';
 import paginationRightSVG from '@plone/volto/icons/right-key.svg';
-import useCartState from '@eeacms/volto-clms-utils/cart/useCartState';
-import { useSelector } from 'react-redux';
+import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
+import CclModal from '@eeacms/volto-clms-theme/components/CclModal/CclModal';
 import { StringToHTML } from '@eeacms/volto-clms-theme/components/CclUtils';
-import { toast } from 'react-toastify';
-import { defineMessages, useIntl } from 'react-intl';
+import useCartState from '@eeacms/volto-clms-utils/cart/useCartState';
+import PlaceHolder from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-thumbnail-placeholder.jpg';
+
+import './download-table.less';
+
+import PropTypes from 'prop-types';
+
+/**
+ * Property types.
+ * @property {Object} propTypes Property types.
+ * @static
+ */
 
 function CclDownloadTable(props) {
   const locale = useSelector((state) => state.intl?.locale);
@@ -47,6 +56,10 @@ function CclDownloadTable(props) {
     },
   );
 
+  const prepackage_grid = props.dataset['@id'].split('products');
+  const prepackage_grid_image =
+    prepackage_grid[0] + 'products/prepackages-grid.png/@@images/image';
+
   const messages = defineMessages({
     added_to_cart: {
       id: 'Added to cart',
@@ -56,6 +69,10 @@ function CclDownloadTable(props) {
       id: 'Success',
       defaultMessage: 'Success',
     },
+    prePackages_location_map: {
+      id: 'Click to open pre-packages location map',
+      defaultMessage: 'Click to open pre-packages location map',
+    },
   });
 
   React.useEffect(() => {
@@ -227,6 +244,7 @@ function CclDownloadTable(props) {
     hasSome('size'),
   ];
   const validcolums = columns.some((column) => !!column);
+
   return (
     prePackagedCollection.length > 0 &&
     validcolums &&
@@ -271,6 +289,27 @@ function CclDownloadTable(props) {
                   </Button>
                 </>
               )}
+              {props.dataset.show_legend_on_prepackages && (
+                <CclModal
+                  trigger={
+                    <CclButton to="#download">
+                      {intl.formatMessage(messages.prePackages_location_map)}
+                    </CclButton>
+                  }
+                  size={'medium'}
+                >
+                  <div className="image-modal">
+                    <img
+                      src={
+                        prepackage_grid_image
+                          ? prepackage_grid_image
+                          : PlaceHolder
+                      }
+                      alt={'Placeholder'}
+                    />
+                  </div>
+                </CclModal>
+              )}
               {cartSelection.length !== prePackagedCollection.length && (
                 <>
                   <br />
@@ -407,11 +446,6 @@ function CclDownloadTable(props) {
   );
 }
 
-/**
- * Property types.
- * @property {Object} propTypes Property types.
- * @static
- */
 CclDownloadTable.propTypes = {
   type: PropTypes.string,
   dataset: PropTypes.shape({

package/src/components/CclDownloadTable/download-table.less

@@ -53,3 +53,7 @@
 .custom-table .ui.dropdown .menu .selected.item {
   color: #a0b128;
 }
+
+.image-modal img {
+  width: 100%;
+}

package/src/customizations/volto-slate/editor/ui/InlineToolbar.jsx

@@ -0,0 +1,73 @@
+import React from 'react'; // , useState
+import SlateToolbar from 'volto-slate/editor/ui/SlateToolbar';
+import SlateContextToolbar from 'volto-slate/editor/ui/SlateContextToolbar';
+import config from '@plone/volto/registry';
+import { hasRangeSelection } from 'volto-slate/utils';
+import { ReactEditor } from 'slate-react';
+import cx from 'classnames';
+
+/**
+ * The main Slate toolbar. All the others are just wrappers, UI or used here
+ * This override is a patch to clean up duplicate SlateContextToolbar buttons. This is not necessary in Volto 16.
+ */
+const InlineToolbar = (props) => {
+  const {
+    editor,
+    className,
+    showExpandedToolbar,
+    setShowExpandedToolbar,
+  } = props;
+
+  const { slate } = config.settings;
+  const [showMainToolbar, setShowMainToolbar] = React.useState(
+    !!(editor.selection && hasRangeSelection(editor)),
+  );
+
+  React.useEffect(() => {
+    let el;
+    try {
+      el = ReactEditor.toDOMNode(editor, editor);
+    } catch {
+      return;
+    }
+    const toggleToolbar = () => {
+      const selection = window.getSelection();
+      const { activeElement } = window.document;
+      if (activeElement !== el) return;
+      if (!selection.isCollapsed && !showMainToolbar) {
+        setShowMainToolbar(true);
+      } else if (selection.isCollapsed && showMainToolbar) {
+        setShowMainToolbar(false);
+      }
+    };
+    window.document.addEventListener('selectionchange', toggleToolbar);
+    return () => document.removeEventListener('selectionchange', toggleToolbar);
+  }, [editor, showMainToolbar]);
+
+  const showContextToolbar =
+    slate.contextToolbarButtons.map((plug) => plug(editor)).filter((c) => !!c)
+      .length > 0;
+  return (
+    <>
+      <SlateToolbar
+        className={cx(className, {
+          upper: showContextToolbar,
+        })}
+        selected={true}
+        enableExpando={slate.enableExpandedToolbar}
+        showExpandedToolbar={showExpandedToolbar}
+        setShowExpandedToolbar={setShowExpandedToolbar}
+        show={showMainToolbar}
+      />
+      <SlateContextToolbar
+        editor={editor}
+        plugins={slate.contextToolbarButtons.filter((obj, pos, arr) => {
+          return arr.map((mapObj) => mapObj.name).indexOf(obj.name) === pos;
+        })}
+        show={showContextToolbar}
+      />
+    </>
+  );
+};
+
+export default InlineToolbar;