@eeacms/volto-cca-policy 0.1.84 → 0.1.86

package/CHANGELOG.md

@@ -4,6 +4,61 @@ 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).
 
+### [0.1.86](https://github.com/eea/volto-cca-policy/compare/0.1.85...0.1.86) - 1 March 2024
+
+#### :nail_care: Enhancements
+
+- change(banner): improve BannerTitle component [kreafox - [`bb49297`](https://github.com/eea/volto-cca-policy/commit/bb49297ff439dba1b8174cb65c9aae2fc419d047)]
+
+#### :house: Internal changes
+
+- style(stats): CSS fixes [kreafox - [`696c0fd`](https://github.com/eea/volto-cca-policy/commit/696c0fda6241f264f097e76812ada3b30b2ef760)]
+- style(stats): fix z-index on count [kreafox - [`aeaaf1c`](https://github.com/eea/volto-cca-policy/commit/aeaaf1cc912a946b5c2553937c41940b926d3dd8)]
+- style: improve tab items on hover [kreafox - [`7b0bc8b`](https://github.com/eea/volto-cca-policy/commit/7b0bc8b8e398503521d86048f96c5d2749595a55)]
+
+### [0.1.85](https://github.com/eea/volto-cca-policy/compare/0.1.84...0.1.85) - 29 February 2024
+
+#### :house: Internal changes
+
+- style: improve tabs with labels [kreafox - [`5a5ff35`](https://github.com/eea/volto-cca-policy/commit/5a5ff350bcd4d6a876c0d5e86950d89d84b84c7c)]
+- style: increase the count size a bit [kreafox - [`2f1e26c`](https://github.com/eea/volto-cca-policy/commit/2f1e26c14deab6e240f7357ba6283fc7532640c4)]
+- style: improve tabs [kreafox - [`7939172`](https://github.com/eea/volto-cca-policy/commit/7939172ec5badcffc489599cd02783b117609e36)]
+- style: Automated code fix [eea-jenkins - [`69f7534`](https://github.com/eea/volto-cca-policy/commit/69f753479ef255be149b3604777fd035bb767ddc)]
+
+#### :hammer_and_wrench: Others
+
+- test: increase coverage [kreafox - [`004a588`](https://github.com/eea/volto-cca-policy/commit/004a5883f1569222022ee4e7d81fda039691f9b8)]
+- test: fix issue reported by sonarqube [kreafox - [`c71a32e`](https://github.com/eea/volto-cca-policy/commit/c71a32e37791a2def50117a4d7e1722dd7352c24)]
+- Add show label [Tiberiu Ichim - [`138e61e`](https://github.com/eea/volto-cca-policy/commit/138e61e37a52bb2de92273841aa120a0902e50d4)]
+- test: fix issue reported by sonarqube [kreafox - [`4985ecf`](https://github.com/eea/volto-cca-policy/commit/4985ecfa7d0444c00f34e9f04f90df22ed6e379d)]
+- Add titles [Tiberiu Ichim - [`0357d59`](https://github.com/eea/volto-cca-policy/commit/0357d590ae65b17af7739b6bfd1912f756d389c1)]
+- Use universalLink [Tiberiu Ichim - [`23234fd`](https://github.com/eea/volto-cca-policy/commit/23234fd4c480059e1b68cb8e67f0c6dbf869e45b)]
+- Fix portal types [Tiberiu Ichim - [`ec763b5`](https://github.com/eea/volto-cca-policy/commit/ec763b558f6b58ee63c0f5c1c5c828b847a63ef4)]
+- URL for EEA Search [Tiberiu Ichim - [`2aff2a8`](https://github.com/eea/volto-cca-policy/commit/2aff2a8090195bd3d1bdb3e0328f34e7423f2c10)]
+- WIP on eea search [Tiberiu Ichim - [`6c9e19b`](https://github.com/eea/volto-cca-policy/commit/6c9e19bff8c6049e3585cb44af99236310d9d9bb)]
+- Refs #266057 - Fix event URL in event title when event_url is empty. [GhitaB - [`33bfaf0`](https://github.com/eea/volto-cca-policy/commit/33bfaf0957d8ab26fef1d47b9f52925ac5a60748)]
+- Improve icons [Tiberiu Ichim - [`19f2606`](https://github.com/eea/volto-cca-policy/commit/19f2606df7388d3cca1bc0d4af5739b8064d8531)]
+- Refs #266057 - Use DD MMM instead of DD.MMM. in events cards listing. [GhitaB - [`13db0b7`](https://github.com/eea/volto-cca-policy/commit/13db0b7e78bdd78e1e39448e4e373a8d333de11e)]
+- Improve icons [Tiberiu Ichim - [`c9bff8d`](https://github.com/eea/volto-cca-policy/commit/c9bff8d770dcdfe98d58147aa396ce99210269e9)]
+- Improve icons [Tiberiu Ichim - [`b86add7`](https://github.com/eea/volto-cca-policy/commit/b86add76fb86e7c4b71242d0477079424393e1a4)]
+- Improve icons [Tiberiu Ichim - [`23e1a6f`](https://github.com/eea/volto-cca-policy/commit/23e1a6fd59998e7f3179775c194f9f917dba5a55)]
+- Add collection summary WIP [Tiberiu Ichim - [`b637b2d`](https://github.com/eea/volto-cca-policy/commit/b637b2d1593bed2ebf201827d9b358ff9121b424)]
+- Add collection summary WIP [Tiberiu Ichim - [`4b3c952`](https://github.com/eea/volto-cca-policy/commit/4b3c9520d875ed078d59698220617d41b853baa3)]
+- country map ol remove old JS and d3 View [Tripon Eugen - [`2dd7dc6`](https://github.com/eea/volto-cca-policy/commit/2dd7dc68a88abbcf873db37237dc7b1b841194f2)]
+- country map ol style outside eu [Tripon Eugen - [`fa6b322`](https://github.com/eea/volto-cca-policy/commit/fa6b322008ea64596328f5217f1a9b9ca6d91f6d)]
+- Move CSS from voltoCustom.css [kreafox - [`388c70e`](https://github.com/eea/volto-cca-policy/commit/388c70ece86c5b103f84c13819ac7bb8e82c59d7)]
+- style fix [kreafox - [`e2ee48c`](https://github.com/eea/volto-cca-policy/commit/e2ee48cc56167d7f84f62a265f0c7b4771e9aab6)]
+- Add collection summary WIP [Tiberiu Ichim - [`6d94aad`](https://github.com/eea/volto-cca-policy/commit/6d94aadfb565d0ea2699848054c13b24735658a2)]
+- Add parent folder for country map [Tiberiu Ichim - [`a694db9`](https://github.com/eea/volto-cca-policy/commit/a694db9c2d8e45231b208a748c0b02d318282a0d)]
+- Add visibility sensor for map [Tiberiu Ichim - [`51548c6`](https://github.com/eea/volto-cca-policy/commit/51548c6c04ecff65ce7237dce6e9cbff0888184a)]
+- country map ol eslint [Tripon Eugen - [`bc49f3f`](https://github.com/eea/volto-cca-policy/commit/bc49f3f85b892591c6ea7e4764763e3bbe6b387d)]
+- country map ol eslint [Tripon Eugen - [`e2df968`](https://github.com/eea/volto-cca-policy/commit/e2df968ea4b5dc669868c6a2cc51589353b4481b)]
+- country map ol eslint [Tripon Eugen - [`171b34b`](https://github.com/eea/volto-cca-policy/commit/171b34bd0d78000f8a723647194b5aa9c8512915)]
+- country map ol eslint [Tripon Eugen - [`491941f`](https://github.com/eea/volto-cca-policy/commit/491941f9a766acc67d0dcb66bb06f197fe0f5a43)]
+- country map ol eslint [Tripon Eugen - [`0431124`](https://github.com/eea/volto-cca-policy/commit/0431124e3df5e828e5521801da40702642e8085d)]
+- country map ol blues with green hover [Tripon Eugen - [`f8adf0a`](https://github.com/eea/volto-cca-policy/commit/f8adf0a036f9667f3f9b8ba66b50176967d6957c)]
+- WIP [Tiberiu Ichim - [`300d3d0`](https://github.com/eea/volto-cca-policy/commit/300d3d0de2aaa32196274bc44808efaa86dc34f7)]
+- country map ol init [Tripon Eugen - [`1679de1`](https://github.com/eea/volto-cca-policy/commit/1679de1b5a5677a4ae2e3d0a1cdc2010f800a54d)]
 ### [0.1.84](https://github.com/eea/volto-cca-policy/compare/0.1.83...0.1.84) - 28 February 2024
 
 #### :bug: Bug Fixes
@@ -440,10 +495,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #260715 rast-block wip [Tripon Eugen - [`f19d54e`](https://github.com/eea/volto-cca-policy/commit/f19d54e0b9a6a86bf344eb85b6a1cda7f3de91bf)]
 - Refs #260715 rast-block wip [Tripon Eugen - [`2828537`](https://github.com/eea/volto-cca-policy/commit/2828537b6c084cd1a82162d552fb4ef025b71f9f)]
 - Refs #260715 rast-block updates [Tripon Eugen - [`1e803e5`](https://github.com/eea/volto-cca-policy/commit/1e803e5bd3d3fb7558f261c76c68866be7beb8b5)]
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`0a15e1b`](https://github.com/eea/volto-cca-policy/commit/0a15e1b2ad081233685e80d5b3c60a8663f6b896)]
+- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`9554e44`](https://github.com/eea/volto-cca-policy/commit/9554e44c92a621a52b2adb5a4830fb084ee5734b)]
 ### [0.1.49](https://github.com/eea/volto-cca-policy/compare/0.1.48...0.1.49) - 15 November 2023
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7b820a6`](https://github.com/eea/volto-cca-policy/commit/7b820a6369c2ddd5203b1a4abe352cb4bb43db7a)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`f0a8061`](https://github.com/eea/volto-cca-policy/commit/f0a8061c275c236deb00087c23fac9860a073106)]
 
 #### :hammer_and_wrench: Others
@@ -460,6 +518,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #259267 - jenkins test [Tripon Eugen - [`cacd31e`](https://github.com/eea/volto-cca-policy/commit/cacd31e7b1afe0983674ed5c7632d2e1d7fa752e)]
 - Refs #259267 - jenkins [Tripon Eugen - [`5b3affe`](https://github.com/eea/volto-cca-policy/commit/5b3affee8401239de10097884c1b7f2349d15ec0)]
 - Refs #259267 - add When, lead image and title to files [Tripon Eugen - [`2cedb23`](https://github.com/eea/volto-cca-policy/commit/2cedb237f898af9057e13fba94b615ef71077204)]
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`4d607a5`](https://github.com/eea/volto-cca-policy/commit/4d607a576e9d0a5c34e48c41b409e7df616ee3d6)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`b7f74d5`](https://github.com/eea/volto-cca-policy/commit/b7f74d53513a6edbfbca5cb6d19687929bb1e5db)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`db65617`](https://github.com/eea/volto-cca-policy/commit/db656173391f65157098d95d388c25f6429753d8)]
 - Refs #259267 - cca event blocks attachments and check not mandatoty fields [Tripon Eugen - [`3138e5a`](https://github.com/eea/volto-cca-policy/commit/3138e5afb5bfbdbed14e27ed457b16867b7fa414)]
 - Refs #256681 - Fix error in CCA Event view menu. ([React Intl] An id must be provided to format a message.) [GhitaB - [`517eeb8`](https://github.com/eea/volto-cca-policy/commit/517eeb817264a47bbfd6b9b7d22aaf22d44ed224)]
 - Refs #161485 - Fix ECDE name conflict. [GhitaB - [`8bfd99f`](https://github.com/eea/volto-cca-policy/commit/8bfd99ff68bb82a04d1c0ed625fa514fcf46289e)]
@@ -676,6 +737,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`ad1ced0`](https://github.com/eea/volto-cca-policy/commit/ad1ced0971ba116c13a3b5fcc039172cc915c919)]
 
 #### :hammer_and_wrench: Others
 
@@ -1156,6 +1218,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #158294 - Update supported languages list. [GhitaB - [`0a4f91f`](https://github.com/eea/volto-cca-policy/commit/0a4f91f39b7edc367bd4c127d6a8f273c7788361)]
+- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`8f1f9ce`](https://github.com/eea/volto-cca-policy/commit/8f1f9ce6c22805670cc0800d3c779b6d619d0f31)]
 ### [0.1.1](https://github.com/eea/volto-cca-policy/compare/0.1.0...0.1.1) - 13 December 2022
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.84",
+  "version": "0.1.86",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -40,7 +40,9 @@
     "@eeacms/volto-widget-geolocation": "*",
     "@eeacms/volto-widget-temporal-coverage": "*",
     "d3": "4",
-    "d3-geo": "3"
+    "d3-geo": "3",
+    "query-string": "7.1.0",
+    "react-visibility-sensor": "5.1.1"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.10.0",

package/src/components/manage/Blocks/CollectionStatistics/CollectionStatsEdit.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { SidebarPortal } from '@plone/volto/components';
+import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
+import Schema from './schema';
+import View from './CollectionStatsView';
+
+const Edit = (props) => {
+  const schema = Schema();
+  return (
+    <>
+      <View {...props} mode="edit" />
+
+      <SidebarPortal selected={props.selected}>
+        <InlineForm
+          schema={schema}
+          title={schema.title}
+          onChangeField={(id, value) => {
+            props.onChangeBlock(props.block, {
+              ...props.data,
+              [id]: value,
+            });
+          }}
+          formData={props.data}
+        />
+      </SidebarPortal>
+    </>
+  );
+};
+
+export default Edit;

package/src/components/manage/Blocks/CollectionStatistics/CollectionStatsView.jsx

@@ -0,0 +1,125 @@
+import React from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { getQueryStats } from '@eeacms/volto-cca-policy/store';
+import { getBaseUrl as getBase } from '@eeacms/volto-cca-policy/utils';
+import { getBaseUrl } from '@plone/volto/helpers';
+import { Icon, UniversalLink } from '@plone/volto/components';
+import { Icon as UiIcon } from 'semantic-ui-react';
+import config from '@plone/volto/registry';
+
+import qs from 'query-string';
+import './styles.less';
+
+const useStats = (path, id, data) => {
+  const dispatch = useDispatch();
+
+  React.useEffect(() => {
+    dispatch(getQueryStats(path, id, data));
+  }, [path, id, data, dispatch]);
+
+  const stats = useSelector((store) => store.querystats?.[id]?.items || {});
+
+  return stats;
+};
+
+export const StatVoltoIcon = ({ name, value, source, showLabel = false }) => {
+  return (
+    <div className="tab-icon" title={name}>
+      <div className="tab-icon-wrapper">
+        {!source && name}
+        {!!source && <Icon title={name} name={source} size="50" />}
+        <span className="count">{value}</span>
+      </div>
+      {!!showLabel && <span className="label">{name}</span>}
+    </div>
+  );
+};
+
+export const RemixIcon = ({ name, value, source, showLabel = false }) => {
+  return (
+    <div className="tab-icon semantic-icon" title={name}>
+      <div className="tab-icon-wrapper">
+        {!!source && <UiIcon title={name} name={source} />}
+        <span className="count">{value}</span>
+      </div>
+      {!!showLabel && <span className="label">{name}</span>}
+    </div>
+  );
+};
+
+const makeSearchBlockQuery = ({ base, query, field, value }) => {
+  const filtered = [
+    ...query.filter(({ i }) => i !== field),
+    {
+      i: field,
+      o: 'plone.app.querystring.operation.selection.any',
+      v: [value],
+    },
+  ];
+  const params = qs.stringify({ query: JSON.stringify(filtered) });
+
+  return `${base}?${params}`;
+};
+
+const makeEEASearchQuery = ({ base, field, value }) => {
+  // TODO: don't hardcode the language
+  const rest =
+    'filters[1][field]=issued.date&filters[1][values][0]=Last 5 years&filters[1][type]=any&filters[2][field]=language&filters[2][values][0]=en&filters[2][type]=any&sort-field=issued.date&sort-direction=desc';
+  const filter = `filters[0][field]=${field}&filters[0][type]=any&filters[0][values][0]=${value}`;
+
+  return `${base}?size=n_10_n&${filter}&${rest}`;
+};
+
+const urlBuilders = {
+  SearchBlock: makeSearchBlockQuery,
+  EEASemanticSearch: makeEEASearchQuery,
+};
+
+const nop = () => '';
+
+export default function CollectionStatsView(props) {
+  const { id, data = {}, pathname = props.path } = props;
+  const field = data.aggregateField?.value;
+  const { queryParameterStyle = 'SearchBlock', query = {}, showLabel } = data;
+  const base = getBase(props);
+  let stats = useStats(getBaseUrl(pathname), id, data);
+
+  const groupDefinition =
+    config.blocks.blocksConfig.collectionStats.groups[field] || {};
+  const { cleanup, icons = {}, iconComponent: IconComponent } = groupDefinition;
+
+  if (cleanup) stats = cleanup(stats);
+
+  const keys = Object.keys(stats);
+  const urlHandler = urlBuilders[queryParameterStyle] || nop;
+
+  return (
+    (field && keys.length > 0 && (
+      <div className="collection-stats">
+        {keys
+          .sort((a, b) => a.localeCompare(b))
+          .map((k) => (
+            <UniversalLink
+              className="tab-item-link"
+              key={k}
+              href={urlHandler({
+                base,
+                query: query.query,
+                field: groupDefinition.searchFieldName || field,
+                value: k,
+              })}
+            >
+              <IconComponent
+                name={k}
+                value={stats[k]}
+                field={field}
+                source={icons[k]}
+                showLabel={showLabel}
+              />
+            </UniversalLink>
+          ))}
+      </div>
+    )) ||
+    'no results'
+  );
+}

package/src/components/manage/Blocks/CollectionStatistics/index.js

@@ -0,0 +1,128 @@
+import CollectionStatsEdit from './CollectionStatsEdit';
+import CollectionStatsView, {
+  StatVoltoIcon,
+  RemixIcon,
+} from './CollectionStatsView';
+
+import worldSVG from '@plone/volto/icons/world.svg';
+import airPollutionSvg from '@eeacms/volto-cca-policy/icons/air_pollution_and_aero-allergens.svg';
+import heatSvg from '@eeacms/volto-cca-policy/icons/heat.svg';
+import climateSensitiveSvg from '@eeacms/volto-cca-policy/icons/climate-sensitive_diseases.svg';
+import wildfiresSvg from '@eeacms/volto-cca-policy/icons/wildfires.svg';
+import droughtsSvg from '@eeacms/volto-cca-policy/icons/droughts_and_floods.svg';
+
+const healthImpactIcons = {
+  'Climate-sensitive diseases': climateSensitiveSvg,
+  Heat: heatSvg,
+  Wildfires: wildfiresSvg,
+  'Droughts and floods': droughtsSvg,
+  'Air pollution and aero-allergens': airPollutionSvg,
+};
+
+const portalTypeIcons = {
+  'Case study': 'file text',
+  Guidance: 'compass',
+  Indicator: 'area chart',
+  'Information portal': 'info circle',
+  'Publication reference': 'newspaper',
+  'Research and knowledge project': 'university',
+  Tool: 'wrench',
+  Video: 'video play',
+  // 'eea.climateadapt.aceproject': '',
+  // 'eea.climateadapt.adaptationoption': '',
+  // 'eea.climateadapt.c3sindicator': '',
+  // 'eea.climateadapt.mapgraphdataset': '',
+  // 'eea.climateadapt.organisation': '',
+};
+
+const portalTypesToSearchTypes = {
+  'eea.climateadapt.adaptationoption': 'Adaptation option',
+  'eea.climateadapt.casestudy': 'Case study',
+  'eea.climateadapt.guidancedocument': 'Guidance',
+  'eea.climateadapt.indicator': 'Indicator',
+  'eea.climateadapt.c3sindicator': 'Indicator',
+  'eea.climateadapt.informationportal': 'Information portal',
+  'eea.climateadapt.publicationreport': 'Publication reference',
+  'eea.climateadapt.researchproject': 'Research and knowledge project',
+  'eea.climateadapt.tool': 'Tool',
+  'eea.climateadapt.video': 'Video',
+  // TODO: what about these?
+  // 'eea.climateadapt.aceproject': '',
+  // 'eea.climateadapt.mapgraphdataset': '',
+  // 'eea.climateadapt.organisation': '',
+};
+
+export default function installCollectionStatsBlock(config) {
+  config.blocks.blocksConfig.collectionStats = {
+    id: 'collectionStats',
+    title: 'Collection Statistics',
+    icon: worldSVG,
+    group: 'site',
+    edit: CollectionStatsEdit,
+    view: CollectionStatsView,
+    sidebarTab: 1,
+    security: {
+      addPermission: [],
+      view: [],
+    },
+    groups: {
+      health_impacts: {
+        cleanup: (stats) => {
+          const res = {};
+          Object.keys(stats).forEach((name) => {
+            const count = parseInt(stats[name]);
+
+            if (name === 'Air quality and aeroallergens')
+              name = 'Air pollution and aero-allergens';
+            if (name === 'Heat and cold') name = 'Heat';
+            if (name === 'Floods and storms') name = 'Droughts and floods';
+
+            // if (name === '-NONSPECIFIC-') return;
+            // this excludes options that have no icon
+            if (!healthImpactIcons[name]) return;
+
+            if (!res[name]) res[name] = 0;
+            res[name] += count;
+          });
+
+          return res;
+        },
+        icons: healthImpactIcons,
+        iconComponent: StatVoltoIcon,
+      },
+      portal_type: {
+        searchFieldName: 'objectProvides',
+        cleanup: (stats) => {
+          const res = {};
+          Object.keys(stats).forEach((name) => {
+            const count = parseInt(stats[name]);
+
+            name = portalTypesToSearchTypes[name];
+            if (!name) return;
+
+            if (!portalTypeIcons[name]) return;
+
+            if (!res[name]) res[name] = 0;
+            res[name] += count;
+          });
+          return res;
+        },
+        icons: portalTypeIcons,
+        iconComponent: RemixIcon,
+      },
+    },
+  };
+
+  return config;
+}
+
+// -NONSPECIFIC-
+// Air pollution and aero-allergens
+// Air quality and aeroallergens
+// Climate-sensitive diseases
+// Droughts and floods
+// Floods and storms
+// Heat
+// Heat and cold
+// Infectious diseases
+// Wildfires

package/src/components/manage/Blocks/CollectionStatistics/schema.js

@@ -0,0 +1,76 @@
+import {
+  hasNonValueOperation,
+  hasDateOperation,
+} from '@plone/volto/components/manage/Blocks/Search/utils';
+
+const Schema = () => {
+  return {
+    title: 'Collection Statistics',
+    fieldsets: [
+      {
+        id: 'default',
+        title: 'Default',
+        fields: ['aggregateField', 'queryParameterStyle', 'href', 'showLabel'],
+      },
+      {
+        id: 'query',
+        title: 'Query',
+        fields: ['query'],
+      },
+    ],
+    properties: {
+      query: {
+        title: 'Query',
+        widget: 'query',
+      },
+      aggregateField: {
+        title: 'Aggregate Field',
+        widget: 'select_querystring_field',
+        vocabulary: { '@id': 'plone.app.vocabularies.MetadataFields' },
+        filterOptions: (options) => {
+          // Only allows indexes that provide simple, fixed vocabularies.
+          // This should be improved, together with the facets. The querystring
+          // widget implementation should serve as inspiration for those dynamic
+          // types of facets.
+          return Object.assign(
+            {},
+            ...Object.keys(options).map((k) => {
+              const flag =
+                Object.keys(options[k].values || {}).length ||
+                hasNonValueOperation(options[k].operations) ||
+                hasDateOperation(options[k].operations);
+              return flag ? { [k]: options[k] } : {};
+            }),
+          );
+        },
+      },
+      queryParameterStyle: {
+        title: 'Query parameters syle',
+        description: 'The destination listing page type',
+        choices: [
+          ['SearchBlock', 'Volto Search block'],
+          ['EEASemanticSearch', 'EEA Semantic Search'],
+        ],
+        default: 'ListingBlock',
+      },
+      showLabel: {
+        type: 'boolean',
+        title: 'Show label',
+        default: false,
+      },
+
+      href: {
+        title: 'Listing page',
+        description:
+          'The destination listing page. If empty, the current folder will be used.',
+        widget: 'object_browser',
+        mode: 'link',
+        selectedItemAttrs: [],
+        allowExternals: true,
+      },
+    },
+    required: [],
+  };
+};
+
+export default Schema;

package/src/components/manage/Blocks/CollectionStatistics/styles.less

@@ -0,0 +1,68 @@
+@type: 'extra';
+@element: 'custom';
+
+@import (multiple, reference, optional) '../../theme.config';
+
+.collection-stats {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin: 1em 0;
+  gap: 1em;
+
+  .semantic-icon {
+    i.icon {
+      font-size: 2em;
+    }
+
+    .label {
+      width: 85px !important;
+    }
+  }
+
+  .tab-icon-wrapper {
+    position: relative;
+    display: inline-block;
+  }
+
+  .tab-item-link:hover {
+    .count {
+      background-color: @ccaGreenColor;
+    }
+
+    .tab-icon,
+    .label {
+      color: @primaryColor;
+    }
+  }
+
+  .tab-icon {
+    color: @secondaryColor;
+    text-align: center;
+
+    .label {
+      display: block;
+      width: 120px;
+      color: @contentAreaColor;
+      font-size: 14px;
+    }
+
+    .count {
+      position: absolute;
+      z-index: 1;
+      top: auto;
+      bottom: 0;
+      left: 100%;
+      width: 25px;
+      height: 25px;
+      margin-left: -1.5em;
+      background-color: #161c23;
+      border-radius: 50%;
+      color: @white;
+      font-size: 9px;
+      font-weight: 700;
+      line-height: 25px;
+      text-align: center;
+    }
+  }
+}

package/src/components/manage/Blocks/CountryMapObservatory/CountryMapObservatoryEdit.jsx

@@ -1,5 +1,28 @@
+import { BlockDataForm, SidebarPortal } from '@plone/volto/components';
 import CountryMapObservatoryView from './CountryMapObservatoryOLView';
+import Schema from './schema';
 
 export default function CountryMapObservatoryEdit(props) {
-  return <CountryMapObservatoryView {...props} mode="edit" />;
+  const { block, data, onChangeBlock, selected } = props;
+  const schema = Schema(data);
+  return (
+    <>
+      <CountryMapObservatoryView {...props} mode="edit" />
+      <SidebarPortal selected={selected}>
+        <BlockDataForm
+          block={block}
+          title={schema.title}
+          schema={schema}
+          onChangeField={(id, value) => {
+            onChangeBlock(block, {
+              ...data,
+              [id]: value,
+            });
+          }}
+          onChangeBlock={onChangeBlock}
+          formData={data}
+        />
+      </SidebarPortal>
+    </>
+  );
 }

package/src/components/manage/Blocks/CountryMapObservatory/CountryMapObservatoryOLView.jsx

@@ -1,3 +1,4 @@
+import { getBaseUrl } from '@eeacms/volto-cca-policy/utils';
 import React from 'react';
 import { compose } from 'redux';
 import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
@@ -8,6 +9,7 @@ import { openlayers as ol } from '@eeacms/volto-openlayers-map';
 import { euCountryNames } from '@eeacms/volto-cca-policy/helpers/country_map/countryMap';
 
 import withResponsiveContainer from '../withResponsiveContainer';
+import withVisibilitySensor from '../withVisibilitySensor';
 import { makeStyles } from './mapstyle';
 import { Interactions } from './Interactions';
 import { withGeoJsonData } from './hocs';
@@ -85,7 +87,7 @@ const CountryMapObservatoryView = (props) => {
     ]);
   }, [geofeatures]);
 
-  const baseUrl = props.path || props.location?.pathname || '';
+  const baseUrl = getBaseUrl(props);
 
   const onFeatureClick = React.useCallback(
     (feature) => {
@@ -94,6 +96,7 @@ const CountryMapObservatoryView = (props) => {
     },
     [baseUrl, history],
   );
+  // console.log(geofeatures, projection, euCountriesSource, overlaySource);
 
   return tileWMSSources ? (
     <Map
@@ -135,4 +138,5 @@ export default compose(
   clientOnly,
   withGeoJsonData,
   withResponsiveContainer('countryMapObservatory'),
+  withVisibilitySensor(),
 )(CountryMapObservatoryView);

package/src/components/manage/Blocks/CountryMapObservatory/Interactions.jsx

@@ -28,8 +28,6 @@ export const Interactions = ({ overlaySource, tooltipRef, onFeatureClick }) => {
       if (evt.dragging) {
         return;
       }
-      // eslint-disable-next-line no-console
-      console.log('CountryObservatoryMap event');
       const domEvt = evt.originalEvent;
       const pixel = map.getEventPixel(evt.originalEvent);
       const feature = map.forEachFeatureAtPixel(pixel, function (feature) {

package/src/components/manage/Blocks/CountryMapObservatory/schema.js

@@ -1,29 +1,26 @@
-const FilterSchema = (data) => {
+const Schema = () => {
   return {
     title: 'Country Map',
     fieldsets: [
       {
         id: 'default',
         title: 'Default',
-        fields: ['display_mode', 'valid_countries'],
+        fields: ['href'],
       },
     ],
     properties: {
-      display_mode: {
-        title: 'Display Mode',
-        // description: 'Observatory/country map...',
-        // choices: [
-        //   ['cca', 'Climate Adapta'],
-        //   ['observatory', 'Observatory'],
-        // ],
-      },
-      valid_countries: {
-        title: 'Valid country list',
-        // description: 'List of countries',
+      href: {
+        title: 'Countries folder',
+        description:
+          'The parent location of all country profiles. If empty, the current folder will be used as parent.',
+        widget: 'object_browser',
+        mode: 'link',
+        selectedItemAttrs: [],
+        allowExternals: true,
       },
     },
     required: [],
   };
 };
 
-export default FilterSchema;
+export default Schema;