@eeacms/volto-clms-theme 1.1.103 → 1.1.105

package/CHANGELOG.md

@@ -4,6 +4,28 @@ 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.105](https://github.com/eea/volto-clms-theme/compare/1.1.104...1.1.105) - 25 January 2024
+
+#### :bug: Bug Fixes
+
+- fix: CLMS-2970 redirect to dataset page [Unai - [`df6898f`](https://github.com/eea/volto-clms-theme/commit/df6898f37b79f4c309764928fb943b6f8076affb)]
+- fix: CLMS-2982 [Unai - [`2b3226b`](https://github.com/eea/volto-clms-theme/commit/2b3226bd6020da1dab5d0544604ec6907b440d99)]
+- fix: CLMS-3026 [Unai - [`6616839`](https://github.com/eea/volto-clms-theme/commit/66168397ff68cd96f861e22424c144a7218a00ac)]
+- fix: CLMS-3026 [Unai - [`2a0edb9`](https://github.com/eea/volto-clms-theme/commit/2a0edb936adffdfd20a61fbef69f86fa85954eb2)]
+
+#### :hammer_and_wrench: Others
+
+- lint [Unai - [`79e0512`](https://github.com/eea/volto-clms-theme/commit/79e0512de5f15b307859e949b3c491792178e208)]
+- lint [Unai - [`3b65686`](https://github.com/eea/volto-clms-theme/commit/3b65686e7f5b4d1b1fd20e72a3fada723ac88a84)]
+- dataset extras removed from homeBgImageBlock & white variation still working [Unai - [`9707e63`](https://github.com/eea/volto-clms-theme/commit/9707e632877bbee38d208f0eb2d5b58d88e5e15e)]
+- new listing card variation [Unai - [`b34ddb4`](https://github.com/eea/volto-clms-theme/commit/b34ddb40c79014cae7f2fe68513a9c12462cfc52)]
+- Revert "fix: CLMS-3026" [Unai - [`36c450d`](https://github.com/eea/volto-clms-theme/commit/36c450db7351bef129241dcd2816c0bc1d4a1a44)]
+### [1.1.104](https://github.com/eea/volto-clms-theme/compare/1.1.103...1.1.104) - 19 January 2024
+
+#### :bug: Bug Fixes
+
+- fix: multiselect in accordionCheckbox facet [Unai - [`55d543f`](https://github.com/eea/volto-clms-theme/commit/55d543ffffb8edfb4d5872231add7e7c5406d5a5)]
+
 ### [1.1.103](https://github.com/eea/volto-clms-theme/compare/1.1.102...1.1.103) - 17 January 2024
 
 #### :hammer_and_wrench: Others
@@ -204,7 +226,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - to render nothing, return null [Mikel Larreategi - [`2fb3580`](https://github.com/eea/volto-clms-theme/commit/2fb35802b23e3aba5fd166aeefd103c929ffb5d1)]
 - simplify condtioin [Mikel Larreategi - [`f9b43da`](https://github.com/eea/volto-clms-theme/commit/f9b43da91d360e0028402f9a7ba762f16b0d9b22)]
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`7c6e9ca`](https://github.com/eea/volto-clms-theme/commit/7c6e9cac9da0c06d0f24711303404f5055fba7d1)]
 ### [1.1.80](https://github.com/eea/volto-clms-theme/compare/1.1.79...1.1.80) - 17 November 2023
 
 #### :bug: Bug Fixes
@@ -215,7 +236,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`37c3299`](https://github.com/eea/volto-clms-theme/commit/37c3299dd19c95057e70d48152bfef2365f2416c)]
 - CLMS-2509 (Bug): Lint [Urkorue - [`1bbc011`](https://github.com/eea/volto-clms-theme/commit/1bbc011481c0ee1feb68d0cf57c4a5a9f4c224ca)]
 - CLMS-2509 (Bug): Timeseries icon centered [Urkorue - [`fc38685`](https://github.com/eea/volto-clms-theme/commit/fc3868598ab592f01bb3ee23f985ada5c11227d4)]
 ### [1.1.78](https://github.com/eea/volto-clms-theme/compare/1.1.77...1.1.78) - 16 November 2023
@@ -268,17 +288,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`c55db1c`](https://github.com/eea/volto-clms-theme/commit/c55db1c20cfef1eb34c587343a4822fa4bde3c54)]
 ### [1.1.73](https://github.com/eea/volto-clms-theme/compare/1.1.72...1.1.73) - 6 November 2023
 
 #### :hammer_and_wrench: Others
 
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`3a543b9`](https://github.com/eea/volto-clms-theme/commit/3a543b9000c1168d54edfb8003eb08dfa7c85031)]
 - comment Integration tests [Ion Lizarazu - [`74713f8`](https://github.com/eea/volto-clms-theme/commit/74713f8f78d77ba193d8c27462cc8787d698ab81)]
 - uncomment cypress tests [Ion Lizarazu - [`3526a5c`](https://github.com/eea/volto-clms-theme/commit/3526a5c46481667b0518c6cce0927e67726c6f6c)]
 - use chrome instead of chromium to run cypress tests [Ion Lizarazu - [`6ae3a06`](https://github.com/eea/volto-clms-theme/commit/6ae3a06dbec1914c06a55c0dcb826c49b75f9739)]
 - ccltabs activeTab condition having first child [Ion Lizarazu - [`3cf9376`](https://github.com/eea/volto-clms-theme/commit/3cf9376d55f5f41b7e42c25e5925cd871ec71d81)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`f41ecfe`](https://github.com/eea/volto-clms-theme/commit/f41ecfea8b5a1e409303ffcc7befe7f51316d652)]
 ### [1.1.72](https://github.com/eea/volto-clms-theme/compare/1.1.71...1.1.72) - 2 November 2023
 
 ### [1.1.71](https://github.com/eea/volto-clms-theme/compare/1.1.70...1.1.71) - 31 October 2023
@@ -289,7 +306,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`67ca3bb`](https://github.com/eea/volto-clms-theme/commit/67ca3bb111f34842569c12b9c87a2a91bd14b09e)]
 
 #### :hammer_and_wrench: Others
 
@@ -386,7 +402,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - readme [Mikel Larreategi - [`3c0ab05`](https://github.com/eea/volto-clms-theme/commit/3c0ab051981a4efad7712bc46182eed9d79fd10f)]
 - remove from addons [Mikel Larreategi - [`89c2e7d`](https://github.com/eea/volto-clms-theme/commit/89c2e7d793193e6bb64642f0b06a01cd3c81108a)]
-- yarn.lock added after running yarn [Unai - [`ad307be`](https://github.com/eea/volto-clms-theme/commit/ad307be72bbfe753f7571ea4d784a09978e0f7f2)]
 - prettier issue fix [Unai - [`8bc0650`](https://github.com/eea/volto-clms-theme/commit/8bc0650918f9fa1065d19d2c15ce153a5fc5abbb)]
 - set a limit of 5 items in the download queue [Mikel Larreategi - [`b81cc83`](https://github.com/eea/volto-clms-theme/commit/b81cc8383165bafbbff52fbeeb365d413051802e)]
 - adjust logo size [Mikel Larreategi - [`b90a72c`](https://github.com/eea/volto-clms-theme/commit/b90a72c07102025a7e90607b25d34611ddd4f4f6)]
@@ -528,7 +543,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - fix cart items concat function [Ion Lizarazu - [`4b72249`](https://github.com/eea/volto-clms-theme/commit/4b72249ef17a0cda22661809fce5be7c2d1f6649)]
 - revert Jenkinsfile [Ion Lizarazu - [`64f6cd0`](https://github.com/eea/volto-clms-theme/commit/64f6cd08100357843b507c00d3286d7debe0ef04)]
-- yarn.lock file [Ion Lizarazu - [`8444ad1`](https://github.com/eea/volto-clms-theme/commit/8444ad1606b3939e4609bdd186e5ace2252588a8)]
 - packages.json versions order [Ion Lizarazu - [`4fd7a86`](https://github.com/eea/volto-clms-theme/commit/4fd7a86ab43238841b421e1ed10ebd52ab420a15)]
 - downloadablefilestablewidget param modification [Ion Lizarazu - [`5dd794a`](https://github.com/eea/volto-clms-theme/commit/5dd794a33a8eddd042a753b7ab47e7d2a323b011)]
 - add technical_documents_accordion_text field to the dataset view [Ion Lizarazu - [`96ed1e5`](https://github.com/eea/volto-clms-theme/commit/96ed1e5e2c2b501bd303bc76b333a70ad1614c16)]
@@ -653,7 +667,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)]
@@ -741,7 +754,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
 
@@ -1940,7 +1952,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)]
@@ -2091,7 +2102,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
@@ -2996,13 +3006,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.103",
+  "version": "1.1.105",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/Blocks/CclCardContainerBlock/CardContainerSchema.js

@@ -22,35 +22,94 @@ export const CardContainerSchema = () => ({
   required: ['variation', 'cardOrigin'],
 });
 
-export const CardBlockSchema = () => ({
-  title: 'Card block',
-  fieldsets: [
-    {
-      id: 'default',
-      title: 'Default',
-      fields: ['title', 'description', 'url'],
-    },
-  ],
-  properties: {
-    title: {
-      title: 'Title',
-      description: 'Card title',
-      type: 'string',
-      placeholder: 'Card title here',
-    },
-    image: {
-      title: 'Card image',
-    },
-    description: {
-      title: 'Product description',
-      type: 'string',
-    },
-    url: {
-      title: 'url',
-      widget: 'object_browser',
-      mode: 'link',
-      allowExternals: true,
+export const CardBlockSchema = (hasExtras, hasButton) => {
+  const hasExtrasFieldset = hasExtras
+    ? [
+        {
+          id: 'extraFields',
+          title: 'Extra fields',
+          fields: ['subtitle', 'hasButton'],
+        },
+      ]
+    : [];
+  const hasButtonFieldset = hasButton
+    ? [
+        {
+          id: 'buttonStyle',
+          title: 'Button style',
+          fields: ['buttonTitle', 'href', 'style', 'disabled'],
+        },
+      ]
+    : [];
+
+  return {
+    title: 'Card block',
+    fieldsets: [
+      {
+        id: 'default',
+        title: 'Default',
+        fields: ['title', 'description', 'url'],
+      },
+      ...hasExtrasFieldset,
+      ...hasButtonFieldset,
+    ],
+    properties: {
+      title: {
+        title: 'Title',
+        description: 'Card title',
+        type: 'string',
+        placeholder: 'Card title here',
+      },
+      image: {
+        title: 'Card image',
+      },
+      description: {
+        title: 'Product description',
+        type: 'string',
+      },
+      url: {
+        title: 'url',
+        widget: 'object_browser',
+        mode: 'link',
+        allowExternals: true,
+      },
+      subtitle: {
+        title: 'SubTitle',
+        description: 'Div Subtitle',
+        type: 'string',
+      },
+      hasButton: {
+        title: 'Button',
+        type: 'boolean',
+        default: false,
+      },
+      buttonTitle: {
+        title: 'Title',
+        description: 'Add button text',
+        type: 'string',
+      },
+      href: {
+        title: 'URL',
+        description: 'Select site content or paste external url',
+        widget: 'object_browser',
+        mode: 'link',
+        selectedItemAttrs: ['Title', 'Description', '@type', '@id'],
+        allowExternals: true,
+      },
+      style: {
+        title: 'Button style',
+        choices: [
+          ['default', 'Default'],
+          ['filled', 'Filled'],
+        ],
+        default: 'default',
+      },
+      disabled: {
+        title: 'Disabled',
+        type: 'boolean',
+        default: false,
+      },
     },
-  },
-  required: [],
-});
+    required: [],
+  };
+};

package/src/components/Blocks/CclCardContainerBlock/CclCardContainerBlockEdit.jsx

@@ -1,19 +1,23 @@
-import { CardBlockSchema, CardContainerSchema } from './CardContainerSchema';
 import React, { useState } from 'react';
-import { emptyCard, getPanels } from '../utils';
+import { injectIntl } from 'react-intl';
+import { defineMessages } from 'react-intl';
+import { compose } from 'redux';
 
-import CclCard from '@eeacms/volto-clms-theme/components/CclCard/CclCard';
 import { SidebarPortal, BlockDataForm } from '@plone/volto/components'; // BlocksForm, Icon,
-import { addExtensionFieldToSchema } from '@plone/volto/helpers/Extensions/withBlockSchemaEnhancer';
-import { compose } from 'redux';
-import { injectIntl } from 'react-intl';
-import { isEmpty } from 'lodash';
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
-import CclImageEditor from '@eeacms/volto-clms-theme/components/CclImageEditor/CclImageEditor';
-import { defineMessages } from 'react-intl';
+import { addExtensionFieldToSchema } from '@plone/volto/helpers/Extensions/withBlockSchemaEnhancer';
 import config from '@plone/volto/registry';
+import CclHomeImageEditor from '@eeacms/volto-clms-theme/components/Blocks/CclHomeBgImageBlock/CclHomeImageEditor';
+import { HomeBgImg } from '@eeacms/volto-clms-theme/components/Blocks/CclHomeBgImageBlock/HomeBgImg';
+import CclCard from '@eeacms/volto-clms-theme/components/CclCard/CclCard';
+import CclImageEditor from '@eeacms/volto-clms-theme/components/CclImageEditor/CclImageEditor';
+
+import { emptyCard, getPanels } from '../utils';
+import { CardBlockSchema, CardContainerSchema } from './CardContainerSchema';
 import getListingBodyVariation from './utils.js';
 
+import { isEmpty } from 'lodash';
+
 const messages = defineMessages({
   template: {
     id: 'Variation',
@@ -64,12 +68,16 @@ const CclCardContainerBlockEdit = ({
 
   const variation = getListingBodyVariation(data);
   let containerClass = '';
-  if (['news', 'event'].includes(variation.templateID)) {
+  if (data.variation === 'cardWithBgImage') {
+    containerClass = 'home-map-container';
+  } else if (['news', 'event'].includes(variation.templateID)) {
     containerClass = 'ccl-container';
   } else if (!['line', 'doc', 'globalSearch'].includes(variation.templateID)) {
     containerClass = 'card-container';
   }
 
+  let hasExtras = data.variation === 'cardWithBgImage' ? true : false;
+
   return (
     <>
       <div
@@ -83,32 +91,62 @@ const CclCardContainerBlockEdit = ({
         {data.title || 'Card container'}
       </div>
       <div className={containerClass}>
-        {panels.map(([uid, panel], index) => (
-          <CclCard
-            key={index}
-            type={variation?.templateID || 'doc'}
-            card={panel}
-            onClickImage={() => {
-              setSelectedCardBlock(uid);
-            }}
-            isCustomCard={true}
-            CclImageEditor={
-              <CclImageEditor
-                block={block}
-                data={data}
-                editable={editable}
-                imageUrl={panel?.image?.url}
-                onChangeBlock={onChangeBlock}
-                openObjectBrowser={openObjectBrowser}
-                pathname={pathname}
-                selected={selected}
-                selectedCardBlock={selectedCardBlock}
-                setSelectedCardBlock={setSelectedCardBlock}
-                uid={uid}
+        {variation?.id === 'cardWithBgImage' ? (
+          <>
+            <CclHomeImageEditor
+              data={data}
+              openObjectBrowser={openObjectBrowser}
+              selected={selected}
+              block={block}
+              editable={editable}
+              pathname={pathname}
+              onChangeBlock={onChangeBlock}
+            />
+            <HomeBgImg url={data?.image?.url} alt={data?.image?.alt} />
+            <div className="ccl-container">
+              {panels.map(([uid, panel], index) => (
+                <CclCard
+                  key={index}
+                  type={variation?.templateID || 'doc'}
+                  card={panel}
+                  onClickImage={() => {
+                    setSelectedCardBlock(uid);
+                  }}
+                  isCustomCard={true}
+                />
+              ))}
+            </div>
+          </>
+        ) : (
+          <>
+            {panels.map(([uid, panel], index) => (
+              <CclCard
+                key={index}
+                type={variation?.templateID || 'doc'}
+                card={panel}
+                onClickImage={() => {
+                  setSelectedCardBlock(uid);
+                }}
+                isCustomCard={true}
+                CclImageEditor={
+                  <CclImageEditor
+                    block={block}
+                    data={data}
+                    editable={editable}
+                    imageUrl={panel?.image?.url}
+                    onChangeBlock={onChangeBlock}
+                    openObjectBrowser={openObjectBrowser}
+                    pathname={pathname}
+                    selected={selected}
+                    selectedCardBlock={selectedCardBlock}
+                    setSelectedCardBlock={setSelectedCardBlock}
+                    uid={uid}
+                  />
+                }
               />
-            }
-          />
-        ))}
+            ))}
+          </>
+        )}
       </div>
       <SidebarPortal selected={selected && selectedCardBlock === -1}>
         <BlockDataForm
@@ -129,7 +167,10 @@ const CclCardContainerBlockEdit = ({
         }
       >
         <BlockDataForm
-          schema={CardBlockSchema()}
+          schema={CardBlockSchema(
+            hasExtras,
+            data?.customCards?.blocks?.[selectedCardBlock]?.hasButton,
+          )}
           title="Card block"
           onChangeField={(id, value) => {
             onChangeBlock(block, {

package/src/components/Blocks/CclCardContainerBlock/CclCardContainerBlockView.jsx

@@ -1,5 +1,8 @@
-import CclCard from '@eeacms/volto-clms-theme/components/CclCard/CclCard';
 import React from 'react';
+
+import { HomeBgImg } from '@eeacms/volto-clms-theme/components/Blocks/CclHomeBgImageBlock/HomeBgImg';
+import CclCard from '@eeacms/volto-clms-theme/components/CclCard/CclCard';
+
 import getListingBodyVariation from './utils.js';
 
 const CclCardContainerBlockView = (props) => {
@@ -11,23 +14,45 @@ const CclCardContainerBlockView = (props) => {
   const variation = getListingBodyVariation(data);
 
   let containerClass = '';
-  if (['news', 'event'].includes(variation.templateID)) {
+  if (data.variation === 'cardWithBgImage') {
+    containerClass = 'home-map-container';
+  } else if (['news', 'event'].includes(variation.templateID)) {
     containerClass = 'ccl-container';
   } else if (!['line', 'doc', 'globalSearch'].includes(variation.templateID)) {
     containerClass = 'card-container';
   }
+
   return (
-    <div className={containerClass}>
-      {cards &&
-        cards.map((card, index) => (
-          <CclCard
-            key={index}
-            type={variation.templateID}
-            card={card}
-            isCustomCard={true}
-          />
-        ))}
-    </div>
+    <>
+      {containerClass === 'home-map-container' ? (
+        <div className={containerClass}>
+          <HomeBgImg url={data?.image?.url} alt={data?.image?.alt} />
+          <div className="ccl-container">
+            {cards &&
+              cards.map((card, index) => (
+                <CclCard
+                  key={index}
+                  type={variation.templateID}
+                  card={card}
+                  isCustomCard={true}
+                />
+              ))}
+          </div>
+        </div>
+      ) : (
+        <div className={containerClass}>
+          {cards &&
+            cards.map((card, index) => (
+              <CclCard
+                key={index}
+                type={variation.templateID}
+                card={card}
+                isCustomCard={true}
+              />
+            ))}
+        </div>
+      )}
+    </>
   );
 };
 

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

@@ -31,6 +31,7 @@ const CclHomeBgImageBlockEdit = (props) => {
     });
     /* eslint-disable-next-line */
   }, []);
+
   return (
     <>
       <BodyTemplate
@@ -44,7 +45,6 @@ const CclHomeBgImageBlockEdit = (props) => {
             config,
             data.hasButton,
             data.hasLocationInfo,
-            data.hasDatasetButton,
           )}
           title="Carousel Div block"
           onChangeField={(id, value) => {

package/src/components/Blocks/CclHomeBgImageBlock/CclHomeBgImageSchema.js

@@ -1,9 +1,4 @@
-export const HomeBgImageSchema = (
-  config,
-  hasButton,
-  hasLocationInfo,
-  hasDatasetButton,
-) => {
+export const HomeBgImageSchema = (config, hasButton, hasLocationInfo) => {
   const variationsConfig = config.blocks.blocksConfig['homeBgImage'].variations;
   const variations = Object.keys(variationsConfig).map((variation) => [
     variationsConfig[variation].id,
@@ -18,20 +13,6 @@ export const HomeBgImageSchema = (
         },
       ]
     : [];
-  const hasDatasetButtonFieldset = hasDatasetButton
-    ? [
-        {
-          id: 'datasetButtonStyle',
-          title: 'Dataset button style',
-          fields: [
-            'dataset_buttonTitle',
-            'dataset_href',
-            'dataset_style',
-            'dataset_disabled',
-          ],
-        },
-      ]
-    : [];
   const hasLocationFieldset = hasLocationInfo
     ? [
         {
@@ -55,15 +36,10 @@ export const HomeBgImageSchema = (
           'location',
           'hasLocationInfo',
           'hasButton',
-          'dataset_title',
-          'dataset_subtitle',
-          'dataset_description',
-          'hasDatasetButton',
         ],
       },
       ...hasLocationFieldset,
       ...hasButtonFieldset,
-      ...hasDatasetButtonFieldset,
     ],
     properties: {
       title: {
@@ -146,52 +122,6 @@ export const HomeBgImageSchema = (
         type: 'boolean',
         default: false,
       },
-      dataset_title: {
-        title: 'Dataset title',
-        description: 'Dataset div title',
-        type: 'string',
-      },
-      dataset_subtitle: {
-        title: 'Dataset subTitle',
-        description: 'Dataset div Subtitle',
-        type: 'string',
-      },
-      dataset_description: {
-        title: 'Dataset description',
-        description: 'Dataset div description',
-        type: 'string',
-      },
-      hasDatasetButton: {
-        title: 'Dataset button',
-        type: 'boolean',
-        default: false,
-      },
-      dataset_buttonTitle: {
-        title: 'Title',
-        description: 'Add button text',
-        type: 'string',
-      },
-      dataset_href: {
-        title: 'URL',
-        description: 'Select site content or paste external url',
-        widget: 'object_browser',
-        mode: 'link',
-        selectedItemAttrs: ['Title', 'Description', '@type', '@id'],
-        allowExternals: true,
-      },
-      dataset_style: {
-        title: 'Button style',
-        choices: [
-          ['default', 'Default'],
-          ['filled', 'Filled'],
-        ],
-        default: 'default',
-      },
-      dataset_disabled: {
-        title: 'Disabled',
-        type: 'boolean',
-        default: false,
-      },
     },
     required: [],
   };

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

@@ -23,6 +23,14 @@ export const uncheckOptionAndChildren = (value, option) => {
 };
 
 export const enhanceExpandedByDefault = ({ schema, formData }) => {
+  let { fields } = schema.fieldsets[0];
+  const pos = fields.indexOf('type') + 1;
+  fields = [
+    ...fields.slice(0, pos),
+    'multiple',
+    ...fields.slice(pos, fields.length),
+  ];
+  schema.fieldsets[0].fields = fields;
   return expandedByDefault(schema);
 };
 

package/src/components/Blocks/customBlocks.js

@@ -165,6 +165,12 @@ const availableVariations = [
     true,
   ),
   listingVariation('CclGlobalSearch', false, 'Global search', 'globalSearch'),
+  listingVariation(
+    'cardWithBgImage',
+    false,
+    'cardWithBgImage',
+    'cardWithBgImage',
+  ),
 ];
 
 const customBlocks = (config) => ({