design-comuni-plone-theme 12.0.0-alpha.1 → 12.0.0

package/src/components/ImageWithErrors/ImageWithErrors.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { Image } from '@plone/volto/components';
+import { useFallbackImageSrc } from 'design-comuni-plone-theme/helpers';
+
+const ImageWithErrors = ({ src, fallbackSrc = '', ...rest }) => {
+  const { className, sizes } = rest;
+  const { currentSrc, handleError, getFallbackImageStyle } =
+    useFallbackImageSrc({
+      src,
+      customFallbackSrc: fallbackSrc,
+      className,
+      sizes,
+    });
+  let commonProps = { ...rest };
+  const fallbackStyle = getFallbackImageStyle({
+    src,
+    customFallbackSrc: fallbackSrc,
+    className,
+    sizes,
+  });
+  if (fallbackStyle) {
+    commonProps = {
+      ...commonProps,
+      style: { ...commonProps.style, ...fallbackStyle },
+    };
+  }
+  return <Image {...commonProps} src={currentSrc} onError={handleError} />;
+};
+
+export default ImageWithErrors;

package/src/components/ItaliaTheme/AppExtras/GenericAppExtras.jsx

@@ -1,16 +1,12 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { useIntl } from 'react-intl';
 import { useLocation } from 'react-router-dom';
