Update

eea · May 26, 2021 · 9ca01cb · 9ca01cb
1 parent 80a562e
commit 9ca01cb
Show file tree

Hide file tree

Showing 7 changed files with 1,161 additions and 113 deletions.
diff --git a/src/components/manage/Blocks/FiltersBlock/View.jsx b/src/components/manage/Blocks/FiltersBlock/View.jsx
@@ -783,7 +783,6 @@ const View = ({ content, ...props }) => {
       }
     });
 
-
     setState({
       ...state,
       filters: newFilters,

diff --git a/src/components/manage/Blocks/SiteLocationMap/View.jsx b/src/components/manage/Blocks/SiteLocationMap/View.jsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import { connect } from 'react-redux';
+import { Container } from 'semantic-ui-react';
 import Map from '@eeacms/volto-openlayers-map/Map';
 import { Interactions } from '@eeacms/volto-openlayers-map/Interactions';
 import { Controls } from '@eeacms/volto-openlayers-map/Controls';
@@ -52,8 +53,8 @@ const View = (props) => {
   });
 
   return (
-    <div className="site-location-map-wrapper full-width">
-      <div className="site-location-map full-width">
+    <div className="site-location-map-wrapper">
+      <Container className="site-location-map">
         <Map
           view={{
             center: proj.fromLonLat([20, 50]),
@@ -94,7 +95,7 @@ const View = (props) => {
             select={false}
           />
         </Map>
-      </div>
+      </Container>
     </div>
   );
 };

diff --git a/src/components/manage/Blocks/SiteLocationMap/style.css b/src/components/manage/Blocks/SiteLocationMap/style.css
@@ -14,6 +14,6 @@ div#view .ui.container > .site-location-map {
 }
 
 .site-location-map .ol-map {
-  height: 400px;
-  min-height: 400px;
+  height: 300px;
+  min-height: 300px;
 }
diff --git a/src/components/manage/Blocks/SiteStructureSidebar/View.jsx b/src/components/manage/Blocks/SiteStructureSidebar/View.jsx
@@ -24,9 +24,6 @@ GROUP BY facilities.siteName,
   lcps.lcpInspireId
 */
 
-// AT.CAED/9008390010204.SITE -> fara lcps
-// AT.CAED/9008390099636.SITE -> cu de toate
-
 const getQueryString = (query) => {
   if (!Object.keys(query).length) return '';
   return '?' + qs.stringify(query);
@@ -35,10 +32,9 @@ const getQueryString = (query) => {
 const View = (props) => {
   const [siteStructure, setSiteStructure] = React.useState(null);
   const [siteDetails, setSiteDetails] = React.useState({});
-  const { data = {}, provider_data = {} } = props;
+  const { provider_data = {} } = props;
   const provider_data_string = JSON.stringify(provider_data);
   const dataReady = provider_data?.siteInspireId?.length > 0;
-  const parentPathname = removeTralingSlash(data.pathname || '');
   const pathname = removeTralingSlash(props.location.pathname || '');
   const query = qs.parse(props.location?.search?.replace('?', ''));
   const newQuery = qs.parse(props.location?.search?.replace('?', ''));
@@ -88,6 +84,7 @@ const View = (props) => {
         facilities: newSiteStructure.facilities.sort(),
       });
     }
+    /* eslint-disable-next-line */
   }, [provider_data_string]);
 
   return props.mode === 'edit' ? (

diff --git a/src/components/theme/View/DefaultView.jsx b/src/components/theme/View/DefaultView.jsx
@@ -6,6 +6,7 @@
 import React, { useEffect, useState } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
+import { matchPath } from 'react-router';
 import { useHistory } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
@@ -21,6 +22,7 @@ import {
   getBlocksLayoutFieldname,
   hasBlocksData,
   getBaseUrl,
+  flattenToAppURL,
 } from '@plone/volto/helpers';
 
 const messages = defineMessages({
@@ -53,10 +55,12 @@ const DefaultView = ({ content, intl, location, query }) => {
     const unlisten = history.listen((location, action) => {
       if (location?.state?.ignoreScrollBehavior) {
         const scrollTo = window.scrollTo;
+        const y = window.scrollY;
         window.scrollTo = () => {};
         setTimeout(() => {
           window.scrollTo = scrollTo;
-        }, 1);
+          window.scrollTo(0, y);
+        }, 10);
       }
     });
     return () => {
@@ -67,11 +71,13 @@ const DefaultView = ({ content, intl, location, query }) => {
   }, []);
 
   useEffect(() => {
-    if (
-      content['layout'] === 'default_view' &&
-      content['@type'] === 'site_template' &&
-      hasRequiredQuery
-    ) {
+    const isIndustrialSite = !!matchPath(flattenToAppURL(content?.['@id']), {
+      path: '/industrial-site/*',
+      exact: true,
+      strict: false,
+    });
+
+    if (isIndustrialSite && hasRequiredQuery) {
       history.push('/explore/explore-data-map/map');
       return;
     }

diff --git a/src/customizations/volto/components/theme/Footer/Footer.jsx b/src/customizations/volto/components/theme/Footer/Footer.jsx
@@ -36,22 +36,28 @@ const Footer = ({ intl }) => (
               </li>
 
               <li>
-                <Link className="item" to="/explore/explore-data-map/map">
-                  <FormattedMessage
-                    id="data"
-                    defaultMessage="Browse the data"
-                  />
+                <Link className="item" to="/explore">
+                  <FormattedMessage id="explore" defaultMessage="Explore" />
+                </Link>
+              </li>
+
+              <li>
+                <Link className="item" to="/analyse">
+                  <FormattedMessage id="analyse" defaultMessage="Analyse" />
                 </Link>
               </li>
 
               <li>
                 <Link className="item" to="/download">
-                  <FormattedMessage id="datasets" defaultMessage="Download" />
+                  <FormattedMessage id="download" defaultMessage="Download" />
                 </Link>
               </li>
               <li>
-                <Link className="item" to="/glossary">
-                  <FormattedMessage id="glossary" defaultMessage="Glossary" />
+                <Link className="item" to="/pollutants">
+                  <FormattedMessage
+                    id="pollutants"
+                    defaultMessage="Pollutants"
+                  />
                 </Link>
               </li>
               <li>