diff --git a/.release-it.json b/.release-it.json
new file mode 100644
index 00000000..c57e7a46
--- /dev/null
+++ b/.release-it.json
@@ -0,0 +1,17 @@
+{
+ "npm": {
+ "publish": false
+ },
+ "git": {
+ "changelog": "npx auto-changelog --stdout --commit-limit false -u --template https://github.com/raw/release-it/release-it/master/templates/changelog-compact.hbs",
+ "tagName": "${version}"
+ },
+ "github": {
+ "release": true,
+ "releaseName": "${version}",
+ "releaseNotes": "npx auto-changelog --stdout --commit-limit false -u --template https://github.com/raw/release-it/release-it/master/templates/changelog-compact.hbs"
+ },
+ "hooks": {
+ "after:bump": "npx auto-changelog --commit-limit false -p"
+ }
+}
\ No newline at end of file
diff --git a/jsconfig.json b/jsconfig.json
index 8e43a169..c1d953f2 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -19,7 +19,7 @@
"volto-matomo": [
"develop/volto-matomo/src"
],
- "volto-sentry-rancher-config": [
+ "@eeacms/volto-sentry-rancher-config": [
"develop/volto-sentry-rancher-config/src"
]
},
diff --git a/package.json b/package.json
index 1b3a0be9..a6d0545c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "ims-frontend",
"description": "IMS: Volto Frontend",
"license": "MIT",
- "version": "1.1.0",
+ "version": "1.1.2",
"private": true,
"workspaces": [
"src/develop/volto-grid-block",
diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
index c0957067..6ff96de7 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -1,7 +1,6 @@
/* REACT */
import React, { useState, useRef, useEffect } from 'react';
import cookie from 'react-cookie';
-import { useHistory } from 'react-router-dom';
import { compose } from 'redux';
import { connect } from 'react-redux';
import { Link } from 'react-router-dom';
@@ -11,14 +10,14 @@ import qs from 'query-string';
import axios from 'axios';
import jsonp from 'jsonp';
import { settings } from '~/config';
-import { isArray, isObject } from 'lodash';
+import { isArray } from 'lodash';
// VOLTO
import { Icon as VoltoIcon } from '@plone/volto/components';
import PrivacyProtection from './PrivacyProtection';
// VOLTO-DATABLOCKS
import { setQueryParam } from 'volto-datablocks/actions';
// SEMANTIC REACT UI
-import { Grid, Header, Loader, Dimmer, Image } from 'semantic-ui-react';
+import { Grid, Header, Loader, Dimmer } from 'semantic-ui-react';
// SVGs
import clearSVG from '@plone/volto/icons/clear.svg';
import navigationSVG from '@plone/volto/icons/navigation.svg';
@@ -114,16 +113,12 @@ const OpenlayersMapView = (props) => {
const ViewYourAreaControl = useRef(null);
const siteTermRef = useRef(null);
const mounted = useRef(false);
- const history = useHistory();
const draggable = !!props.data?.draggable?.value;
const hasPopups = !!props.data?.hasPopups?.value;
const hasSidebar = !!props.data?.hasSidebar?.value;
const hasRegionsFeatures = !!props.data?.hasRegionsFeatures?.value;
const filterSource = props.data?.filterSource?.value || 'query_params';
const zoomSwitch = 6;
- const currentMapZoom = state.map?.element
- ? state.map.element?.getView().getZoom()
- : null;
const dataprotection = {
enabled: true,
privacy_statement:
diff --git a/src/components/manage/Blocks/FiltersBlock/View.jsx b/src/components/manage/Blocks/FiltersBlock/View.jsx
index ef033c37..3f6b3722 100644
--- a/src/components/manage/Blocks/FiltersBlock/View.jsx
+++ b/src/components/manage/Blocks/FiltersBlock/View.jsx
@@ -1,18 +1,8 @@
/* REACT */
import React, { useState, useEffect, useRef } from 'react';
-import { useHistory } from 'react-router-dom';
import { compose } from 'redux';
import { connect } from 'react-redux';
-import {
- Button,
- Header,
- Image,
- Modal,
- Select,
- Input,
- Radio,
- List,
-} from 'semantic-ui-react';
+import { Header, Modal, Select, Input, List } from 'semantic-ui-react';
import { Portal } from 'react-portal';
import { Icon } from '@plone/volto/components';
import { setQueryParam } from 'volto-datablocks/actions';
@@ -38,7 +28,6 @@ const keyCodes = {
};
const View = ({ content, ...props }) => {
- const history = useHistory();
const providerUrl = settings.providerUrl;
const [state, setState] = useState({
id: _uniqueId('block_'),
@@ -64,19 +53,15 @@ const View = ({ content, ...props }) => {
});
const [filtersMetaReady, setFiltersMetaReady] = useState(false);
const [loadingData, setLoadingData] = useState(false);
- const [factsData, setFactsData] = useState({});
- const [alphaFeature, setAlphaFeature] = useState({});
const [sitesResults, setSitesResults] = useState([]);
const [searchResultsIndex, setSearchResultsIndex] = useState(0);
const [searchResultsActive, setSearchResultsActive] = useState(false);
const [locationResults, setLocationResults] = useState([]);
const [searchTerm, setSearchTerm] = useState('');
const [triggerSearch, setTriggerSearch] = useState(false);
- const [quickFactsListener, setQuickFactsListener] = useState(false);
const [sidebar, setSidebar] = useState(false);
const [mountState, setMountState] = useState(false);
const [clock, setClock] = useState(0);
- const alphaFeatureRef = useRef({});
const searchContainerModal = useRef(null);
const searchContainer = useRef(null);
const mounted = useRef(false);
@@ -94,176 +79,16 @@ const View = ({ content, ...props }) => {
.slice(0, sitesResults.length < 3 ? 6 - sitesResults.length : 3),
];
- const updateFactsData = (initialization = false) => {
- const promises = [];
- let reqs;
- const reportingYears =
- props.discodata_query.search.reportingYear?.filter(
- (reportingYear) => reportingYear,
- ) || [];
-
- if (initialization) {
- reqs = [
- {
- factId: 'EU_quick_facts',
- sql: `SELECT count(id) AS AllSites
- FROM [IED].[latest].[ProductionSite_NoGeo]`,
- descriptionDiscodataKey: ['AllSites'],
- title: 'EU Quick facts',
- description: [':descriptionDiscodataKey reporting sites (all years)'],
- type: 'firstElement',
- },
- ];
- } else {
- reqs = [
- alphaFeature?.getProperties?.()?.countryCode
- ? {
- factId: 'Country_quick_facts',
- sql:
- `SELECT DISTINCT
- PS.countryCode,
- LC.CountryName as countryName,
- count(*) as sites
- FROM [IED].[latest].[ProductionSite_NoGeo] as PS
- LEFT JOIN [IED].[latest].[LOV_Countries] as LC
- ON PS.countryCode = LC.CountryCode
- WHERE PS.countryCode = '${
- alphaFeature.getProperties().countryCode
- }'` +
- (reportingYears?.length > 0
- ? ` AND reportingYear IN (${reportingYears.join(',')}) `
- : ' ') +
- `GROUP BY PS.countryCode, LC.CountryName`,
- titleDiscodataKey: 'countryName',
- descriptionDiscodataKey: ['sites'],
- title: ':titleDiscodataKey quick facts',
- description: [
- `:descriptionDiscodataKey reporting sites (${
- reportingYears?.length > 0
- ? reportingYears.join(', ')
- : 'all years'
- })`,
- ],
- type: 'firstElement',
- }
- : null,
- {
- factId: 'EU_quick_facts',
- sql:
- `SELECT count(id) AS AllSites
- FROM [IED].[latest].[ProductionSite_NoGeo]` +
- (reportingYears?.length > 0
- ? `WHERE reportingYear IN (${reportingYears.join(',')})`
- : ''),
- descriptionDiscodataKey: ['AllSites'],
- title: 'EU Quick facts',
- description: [
- `:descriptionDiscodataKey reporting sites (${
- reportingYears?.length > 0
- ? reportingYears.join(', ')
- : 'all years'
- })`,
- ],
- type: 'firstElement',
- },
- ].filter((req) => req);
- }
- reqs.forEach((req) => {
- promises.push(axios.get(makeUrl(providerUrl, req.sql)));
- });
-
- Promise.all(promises)
- .then((response) => {
- const newFactsData = { ...factsData };
- response.forEach((res, index) => {
- const results = JSON.parse(res.request.response).results;
- if (reqs[index].type === 'firstElement') {
- const title = reqs[index].title.includes(':titleDiscodataKey')
- ? reqs[index].title.replace(
- ':titleDiscodataKey',
- results[0]?.[reqs[index].titleDiscodataKey],
- )
- : reqs[index].title;
- const description = reqs[index].description.map(
- (descr, descrIndex) => {
- return descr.includes(':descriptionDiscodataKey') &&
- results[0]?.[
- reqs[index].descriptionDiscodataKey?.[descrIndex]
- ]
- ? descr.replace(
- ':descriptionDiscodataKey',
- results[0]?.[
- reqs[index].descriptionDiscodataKey?.[descrIndex]
- ],
- )
- : descr;
- },
- );
- newFactsData[reqs[index].factId] = {
- title,
- description,
- };
- }
- });
- setFactsData({
- ...factsData,
- ...newFactsData,
- });
- })
- .catch((error) => {});
- };
-
- const onFeaturechange = (e) => {
- if (
- mounted.current &&
- e.detail.feature?.getProperties?.()?.countryCode !==
- alphaFeatureRef.current?.getProperties?.()?.countryCode
- ) {
- setAlphaFeature(e.detail.feature);
- }
- };
-
useEffect(function () {
mounted.current = true;
setMountState(true);
- updateFactsData(true);
- const unlisten = history.listen((location, action) => {
- if (mounted.current) {
- setQuickFactsListener(false);
- }
- });
return () => {
- if (quickFactsListener && document.getElementById(`dynamic-filter`)) {
- document
- .getElementById(`dynamic-filter`)
- .removeEventListener('featurechange', onFeaturechange);
- }
mounted.current = false;
- unlisten();
setMountState(false);
};
/* eslint-disable-next-line */
}, []);
- if (
- mounted.current &&
- !quickFactsListener &&
- document.getElementById('dynamic-filter')
- ) {
- setQuickFactsListener(true);
- document
- .getElementById(`dynamic-filter`)
- .addEventListener('featurechange', onFeaturechange);
- }
-
- useEffect(() => {
- if (mounted.current) {
- alphaFeatureRef.current = alphaFeature;
- updateFactsData(false);
- }
- /* eslint-disable-next-line */
- }, [alphaFeature, JSON.stringify(props.discodata_query.search.reportingYear)])
-
useEffect(() => {
if (mounted.current && triggerSearch) {
submit();
@@ -1432,6 +1257,37 @@ const View = ({ content, ...props }) => {
value={state.filters['reportingYear']?.[0]}
/>
+
+
+
-
-
-
- {state.factsDataOrder &&
- state.factsDataOrder.map((key) => {
- return factsData[key] ? (
-
- {factsData[key]?.title && (
-
- )}
- {factsData[key]?.description &&
- factsData[key].description.map(
- (description, index) => {
- return (
- {description}
- );
- },
- )}
-
- ) : (
- ''
- );
- })}
-