From bf739d9143d828e685cfbf9f4d54b18660001780 Mon Sep 17 00:00:00 2001
From: Miu Razvan <miu.razvan28@gmail.com>
Date: Wed, 23 Sep 2020 13:21:29 +0300
Subject: [PATCH] Update

---
 .../manage/Blocks/ArticlesSparql/View.jsx     | 38 +++++--------------
 .../DiscodataOpenlayersMapBlock/View.jsx      |  7 +++-
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/components/manage/Blocks/ArticlesSparql/View.jsx b/src/components/manage/Blocks/ArticlesSparql/View.jsx
index fe9f8cdc..1e07c403 100644
--- a/src/components/manage/Blocks/ArticlesSparql/View.jsx
+++ b/src/components/manage/Blocks/ArticlesSparql/View.jsx
@@ -57,7 +57,15 @@ const View = (props) => {
                 key={`sparql-row-${index}-${item.title}`}
               >
                 <div className="column-4 sm-12 article hero pa-1">
-                  <Image src={item.image || placeholderImage} />
+                  <Image
+                    src={
+                      item.image ||
+                      `${
+                        item.resource ? item.resource + '/image_large' : ''
+                      }` ||
+                      placeholderImage
+                    }
+                  />
                 </div>
                 <div className="column-8 sm-12 article pa-1">
                   <div className="article-header">
@@ -103,34 +111,6 @@ const View = (props) => {
       ) : (
         ''
       )}
-      {/* {items.length > 2 ? (
-        <div className="articles-slideshow">
-          {activeItem > 1 ? (
-            <Icon
-              onClick={() => {
-                setActiveItem(activeItem - 1);
-              }}
-              name={upSVG}
-              size="24px"
-            />
-          ) : (
-            ''
-          )}
-          {activeItem < items.length - 1 ? (
-            <Icon
-              onClick={() => {
-                setActiveItem(activeItem + 1);
-              }}
-              name={downSVG}
-              size="24px"
-            />
-          ) : (
-            ''
-          )}
-        </div>
-      ) : (
-        ''
-      )} */}
     </div>
   );
 };
diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
index 7b1bf172..ccf13152 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -23,6 +23,7 @@ import navigationSVG from '@plone/volto/icons/navigation.svg';
 // STYLES
 import 'ol/ol.css';
 import './style.css';
+import ContentsPropertiesModal from '../../../../../omelette/src/components/manage/Contents/ContentsPropertiesModal';
 
 const splitBy = (arr, delimiter) => {
   if (Array.isArray(arr)) {
@@ -256,7 +257,7 @@ const OpenlayersMapView = (props) => {
         if (!state.map.sitesSourceLayer.getVisible()) {
           state.map.sitesSourceLayer.setVisible(true);
         }
-        if (hasRegionsFeatures && !state.map.regionsSourceLayer.getVisible()) {
+        if (hasRegionsFeatures && state.map.regionsSourceLayer.getVisible()) {
           state.map.regionsSourceLayer.setVisible(false);
         }
         state.map.sitesSourceLayer &&
@@ -304,6 +305,10 @@ const OpenlayersMapView = (props) => {
     if (hasSidebar && filterSource === 'eprtr_filters') {
       sitesSourceQuery.whereStatements = {
         ...sitesSourceQuery.whereStatements,
+        siteTerm: {
+          sql: `(siteName LIKE '%:options%')`,
+          type: 'string',
+        },
         // Industries
         EEAActivity: {
           sql: `(eea_activities LIKE '%:options%')`,