@eeacms/volto-clms-theme 1.0.139 → 1.0.141

package/CHANGELOG.md

@@ -4,6 +4,26 @@ 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.141](https://github.com/eea/volto-clms-theme/compare/1.0.140...1.0.141) - 7 November 2022
+
+#### :bug: Bug Fixes
+
+- fix: remove No value on required selections at volto-form-block [ionlizarazu - [`a3b8731`](https://github.com/eea/volto-clms-theme/commit/a3b87310b724ea6b236fd6ce9cf3c34cfda076f2)]
+- fix: volto-form-block config [ionlizarazu - [`4db7214`](https://github.com/eea/volto-clms-theme/commit/4db7214b00a3613c1e8e461c620bba3890469b98)]
+
+### [1.0.140](https://github.com/eea/volto-clms-theme/compare/1.0.139...1.0.140) - 7 November 2022
+
+#### :bug: Bug Fixes
+
+- fix: use UniversalLink to render the final link, and include the download url of the file [Mikel Larreategi - [`8a490db`](https://github.com/eea/volto-clms-theme/commit/8a490db836f72e1330aa2e22db5e8222fd7dbc53)]
+
+#### :house: Internal changes
+
+- chore: use UniversalLink [Mikel Larreategi - [`f304971`](https://github.com/eea/volto-clms-theme/commit/f304971e4d555dd16498ceccc5ff43586d81626b)]
+
+#### :hammer_and_wrench: Others
+
+- new sorting for geographical classification facet [Mikel Larreategi - [`4faaa55`](https://github.com/eea/volto-clms-theme/commit/4faaa55ac2bc2bd8b783d929b30faffa025bae38)]
 ### [1.0.139](https://github.com/eea/volto-clms-theme/compare/1.0.138...1.0.139) - 4 November 2022
 
 #### :bug: Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.139",
+  "version": "1.0.141",
   "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/VoltoListingBlock/CclListingCards.jsx

@@ -5,6 +5,7 @@ import { flattenToAppURL } from '@plone/volto/helpers';
 
 import { isInternalURL } from '@plone/volto/helpers/Url/Url';
 import { useSelector } from 'react-redux';
+import { UniversalLink } from '@plone/volto/components';
 
 import CclCard from '@eeacms/volto-clms-theme/components/CclCard/CclCard';
 
@@ -27,7 +28,7 @@ const CclListingCards = (props) => {
       </ConditionalLink>
     );
   } else if (href) {
-    link = <a href={href}>{linkTitle || href}</a>;
+    link = <UniversalLink href={href}>{linkTitle || href}</UniversalLink>;
   }
   let containerClass = '';
   if (['news', 'event'].includes(variation)) {

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

@@ -52,6 +52,13 @@ const rewriteOptions = (name, choices) => {
     'Document',
   ];
 
+  const dataset_geographical_classification = [
+    'EEA',
+    'Northern hemisphere',
+    'Southern hemisphere',
+    'Global',
+  ];
+
   if (name === 'portal_type') {
     result = choices
       .filter((opt) => portal_types.includes(opt.value))
@@ -114,6 +121,16 @@ const rewriteOptions = (name, choices) => {
       return 0;
     });
   }
+
+  if (name === 'dataset_geographical_classification') {
+    result = choices.sort((a, b) => {
+      return (
+        dataset_geographical_classification.indexOf(a.value) -
+        dataset_geographical_classification.indexOf(b.value)
+      );
+    });
+  }
+
   return result;
 };
 

package/src/components/Blocks/customBlocks.js

@@ -507,6 +507,7 @@ const customBlocks = (config) => ({
     view: FormCustomView,
     fieldSchema: customIdFieldSchema,
     fieldTypeSchemaExtenders: {
+      ...config.blocks.blocksConfig.form.fieldTypeSchemaExtenders,
       checkbox_html: CheckboxSchemaExtender,
     },
     additionalFields: [

package/src/components/CclCard/CclCard.jsx

@@ -13,6 +13,7 @@ import { Icon as VoltoIcon } from '@plone/volto/components';
 
 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 } from '@plone/volto/components';
 
 const CardImage = ({ card, size = 'preview', isCustomCard }) => {
   return card?.image_field ? (
@@ -142,7 +143,12 @@ function CclCard(props) {
                 </div>
                 <div className="card-text">
                   <div className="card-file-title">
-                    <CardLink url={url}>{card?.title}</CardLink>
+                    <UniversalLink
+                      openLinkInNewTab={true}
+                      href={url + '/@@download/file'}
+                    >
+                      {card?.title}
+                    </UniversalLink>
                   </div>
                   {showDates && (
                     <div className="card-file-date">

package/src/customizations/volto-form-block/components/Field.jsx

@@ -100,6 +100,7 @@ const Field = ({
           isDisabled={disabled}
           invalid={isInvalid().toString()}
           required={required}
+          noValueOption={!required}
           {...(isInvalid() ? { className: 'is-invalid' } : {})}
         />
       )}