@eeacms/volto-n2k 1.0.28 → 1.0.30

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

@@ -1,9 +1,7 @@
 import React from 'react';
-// import { UniversalLink } from '@plone/volto/components';
 import './style.less';
 
 const View = (props) => {
-  // const provider_data = props.provider_data || {};
   return (
     <div className="species-classification">
       {props.mode === 'edit' ? <p>Species classification</p> : ''}

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

@@ -74,9 +74,9 @@ const View = (props) => {
             center: proj.fromLonLat([20, 50]),
             showFullExtent: true,
             zoom: 5,
+            ...(options.extent ? { extent: options.extent } : {}),
           }}
           pixelRatio={1}
-          {...options}
         >
           <Layers>
             <Layer.Tile source={tileWMSSources[0]} zIndex={0} />

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

@@ -70,9 +70,9 @@ const View = (props) => {
             center: proj.fromLonLat([20, 50]),
             showFullExtent: true,
             zoom: 5,
+            ...(options.extent ? { extent: options.extent } : {}),
           }}
           pixelRatio={1}
-          {...options}
         >
           <Layers>
             <Layer.Tile source={tileWMSSources[0]} zIndex={0} />

package/src/components/manage/Blocks/StackedBarChart/Chart.jsx

@@ -26,18 +26,12 @@ function Chart(props) {
   } = props;
 
   useEffect(() => {
-    // dispose();
     if (xDomain.length && yDomain.length) {
       makeAxis();
     }
     /* eslint-disable-next-line */
   }, [JSON.stringify(xDomain), JSON.stringify(yDomain)]);
 
-  // const dispose = () => {
-  //   const svg = select(svgRef.current);
-  //   svg.selectAll('*').remove();
-  // };
-
   const makeAxis = () => {
     const svg = select(svgRef.current);
     //  Scales

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

@@ -33,28 +33,33 @@ const View = (props) => {
   return (
     <div className="connected-status-list">
       {props.mode === 'edit' ? <p>Connected status list</p> : ''}
-      <ul>
-        {Array(Math.max(0, columns))
-          .fill()
-          .map((_, column) => {
-            const status =
-              status_labels[
-                provider_data[data.status]?.[column]?.toLowerCase()
-              ] || status_labels.unknown;
-            return (
-              <li
-                key={`connected-list-${column}`}
-                className={cx(`status-${status.value}`)}
-              >
-                <span className="value">
-                  {provider_data[data.value][column]}
-                </span>
-                <Icon name={arrowSVG} size="16px" />
-                <span className="status">{status.title}</span>
-              </li>
-            );
-          })}
-      </ul>
+      {!!columns && (
+        <ul>
+          {Array(Math.max(0, columns))
+            .fill()
+            .map((_, column) => {
+              const status =
+                status_labels[
+                  provider_data[data.status]?.[column]?.toLowerCase()
+                ] || status_labels.unknown;
+              return (
+                <li
+                  key={`connected-list-${column}`}
+                  className={cx(`status-${status.value}`)}
+                >
+                  {provider_data[data.value] && (
+                    <span className="value">
+                      {provider_data[data.value][column]}
+                    </span>
+                  )}
+                  <Icon name={arrowSVG} size="16px" />
+                  <span className="status">{status.title}</span>
+                </li>
+              );
+            })}
+        </ul>
+      )}
+      {!columns && <p className="no-results">-</p>}
     </div>
   );
 };

package/src/components/manage/Blocks/StatusList/style.less

@@ -1,4 +1,11 @@
+@import (multiple, reference, optional) '../../theme.config';
+
+@type: extra;
+@element: custom;
+
 .connected-status-list {
+  margin-bottom: 1rem;
+
   ul {
     padding-left: 0;
     margin-left: -0.5rem;
@@ -40,6 +47,7 @@
 
       &.status-bad {
         background-color: #dd552b;
+        color: #fff;
 
         .icon {
           rotate: 45deg;
@@ -47,7 +55,7 @@
       }
 
       &.status-unkown {
-        background-color: #afb0b3;
+        background-color: @grey-2;
       }
     }
   }

package/src/components/theme/Sitemap/Sitemap.jsx

@@ -8,10 +8,9 @@ import PropTypes from 'prop-types';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { matchPath } from 'react-router';
-import { asyncConnect } from '@plone/volto/helpers';
+import { asyncConnect, Helmet } from '@plone/volto/helpers';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Container } from 'semantic-ui-react';
-import { Helmet } from '@plone/volto/helpers';
 import { Link } from 'react-router-dom';
 import config from '@plone/volto/registry';
 import { withLocalStorage } from '@eeacms/volto-n2k/hocs';

package/src/helpers.js

@@ -53,12 +53,12 @@ export function sortBy(obj, property, order = 'ASC') {
 }
 
 export const componentToHex = (c) => {
-  var hex = parseInt(c).toString(16);
+  const hex = parseInt(c).toString(16);
   return hex.length === 1 ? '0' + hex : hex;
 };
 
 function hexToRgb(hex) {
-  var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  let result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
   return result
     ? [
         parseInt(result[1], 16),
@@ -86,7 +86,7 @@ export const getContrastColor = (rgb) => {
 };
 
 export const adjustBrightness = (col, amt) => {
-  var usePound = false;
+  let usePound = false;
 
   if (col.includes('rgb(')) {
     const rgb = col

package/src/index.js

@@ -42,13 +42,13 @@ import installSpeciesDistribution from './components/manage/Blocks/SpeciesDistri
 import installSpeciesProtectedSites from './components/manage/Blocks/SpeciesProtectedSites';
 import installStackedBarChart from './components/manage/Blocks/StackedBarChart';
 import installTilesImages from './components/manage/Blocks/TilesImages';
+import installN2KCountryProfileMap from './components/manage/Blocks/N2KCountryProfileMap';
+import installCDDACountryProfileMap from './components/manage/Blocks/CDDACountryProfileMap';
 
 import { LINK } from '@plone/volto-slate/constants';
 
 import { gridSizes, variants } from './grid';
 
-// import './less/styles.less';
-
 Array.prototype.sortByProperty = function (property, order = 'ASC') {
   return this.sort((a, b) => {
     if (a[property] < b[property]) return order === 'ASC' ? -1 : 1;
@@ -158,6 +158,8 @@ const applyConfig = (config) => {
     installSpeciesProtectedSites,
     installStackedBarChart,
     installTilesImages,
+    installN2KCountryProfileMap,
+    installCDDACountryProfileMap,
   ].reduce((acc, apply) => apply(acc), config);
 };