@eeacms/volto-clms-theme 1.0.66 → 1.0.70

package/CHANGELOG.md

@@ -4,8 +4,66 @@ 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.70](https://github.com/eea/volto-clms-theme/compare/1.0.69...1.0.70)
+
+- test [`030fee9`](https://github.com/eea/volto-clms-theme/commit/030fee91c17a03a5a3449500af23429d47c2b168)
+- gemet inspire themes label renaming [`669643a`](https://github.com/eea/volto-clms-theme/commit/669643a41d16c84c044b564047fee161a10a1e80)
+- fix te3st [`5b49612`](https://github.com/eea/volto-clms-theme/commit/5b49612b558765f326f14aaae8b195e21d02c461)
+- fix test [`a0fade3`](https://github.com/eea/volto-clms-theme/commit/a0fade3fa8dfb9bcce669b73e6181d9fe32af1b8)
+- fix routing on vertical tabs with search filters [`d5515a1`](https://github.com/eea/volto-clms-theme/commit/d5515a163fee044405070848b9b65c27b3cab34c)
+- search widget modification [`79fd282`](https://github.com/eea/volto-clms-theme/commit/79fd282cd4daf6bfc3f974ce28e89b6aa69106b8)
+- test [`0f4654a`](https://github.com/eea/volto-clms-theme/commit/0f4654a1b5b2b6c27cc403f4a4e15c447ce5e2df)
+- test [`2797b10`](https://github.com/eea/volto-clms-theme/commit/2797b10c42dca21f31b898de8b4483d5f3bf39c3)
+- test [`e0a1f29`](https://github.com/eea/volto-clms-theme/commit/e0a1f296b29abdb4aad93517171fc4f14218a6f0)
+- test [`8bd1316`](https://github.com/eea/volto-clms-theme/commit/8bd1316153da80952c2db8188dd71bd10d0466eb)
+
+#### [1.0.69](https://github.com/eea/volto-clms-theme/compare/1.0.68...1.0.69)
+
+> 17 February 2022
+
+- Develop [`#206`](https://github.com/eea/volto-clms-theme/pull/206)
+- new set of action and reducers to import WMS layers from a new endpoint [`#204`](https://github.com/eea/volto-clms-theme/pull/204)
+- Bugs n improvements [`#205`](https://github.com/eea/volto-clms-theme/pull/205)
+- add react-input-range to transformIgnorePatterns [`e3c704d`](https://github.com/eea/volto-clms-theme/commit/e3c704d4e0569d55b1c5cf50a3bf3191452aea38)
+- global search variation [`3599a89`](https://github.com/eea/volto-clms-theme/commit/3599a897c1cdbdb39041144d0b6610bb1debbe5a)
+- prettier [`bc6f853`](https://github.com/eea/volto-clms-theme/commit/bc6f85356460b5e03f3bbda134318adc5950d30f)
+- fix tests [`09cd0b9`](https://github.com/eea/volto-clms-theme/commit/09cd0b99706492f2a24e79ed6f280fe6e023e084)
+- Map styles [`ed902d4`](https://github.com/eea/volto-clms-theme/commit/ed902d49b46341ebdc1d12ceb6a1ca49129a4cd7)
+- elvis [`09886c4`](https://github.com/eea/volto-clms-theme/commit/09886c40b1cab893cc94aaed3ded237aadf1171b)
+- fix test [`50c0e5a`](https://github.com/eea/volto-clms-theme/commit/50c0e5a4231833596ae738ef6a4d76f63eaf5c22)
+- fix test [`1d2669f`](https://github.com/eea/volto-clms-theme/commit/1d2669ffb71c33ae692b4023a85ce4c6a76c0cec)
+- double range facet for temporal extent filter [`118e622`](https://github.com/eea/volto-clms-theme/commit/118e622eca2486893e5993bfd89f1024a922a184)
+- Header responsive [`872534f`](https://github.com/eea/volto-clms-theme/commit/872534fd9bf616447b60c4a87fe62e544cafdc1b)
+- News/Event line color [`e144da8`](https://github.com/eea/volto-clms-theme/commit/e144da8845dece2098312af1fdcfa4901bbaeabe)
+
+#### [1.0.68](https://github.com/eea/volto-clms-theme/compare/1.0.67...1.0.68)
+
+> 14 February 2022
+
+- Develop [`#203`](https://github.com/eea/volto-clms-theme/pull/203)
+- fix underpanel [`d665279`](https://github.com/eea/volto-clms-theme/commit/d665279a8b2fefc450353af0121325c375d32cb5)
+- Selected files information, option to clear selection and indeterminate checkbox at header [`b72f476`](https://github.com/eea/volto-clms-theme/commit/b72f476a2bd382fd2cce4ed8abc9134fb05ceb32)
+
+#### [1.0.67](https://github.com/eea/volto-clms-theme/compare/1.0.66...1.0.67)
+
+> 11 February 2022
+
+- Downloadable files and some test improvements [`#202`](https://github.com/eea/volto-clms-theme/pull/202)
+- code smells [`b07ed5d`](https://github.com/eea/volto-clms-theme/commit/b07ed5d8101981349d768e47553277d1f049eed5)
+- small fix [`3fc4119`](https://github.com/eea/volto-clms-theme/commit/3fc4119394c6fc0782d41878e153bff79060605d)
+- all initial test created [`240fc74`](https://github.com/eea/volto-clms-theme/commit/240fc74514051740098b026cc0ad834d3a3a1763)
+- render loading component while libraries accordion is loading [`d7955ae`](https://github.com/eea/volto-clms-theme/commit/d7955aebabc3b969a7753a89e54e63f58799dd1e)
+- fix test imports [`3c61991`](https://github.com/eea/volto-clms-theme/commit/3c61991b8559c508ec009d2a4ebdc8bdb704a985)
+- hide searchbox when the results are less than 10 [`eedda03`](https://github.com/eea/volto-clms-theme/commit/eedda03b4d752f2c54714dbb97c624eba8332494)
+- downloadable files modifications [`7bdf690`](https://github.com/eea/volto-clms-theme/commit/7bdf6909693640d33e4087281d49c8497cf65c02)
+- downloadable files modifications [`16b86fd`](https://github.com/eea/volto-clms-theme/commit/16b86fd056cc2790335505f80fc67d37c674f260)
+- redesign dataset view [`05b2688`](https://github.com/eea/volto-clms-theme/commit/05b2688d0d490c35fe65810e0a5497712948db24)
+
 #### [1.0.66](https://github.com/eea/volto-clms-theme/compare/1.0.65...1.0.66)
 
+> 9 February 2022
+
+- Add tests [`#201`](https://github.com/eea/volto-clms-theme/pull/201)
 - Setup testing [`#199`](https://github.com/eea/volto-clms-theme/pull/199)
 - Setup testing [`#200`](https://github.com/eea/volto-clms-theme/pull/200)
 - Bugs n improvements [`#198`](https://github.com/eea/volto-clms-theme/pull/198)

package/jest-addon.config.js

@@ -28,7 +28,7 @@ module.exports = {
     '^.+\\.(svg)$': './node_modules/@plone/volto/jest-svgsystem-transform.js',
   },
   transformIgnorePatterns: [
-    'node_modules/(?!(@eeacms/volto-clms-utils/|@plone/volto/|slick-carousel))',
+    'node_modules/(?!(@eeacms/volto-clms-utils/|@plone/volto/|slick-carousel|react-input-range))',
   ],
   coverageThreshold: {
     global: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.66",
+  "version": "1.0.70",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -49,7 +49,8 @@
     "react-svg": "14.0.4",
     "slick-carousel": "1.8.1",
     "volto-dropdownmenu": "2.2.7",
-    "volto-form-block": "2.2.2"
+    "volto-form-block": "2.2.2",
+    "react-input-range": "^1.3.0"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",

package/src/actions/import_wms_layers/import_wms_layers.js

@@ -0,0 +1,20 @@
+/**
+ * Post meeting register actions.
+ * @module actions/postImportGeonetwork
+ */
+export const POST_IMPORT_WMS_LAYERS = 'POST_IMPORT_WMS_LAYERS';
+
+/**
+ * Post import geonetwork.
+ * @function postImportGeonetwork
+ * @returns {Object} Get extra items action.
+ */
+export function postImportWMSLayers(url, id, type) {
+  return {
+    type: POST_IMPORT_WMS_LAYERS,
+    request: {
+      op: 'post',
+      path: `${url}/@import-wms-layers`,
+    },
+  };
+}

package/src/actions/import_wms_layers/import_wms_layers.test.js

@@ -0,0 +1,15 @@
+import { postImportWMSLayers } from './import_wms_layers';
+import { POST_IMPORT_WMS_LAYERS } from './import_wms_layers';
+
+describe('Import geonetwork action', () => {
+  describe('postImportWMSLayers', () => {
+    it('should create an action to post geonetwork', () => {
+      const url = 'http://localhost';
+      const action = postImportWMSLayers(url);
+
+      expect(action.type).toEqual(POST_IMPORT_WMS_LAYERS);
+      expect(action.request.op).toEqual('post');
+      expect(action.request.path).toEqual(`${url}/@import-wms-layers`);
+    });
+  });
+});

package/src/actions/index.js

@@ -82,3 +82,8 @@ export {
   unsubscribeTo,
   confirmUnsubscribeTo,
 } from './subscription/post_subscription';
+
+export {
+  POST_IMPORT_WMS_LAYERS,
+  postImportWMSLayers,
+} from './import_wms_layers/import_wms_layers';

package/src/components/Blocks/CclButtonBlock/CclButtonBlockEdit.test.jsx

@@ -1,15 +1,12 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import configureStore from 'redux-mock-store';
-import { Provider } from 'react-intl-redux';
-import { MemoryRouter } from 'react-router-dom';
+import Enzyme, { mount } from 'enzyme';
 
-import CclButtonBlockEdit from './CclButtonBlockEdit';
-
-import Enzyme from 'enzyme';
 import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
-// import { shallow } from 'enzyme';
-import { mount } from 'enzyme';
+import CclButtonBlockEdit from './CclButtonBlockEdit';
+import { MemoryRouter } from 'react-router-dom';
+import { Provider } from 'react-intl-redux';
+import React from 'react';
+import configureStore from 'redux-mock-store';
+import renderer from 'react-test-renderer';
 
 Enzyme.configure({ adapter: new Adapter() });
 
@@ -35,6 +32,7 @@ describe('CclButtonBlockEdit', () => {
       style: 'default',
       download: false,
     };
+
     // const component = shallow(
     const component = mount(
       <Provider store={store}>
@@ -43,8 +41,12 @@ describe('CclButtonBlockEdit', () => {
             data={data}
             selected={false}
             block="1234"
-            onChangeBlock={() => {}}
-            setSidebarTab={() => {}}
+            onChangeBlock={() => {
+              return 'test';
+            }}
+            setSidebarTab={() => {
+              return 'test';
+            }}
           />
         </MemoryRouter>
       </Provider>,
@@ -75,10 +77,18 @@ describe('CclButtonBlockEdit', () => {
             data={data}
             selected={false}
             block="1234"
-            onChangeBlock={() => {}}
-            onSelectBlock={() => {}}
-            onChangeField={() => {}}
-            setSidebarTab={() => {}}
+            onChangeBlock={() => {
+              return 'test';
+            }}
+            onSelectBlock={() => {
+              return 'test';
+            }}
+            onChangeField={() => {
+              return 'test';
+            }}
+            setSidebarTab={() => {
+              return 'test';
+            }}
           />
         </MemoryRouter>
       </Provider>,
@@ -87,4 +97,46 @@ describe('CclButtonBlockEdit', () => {
     const json = component.toJSON();
     expect(json).toMatchSnapshot();
   });
+  //jest test for CclButtonBlockEdit onChangeBlock statement
+  it('CclButtonBlockEdit onChangeBlock', () => {
+    const store = mockStore({
+      content: {
+        create: {},
+        data: {},
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const data = {
+      href: ['https://www.google.com', 'https://www.google.com'],
+      disabled: true,
+    };
+    const component = mount(
+      <Provider store={store}>
+        <MemoryRouter>
+          <CclButtonBlockEdit
+            data={data}
+            selected={false}
+            block="1234"
+            onChangeBlock={() => {
+              return 'test';
+            }}
+            onSelectBlock={() => {
+              return 'test';
+            }}
+            onChangeField={() => {
+              return 'test';
+            }}
+            setSidebarTab={() => {
+              return 'test';
+            }}
+          />
+        </MemoryRouter>
+      </Provider>,
+    );
+    const legend = component.find('.ccl-block-editor-header');
+    legend.simulate('click');
+  });
 });

package/src/components/Blocks/CclCardBlock/CclCardBlockEdit.test.jsx

@@ -1,15 +1,14 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import configureStore from 'redux-mock-store';
-import { Provider } from 'react-intl-redux';
-import { MemoryRouter } from 'react-router-dom';
+import Enzyme, { mount } from 'enzyme';
 
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import CclCardBlockEdit from './CclCardBlockEdit';
+import { MemoryRouter } from 'react-router-dom';
+import { Provider } from 'react-intl-redux';
+import React from 'react';
+import configureStore from 'redux-mock-store';
+import renderer from 'react-test-renderer';
 
-import Enzyme from 'enzyme';
-import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 // import { shallow } from 'enzyme';
-import { mount } from 'enzyme';
 
 Enzyme.configure({ adapter: new Adapter() });
 

package/src/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingCards.jsx

@@ -25,7 +25,7 @@ const CclListingCards = (props) => {
   let containerClass = '';
   if (['news', 'event'].includes(variation)) {
     containerClass = 'ccl-container';
-  } else if (!['line', 'doc'].includes(variation)) {
+  } else if (!['line', 'doc', 'globalSearch'].includes(variation)) {
     containerClass = 'card-container';
   }
   return (

package/src/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingCards.test.jsx

@@ -1,12 +1,12 @@
-import CclListingCards from './CclListingCards';
-import React from 'react';
-import { MemoryRouter } from 'react-router-dom';
+import Enzyme, { mount } from 'enzyme';
 
-import Enzyme from 'enzyme';
 import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
-import configureStore from 'redux-mock-store';
+import CclListingCards from './CclListingCards';
+import { MemoryRouter } from 'react-router-dom';
 import { Provider } from 'react-intl-redux';
-import { mount } from 'enzyme';
+import React from 'react';
+import configureStore from 'redux-mock-store';
+
 Enzyme.configure({ adapter: new Adapter() });
 
 const mockStore = configureStore();

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

@@ -0,0 +1,74 @@
+import { Segment } from 'semantic-ui-react';
+import React, { useState } from 'react';
+import InputRange from 'react-input-range';
+import 'react-input-range/lib/css/index.css';
+import './range.css';
+
+const DoubleRangeFacet = (props) => {
+  const { facet, choices, onChange, value } = props;
+  const facetValue = value;
+  var [open, setOpen] = React.useState(false);
+
+  const convertToRange = (values) => {
+    return {
+      min: Math.min.apply(
+        Math,
+        values.map(function (o) {
+          return o.value;
+        }),
+      ),
+      max: Math.max.apply(
+        Math,
+        values.map(function (o) {
+          return o.value;
+        }),
+      ),
+    };
+  };
+
+  const startingValues = convertToRange(choices);
+
+  const [rangeValues, setRangeValues] = useState(startingValues);
+
+  const onChangeRange = (rValue, onChange) => {
+    setRangeValues(rValue);
+    onChange(
+      facet.field.value,
+      [...Array(rValue.max - rValue.min + 1).keys()].map((i) =>
+        (i + rValue.min).toString(),
+      ),
+    );
+  };
+
+  return (
+    <fieldset className="ccl-fieldset">
+      <div
+        className="ccl-expandable__button"
+        aria-expanded={open}
+        onClick={() => setOpen(!open)}
+        onKeyDown={() => setOpen(!open)}
+        tabIndex={0}
+        role={'button'}
+      >
+        <legend className="ccl-form-legend">
+          {facet.title} {startingValues.min} - {startingValues.max}
+        </legend>
+      </div>
+      <div>
+        <Segment basic padded>
+          <InputRange
+            minValue={startingValues.min}
+            maxValue={startingValues.max}
+            value={
+              facetValue.length > 0 ? convertToRange(facetValue) : rangeValues
+            }
+            onChange={(value) => onChangeRange(value, onChange)}
+          />
+        </Segment>
+        <br />
+      </div>
+    </fieldset>
+  );
+};
+
+export default DoubleRangeFacet;

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

@@ -0,0 +1,57 @@
+import React from 'react';
+import { Button, Icon } from 'semantic-ui-react';
+import { defineMessages, useIntl } from 'react-intl';
+
+const messages = defineMessages({
+  currentFilters: {
+    id: 'Current filters applied',
+    defaultMessage: 'Current filters applied',
+  },
+  clearFilters: {
+    id: 'Clear filters',
+    defaultMessage: 'Clear filters',
+  },
+});
+
+const FilterList = (props) => {
+  const { facets, setFacets, isEditMode } = props;
+  const showFilterList = !Object.values(facets).every((facet) => !facet.length);
+
+  const currentFilters = Object.fromEntries(
+    Object.entries(facets).filter((v) => v[1] && v[0] !== 'SearchableText'),
+  );
+
+  const totalFilters = [].concat.apply([], Object.values(currentFilters))
+    .length;
+
+  const intl = useIntl();
+
+  return showFilterList && Object.keys(currentFilters).length ? (
+    <div className="accordion ui filter-listing">
+      <div
+        className="filter-list-header"
+        style={{ cursor: 'auto' }}
+        active={false}
+      >
+        <div className="filter-list-title">
+          {intl.formatMessage(messages.currentFilters)}: {totalFilters}
+        </div>
+        <Button
+          icon
+          basic
+          compact
+          size="small"
+          onClick={(e) => {
+            e.stopPropagation();
+            !isEditMode && setFacets({});
+          }}
+        >
+          <Icon name="trash" />
+          {intl.formatMessage(messages.clearFilters)}
+        </Button>
+      </div>
+    </div>
+  ) : null;
+};
+
+export default FilterList;

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

@@ -1,13 +1,13 @@
 import { Button, Grid, Segment } from 'semantic-ui-react';
 import {
   Facets,
-  FilterList,
   SearchDetails,
   SearchInput,
   SortOn,
 } from '@plone/volto/components/manage/Blocks/Search/components';
 import { defineMessages, useIntl } from 'react-intl';
 
+import FilterList from './FilterList';
 import CclFiltersModal from '@eeacms/volto-clms-theme/components/CclFiltersModal/CclFiltersModal';
 import { Icon } from '@plone/volto/components';
 import React from 'react';
@@ -59,7 +59,6 @@ const RightModalFacets = (props) => {
   const { showSearchButton } = data;
   const isLive = !showSearchButton;
   const intl = useIntl();
-
   return (
     <Grid className="searchBlock-facets right-column-facets" stackable>
       {data?.headline && (

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

@@ -1,5 +1,14 @@
+import DoubleRangeFacet from './DoubleRangeFacet';
 import AccordionFacet from './AccordionFacet';
 import RightModalFacets from './RightModalFacets';
 import WithType from './WithType';
+import rewriteOptions, { portal_types_labels } from './rewriteOptions';
 
-export { RightModalFacets, AccordionFacet, WithType };
+export {
+  RightModalFacets,
+  AccordionFacet,
+  WithType,
+  DoubleRangeFacet,
+  rewriteOptions,
+  portal_types_labels,
+};

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/range.css

@@ -0,0 +1,5 @@
+.input-range__track--active,
+.input-range__slider {
+  border: #a0b128;
+  background: #a0b128;
+}

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

@@ -0,0 +1,84 @@
+export const portal_types_labels = {
+  DataSet: 'Dataset',
+  Product: 'Product',
+  'News Item': 'News',
+  'eea.meeting': 'Event',
+  UseCase: 'Use case',
+  WorkOpportunity: 'Work opportunity',
+  Tender: 'Tender',
+  TechnicalLibrary: 'Product documentation',
+};
+
+export const category_labels = {
+  farming: 'Farming',
+  biota: 'Biota',
+  boundaries: 'Boundaries',
+  climatologyMeteorologyAtmosphere: 'Climatology / Meteorology / Atmosphere',
+  economy: 'Economy',
+  elevation: 'Elevation',
+  environment: 'Environment',
+  geoscientificInformation: 'Geoscientific Information',
+  health: 'Health',
+  imageryBaseMapsEarthCover: 'Imagery / Base Maps / Earth Cover',
+  intelligenceMilitary: 'Intelligence / Military',
+  inlandWaters: 'InlandWaters',
+  location: 'Location',
+  oceans: 'Oceans',
+  planningCadastre: 'Planning Cadastre',
+  society: 'Society',
+  structure: 'Structure',
+  transportation: 'Transportation',
+  utilitiesCommunication: 'Utilities / Communication',
+};
+
+const rewriteOptions = (name, choices) => {
+  var result = choices;
+  if (name === 'review_state') {
+    result = choices.map((opt) => ({
+      ...opt,
+      label: opt.label.replace(/\[.+\]/, '').trim(),
+    }));
+  }
+  const portal_types = [
+    'DataSet',
+    'Product',
+    'News Item',
+    'eea.meeting',
+    'UseCase',
+    'WorkOpportunity',
+    'Tender',
+    'TechnicalLibrary',
+  ];
+  if (name === 'portal_type') {
+    result = choices
+      .filter((opt) => portal_types.includes(opt.value))
+      .map((opt) => {
+        return { ...opt, label: portal_types_labels[opt.value] };
+      })
+      .sort((a, b) => {
+        if (a.label < b.label) {
+          return -1;
+        } else if (a.label > b.label) {
+          return 1;
+        }
+        return 0;
+      });
+  }
+  if (name === 'classificationTopicCategory') {
+    result = choices
+      .map((opt) => {
+        return { ...opt, label: category_labels[opt.value] };
+      })
+      .sort((a, b) => {
+        if (a.label < b.label) {
+          return -1;
+        } else if (a.label > b.label) {
+          return 1;
+        }
+        return 0;
+      });
+  }
+  return result;
+};
+
+export default rewriteOptions;

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/CclVerticalFaqTabsView.jsx

@@ -61,7 +61,7 @@ const CclVerticalFaqTabsView = (props) => {
                 className={cx('card', tab === activeTab && 'active')}
               >
                 <NavLink
-                  to={'#tab' + tabIndex}
+                  to={'#tab=' + tabIndex}
                   className="collapsed"
                   onClick={(e) => {
                     handleActive(activeTab, tab, setActiveTab);

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/CclVerticalTabsView.jsx

@@ -80,7 +80,7 @@ const CclVerticalTabsView = (props) => {
                   <span>{title || defaultTitle}</span>
                 ) : (
                   <NavLink
-                    to={'#tab' + tabIndex}
+                    to={'#tab=' + tabIndex}
                     className="collapsed"
                     onClick={(e) => {
                       handleClick(e, tab, activeTab, setActiveTab);

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/RoutingHOC.jsx

@@ -16,7 +16,7 @@ const RoutingHOC = (TabView) =>
       ) {
         return rTabsList[0];
       }
-      return rTabsList[window.location.hash.substring(4) - 1];
+      return rTabsList[window.location.hash.match(/.*&?#?tab=(.*)/)[1] - 1];
     }
     React.useEffect(() => {
       const isReload =

package/src/components/Blocks/customBlocks.js

@@ -2,6 +2,8 @@ import {
   AccordionFacet,
   RightModalFacets,
   WithType,
+  DoubleRangeFacet,
+  rewriteOptions,
 } from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoSearchBlock';
 import {
   CclCarouselView,
@@ -118,6 +120,7 @@ const availableVariations = [
     'CloseTenders',
     true,
   ),
+  listingVariation('CclGlobalSearch', false, 'Global search', 'globalSearch'),
 ];
 
 const customBlocks = (config) => ({
@@ -310,6 +313,9 @@ const customBlocks = (config) => ({
       ...config.blocks.blocksConfig.search.extensions,
       facetWidgets: {
         ...config.blocks.blocksConfig.search.extensions.facetWidgets,
+        rewriteOptions: (name, choices) => {
+          return rewriteOptions(name, choices);
+        },
         types: [
           {
             id: 'accordionCheckboxFacet',
@@ -323,6 +329,12 @@ const customBlocks = (config) => ({
             view: WithType(AccordionFacet, 'label'),
             isDefault: false,
           },
+          {
+            id: 'doubleRangeFacet',
+            title: 'Double Range',
+            view: DoubleRangeFacet,
+            isDefault: false,
+          },
           ...config.blocks.blocksConfig.search.extensions.facetWidgets.types,
         ],
       },