Update

eea · Oct 11, 2020 · 7a71b72 · 7a71b72
1 parent 8672665
commit 7a71b72
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 31 deletions.
diff --git a/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx b/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx
@@ -68,8 +68,8 @@ const renderComponents = {
   },
   header: (props) => {
     let value = props.item?.[props.component?.value];
-    if (value && !isNaN(Date.parse(value)) && value.length >= 10) {
-      value = moment(props.item[value]).format('DD MMM YYYY');
+    if (value && value && moment(value, 'DD-MM-YYYY', true).isValid()) {
+      value = moment(value).format('DD MMM YYYY');
     }
     const text = props.component?.static
       ? props.component?.staticValue

diff --git a/src/components/manage/Blocks/PollutantIndex/View.jsx b/src/components/manage/Blocks/PollutantIndex/View.jsx
@@ -636,7 +636,7 @@ const View = (props) => {
         },
       });
     }
-  }, [indexPollutantId]);
+  }, [indexPollutantId, JSON.stringify(indexPollutants)]);
 
   useEffect(() => {
     const newPollutantGroup = indexPollutantGroups.filter(
@@ -648,32 +648,32 @@ const View = (props) => {
         ? newPollutantGroup
         : undefined,
     );
-  }, [indexPollutantGroupId]);
+  }, [indexPollutantGroupId, JSON.stringify(indexPollutantGroups)]);
 
-  useEffect(() => {
-    if (
-      mounted.current &&
-      !initialized &&
-      !indexPollutantGroupId &&
-      indexPollutantGroups.length > 0 &&
-      indexPollutants.length > 0
-    ) {
-      props.setQueryParam({
-        queryParam: {
-          index_pollutant_group_id: parseInt(indexPollutants[0].parentId),
-          index_pollutant_id: parseInt(indexPollutants[0].pollutantId),
-        },
-      });
-      setCurrentPollutantGroup(
-        indexPollutantGroups.filter(
-          (group) =>
-            parseInt(group.pollutantId) ===
-            parseInt(indexPollutants[0].parentId),
-        )[0],
-      );
-      setInitialized(true);
-    }
-  }, [indexPollutantGroups?.length, indexPollutants?.length]);
+  // useEffect(() => {
+  //   if (
+  //     mounted.current &&
+  //     !initialized &&
+  //     !indexPollutantGroupId &&
+  //     indexPollutantGroups.length > 0 &&
+  //     indexPollutants.length > 0
+  //   ) {
+  //     props.setQueryParam({
+  //       queryParam: {
+  //         index_pollutant_group_id: parseInt(indexPollutants[0].parentId),
+  //         index_pollutant_id: parseInt(indexPollutants[0].pollutantId),
+  //       },
+  //     });
+  //     setCurrentPollutantGroup(
+  //       indexPollutantGroups.filter(
+  //         (group) =>
+  //           parseInt(group.pollutantId) ===
+  //           parseInt(indexPollutants[0].parentId),
+  //       )[0],
+  //     );
+  //     setInitialized(true);
+  //   }
+  // }, [indexPollutantGroups?.length, indexPollutants?.length]);
 
   useEffect(() => {
     mounted.current = true;

diff --git a/src/components/theme/View/DefaultView.jsx b/src/components/theme/View/DefaultView.jsx
@@ -37,6 +37,17 @@ const DefaultView = ({ content, intl, location }) => {
   const blocksLayoutFieldname = getBlocksLayoutFieldname(content);
   const contentTypeBlocks = content['@components']?.layout?.[blocksFieldname];
 
+  useEffect(() => {
+    if (content['@type' === 'site_template']) {
+      const hashElement = document.getElementById(
+        location.hash.replace('#', ''),
+      );
+      if (hashElement) {
+        hashElement.scrollIntoView();
+      }
+    }
+  }, []);
+
   useEffect(() => {
     if (content['@type' === 'site_template']) {
       const hashElement = document.getElementById(

diff --git a/src/customizations/volto/components/theme/Search/Search.jsx b/src/customizations/volto/components/theme/Search/Search.jsx
@@ -392,16 +392,18 @@ class Search extends Component {
                   .filter(
                     (pollutant) =>
                       pollutant.pollutantId &&
-                      pollutant.name.includes(this.props.searchableText),
+                      pollutant.name
+                        .toLowerCase()
+                        .includes(this.props.searchableText.toLowerCase()),
                   )
                   .map((pollutant) => (
                     <Link
                       key={`item-${pollutant.pollutantId}`}
                       className="outline dark-blue"
                       as="a"
-                      to="/glossary/pollutants/pollutant-index"
+                      to="/test"
                       onClick={() => {
-                        setQueryParam({
+                        this.props.setQueryParam({
                           queryParam: {
                             index_pollutant_group_id: parseInt(
                               pollutant.parentId,