From 8f661c58514b6ccb078a64e29432be34e8d6c70c Mon Sep 17 00:00:00 2001
From: Miu Razvan <miu.razvan28@gmail.com>
Date: Tue, 22 Sep 2020 20:52:44 +0300
Subject: [PATCH] Fixed popup when advanced filter applied

---
 .../manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
index e24eb3e4..7b1bf172 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -1063,15 +1063,19 @@ const OpenlayersMapView = (props) => {
         {state.popup.element && (
           <>
             <div className="popover-header">
-              {currentMapZoom && currentMapZoom > zoomSwitch ? (
+              {state.popup.properties.siteName ? (
                 <Header as="h3">{state.popup.properties.siteName}</Header>
-              ) : (
+              ) : state.popup.properties.NUTS_NAME &&
+                state.popup.properties.CNTR_CODE &&
+                state.popup.properties.COUNTRY ? (
                 <Header as="h3">{`${state.popup.properties.NUTS_NAME}, ${state.popup.properties.CNTR_CODE}, ${state.popup.properties.COUNTRY}`}</Header>
+              ) : (
+                ''
               )}
             </div>
             <div className="popover-body">
               <Grid.Column stretched>
-                {currentMapZoom && currentMapZoom > zoomSwitch ? (
+                {!state.popup.properties.num_sites ? (
                   ''
                 ) : (
                   <Grid.Row>