-import { Helmet, BodyClass } from '@plone/volto/helpers';
-import { RemoveBodyClass } from 'design-comuni-plone-theme/components/ItaliaTheme';
-import { getSiteProperty } from 'design-comuni-plone-theme/helpers';
+import { BodyClass } from '@plone/volto/helpers';
 import ScrollToTop from 'design-comuni-plone-theme/components/ItaliaTheme/ScrollToTop/ScrollToTop';
 import { SubsiteLoader } from 'volto-subsites';
 import config from '@plone/volto/registry';
 
 const GenericAppExtras = (props) => {
-  const intl = useIntl();
   const location = useLocation();
 
   const subsite = useSelector((state) => state.subsite?.data);
@@ -19,7 +15,6 @@ const GenericAppExtras = (props) => {
   if (subsiteLoadable) {
     subsiteLoadable.load();
   }
-  const siteTitle = subsite?.title ?? getSiteProperty('siteTitle', intl.locale);
 
   const FORCE_PUBLIC_UI = ['/sitemap', '/search'];
   const isPublicUI = FORCE_PUBLIC_UI.reduce(
@@ -29,11 +24,10 @@ const GenericAppExtras = (props) => {
 
   return (
     <>
-      <Helmet titleTemplate={`%s - ${siteTitle}`} />
       {isPublicUI && (
         <>
           <BodyClass className="public-ui" />
-          <RemoveBodyClass className="cms-ui" />
+          <BodyClass className="cms-ui" remove={true} />
         </>
       )}
       <ScrollToTop />

package/src/components/ItaliaTheme/AppExtras/SiteSettingsExtras.jsx

@@ -0,0 +1,35 @@
+/*
+CUSTOMIZATIONS:
+- get defaultValue from siteProperties
+*/
+
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { Helmet } from '@plone/volto/helpers';
+import { SiteProperty } from 'volto-site-settings';
+import { getSiteProperty } from 'design-comuni-plone-theme/helpers';
+
+const SiteSettingsExtras = (props) => {
+  const intl = useIntl();
+  let siteTitle = SiteProperty({
+    property: 'site_title',
+    getValue: true,
+    defaultValue: getSiteProperty('siteTitle', intl.locale),
+  });
+
+  const parentSiteTitle = SiteProperty({
+    property: 'site_title',
+    getValue: true,
+    getParent: true,
+    defaultValue: getSiteProperty('siteTitle', intl.locale),
+  });
+
+  if (parentSiteTitle !== siteTitle) {
+    siteTitle = siteTitle + ' - ' + parentSiteTitle;
+  }
+
+  siteTitle = siteTitle?.replaceAll('\\n', ' - ') ?? '';
+
+  return <Helmet titleTemplate={`%s - ${siteTitle}`} />;
+};
+export default SiteSettingsExtras;

package/src/components/ItaliaTheme/Blocks/Accordion/Block/ViewBlock.jsx

@@ -66,8 +66,9 @@ const ViewBlock = ({ data, isOpen, toggle, id, index }) => {
           id={`content-${id}-${index}`}
           role="region"
           aria-labelledby={`${id}-${index}`}
+          hidden={!isOpen}
         >
-          <div className="accordion-inner" onFocus={toggle()}>
+          <div className="accordion-inner">
             <TextBlockView id={id} data={{ value: data.text }} />
           </div>
           {data.href && (

package/src/components/ItaliaTheme/Blocks/Accordion/Edit.jsx

@@ -12,6 +12,7 @@ import {
   SubblocksEdit,
   SubblocksWrapper,
 } from 'volto-subblocks';
+import { TextEditorWidget } from 'design-comuni-plone-theme/components/ItaliaTheme';
 
 import { SidebarPortal } from '@plone/volto/components';
 import { handleKeyDownOwnFocusManagement } from 'design-comuni-plone-theme/helpers/blocks';
@@ -24,6 +25,14 @@ const messages = defineMessages({
     id: 'Add accordion item',
     defaultMessage: 'Aggiungi elemento',
   },
+  title: {
+    id: 'Title',
+    defaultMessage: 'Titolo...',
+  },
+  description: {
+    id: 'Description placeholder',
+    defaultMessage: 'Descrizione...',
+  },
 });
 /**
  * Edit Accordion block class.
@@ -107,6 +116,56 @@ class Edit extends SubblocksEdit {
         <div className="full-width section section-muted section-inset-shadow py-5 is-edit-mode">
           <Container className="px-md-4">
             <Card className="card-bg rounded" noWrapper={false} space tag="div">
+              <div className="block-header">
+                <div className="title">
+                  <TextEditorWidget
+                    {...this.props}
+                    showToolbar={false}
+                    data={this.props.data}
+                    key={'title'}
+                    fieldName="title"
+                    selected={this.state.selectedField === 'title'}
+                    setSelected={(f) => {
+                      this.setState({
+                        selectedField: f,
+                        subIndexSelected: -1,
+                      });
+                    }}
+                    placeholder={this.props.intl.formatMessage(messages.title)}
+                    focusNextField={() => {
+                      this.setState({ selectedField: 'description' });
+                    }}
+                  />
+                </div>
+
+                <div className="description">
+                  <TextEditorWidget
+                    {...this.props}
+                    showToolbar={true}
+                    data={this.props.data}
+                    fieldName="description"
+                    selected={this.state.selectedField === 'description'}
+                    setSelected={(f) => {
+                      this.setState({
+                        selectedField: f,
+                        subIndexSelected: -1,
+                      });
+                    }}
+                    placeholder={this.props.intl.formatMessage(
+                      messages.description,
+                    )}
+                    focusPrevField={() => {
+                      this.setState({ selectedField: 'title' });
+                    }}
+                    focusNextField={() => {
+                      this.setState({
+                        selectedField: null,
+                        subIndexSelected: 0,
+                      });
+                    }}
+                  />
+                </div>
+              </div>
               <CardBody tag="div">
                 <SubblocksWrapper node={this.node}>
                   {this.state.subblocks.map((subblock, subindex) => (

package/src/components/ItaliaTheme/Blocks/Accordion/View.jsx

@@ -6,6 +6,7 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import ViewBlock from './Block/ViewBlock';
+import { TextBlockView } from '@plone/volto-slate/blocks/Text';
 import { Container, Card, CardBody } from 'design-react-kit';
 
 /**
@@ -25,6 +26,14 @@ const AccordionView = ({ data, block }) => {
         <div className="full-width section section-muted section-inset-shadow py-5">
           <Container className="px-md-4">
             <Card className="card-bg rounded" noWrapper={false} space tag="div">
+              <div className="block-header">
+                {data.title && <div className="title">{data.title}</div>}
+                {data.description && (
+                  <div className="description">
+                    <TextBlockView data={{ value: data.description }} />
+                  </div>
+                )}
+              </div>
               <CardBody tag="div">
                 {data.subblocks.map((subblock, index) => (
                   <ViewBlock

package/src/components/ItaliaTheme/Blocks/Alert/Edit.jsx

@@ -68,7 +68,7 @@ const Edit = (props) => {
                   {...props}
                   data={data}
                   fieldName="text"
-                  selected={selectedField === 'text'}
+                  selected={selected && selectedField === 'text'}
                   setSelected={setSelectedField}
                   placeholder={intl.formatMessage(messages.content_placeholder)}
                   showToolbar={true}

package/src/components/ItaliaTheme/Blocks/ArgumentsInEvidence/BottomBody.jsx

@@ -26,9 +26,9 @@ const BottomBody = ({ data, intl, hasArguments }) => {
         <div
           className={data?.centerAlignment ? 'col-lg-12 mb-3' : 'col-lg-auto'}
         >
-          <h6 className="text-uppercase text-center mt-1">
+          <p className="h6 text-uppercase text-center mt-1">
             {intl?.formatMessage(messages.otherArguments)}
-          </h6>
+          </p>
         </div>
         <div className={data?.centerAlignment ? 'col-lg-12' : 'col-lg-auto'}>
           {data?.arguments?.map((argument, index) => (

package/src/components/ItaliaTheme/Blocks/BandiSearch/Body.jsx

@@ -167,6 +167,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
                 <>
                   {React.createElement(filterOne.widget.component, {
                     ...filterOne.widget?.props,
+                    blockID: id,
                     id: 'filterOne',
                     onChange: (filter, value) => {
                       dispatchFilter({
@@ -180,6 +181,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
               {filterTwo &&
                 React.createElement(filterTwo.widget?.component, {
                   ...filterTwo.widget?.props,
+                  blockID: id,
                   id: 'filterTwo',
                   onChange: (filter, value) =>
                     dispatchFilter({
@@ -190,6 +192,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
               {filterThree &&
                 React.createElement(filterThree.widget?.component, {
                   ...filterThree.widget?.props,
+                  blockID: id,
                   id: 'filterThree',
                   onChange: (filter, value) =>
                     dispatchFilter({
@@ -203,6 +206,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
                 icon={false}
                 tag="button"
                 className="my-2 my-lg-1"
+                type="submit"
               >
                 {intl.formatMessage(messages.find)}
               </Button>

package/src/components/ItaliaTheme/Blocks/CTABlock/Block.jsx

@@ -69,7 +69,7 @@ const Block = (props) => {
                 showToolbar={false}
                 data={data}
                 fieldName="cta_title"
-                selected={selectedField === 'cta_title'}
+                selected={selected && selectedField === 'cta_title'}
                 setSelected={setSelectedField}
                 block={block}
                 placeholder={intl.formatMessage(messages.cta_title)}
@@ -89,7 +89,7 @@ const Block = (props) => {
               data={data}
               fieldName="cta_content"
               block={block}
-              selected={selectedField === 'cta_content'}
+              selected={selected && selectedField === 'cta_content'}
               placeholder={intl.formatMessage(messages.cta_content)}
               setSelected={setSelectedField}
               focusPrevField={() => {

package/src/components/ItaliaTheme/Blocks/Calendar/Body.jsx

@@ -123,6 +123,7 @@ const Body = ({ data, block, inEditMode, path, onChangeBlock, reactSlick }) => {
   const adaptedQuery = Object.assign(
     {
       fullobjects: 1,
+      sort_on: !Object.keys(_querystring).includes('sort_on') ? 'start' : null,
     },
     ...copyFields.map((name) =>
       Object.keys(_querystring).includes(name)

package/src/components/ItaliaTheme/Blocks/Callout/Edit.jsx

@@ -57,7 +57,7 @@ const Edit = (props) => {
               block={block}
               fieldName="title"
               onChangeBlock={onChangeBlock}
-              selected={selectedField === 'title'}
+              selected={selected && selectedField === 'title'}
               placeholder={intl.formatMessage(messages.title)}
               setSelected={setSelectedField}
               focusNextField={() => {
@@ -74,7 +74,7 @@ const Edit = (props) => {
             fieldName="text"
             block={block}
             onSelectBlock={onSelectBlock}
-            selected={selectedField === 'text'}
+            selected={selected && selectedField === 'text'}
             placeholder={intl.formatMessage(messages.text)}
             onChangeBlock={onChangeBlock}
             setSelected={setSelectedField}

package/src/components/ItaliaTheme/Blocks/Common/SearchFilters/DateFilter.jsx

@@ -188,6 +188,7 @@ const DateFilter = (props) => {
     endLabel,
     defaultStart,
     defaultEnd,
+    blockID,
     ...rest
   } = props;
   const { DateRangePicker } = reactDates;
@@ -230,12 +231,12 @@ const DateFilter = (props) => {
       <DateRangePicker
         {...rest}
         startDate={value?.startDate || defaultStart}
-        startDateId="start-date-filter"
+        startDateId={`start-date-filter-${blockID}`}
         startDatePlaceholderText={
           startLabel ?? intl.formatMessage(messages.eventSearchStartDate)
         }
         endDate={value?.endDate || defaultEnd}
-        endDateId="end-date-filter"
+        endDateId={`end-date-filter-${blockID}`}
         endDatePlaceholderText={
           endLabel ?? intl.formatMessage(messages.eventSearchEndDate)
         }

package/src/components/ItaliaTheme/Blocks/Common/SearchFilters/SelectFilter.jsx

@@ -11,6 +11,7 @@ const SelectFilter = ({
   onChange,
   placeholder,
   isSearchable = false,
+  optionsQuerySize = 25,
 }) => {
   const dispatch = useDispatch();
 
@@ -52,11 +53,18 @@ const SelectFilter = ({
         );
       }
     } else if (options.vocabulary) {
-      dispatch(getVocabulary({ vocabNameOrURL: options.vocabulary }));
+      dispatch(
+        getVocabulary({
+          vocabNameOrURL: options.vocabulary,
+          size: optionsQuerySize,
+        }),
+      );
     }
   }, []);
 
-  const select_options = options?.vocabulary
+  const select_options = options?.choices
+    ? options.choices
+    : options?.vocabulary
     ? vocabularies?.[options.vocabulary]?.items
     : selectOptions;
 
@@ -70,7 +78,7 @@ const SelectFilter = ({
           onChange(id, opt);
         }}
         options={select_options?.filter((opt) => !!opt.value?.toString()) ?? []}
-        isClearable={true}
+        isClearable={options?.isClearable ?? true}
         isSearchable={isSearchable}
         // components={{
         //   ClearIndicator: (props) => {

package/src/components/ItaliaTheme/Blocks/Common/SearchFilters/TextFilter.jsx

@@ -21,6 +21,7 @@ const TextFilter = ({ value, id, onChange, placeholder }) => {
         onChange={(e, data) => {
           onChange(id, e.target.value ?? '');
         }}
+        autocomplete="off"
       />
     </div>
   );

package/src/components/ItaliaTheme/Blocks/ContactsBlock/Block/EditBlock.jsx

@@ -52,24 +52,13 @@ class EditBlock extends SubblockEdit {
     // eslint-disable-next-line no-unused-expressions
     this.contact_item_ref?.current?.addEventListener('keydown', (e) => {
       if (e.keyCode === 13) {
-        if (!(this.state.focusOn === 'text')) {
-          this.setState({ focusOn: 'text' });
+        if (!(this.state.focusOn === 'title')) {
+          this.setState({ focusOn: 'title' });
         }
       }
     });
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (!this.props.selected && nextProps.focusOn) {
-      this.props.onSelectBlock(this.props.block);
-    }
-
-    if (nextProps.selected && !this.state.focusOn) {
-      this.setState({ focusOn: 'title' });
-    } else if (!nextProps.selected) {
-      this.setState({ focusOn: null });
-    }
-  }
   /**
    * Render method.
    * @method render
@@ -95,6 +84,7 @@ class EditBlock extends SubblockEdit {
               {/* eslint-disable */}
               <TextEditorWidget
                 {...this.props}
+                index={this.props.blockIndex}
                 key="title"
                 showToolbar={false}
                 data={this.props.data}
@@ -125,6 +115,7 @@ class EditBlock extends SubblockEdit {
             <div className="contact-text">
               <TextEditorWidget
                 {...this.props}
+                index={this.props.blockIndex}
                 key="text"
                 data={this.props.data}
                 fieldName="text"
@@ -135,7 +126,9 @@ class EditBlock extends SubblockEdit {
                   this.props.onChangeBlock(this.props.index, _data);
                 }}
                 selected={this.props.selected && this.state.focusOn === 'text'}
-                setSelected={(f) => this.setState({ focusOn: f })}
+                setSelected={(f) => {
+                  this.setState({ focusOn: f });
+                }}
                 focusPrevField={() => {
                   this.setState({ focusOn: 'title' });
                 }}
@@ -151,6 +144,7 @@ class EditBlock extends SubblockEdit {
               </div>
               <TextEditorWidget
                 {...this.props}
+                index={this.props.blockIndex}
                 key="tel"
                 data={this.props.data}
                 fieldName="tel"
@@ -177,6 +171,7 @@ class EditBlock extends SubblockEdit {
               </div>
               <TextEditorWidget
                 {...this.props}
+                index={this.props.blockIndex}
                 key="email"
                 wrapClass="email"
                 data={this.props.data}
@@ -188,7 +183,14 @@ class EditBlock extends SubblockEdit {
                 placeholder={this.props.intl.formatMessage(
                   messages.textPlaceholder,
                 )}
-                setSelected={(f) => this.setState({ focusOn: f })}
+                setSelected={(f) => {
+                  if (!this.props.selected) {
+                    //a11y - per il focus del blocco da tastiera con navigazione inversa
+                    this.props.onSubblockChangeFocus(this.props.index);
+                    this.props.onSelectBlock(this.props.block);
+                  }
+                  this.setState({ focusOn: f });
+                }}
                 focusPrevField={() => {
                   this.setState({ focusOn: 'tel' });
                 }}

package/src/components/ItaliaTheme/Blocks/ContactsBlock/Edit.jsx

@@ -50,7 +50,10 @@ class Edit extends SubblocksEdit {
   UNSAFE_componentWillReceiveProps(newProps) {
     if (newProps.selected) {
       if (!this.props.selected) {
-        this.setState({ selectedField: 'title' });
+        if (!this.state.selectedField && this.state.subIndexSelected < 0) {
+          //a11y - test subIndexSelected<0 per gestire il focus con navigazione da tastiera al contrario (dal blocco successivo a questo blocco)
+          this.setState({ selectedField: 'title' });
+        }
       }
     } else {
       this.setState({ selectedField: null });
@@ -122,6 +125,8 @@ class Edit extends SubblocksEdit {
           className={`full-width section bg-${
             this.props.data.bg_color ?? 'primary'
           } py-5`}
+          role="form"
+          aria-label={this.props.blocksConfig[this.props.type].title}
         >
           <Container className="px-md-4">
             <div className="block-header">
@@ -134,9 +139,12 @@ class Edit extends SubblocksEdit {
                   fieldName="title"
                   selected={this.state.selectedField === 'title'}
                   placeholder={this.props.intl.formatMessage(messages.title)}
-                  onSelectBlock={() => {}}
                   setSelected={(f) => {
                     this.setState({ selectedField: f, subIndexSelected: -1 });
+                    if (!this.props.selected) {
+                      //a11y - per il focus del blocco da tastiera
+                      this.props.onSelectBlock(this.props.block);
+                    }
                   }}
                   focusNextField={() => {
                     this.setState({ selectedField: 'description' });
@@ -154,7 +162,6 @@ class Edit extends SubblocksEdit {
                   placeholder={this.props.intl.formatMessage(
                     messages.description,
                   )}
-                  onSelectBlock={() => {}}
                   setSelected={(f) => {
                     this.setState({ selectedField: f, subIndexSelected: -1 });
                   }}
@@ -182,12 +189,11 @@ class Edit extends SubblocksEdit {
                       {...this.props}
                       data={subblock}
                       index={subindex}
+                      blockIndex={this.props.index}
                       selected={this.isSubblockSelected(subindex)}
                       {...this.subblockProps}
-                      openObjectBrowser={this.props.openObjectBrowser}
-                      onSubblockChangeFocus={this.onSubblockChangeFocus}
                       onChangeFocus={this.onSubblockChangeFocus}
-                      isLast={this.state.subblocks.length - 1 === subindex}
+                      isLast={subindex === this.state.subblocks.length - 1}
                       isFirst={subindex === 0}
                       onFocusPreviousBlock={() => {
                         this.setState({

package/src/components/ItaliaTheme/Blocks/CountDown/Edit.jsx

@@ -68,7 +68,7 @@ const Edit = (props) => {
                   {...otherProps}
                   data={data}
                   fieldName="text"
-                  selected={selectedField === 'text'}
+                  selected={selected && selectedField === 'text'}
                   block={block}
                   placeholder={intl.formatMessage(messages.text)}
                   setSelected={setSelectedField}
@@ -100,7 +100,7 @@ const Edit = (props) => {
                   data={data}
                   block={block}
                   fieldName="countdown_text"
-                  selected={selectedField === 'countdown_text'}
+                  selected={selected && selectedField === 'countdown_text'}
                   placeholder={intl.formatMessage(messages.text)}
                   setSelected={setSelectedField}
                   focusPrevField={() => {

package/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx

@@ -75,6 +75,11 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
         o: 'plone.app.querystring.operation.selection.any',
         v: ['Event'],
       },
+      {
+        i: 'rassegna',
+        o: 'plone.app.querystring.operation.boolean.isFalse',
+        v: '',
+      },
     ];
 
     [filterOne, filterTwo, filterThree].forEach((f) => {
@@ -98,9 +103,11 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
       getQueryStringResults(
         subsite ? flattenToAppURL(subsite['@id']) : '',
         {
-          fullobjects: 1,
           query: query,
+          metadata_fields: '_all',
           b_size: b_size,
+          sort_order: 'ascending',
+          sort_on: 'start',
         },
         id + '_events_search',
         page,
@@ -175,6 +182,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
                 <>
                   {React.createElement(filterOne.widget.component, {
                     ...filterOne.widget?.props,
+                    blockID: id,
                     id: 'filterOne',
                     onChange: (filter, value) => {
                       dispatchFilter({
@@ -188,6 +196,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
               {filterTwo &&
                 React.createElement(filterTwo.widget?.component, {
                   ...filterTwo.widget?.props,
+                  blockID: id,
                   id: 'filterTwo',
                   onChange: (filter, value) =>
                     dispatchFilter({
@@ -198,6 +207,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
               {filterThree &&
                 React.createElement(filterThree.widget?.component, {
                   ...filterThree.widget?.props,
+                  blockID: id,
                   id: 'filterThree',
                   onChange: (filter, value) =>
                     dispatchFilter({
@@ -211,6 +221,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
                 icon={false}
                 tag="button"
                 className="my-2 my-lg-1"
+                type="submit"
               >
                 {intl.formatMessage(messages.find)}
               </Button>
@@ -223,7 +234,11 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
         items?.length > 0 ? (
           <div className="mt-4" ref={resultsRef} aria-live="polite">
             <div className="block listing">
-              <CardWithImageTemplate items={items} full_width={false} />
+              <CardWithImageTemplate
+                items={items}
+                full_width={false}
+                always_show_image={data.always_show_image}
+              />
             </div>
             {querystringResults.total > b_size && (
               <Pagination

package/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js

@@ -36,6 +36,8 @@ const DefaultFilters = () => {
   const intl = useIntl();
   moment.locale(intl.locale);
   const subsite = useSelector((state) => state.subsite?.data);
+  const isSubsiteValid = subsite && Object.keys(subsite).length > 0;
+  const path = isSubsiteValid ? flattenToAppURL(subsite['@id']) : '/';
 
   return {
     text_filter: {
@@ -67,19 +69,10 @@ const DefaultFilters = () => {
           value: null,
           isSearchable: true,
           options: {
-            dispatch: {
-              path: subsite ? flattenToAppURL(subsite['@id']) : '/',
-              portal_types: ['Venue'],
-              fullobjects: 0,
-              b_size: 10000,
-              subrequests_name: 'venues',
-              additionalParams: {
-                sort_on: 'sortable_title',
-                sort_order: 'ascending',
-              },
-            },
+            vocabulary: 'design.plone.vocabularies.event_location',
             placeholder: intl.formatMessage(messages.venues),
           },
+          optionsQuerySize: -1,
         },
       },
       query: (value, query) => {
@@ -99,12 +92,12 @@ const DefaultFilters = () => {
         component: DateFilter,
         props: {
           value: {
-            startDate: moment().startOf('day'),
-            endDate: moment().endOf('day'),
+            startDate: null,
+            endDate: null,
           },
           showClearDates: true,
-          defaultStart: moment().startOf('day'),
-          defaultEnd: moment().endOf('day'),
+          defaultStart: null,
+          defaultEnd: null,
           isOutsideRange: () => false,
         },
       },