@eeacms/volto-clms-theme 1.0.119 → 1.0.122

package/CHANGELOG.md

@@ -4,6 +4,74 @@ 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.122](https://github.com/eea/volto-clms-theme/compare/1.0.121...1.0.122) - 12 September 2022
+
+#### :rocket: New Features
+
+- feat: show effective, but if there is no effective, show the creation date [Mikel Larreategi - [`a5fcda7`](https://github.com/eea/volto-clms-theme/commit/a5fcda7fdeee90958332b1ecd67815f6c7acebae)]
+
+#### :bug: Bug Fixes
+
+- fix: dataset view loaded when accessing from catalogue [Unai - [`75a311b`](https://github.com/eea/volto-clms-theme/commit/75a311bbb38edd754421ea59ae421789db14a389)]
+- fix: technnical library searched in main dataset page [Unai - [`d6c9f92`](https://github.com/eea/volto-clms-theme/commit/d6c9f925018d1209569564ac92c7ebcbca43a08b)]
+- fix: external url opens in new tab [Unai - [`89f6db0`](https://github.com/eea/volto-clms-theme/commit/89f6db08b8a38f535469f293c9eaf5720968b5d3)]
+- fix: error on image widget fixed [Unai - [`9c56bf8`](https://github.com/eea/volto-clms-theme/commit/9c56bf86a023b97744b8cdcce3c032c434947563)]
+- fix: CLMS-1158 sort gement vocabulary alphabetically with lowercase [Mikel Larreategi - [`195d7d2`](https://github.com/eea/volto-clms-theme/commit/195d7d22d2ebd816612022f720c99dee31116307)]
+
+#### :hammer_and_wrench: Others
+
+- fix typo [Mikel Larreategi - [`21352f9`](https://github.com/eea/volto-clms-theme/commit/21352f97672beda66b626ae00614d2437a7d37ad)]
+- fix typo [Mikel Larreategi - [`dcac8e4`](https://github.com/eea/volto-clms-theme/commit/dcac8e4377ef6d2035b22ff21141259e440eabda)]
+- ESLint fix [rodriama - [`176abac`](https://github.com/eea/volto-clms-theme/commit/176abac31f7bb32024d7538655d418654a78ad49)]
+- ESLint fix [rodriama - [`5931a21`](https://github.com/eea/volto-clms-theme/commit/5931a21ebfbcdbc09d0e325acfa3dff4c60d93e7)]
+- Carousel text link width [rodriama - [`744a222`](https://github.com/eea/volto-clms-theme/commit/744a222ef381062a9bc62394ef9f5b3037d19533)]
+- Pre-packaged and cart table styles [rodriama - [`7997b90`](https://github.com/eea/volto-clms-theme/commit/7997b90146423b976ba7939fda37458b561b0cc9)]
+- Pre-package message styles [rodriama - [`36ca58f`](https://github.com/eea/volto-clms-theme/commit/36ca58f5d210dda93b3d0ffe27bf0a816871c926)]
+- li bullet [rodriama - [`5395ea9`](https://github.com/eea/volto-clms-theme/commit/5395ea940f1dcd3512d08fc961a0207eea2baddb)]
+- Revert "Revert "refactor(widget): changed used widget in datetime cases"" [Mikel Larreategi - [`f2a0399`](https://github.com/eea/volto-clms-theme/commit/f2a03991691db758b568e58cc6abb9fa196fcbb1)]
+- Revert "Revert "refactor(meeting): changed from Meeting Registration to Event Registration"" [Mikel Larreategi - [`cb56508`](https://github.com/eea/volto-clms-theme/commit/cb56508a9eff001226e85e78674d2b2ef9b537df)]
+- Revert "Revert "refactor(news events and datasets): remove related datasets and product accordions from news and events and replaced image scale used in datasets"" [Mikel Larreategi - [`cb35423`](https://github.com/eea/volto-clms-theme/commit/cb354230d1aca5e62acbce62f0ce2a5df7c02be9)]
+- Revert "Revert "new version of volto-form-block and modifications to add links to checkbox description"" [Mikel Larreategi - [`33a222a`](https://github.com/eea/volto-clms-theme/commit/33a222a38d74c95e8c706fce69a0334cf3c4f4e6)]
+- Revert "Revert "fix: CLMS-1067"" [Mikel Larreategi - [`a790c1f`](https://github.com/eea/volto-clms-theme/commit/a790c1f6f3fb9e18666ad1e2b53fad7e86c7c0e0)]
+- Revert "Revert "fix: display the dropdown above the footer"" [Mikel Larreategi - [`f436e66`](https://github.com/eea/volto-clms-theme/commit/f436e66b58070f7f3c59ae22968b032fbc72b690)]
+- bugfixes [ionlizarazu - [`a2d3ba0`](https://github.com/eea/volto-clms-theme/commit/a2d3ba044a21ca6d1c8f2af8a8b4889477c994c5)]
+- bugfixes [ionlizarazu - [`0e2e7f7`](https://github.com/eea/volto-clms-theme/commit/0e2e7f738adae529217562cb11872cb12d1530bd)]
+### [1.0.121](https://github.com/eea/volto-clms-theme/compare/1.0.120...1.0.121) - 5 September 2022
+
+#### :bug: Bug Fixes
+
+- fix: CLMS-1224 this file should be removed with volto-16 [Unai - [`7cf72ab`](https://github.com/eea/volto-clms-theme/commit/7cf72aba7b1d69cf1b310a89410aa3a3753f01f3)]
+- fix:lint problems [Unai - [`4e8b9dc`](https://github.com/eea/volto-clms-theme/commit/4e8b9dc6c3cb6813baeb4b75fea5afb1198d9640)]
+- fix: not count children filters on checboxParentFacets [ionlizarazu - [`4b21b1c`](https://github.com/eea/volto-clms-theme/commit/4b21b1c3337e132248ad1ada6a9bf268c5332579)]
+- fix: related use cases [Unai - [`381af05`](https://github.com/eea/volto-clms-theme/commit/381af058fe7484805e5175600b40cd80d52d2c9e)]
+- fix: changed data resource abstract with overview [Unai - [`c630b7e`](https://github.com/eea/volto-clms-theme/commit/c630b7e6a6e093319473554a4a724fd320783f2d)]
+- fix:redirect to download from map viewer when necesary [Unai - [`9ad9d78`](https://github.com/eea/volto-clms-theme/commit/9ad9d78e7e7b946c34da20d7edea2d68c7cd6fe5)]
+- fix: file card modified to show effective date [Unai - [`b2467e7`](https://github.com/eea/volto-clms-theme/commit/b2467e7a3a813871811388e92b308aea62aa688c)]
+- fix:technical documents on datasets general info view [Unai - [`532cf09`](https://github.com/eea/volto-clms-theme/commit/532cf094933c9d0ba1b9fa77609555621645972a)]
+- fix:carousel link open in new tab [Unai - [`bcc39a5`](https://github.com/eea/volto-clms-theme/commit/bcc39a5b921fee81a653743afd1f219a79c4748f)]
+
+#### :nail_care: Enhancements
+
+- refactor: removed overview title from dataset [Unai - [`e08ff03`](https://github.com/eea/volto-clms-theme/commit/e08ff0348e2a371b033206e3e66f900f09edd443)]
+
+#### :hammer_and_wrench: Others
+
+- merge sprint-31 branch [Mikel Larreategi - [`617b5d2`](https://github.com/eea/volto-clms-theme/commit/617b5d25a17cdd264b017a8440d3c4c1c9e283bd)]
+- rename variable [ionlizarazu - [`7b4c537`](https://github.com/eea/volto-clms-theme/commit/7b4c53783e4bbe676ee6e7982610b191a9b40532)]
+### [1.0.120](https://github.com/eea/volto-clms-theme/compare/1.0.119...1.0.120) - 2 September 2022
+
+#### :bug: Bug Fixes
+
+- fix: use plain a for EU Login URL [Mikel Larreategi - [`e8d2d66`](https://github.com/eea/volto-clms-theme/commit/e8d2d664e750df517a8d955c4833a70e0f8b34e3)]
+
+#### :hammer_and_wrench: Others
+
+- Map login button fix [rodriama - [`0e7e520`](https://github.com/eea/volto-clms-theme/commit/0e7e520ac2515846b4af6e782a9f4cdc2375a467)]
+- Card doc fix [rodriama - [`556e33c`](https://github.com/eea/volto-clms-theme/commit/556e33c833b9980edab3b778fc408e662fd5fffd)]
+- ESLint fix [rodriama - [`d55db81`](https://github.com/eea/volto-clms-theme/commit/d55db818a02be4ccfcc524c1f03005600644a9e4)]
+- Credits pop up fix [rodriama - [`3772c16`](https://github.com/eea/volto-clms-theme/commit/3772c163a0a998a7dc7b0fddd176346f2d56a4e1)]
+- ESLint fix [rodriama - [`08a9bd8`](https://github.com/eea/volto-clms-theme/commit/08a9bd8c3cc78d928df58cc8b66fa3aea81f2b13)]
+- Event detail segment [rodriama - [`524e3ff`](https://github.com/eea/volto-clms-theme/commit/524e3fff130ae53ffb09aa534d120677e5fd1c1a)]
 ### [1.0.119](https://github.com/eea/volto-clms-theme/compare/1.0.118...1.0.119) - 1 September 2022
 
 #### :bug: Bug Fixes
@@ -143,7 +211,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)]
@@ -294,7 +361,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
@@ -1199,13 +1265,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.0.119",
+  "version": "1.0.122",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -55,7 +55,7 @@
     "react-svg": "14.0.4",
     "slick-carousel": "1.8.1",
     "volto-dropdownmenu": "2.2.7",
-    "volto-form-block": "2.4.1",
+    "volto-form-block": "2.4.2",
     "react-input-range": "^1.3.0",
     "lightgallery": "^2.4.0",
     "validator": "13.7.0"

package/src/components/Blocks/CclHomeBgImageBlock/CclGreenBgView.jsx

@@ -69,6 +69,8 @@ const CclGreenBgView = (props) => {
                 <a
                   className="ccl-banner-info-link"
                   href={'' + data?.locationHref?.[0]?.['@id']}
+                  target="_blank"
+                  rel="noreferrer"
                 >
                   More info
                 </a>

package/src/components/Blocks/CclTextLinkCarouselBlock/CclTextLinkCarouselView.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import loadable from '@loadable/component';
+import { UniversalLink } from '@plone/volto/components';
 const Slider = loadable(() => import('react-slick'));
 
 const CclTextLinkCarouselView = (props) => {
@@ -24,7 +25,14 @@ const CclTextLinkCarouselView = (props) => {
           {data?.textLink?.items.map((item, index) => (
             <div className="text-link-carousel-block" key={index}>
               <div className="text-link-carousel-block-content">
-                <a href={'' + item?.link?.[0]?.['@id']}>{item?.text}</a>
+                <UniversalLink
+                  openLinkInNewTab={true}
+                  href={'' + item?.link?.[0]?.['@id']}
+                >
+                  {item?.text}
+                </UniversalLink>
+
+                {/* <a href={'' + item?.link?.[0]?.['@id']}>{item?.text}</a> */}
               </div>
             </div>
           ))}

package/src/components/Blocks/CustomTemplates/VoltoFormBlock/CheckboxHtmlWidget.jsx

@@ -0,0 +1,97 @@
+/**
+ * CheckboxHtmlWidget component.
+ * @module components/manage/Widgets/CheckboxHtmlWidget
+ * added aria- attributes
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Checkbox } from 'semantic-ui-react';
+
+import { injectIntl } from 'react-intl';
+import { FormFieldWrapper } from '@plone/volto/components';
+import { StringToHTML } from '@eeacms/volto-clms-theme/components/CclUtils';
+
+/**
+ * CheckboxHtmlWidget component class.
+ * @function CheckboxHtmlWidget
+ * @returns {string} Markup of the component.
+ *
+ * To use it, in schema properties, declare a field like:
+ *
+ * ```jsx
+ * {
+ *  title: "Active",
+ *  type: 'boolean',
+ * }
+ * ```
+ */
+const CheckboxHtmlWidget = (props) => {
+  const { id, title, value, onChange, isDisabled, required, invalid } = props;
+
+  let attributes = {};
+  if (required) {
+    attributes.required = true;
+    attributes['aria-required'] = 'true';
+  }
+
+  const isInvalid = invalid === true || invalid === 'true';
+  if (isInvalid) {
+    attributes['aria-invalid'] = true;
+  }
+
+  return (
+    <FormFieldWrapper {...props} columns={1}>
+      <div className="wrapper">
+        <Checkbox
+          id={`field-${id}`}
+          name={`field-${id}`}
+          checked={value || false}
+          disabled={isDisabled}
+          onChange={(event, { checked }) => {
+            onChange(id, checked);
+          }}
+          aria-required={required ? 'true' : 'false'}
+          label={<label htmlFor={`field-${id}`}>{title}</label>}
+          {...attributes}
+        />
+      </div>
+      <StringToHTML string={props.html_description?.data || ''} />
+    </FormFieldWrapper>
+  );
+};
+
+/**
+ * Property types.
+ * @property {Object} propTypes Property types.
+ * @static
+ */
+CheckboxHtmlWidget.propTypes = {
+  id: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+  description: PropTypes.string,
+  required: PropTypes.bool,
+  error: PropTypes.arrayOf(PropTypes.string),
+  value: PropTypes.bool,
+  onChange: PropTypes.func,
+  onEdit: PropTypes.func,
+  onDelete: PropTypes.func,
+  wrapped: PropTypes.bool,
+};
+
+/**
+ * Default properties.
+ * @property {Object} defaultProps Default properties.
+ * @static
+ */
+CheckboxHtmlWidget.defaultProps = {
+  description: null,
+  required: false,
+  error: [],
+  value: null,
+  onChange: null,
+  onEdit: null,
+  onDelete: null,
+};
+
+export default injectIntl(CheckboxHtmlWidget);

package/src/components/Blocks/CustomTemplates/VoltoFormBlock/CheckboxSchemaExtender.js

@@ -0,0 +1,22 @@
+import { defineMessages } from 'react-intl';
+const messages = defineMessages({
+  field_html_description: {
+    id: 'field_html_description',
+    defaultMessage: 'HTML formatted description',
+  },
+});
+
+const CheckboxSchemaExtender = (intl) => {
+  return {
+    fields: ['html_description'],
+    properties: {
+      html_description: {
+        title: intl.formatMessage(messages.field_html_description),
+        widget: 'richtext',
+      },
+    },
+    required: ['html_description'],
+  };
+};
+
+export default CheckboxSchemaExtender;

package/src/components/Blocks/CustomTemplates/VoltoFormBlock/customIdFieldSchema.js

@@ -63,19 +63,6 @@ const messages = defineMessages({
     id: 'form_field_type_static_text',
     defaultMessage: 'Static text',
   },
-  field_input_values: {
-    id: 'form_field_input_values',
-    defaultMessage: 'Possible values',
-  },
-  useAsReplyTo: {
-    id: 'form_useAsReplyTo',
-    defineMessages: "Use as 'reply to'",
-  },
-  useAsReplyTo_description: {
-    id: 'form_useAsReplyTo_description',
-    defineMessages:
-      'If selected, this will be the address the receiver can use to reply.',
-  },
   field_custom_id: {
     id: 'field_custom_id',
     defineMessages: 'Field Custom Id',
@@ -107,14 +94,11 @@ export default (props) => {
           ),
         }
       : {};
-  var fieldTypeChoices = [
-    'select',
-    'single_choice',
-    'multiple_choice',
-  ].includes(props?.field_type)
-    ? ['input_values']
-    : [];
-  var useAsReplyTo = props?.field_type === 'from' ? ['use_as_reply_to'] : [];
+  var schemaExtender =
+    config.blocks.blocksConfig.form.fieldTypeSchemaExtenders[props?.field_type];
+  const schemaExtenderValues = schemaExtender
+    ? schemaExtender(intl)
+    : { properties: [], fields: [], required: [] };
   return {
     title: props?.label || '',
     fieldsets: [
@@ -125,8 +109,7 @@ export default (props) => {
           'label',
           'description',
           'field_type',
-          ...fieldTypeChoices,
-          ...useAsReplyTo,
+          ...schemaExtenderValues.fields,
           'required',
           'field_custom_id',
         ],
@@ -151,27 +134,22 @@ export default (props) => {
         ],
         ...attachmentDescription,
       },
-      input_values: {
-        title: intl.formatMessage(messages.field_input_values),
-        type: 'array',
-        creatable: true,
-      },
-      use_as_reply_to: {
-        title: intl.formatMessage(messages.useAsReplyTo),
-        description: intl.formatMessage(messages.useAsReplyTo_description),
-        type: 'boolean',
-        default: false,
-      },
       required: {
         title: intl.formatMessage(messages.field_required),
         type: 'boolean',
         default: false,
       },
+      ...schemaExtenderValues.properties,
       field_custom_id: {
         title: intl.formatMessage(messages.field_custom_id),
         send_to_backend: true,
       },
     },
-    required: ['label', 'field_type', 'input_values', ...fieldTypeChoices],
+    required: [
+      'label',
+      'field_type',
+      'input_values',
+      ...schemaExtenderValues.required,
+    ],
   };
 };

package/src/components/Blocks/CustomTemplates/VoltoFormBlock/index.js

@@ -0,0 +1,11 @@
+import CheckboxSchemaExtender from './CheckboxSchemaExtender';
+import customIdFieldSchema from './customIdFieldSchema';
+import CheckboxHtmlWidget from './CheckboxHtmlWidget';
+import VocabularyWidget from './VocabularyWidget';
+
+export {
+  CheckboxSchemaExtender,
+  customIdFieldSchema,
+  CheckboxHtmlWidget,
+  VocabularyWidget,
+};

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/FilterList.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Button, Icon } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
+import { structure_taxonomy_terms } from '@eeacms/volto-clms-theme/components';
 
 const messages = defineMessages({
   currentFilters: {
@@ -14,7 +15,7 @@ const messages = defineMessages({
 });
 
 const FilterList = (props) => {
-  const { facets, setFacets, isEditMode, data } = props;
+  const { facets, setFacets, isEditMode, data, querystring } = props;
   const showFilterList = !Object.values(facets).every((facet) => !facet.length);
 
   const baseFacets = data.facets;
@@ -28,10 +29,48 @@ const FilterList = (props) => {
           baseFacets.map((bf) => bf.field?.value).includes(v[0]),
       ),
   );
+  const fieldsToAvoidChildren =
+    data?.facets?.length > 0
+      ? data.facets
+          .filter((item) => item.type === 'checkboxTreeParentFacet')
+          .map((item) => item.field.value)
+      : [];
+  let filtersToAvoid = [];
+  if (querystring.loaded) {
+    filtersToAvoid = fieldsToAvoidChildren
+      .map((field) => {
+        let result = [];
+        const fieldValuesDict = querystring?.indexes[field]?.values;
+        const fieldValues = Object.keys(fieldValuesDict).map((fieldKey) => {
+          return { value: fieldKey, label: fieldValuesDict[fieldKey].title };
+        });
+        const fieldStructuredValues = structure_taxonomy_terms(fieldValues);
+        fieldStructuredValues.forEach((parent) => {
+          parent.childrens.forEach((children) => result.push(children.value));
+        });
+        return result;
+      })
+      .flat(1);
+  }
+  const filtersToAvoidSet = new Set(filtersToAvoid);
 
-  const totalFilters = [].concat.apply([], Object.values(currentFilters))
-    .length;
+  // if (choices?.length > 0) {
+  //   options = structure_taxonomy_terms(choices);
+  // }
+  const currentFiltersToCount = {};
+  Object.keys(currentFilters).forEach((filterKey) => {
+    currentFiltersToCount[filterKey] =
+      typeof currentFilters[filterKey] === 'object'
+        ? currentFilters[filterKey].filter((filter) => {
+            return !filtersToAvoidSet.has(filter);
+          })
+        : null;
+  });
+  // const totalFilters = [].concat.apply([], Object.values(currentFilters))
+  //   .length;
 
+  const totalFilters = [].concat.apply([], Object.values(currentFiltersToCount))
+    .length;
   const intl = useIntl();
 
   return showFilterList && Object.keys(currentFilters).length ? (

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/SearchInput.jsx

@@ -25,6 +25,7 @@ const SearchInput = (props) => {
   useEffect(() => {
     onTriggerSearch(rest.searchedText);
     setSearchText(rest.searchedText);
+    return () => {};
   }, [rest.searchedText, onTriggerSearch, setSearchText]);
 
   return (

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

@@ -4,7 +4,7 @@ export const portal_types_labels = {
   'News Item': 'News',
   'eea.meeting': 'Event',
   UseCase: 'Use case',
-  WorkOpportunity: 'Job vacancy',
+  WorkOpportunity: 'Vacancy',
   Tender: 'Tender',
   TechnicalLibrary: 'Product documentation',
   Document: 'Page',
@@ -94,6 +94,16 @@ const rewriteOptions = (name, choices) => {
         return { ...opt, label: opt.label.replace(/^[0-9][0-9]#/, '') };
       });
   }
+  if (name === 'gemet') {
+    result = choices.sort((a, b) => {
+      if (a.label.toLowerCase() < b.label.toLowerCase()) {
+        return -1;
+      } else if (a.label.toLowerCase() > b.label.toLowerCase()) {
+        return 1;
+      }
+      return 0;
+    });
+  }
   return result;
 };
 

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/custom.less

@@ -17,7 +17,7 @@ div.tabs-block.CCLCarousel {
 .slick-slider.text-carousel {
   div & {
     z-index: 1;
-    width: 60%;
+    width: calc(100% - 8rem);
   }
 }
 
@@ -32,6 +32,7 @@ div.tabs-block.CCLCarousel {
 .text-link-carousel-block {
   height: 2rem;
   padding: 0;
+  margin-left: 0.5rem;
 }
 
 .text-link-carousel-block-content {

package/src/components/Blocks/customBlocks.js

@@ -59,8 +59,12 @@ import TextLinkCarouselView from '@eeacms/volto-clms-theme/components/Blocks/Ccl
 import SubscriptionBlockView from '@eeacms/volto-clms-theme/components/Blocks/CclSubscriptionBlock/SubscriptionView';
 import SubscriptionBlockEdit from '@eeacms/volto-clms-theme/components/Blocks/CclSubscriptionBlock/SubscriptionEdit';
 import containerSVG from '@plone/volto/icons/apps.svg';
-import customIdFieldSchema from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoFormBlock/customIdFieldSchema';
-import VocabularyWidget from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoFormBlock/VocabularyWidget';
+import {
+  customIdFieldSchema,
+  CheckboxSchemaExtender,
+  CheckboxHtmlWidget,
+  VocabularyWidget,
+} from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoFormBlock';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import homeBand from '@plone/volto/icons/image-wide.svg';
 import linkSVG from '@plone/volto/icons/link.svg';
@@ -475,6 +479,9 @@ const customBlocks = (config) => ({
   form: {
     ...config.blocks.blocksConfig.form,
     fieldSchema: customIdFieldSchema,
+    fieldTypeSchemaExtenders: {
+      checkbox_html: CheckboxSchemaExtender,
+    },
     additionalFields: [
       {
         id: 'product_vocabulary',
@@ -511,6 +518,11 @@ const customBlocks = (config) => ({
         label: 'Image Field Widget',
         component: ImageWidget,
       },
+      {
+        id: 'checkbox_html',
+        label: 'Checkbox with html',
+        component: CheckboxHtmlWidget,
+      },
     ],
   },
 });

package/src/components/CLMSDatasetDetailView/CLMSDatasetDetailView.jsx

@@ -77,6 +77,7 @@ const CLMSDatasetDetailView = ({ content, token }) => {
                   key={item.id}
                   loading={geonetwork_importation.loading}
                   circular
+                  style={{ width: '50%' }}
                 >
                   <strong>
                     {item.title} (from {item.type}):{' '}
@@ -203,6 +204,7 @@ const CLMSDatasetDetailView = ({ content, token }) => {
             key={'wms-layers-import'}
             loading={wms_layers_importation?.loading}
             circular
+            style={{ width: '50%' }}
           >
             <Modal
               onClose={() => {
@@ -288,17 +290,13 @@ const CLMSDatasetDetailView = ({ content, token }) => {
               </p>
             )}
           </Segment>
-        </Segment.Group>
-      )}
-
-      {user?.roles && user.roles.includes('Manager') && (
-        <Segment.Group compact horizontal>
           <Segment
             padded={'very'}
             color={'olive'}
             key={'wms-fields-import'}
             loading={wms_fields_importation?.loading}
             circular
+            style={{ width: '50%' }}
           >
             <Modal
               onClose={() => {
@@ -408,7 +406,7 @@ const CLMSDatasetDetailView = ({ content, token }) => {
             {content?.image && (
               <div className="menu-detail-image">
                 <img
-                  src={content?.image?.scales?.mini?.download}
+                  src={content?.image?.scales?.preview?.download}
                   alt="Placeholder"
                 />
               </div>

package/src/components/CLMSDatasetDetailView/DataSetInfoContent.jsx

@@ -14,22 +14,14 @@ import { useLocation } from 'react-router-dom';
 
 const DataSetInfoContent = (props) => {
   const dispatch = useDispatch();
-  const {
-    UID,
-    id,
-    validation,
-    dataResourceAbstract,
-    data,
-    geonetwork_identifiers,
-    citation,
-  } = props;
+  const { UID, id, validation, data, geonetwork_identifiers, citation } = props;
   const location = useLocation();
   const searchSubrequests = useSelector((state) => state.search.subrequests);
   let libraries = searchSubrequests?.[id]?.items || [];
   let librariesPending = searchSubrequests?.[id]?.loading;
   const user = useSelector((state) => state.users.user);
   React.useEffect(() => {
-    if (location.hash === '#GeneralInfo' && UID) {
+    if (UID) {
       dispatch(
         searchContent(
           '',
@@ -66,7 +58,6 @@ const DataSetInfoContent = (props) => {
       ? iTitleIcons.rightPosition
       : iTitleIcons.leftPosition;
   }
-
   return (
     <div>
       {validation?.data && validation?.data !== '<p><br/></p>' && (
@@ -77,11 +68,9 @@ const DataSetInfoContent = (props) => {
         ></CclCitation>
       )}
       <CclInfoContainer>
-        {dataResourceAbstract?.data && (
+        {props?.description && (
           <CclInfoDescription
-            title="Data resource abstract"
-            description={<StringToHTML string={dataResourceAbstract.data} />}
-            tooltip="Brief narrative summary of the content of the resource(s) with coverage, main attributes, data sources, important of the work, etc."
+            description={<StringToHTML string={props.description} />}
           ></CclInfoDescription>
         )}
       </CclInfoContainer>

package/src/components/CLMSDatasetDetailView/DownloadDataSetContent.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import CclDownloadTable from '@eeacms/volto-clms-theme/components/CclDownloadTable/CclDownloadTable';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
-import { Link, useLocation } from 'react-router-dom';
+import { Link, useLocation, Redirect } from 'react-router-dom';
 
 const DownloadDataSetContent = (data) => {
   let url = '/register';
@@ -9,6 +9,12 @@ const DownloadDataSetContent = (data) => {
 
   return (
     <div>
+      {data.downloadable_files?.items[0].path === '' &&
+      location.hash === '#Download' ? (
+        <Redirect to={location.pathname + '/download-by-area'} />
+      ) : (
+        ''
+      )}
       {data.token === '' && (
         <div className="login-block">
           <div className="login-content">

package/src/components/CLMSDatasetDetailView/RelatedUseCases.jsx

@@ -14,7 +14,7 @@ const RelatedUseCases = (props) => {
   let librariesPending = searchSubrequests?.[id]?.loading;
   const location = useLocation();
   React.useEffect(() => {
-    if (location.hash === '#Usecases' && UID) {
+    if (location.hash === '#Use-cases' && UID) {
       dispatch(
         searchContent(
           '',