@eeacms/volto-n2k 1.0.4 → 1.0.6

package/CHANGELOG.md

@@ -4,7 +4,17 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [1.0.4](https://github.com/eea/volto-n2k/compare/1.0.3...1.0.4) - 17 November 2022
+### [1.0.6](https://github.com/eea/volto-n2k/compare/1.0.5...1.0.6) - 14 December 2022
+
+#### :hammer_and_wrench: Others
+
+- update [Miu Razvan - [`e743c1c`](https://github.com/eea/volto-n2k/commit/e743c1c6acd838b359c93b8a922bbbcf247e28a2)]
+### [1.0.5](https://github.com/eea/volto-n2k/compare/1.0.4...1.0.5) - 13 December 2022
+
+#### :hammer_and_wrench: Others
+
+- Don't run cypress [Miu Razvan - [`3afcc02`](https://github.com/eea/volto-n2k/commit/3afcc02e64e90046e109a71bcc69b6160566197d)]
+### [1.0.4](https://github.com/eea/volto-n2k/compare/1.0.3...1.0.4) - 7 December 2022
 
 #### :hammer_and_wrench: Others
 
@@ -125,7 +135,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Update [razvanMiu - [`42ab50e`](https://github.com/eea/volto-n2k/commit/42ab50e6681a47251d15ac06b836c6f8c27157fa)]
 - Added bubble chart [razvanMiu - [`89fba5e`](https://github.com/eea/volto-n2k/commit/89fba5e5db41aa955ba2d0ed58c9f0042c461504)]
 - Group species by id_eunis in species list [razvanMiu - [`543c957`](https://github.com/eea/volto-n2k/commit/543c9573b53acd8eecc9afbb6ae7beeddba53966)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`2ca3e4c`](https://github.com/eea/volto-n2k/commit/2ca3e4c092211f92339791d71db81f5b4ca2d562)]
 - update maps - species and habitats distribution maps [Claudia Ifrim - [`ad12eb1`](https://github.com/eea/volto-n2k/commit/ad12eb141907d6f28444f1eafc3f687735d2a68d)]
 - update format for common name and author [Claudia Ifrim - [`26b7a2f`](https://github.com/eea/volto-n2k/commit/26b7a2f3d20c7701b57fb24f39fc7dfeceec3ce8)]
 - update format for species name (common / scientific) [Claudia Ifrim - [`abdedcf`](https://github.com/eea/volto-n2k/commit/abdedcfe645665031dedf050fd2c5cdde8c14a50)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-n2k",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "volto-n2k: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/manage/Blocks/Landing/DefalutView.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 import { generatePath } from 'react-router';
 import { Grid } from 'semantic-ui-react';
@@ -7,9 +7,20 @@ import { withLocalStorage } from '@eeacms/volto-n2k/hocs';
 import hiker from './images/hiker.webp';
 import { tiles, tileProps, getStyle } from './index';
 
+function removeTrailingSlash(str) {
+  return str.replace(/\/+$/, '');
+}
+
 const DefaultView = (props) => {
   const currentLang = props.localStorage.get('N2K_LANGUAGE');
 
+  useEffect(() => {
+    if (removeTrailingSlash(props.location.pathname) === '/natura2000') {
+      props.history.push(`/natura2000/${currentLang || 'en'}`);
+    }
+    /* eslint-disable-next-line */
+  }, []);
+
   return (
     <>
       <div

package/src/components/manage/Blocks/SiteBanner/View.jsx

@@ -15,7 +15,6 @@ const View = (props) => {
     cdda_designation_national_language = [],
     site_type = [],
     site_code = [],
-    area_km2 = [],
     area_ha = [],
     year_stablished = [],
     number_protected_habitat_types = [],
@@ -70,14 +69,8 @@ const View = (props) => {
 
               <div className="site-detail">
                 <div className="upper">
-                  {isNumber(area_km2[0]) || isNumber(area_ha[0]) ? (
-                    area_km2 > 1 ? (
-                      <div>
-                        {area_km2} km<sup>2</sup>
-                      </div>
-                    ) : (
-                      <div>{area_ha} ha</div>
-                    )
+                  {isNumber(area_ha[0]) ? (
+                    <div>{area_ha} ha</div>
                   ) : (
                     <div>No data</div>
                   )}
@@ -93,7 +86,7 @@ const View = (props) => {
                     <div>-</div>
                   )}
                 </div>
-                <div className="lower">Year established</div>
+                <div className="lower">Site established</div>
               </div>
 
               {site_type[0] === 'CDDA' && (

package/src/components/manage/Blocks/SiteHabitatsList/View.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import findIndex from 'lodash/findIndex';
 import { Icon } from '@plone/volto/components';
 import { Link } from 'react-router-dom';
 import cx from 'classnames';
@@ -9,7 +10,7 @@ import './style.less';
 
 const View = (props) => {
   const [habitats, setHabitats] = React.useState({});
-  const [selectedHabitat, setSelectedHabitat] = React.useState(null);
+  const [expandedHabitats, setExpandedHabitats] = React.useState([]);
   const { provider_data = {}, placeholder = 'No results' } = props;
 
   React.useEffect(() => {
@@ -31,54 +32,70 @@ const View = (props) => {
       {Object.keys(habitats)?.length ? (
         Object.keys(habitats)
           .sort()
-          .map((habitat) => (
-            <div className="habitat" key={habitat}>
-              <div
-                className={cx({
-                  'habitat-toolbar': true,
-                  marginless: selectedHabitat !== habitat,
-                })}
-              >
-                <div className="habitat-name">
-                  <h3>{habitat}</h3>
-                  <p className="count">{habitats[habitat].length}</p>
+          .map((habitat) => {
+            const expanded = expandedHabitats.includes(habitat);
+            return (
+              <div className="habitat" key={habitat}>
+                <div
+                  className={cx({
+                    'habitat-toolbar': true,
+                    marginless: !expanded,
+                  })}
+                >
+                  <div className="habitat-name">
+                    <h3>{habitat}</h3>
+                    <p className="count">{habitats[habitat].length}</p>
+                  </div>
+                  <Icon
+                    name={expanded ? upKeySVG : downKeySVG}
+                    onClick={(e) => {
+                      const index = findIndex(
+                        expandedHabitats,
+                        (name) => name === habitat,
+                      );
+                      if (index === -1) {
+                        setExpandedHabitats((prevExpandedHabitats) => [
+                          ...prevExpandedHabitats,
+                          habitat,
+                        ]);
+                      } else {
+                        setExpandedHabitats((prevExpandedHabitats) => {
+                          const newExpandedHabitats = [...prevExpandedHabitats];
+                          newExpandedHabitats.splice(index, 1);
+                          return newExpandedHabitats;
+                        });
+                      }
+                      e.preventDefault();
+                      e.stopPropagation();
+                    }}
+                    color="#8C8C8C"
+                    size="32px"
+                  />
                 </div>
-                <Icon
-                  name={selectedHabitat === habitat ? upKeySVG : downKeySVG}
-                  onClick={(e) => {
-                    setSelectedHabitat(
-                      selectedHabitat === habitat ? null : habitat,
-                    );
-                    e.preventDefault();
-                    e.stopPropagation();
-                  }}
-                  color="#8C8C8C"
-                  size="32px"
-                />
-              </div>
 
-              {selectedHabitat === habitat
-                ? habitats[habitat].map((item, index) => (
-                    <div
-                      className="habitat-item"
-                      key={`${habitat}-${index}-item`}
-                    >
-                      <Link
-                        className="description"
-                        to={`/natura2000/habitats/h/${item.code_2000}`}
+                {expanded
+                  ? habitats[habitat].map((item, index) => (
+                      <div
+                        className="habitat-item"
+                        key={`${habitat}-${index}-item`}
                       >
-                        {item.habitat_description}
-                      </Link>
-                      <p className="coverage">
-                        {item.coverage_ha.toFixed(2)} ha (
-                        {(item.coverage_ha / 100).toFixed(4)} km
-                        <sup>2</sup>)
-                      </p>
-                    </div>
-                  ))
-                : ''}
-            </div>
-          ))
+                        <Link
+                          className="description"
+                          to={`/natura2000/habitats/h/${item.code_2000}`}
+                        >
+                          {item.habitat_description} ({item.code_2000})
+                        </Link>
+                        <p className="coverage">
+                          {item.coverage_ha.toFixed(2)} ha (
+                          {(item.coverage_ha / 100).toFixed(4)} km
+                          <sup>2</sup>)
+                        </p>
+                      </div>
+                    ))
+                  : ''}
+              </div>
+            );
+          })
       ) : (
         <p>{placeholder}</p>
       )}

package/src/components/theme/Navigation/Navigation.jsx

@@ -303,10 +303,10 @@ class Navigation extends Component {
                     : '#'
                 }
                 openLinkInNewTab={true}
-                title="Deep dive"
+                title="Go to expert view"
                 className="item firstLevel deep-dive"
               >
-                DEEP DIVE
+                GO TO EXPERT VIEW
               </UniversalLink>
             </>
           ) : (