Update

eea · Oct 11, 2020 · 2df6276 · 2df6276
1 parent a812730
commit 2df6276
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/components/manage/Blocks/GlossarySearchBlock/View.jsx b/src/components/manage/Blocks/GlossarySearchBlock/View.jsx
@@ -175,6 +175,7 @@ class View extends Component {
         index_pollutant_id: parseInt(pollutant.pollutantId),
       },
     });
+    this.setState({ active: false, text: pollutant.name });
     this.props.history.push('/glossary/pollutants/pollutant-index');
   }
 

diff --git a/src/components/manage/Blocks/Iframe/View.jsx b/src/components/manage/Blocks/Iframe/View.jsx
@@ -20,7 +20,9 @@ const useWindowSize = () => {
 };
 
 const View = ({ content, ...props }) => {
+  let showIframe = true;
   const [discodataQuery, setDiscodataQuery] = useState({});
+  const [requiredQueries, setRequiredQueries] = useState([]);
   const [flags, setFlags] = useState({});
   const [windowWidth, windowHeight] = useWindowSize();
   const breakPoints = {
@@ -56,7 +58,12 @@ const View = ({ content, ...props }) => {
               newDiscodataQuery[key] = props.search[value.queryParam] || '';
             }
           });
-
+        if (
+          JSON.stringify(Object.keys(properties)) !==
+          JSON.stringify(requiredQueries)
+        ) {
+          setRequiredQueries(Object.keys(properties));
+        }
         if (
           JSON.stringify(newDiscodataQuery) !== JSON.stringify(discodataQuery)
         ) {
@@ -164,7 +171,9 @@ const View = ({ content, ...props }) => {
 
   return (
     <div>
-      {!flagsState ? (
+      {!flagsState &&
+      requiredQueries.length ===
+        requiredQueries.filter((query) => discodataQuery[query]).length ? (
         <Iframe
           title={title}
           url={applyQueryParameters(getUrlByWidth(), {

diff --git a/src/components/manage/Blocks/NavigationBlock/View.jsx b/src/components/manage/Blocks/NavigationBlock/View.jsx
@@ -33,7 +33,7 @@ const View = ({ content, ...props }) => {
       Object.keys(pagesProperties).map((page) => pagesProperties[page]) || [];
     setPages(newPages);
     setNavigationItems([...(props.navigation?.items || []), ...newPages]);
-  }, [data.pages?.value]);
+  }, [props.navigation, data.pages?.value]);
 
   return (props.navigation?.items?.length && parent) || pages.length ? (
     <div className="tabs-view-menu">
@@ -147,6 +147,7 @@ export default compose(
         state.prefetch?.[state.router.location.pathname] || state.content.data,
       pathname: state.router.location.pathname,
       discodata_query: state.discodata_query,
+      navItems: state.navigation.items,
       flags: state.flags,
       navigation: getNavigationByParent(
         state.navigation.items,

diff --git a/theme/site/globals/site.overrides b/theme/site/globals/site.overrides
@@ -1320,9 +1320,9 @@ body.has-sidebar {
             width: 0;
             background-color: transparent !important;
           }
-          &:first-child {
-            margin-left: 0 !important;
-          }
+          // &:first-child {
+          //   margin-left: 0 !important;
+          // }
         }
         .active.item {
           background-color: transparent !important;