@eeacms/volto-clms-theme 1.0.121 → 1.0.123

package/CHANGELOG.md

@@ -4,6 +4,47 @@ 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.123](https://github.com/eea/volto-clms-theme/compare/1.0.122...1.0.123) - 14 September 2022
+
+#### :bug: Bug Fixes
+
+- fix:show vocabulary values in DatasetView [Mikel Larreategi - [`d036043`](https://github.com/eea/volto-clms-theme/commit/d03604303159f86b2a9781368a92f68f83e57b53)]
+
+#### :hammer_and_wrench: Others
+
+- eslint [ionlizarazu - [`7b4faad`](https://github.com/eea/volto-clms-theme/commit/7b4faadabcb364aac0f4234120c2375b8d1b399c)]
+### [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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.121",
+  "version": "1.0.123",
   "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/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

@@ -29,15 +29,18 @@ const FilterList = (props) => {
           baseFacets.map((bf) => bf.field?.value).includes(v[0]),
       ),
   );
-  const fieldsToAvoidChildren = data.facets
-    .filter((item) => item.type === 'checkboxTreeParentFacet')
-    .map((item) => item.field.value);
+  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 fieldValuesDict = querystring?.indexes[field]?.values;
         const fieldValues = Object.keys(fieldValuesDict).map((fieldKey) => {
           return { value: fieldKey, label: fieldValuesDict[fieldKey].title };
         });
@@ -56,11 +59,12 @@ const FilterList = (props) => {
   // }
   const currentFiltersToCount = {};
   Object.keys(currentFilters).forEach((filterKey) => {
-    currentFiltersToCount[filterKey] = currentFilters[filterKey].filter(
-      (filter) => {
-        return !filtersToAvoidSet.has(filter);
-      },
-    );
+    currentFiltersToCount[filterKey] =
+      typeof currentFilters[filterKey] === 'object'
+        ? currentFilters[filterKey].filter((filter) => {
+            return !filtersToAvoidSet.has(filter);
+          })
+        : null;
   });
   // const totalFilters = [].concat.apply([], Object.values(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);
   }
 }
 

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

@@ -406,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

@@ -21,7 +21,7 @@ const DataSetInfoContent = (props) => {
   let librariesPending = searchSubrequests?.[id]?.loading;
   const user = useSelector((state) => state.users.user);
   React.useEffect(() => {
-    if (location.hash === '#General-Info' && UID) {
+    if (UID) {
       dispatch(
         searchContent(
           '',

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -355,7 +355,7 @@ const CLMSCartContent = (props) => {
                         <td>{contentOrDash(item.name)}</td>
                       )}
                       <td>{contentOrDash(item.source)}</td>
-                      <td>
+                      <td style={{ wordBreak: 'break-word' }}>
                         <AreaNaming item={item} />
                       </td>
                       <td>

package/src/components/CLMSMeetingView/CLMSMeetingView.jsx

@@ -20,10 +20,6 @@ import { postMeetingRegister } from '../../actions';
 import { toast } from 'react-toastify';
 import { LightGalleryListing } from './CclLightGallery';
 import CclListingCards from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingCards';
-import config from '@plone/volto/registry';
-import AnimateHeight from 'react-animate-height';
-import { Accordion } from 'semantic-ui-react';
-import { CLMSRelatedItems } from '../CLMSRelatedItems';
 
 export const CLMSMeetingView = (props) => {
   const { content, intl } = props;
@@ -107,7 +103,7 @@ export const CLMSMeetingView = (props) => {
     dispatch(
       createContent(props.location.pathname, {
         '@type': 'AnonymousForm',
-        title: 'Meeting Registration',
+        title: 'Event Registration',
         id: 'form',
       }),
     );
@@ -177,36 +173,6 @@ export const CLMSMeetingView = (props) => {
       intl.formatMessage(messages.no_fullname_customfield),
     );
 
-  const [activeIndex, setActiveIndex] = React.useState([99]);
-
-  const handleClick = ({ index }) => {
-    const newIndex =
-      activeIndex.indexOf(index) === -1
-        ? [...activeIndex, index]
-        : activeIndex.filter((item) => item !== index);
-
-    setActiveIndex(newIndex);
-  };
-
-  const [activeDatasetIndex, setActiveDatasetIndex] = React.useState([99]);
-
-  const handleDatasetClick = ({ datasetindex }) => {
-    const newDatasetIndex =
-      activeDatasetIndex.indexOf(datasetindex) === -1
-        ? [...activeDatasetIndex, datasetindex]
-        : activeDatasetIndex.filter((item) => item !== datasetindex);
-
-    setActiveDatasetIndex(newDatasetIndex);
-  };
-
-  const titleIcons = config.blocks?.blocksConfig?.accordion?.titleIcons;
-
-  function iconName(iconData, iTitleIcons) {
-    return iconData?.right_arrows
-      ? iTitleIcons.rightPosition
-      : iTitleIcons.leftPosition;
-  }
-
   return (
     <div className="ccl-container">
       <h1 className="page-title">{content.title}</h1>
@@ -435,63 +401,6 @@ export const CLMSMeetingView = (props) => {
             linkHref={`${files['@id']}/@@download/file`}
           />
         )}
-        <div className="dataset-info-documents dropdown">
-          <div className="accordion-block"></div>
-          {content?.products?.length > 0 && (
-            <Accordion fluid styled>
-              <Accordion.Title
-                as={'h2'}
-                onClick={() => handleClick({ index: 0 })}
-                className={'accordion-title align-arrow-right'}
-              >
-                {activeIndex.includes(0) ? (
-                  <Icon
-                    name={iconName(content, titleIcons.opened)}
-                    size="24px"
-                  />
-                ) : (
-                  <Icon
-                    name={iconName(content, titleIcons.closed)}
-                    size="24px"
-                  />
-                )}
-                <span>Related products</span>
-              </Accordion.Title>
-              <Accordion.Content active={activeIndex.includes(0)}>
-                <AnimateHeight animateOpacity duration={500} height={'auto'}>
-                  <CLMSRelatedItems items={content.products} />
-                </AnimateHeight>
-              </Accordion.Content>
-            </Accordion>
-          )}
-          {content?.datasets?.length > 0 && (
-            <Accordion fluid styled>
-              <Accordion.Title
-                as={'h2'}
-                onClick={() => handleDatasetClick({ datasetindex: 0 })}
-                className={'accordion-title align-arrow-right'}
-              >
-                {activeDatasetIndex.includes(0) ? (
-                  <Icon
-                    name={iconName(content, titleIcons.opened)}
-                    size="24px"
-                  />
-                ) : (
-                  <Icon
-                    name={iconName(content, titleIcons.closed)}
-                    size="24px"
-                  />
-                )}
-                <span>Related datasets</span>
-              </Accordion.Title>
-              <Accordion.Content active={activeDatasetIndex.includes(0)}>
-                <AnimateHeight animateOpacity duration={500} height={'auto'}>
-                  <CLMSRelatedItems items={content.datasets} />
-                </AnimateHeight>
-              </Accordion.Content>
-            </Accordion>
-          )}
-        </div>
       </Segment>
     </div>
   );

package/src/components/CLMSNewsItemView/CLMSNewsItemView.jsx

@@ -5,46 +5,13 @@ import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import { cclDateFormat } from '@eeacms/volto-clms-theme/components/CclUtils';
 import { LightGalleryListing } from '@eeacms/volto-clms-theme/components/CLMSMeetingView/CclLightGallery';
 import CclListingCards from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingCards';
-import config from '@plone/volto/registry';
-import { Icon } from '@plone/volto/components';
-import AnimateHeight from 'react-animate-height';
-import { Accordion } from 'semantic-ui-react';
-import { CLMSRelatedItems } from '../CLMSRelatedItems';
 
 const CLMSNewsItemView = (props) => {
   const { content } = props;
   const files = content.items
     ? content.items.filter((item) => item['@type'] === 'File')
     : [];
-  const [activeIndex, setActiveIndex] = React.useState([99]);
 
-  const handleClick = ({ index }) => {
-    const newIndex =
-      activeIndex.indexOf(index) === -1
-        ? [...activeIndex, index]
-        : activeIndex.filter((item) => item !== index);
-
-    setActiveIndex(newIndex);
-  };
-
-  const [activeDatasetIndex, setActiveDatasetIndex] = React.useState([99]);
-
-  const handleDatasetClick = ({ datasetindex }) => {
-    const newDatasetIndex =
-      activeDatasetIndex.indexOf(datasetindex) === -1
-        ? [...activeDatasetIndex, datasetindex]
-        : activeDatasetIndex.filter((item) => item !== datasetindex);
-
-    setActiveDatasetIndex(newDatasetIndex);
-  };
-
-  const titleIcons = config.blocks?.blocksConfig?.accordion?.titleIcons;
-
-  function iconName(iconData, iTitleIcons) {
-    return iconData?.right_arrows
-      ? iTitleIcons.rightPosition
-      : iTitleIcons.leftPosition;
-  }
   return (
     <div className="ccl-container">
       {hasBlocksData(content) && content.blocks_layout?.items?.length > 4 ? (
@@ -85,48 +52,6 @@ const CLMSNewsItemView = (props) => {
           linkHref={`${files['@id']}/@@download/file`}
         />
       )}
-      {content?.products?.length > 0 && (
-        <Accordion fluid styled>
-          <Accordion.Title
-            as={'h2'}
-            onClick={() => handleClick({ index: 0 })}
-            className={'accordion-title align-arrow-right'}
-          >
-            {activeIndex.includes(0) ? (
-              <Icon name={iconName(content, titleIcons.opened)} size="24px" />
-            ) : (
-              <Icon name={iconName(content, titleIcons.closed)} size="24px" />
-            )}
-            <span>Related products</span>
-          </Accordion.Title>
-          <Accordion.Content active={activeIndex.includes(0)}>
-            <AnimateHeight animateOpacity duration={500} height={'auto'}>
-              <CLMSRelatedItems items={content.products} />
-            </AnimateHeight>
-          </Accordion.Content>
-        </Accordion>
-      )}
-      {content?.datasets?.length > 0 && (
-        <Accordion fluid styled>
-          <Accordion.Title
-            as={'h2'}
-            onClick={() => handleDatasetClick({ datasetindex: 0 })}
-            className={'accordion-title align-arrow-right'}
-          >
-            {activeDatasetIndex.includes(0) ? (
-              <Icon name={iconName(content, titleIcons.opened)} size="24px" />
-            ) : (
-              <Icon name={iconName(content, titleIcons.closed)} size="24px" />
-            )}
-            <span>Related datasets</span>
-          </Accordion.Title>
-          <Accordion.Content active={activeDatasetIndex.includes(0)}>
-            <AnimateHeight animateOpacity duration={500} height={'auto'}>
-              <CLMSRelatedItems items={content.datasets} />
-            </AnimateHeight>
-          </Accordion.Content>
-        </Accordion>
-      )}
     </div>
   );
 };

package/src/components/CLMSSubscriptionView/SubscriptionView.jsx

@@ -40,8 +40,8 @@ const messages = defineMessages({
     defaultMessage: 'E-mail',
   },
   emailDescription: {
-    id: 'We will use this address to send you the {type}',
-    defaultMessage: 'We will use this address to send you {type} ',
+    id: 'We will use this e-mail address to send you the {type}',
+    defaultMessage: 'We will use this e-mail address to send you {type} ',
   },
   saved: {
     id: 'Changes saved',