@eeacms/volto-clms-theme 1.1.32 → 1.1.33

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.1.33](https://github.com/eea/volto-clms-theme/compare/1.1.32...1.1.33) - 22 August 2023
+
+#### :hammer_and_wrench: Others
+
+- use  aprovider with a store [Mikel Larreategi - [`f10c230`](https://github.com/eea/volto-clms-theme/commit/f10c230c7b4548f94488aa610e98d2bd812136f5)]
+- use a provider [Mikel Larreategi - [`a5b7b02`](https://github.com/eea/volto-clms-theme/commit/a5b7b02c222128bb4ace31b10069989f81391efa)]
+- missing context [Mikel Larreategi - [`926177e`](https://github.com/eea/volto-clms-theme/commit/926177e1caadf52578eef6f390a1b565f4a83d96)]
+- show the new field [Mikel Larreategi - [`1ef84d5`](https://github.com/eea/volto-clms-theme/commit/1ef84d5ac96876dd0e0ad36ae676b98bb1d53e57)]
+- use simple links [Mikel Larreategi - [`d755715`](https://github.com/eea/volto-clms-theme/commit/d755715e3004a01085d85ed82e773d959ddb3ca9)]
+- new field [Mikel Larreategi - [`e80a61b`](https://github.com/eea/volto-clms-theme/commit/e80a61be206b99d56992f581b5f7adb2d8444f3e)]
+- add links [Mikel Larreategi - [`aa273a0`](https://github.com/eea/volto-clms-theme/commit/aa273a0655de622c237e3f16925d588d4bcbc98d)]
+- CLMS-2481 rename sorting index names [Mikel Larreategi - [`93ddba7`](https://github.com/eea/volto-clms-theme/commit/93ddba7aaf4fc4ce4acea036163d210096e60aba)]
 ### [1.1.32](https://github.com/eea/volto-clms-theme/compare/1.1.31...1.1.32) - 21 August 2023
 
 #### :hammer_and_wrench: Others
@@ -90,7 +102,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - remove NUTS text for area naming in the cart [ionlizarazu - [`062e0a3`](https://github.com/eea/volto-clms-theme/commit/062e0a375f5352bc13c18ff7ec33fad4bcc59f2f)]
 - dependencies [ionlizarazu - [`405ef96`](https://github.com/eea/volto-clms-theme/commit/405ef96090fe7bd4af73a49d3285a92fad712e3b)]
-- yarn.lock [ionlizarazu - [`7132119`](https://github.com/eea/volto-clms-theme/commit/71321195c4dd4fceed67f2f0872f3e24bba61c17)]
 - volto-blocks-grid module mapping [ionlizarazu - [`4fec3ca`](https://github.com/eea/volto-clms-theme/commit/4fec3cabc437322ad92ed90d682250bd123ccaaf)]
 - volto-blocks-grid v7.0.2 [ionlizarazu - [`2557e60`](https://github.com/eea/volto-clms-theme/commit/2557e6039d3cea33ca0bd11a0a3ef4764c611f78)]
 - remove styling from teaser block [ionlizarazu - [`879e684`](https://github.com/eea/volto-clms-theme/commit/879e684057c88f52f60f0fa54cbaa155c7d14688)]
@@ -178,7 +189,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`b4cbf65`](https://github.com/eea/volto-clms-theme/commit/b4cbf6557fbc67f7fc4cea5aa2cb19804f3d7e3c)]
 
 #### :hammer_and_wrench: Others
 
@@ -1377,7 +1387,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)]
@@ -1528,7 +1537,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
@@ -2433,13 +2441,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "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/RightModalFacets.jsx

@@ -58,6 +58,7 @@ const RightModalFacets = (props) => {
   const { showSearchButton } = data;
   const isLive = !showSearchButton;
   const intl = useIntl();
+  // Should we generalize this to an external function?
   if (querystring?.sortable_indexes?.effective?.title) {
     querystring.sortable_indexes.effective.title = 'Publication date';
   }
@@ -67,6 +68,13 @@ const RightModalFacets = (props) => {
   if (querystring?.sortable_indexes?.modified?.title) {
     querystring.sortable_indexes.modified.title = 'Last edited';
   }
+  if (querystring?.sortable_indexes?.publication_date?.title) {
+    querystring.sortable_indexes.publication_date.title = 'Publication date';
+  }
+  if (querystring?.sortable_indexes?.version?.title) {
+    querystring.sortable_indexes.version.title = 'Version';
+  }
+
   return (
     <Grid className="searchBlock-facets right-column-facets" stackable>
       {data?.headline && (

package/src/components/CclCard/CclCard.jsx

@@ -1,13 +1,11 @@
-import React from 'react';
+import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
-import { Label } from 'semantic-ui-react';
-import { Icon } from 'semantic-ui-react';
+import { Icon, Label } from 'semantic-ui-react';
 
-import { Icon as VoltoIcon } from '@plone/volto/components';
-import { UniversalLink } from '@plone/volto/components';
-import penSVG from '@plone/volto/icons/pen.svg';
 import PlaceHolder from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-thumbnail-placeholder.jpg';
 import { cclDateFormat } from '@eeacms/volto-clms-theme/components/CclUtils';
+import { UniversalLink, Icon as VoltoIcon } from '@plone/volto/components';
+import penSVG from '@plone/volto/icons/pen.svg';
 // import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
 import { When } from '@eeacms/volto-clms-theme/components/CclWhen/CclWhen';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -15,6 +13,8 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { portal_types_labels } from '../Blocks/CustomTemplates/VoltoSearchBlock';
 
 import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
 
 const CardImage = ({ card, size = 'preview', isCustomCard }) => {
   return card?.image_field ? (
@@ -148,6 +148,9 @@ function CclCard(props) {
       ? 'line card-line-no-description'
       : type || 'line');
 
+  const locale = useSelector((state) => state.intl.locale);
+  const isLoggedIn = useSelector((state) => state.userSession?.token);
+
   return (
     <CardLink
       url={url}
@@ -338,6 +341,60 @@ function CclCard(props) {
                 <div className="card-description">{card?.description}</div>
               )}
               {children}
+
+              <div className="card-doc-extrametadata">
+                {card?.['@type'] === 'DataSet' && (
+                  <>
+                    <br />
+                    <Link to={'/' + locale + '/map-viewer?dataset=' + card.UID}>
+                      <FormattedMessage
+                        id="View in the data viewer"
+                        defaultMessage="View in the data viewer"
+                      />
+                    </Link>
+                    &nbsp; &nbsp; &nbsp;
+                  </>
+                )}
+
+                {card?.['@type'] === 'DataSet' && isLoggedIn && (
+                  <>
+                    <Link to={`${card['@id']}#download`}>
+                      <FormattedMessage
+                        id="Download"
+                        defaultMessage="Download"
+                      />
+                    </Link>
+                    &nbsp; &nbsp; &nbsp;
+                  </>
+                )}
+
+                {card?.['@type'] === 'DataSet' && !isLoggedIn && (
+                  <>
+                    <CclLoginModal
+                      otherPath={`${card['@id']}#download`}
+                      triggerComponent={() => (
+                        // eslint-disable-next-line jsx-a11y/anchor-is-valid
+                        <Link>
+                          <FormattedMessage
+                            id="Download"
+                            defaultMessage="Download"
+                          />
+                        </Link>
+                      )}
+                    />
+                    &nbsp; &nbsp; &nbsp;
+                  </>
+                )}
+
+                {card?.['@type'] === 'DataSet' && (
+                  <Link to={card['@id']}>
+                    <FormattedMessage
+                      id="View more"
+                      defaultMessage="View more"
+                    />
+                  </Link>
+                )}
+              </div>
             </div>
           </>
         )}

package/src/components/CclCard/CclCard.test.jsx

@@ -13,6 +13,9 @@ describe('CclCard', () => {
       create: {},
       data: {},
     },
+    userSession: {
+      token: 'xxxxx',
+    },
     intl: {
       locale: 'en',
       messages: {},
@@ -80,11 +83,13 @@ describe('CclCard', () => {
   it('Check news card', () => {
     const cardtest = renderer
       .create(
-        <MemoryRouter>
-          <CclCard type="news" card={card}>
-            <p>News card test</p>
-          </CclCard>
-        </MemoryRouter>,
+        <Provider store={store}>
+          <MemoryRouter>
+            <CclCard type="news" card={card}>
+              <p>News card test</p>
+            </CclCard>
+          </MemoryRouter>
+        </Provider>,
       )
       .toJSON();
     expect(cardtest).toBeDefined();
@@ -92,11 +97,13 @@ describe('CclCard', () => {
   it('Check three collumns card', () => {
     const cardtest = renderer
       .create(
-        <MemoryRouter>
-          <CclCard type="threeColumns" card={card}>
-            <p>threeColumns card test</p>
-          </CclCard>
-        </MemoryRouter>,
+        <Provider store={store}>
+          <MemoryRouter>
+            <CclCard type="threeColumns" card={card}>
+              <p>threeColumns card test</p>
+            </CclCard>
+          </MemoryRouter>
+        </Provider>,
       )
       .toJSON();
     expect(cardtest).toBeDefined();
@@ -104,11 +111,13 @@ describe('CclCard', () => {
   it('Check block card', () => {
     const cardtest = renderer
       .create(
-        <MemoryRouter>
-          <CclCard type="block" card={card}>
-            <p>Block card test</p>
-          </CclCard>
-        </MemoryRouter>,
+        <Provider store={store}>
+          <MemoryRouter>
+            <CclCard type="block" card={card}>
+              <p>Block card test</p>
+            </CclCard>
+          </MemoryRouter>
+        </Provider>,
       )
       .toJSON();
     expect(cardtest).toBeDefined();
@@ -116,11 +125,13 @@ describe('CclCard', () => {
   it('Check default card', () => {
     const cardtest = renderer
       .create(
-        <MemoryRouter>
-          <CclCard card={card}>
-            <p>Line card test</p>
-          </CclCard>
-        </MemoryRouter>,
+        <Provider store={store}>
+          <MemoryRouter>
+            <CclCard card={card}>
+              <p>Line card test</p>
+            </CclCard>
+          </MemoryRouter>
+        </Provider>,
       )
       .toJSON();
     expect(cardtest).toBeDefined();
@@ -128,9 +139,11 @@ describe('CclCard', () => {
   it('Check default values', () => {
     const card = renderer
       .create(
-        <MemoryRouter>
-          <CclCard />
-        </MemoryRouter>,
+        <Provider store={store}>
+          <MemoryRouter>
+            <CclCard />
+          </MemoryRouter>
+        </Provider>,
       )
       .toJSON();
     expect(card).toBeDefined();

package/src/components/Widgets/MapLayersWidget.jsx

@@ -34,6 +34,13 @@ const ItemSchema = {
       type: 'string',
       default: '',
     },
+    filter_static_legend_url: {
+      title: 'URL to static image legend used in filters',
+      description:
+        'If it is filled, the legend shown on the map when using filters will be the image behind the URL',
+      type: 'string',
+      default: '',
+    },
     fields: {
       title: 'Fields to be shown in the mapviewer',
       description: 'Enter the JSON representing the fields',
@@ -51,6 +58,7 @@ const ItemSchema = {
         'default_active',
         'hide',
         'static_legend_url',
+        'filter_static_legend_url',
         'fields',
       ],
     },