@eeacms/volto-n2k 1.0.34 → 1.1.0

package/src/components/manage/Blocks/NavigationAnchors/schema.js

@@ -38,39 +38,41 @@ const linksSchema = () => ({
   required: [],
 });
 
-export default () => ({
-  title: 'Navigation anchors',
-  fieldsets: [
-    {
-      id: 'default',
-      title: 'Default',
-      fields: ['sticky', 'className', 'align', 'links'],
-    },
-  ],
-  properties: {
-    sticky: {
-      title: 'Sticky',
-      type: 'boolean',
-      default: true,
+export default function getSchema() {
+  return {
+    title: 'Navigation anchors',
+    fieldsets: [
+      {
+        id: 'default',
+        title: 'Default',
+        fields: ['sticky', 'className', 'align', 'links'],
+      },
+    ],
+    properties: {
+      sticky: {
+        title: 'Sticky',
+        type: 'boolean',
+        default: true,
+      },
+      className: {
+        title: 'Class',
+        widget: 'textarea',
+      },
+      align: {
+        title: 'Align',
+        choices: [
+          ['flex-start', 'Left'],
+          ['flex-end', 'Right'],
+          ['center', 'Center'],
+        ],
+        defaultValue: 'flex-start',
+      },
+      links: {
+        title: 'Links',
+        schema: linksSchema(),
+        widget: 'object_list',
+      },
     },
-    className: {
-      title: 'Class',
-      widget: 'textarea',
-    },
-    align: {
-      title: 'Align',
-      choices: [
-        ['flex-start', 'Left'],
-        ['flex-end', 'Right'],
-        ['center', 'Center'],
-      ],
-      defaultValue: 'flex-start',
-    },
-    links: {
-      title: 'Links',
-      schema: linksSchema(),
-      widget: 'object_list',
-    },
-  },
-  required: [],
-});
+    required: [],
+  };
+}

package/src/components/manage/Blocks/SimpleDataTable/index.js

@@ -1,6 +1,6 @@
 import { ColoredTableView, coloredTableSchema } from './templates/colored';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.simpleDataConnectedTable = {
     ...config.blocks.blocksConfig.simpleDataConnectedTable,
     templates: {
@@ -13,4 +13,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

package/src/components/manage/Blocks/SimpleDataTable/templates/colored/style.less

@@ -3,9 +3,9 @@
     table {
       overflow: hidden;
       width: auto;
+      border-radius: 12px !important;
       background: #fff !important;
       border-collapse: separate !important;
-      border-radius: 12px !important;
 
       thead,
       td {
@@ -35,8 +35,8 @@
           display: block;
           width: 16px;
           height: 16px;
-          margin-right: 0.5rem;
           border-radius: 50%;
+          margin-right: 0.5rem;
         }
 
         > * {

package/src/components/manage/Blocks/SiteBanner/index.js

@@ -1,7 +1,7 @@
 import SiteBannerView from './View';
 import getSchema from './schema';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -14,4 +14,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

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

@@ -76,8 +76,8 @@
           display: inline-block;
           padding: 4px 1rem 4px 1.5rem;
           border: 1px solid #707070;
-          background: #fff;
           border-radius: 10px;
+          background: #fff;
           white-space: nowrap;
         }
       }

package/src/components/manage/Blocks/SiteHabitatsList/index.js

@@ -1,7 +1,7 @@
 import SiteHabitatsList from './View';
 import getSchema from './schema';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -14,4 +14,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

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

@@ -6,9 +6,9 @@
   .habitat {
     padding: 1rem 2rem;
     border: 1px solid #e8e8e8;
+    border-radius: 10px;
     margin-bottom: 1rem;
     background-color: #fff !important;
-    border-radius: 10px;
 
     .habitat-toolbar {
       display: flex;
@@ -36,9 +36,9 @@
       .count {
         width: 24px;
         height: 24px;
+        border-radius: 6px;
         margin-bottom: 0;
         background-color: #00a390;
-        border-radius: 6px;
         color: #fff !important;
         font-weight: bold;
         line-height: 24px;

package/src/components/manage/Blocks/SiteProtectedHabitats/index.js

@@ -1,7 +1,7 @@
 import SiteProtectedHabitatsView from './View';
 import getSchema from './schema';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -14,4 +14,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

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

@@ -43,9 +43,9 @@ div#view .ui.container.habitats-wrapper > * {
       position: relative;
       width: 110px;
       height: 110px;
+      border-radius: 50%;
       margin: auto;
       background-color: #eaeaea;
-      border-radius: 50%;
 
       > span {
         position: absolute;

package/src/components/manage/Blocks/SiteProtectedSpecies/index.js

@@ -1,7 +1,7 @@
 import SiteProtectedSpeciesView from './View';
 import getSchema from './schema';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -14,4 +14,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

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

@@ -43,9 +43,9 @@ div#view .ui.container.species-wrapper > * {
       position: relative;
       width: 110px;
       height: 110px;
+      border-radius: 50%;
       margin: auto;
       background-color: #eaeaea;
-      border-radius: 50%;
 
       > span {
         position: absolute;

package/src/components/manage/Blocks/SiteShape/index.js

@@ -7,7 +7,7 @@ export function getSiteShapeURL(site_code) {
   );
 }
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -20,4 +20,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

package/src/components/manage/Blocks/SiteSpeciesList/index.js

@@ -1,7 +1,7 @@
 import SiteSpeciesList from './View';
 import getSchema from './schema';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -14,4 +14,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

package/src/components/manage/Blocks/SlateSVG/styles.less

@@ -1,6 +1,6 @@
 // Editor styles
 .data-entity-edit-node {
   padding: 0px 4px;
-  background-color: #d0e4d5;
   border-radius: 4px;
+  background-color: #d0e4d5;
 }

package/src/components/manage/Blocks/SpeciesBanner/Edit.jsx

@@ -3,7 +3,6 @@ import { SidebarPortal } from '@plone/volto/components';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 import getSchema from './schema';
 import View from './View';
-import './style.less';
 
 const Edit = (props) => {
   const schema = useMemo(() => getSchema(props), [props]);

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

@@ -10,6 +10,7 @@ import { connectToMultipleProviders } from '@eeacms/volto-datablocks/hocs';
 import { replaceQueryParam } from '@eeacms/volto-n2k/helpers';
 import arrowLeft from '@eeacms/volto-n2k/icons/arrow-left.svg';
 import arrowRight from '@eeacms/volto-n2k/icons/arrow-right.svg';
+
 import './style.less';
 
 const SwiperLoader = loadable.lib(() => import('swiper'));
@@ -31,8 +32,10 @@ const _View = (props) => {
     props.data.species_pictures_provider,
   );
   const species = props.providers_data?.[species_provider] || {};
-  const species_pictures =
-    props.providers_data?.[species_pictures_provider] || {};
+  const species_pictures = useMemo(
+    () => props.providers_data?.[species_pictures_provider] || {},
+    [props.providers_data, species_pictures_provider],
+  );
 
   const {
     author = [],
@@ -205,10 +208,10 @@ const View = compose(
   })),
 )(_View);
 
-export default (props) => {
+export default function $View(props) {
   return (
     <VisibilitySensor Placeholder={() => <div>loading....&nbsp;</div>}>
       <View {...props} />
     </VisibilitySensor>
   );
-};
+}

package/src/components/manage/Blocks/SpeciesBanner/index.js

@@ -2,7 +2,7 @@ import worldSVG from '@plone/volto/icons/world.svg';
 import Edit from './Edit';
 import View from './View';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.species_banner = {
     id: 'species_banner',
     title: 'Species banner',
@@ -21,4 +21,4 @@ export default (config) => {
     blockHasOwnFocusManagement: false,
   };
   return config;
-};
+}

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

@@ -3,8 +3,6 @@
 
 @import (multiple, reference, optional) '../../theme.config';
 
-@import 'swiper/swiper.less';
-
 @{view} {
   .species-banner-details {
     &::before {

package/src/components/manage/Blocks/SpeciesClassification/index.js

@@ -1,7 +1,7 @@
 import SpeciesClassification from './View';
 import getSchema from './schema';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -14,4 +14,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

package/src/components/manage/Blocks/SpeciesDistribution/index.js

@@ -13,7 +13,7 @@ export function getSpeciesDistributionURL(code_2000, isBird) {
   );
 }
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -26,4 +26,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

package/src/components/manage/Blocks/SpeciesProtectedSites/index.js

@@ -7,7 +7,7 @@ export function getSpeciesProtectedSitesURL(code_2000) {
   );
 }
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -20,4 +20,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

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

@@ -13,15 +13,8 @@ const getSerieData = (serie) => {
 function StackedBars(props) {
   const { d3 } = props;
   const { scaleOrdinal, stack } = d3;
-  const {
-    element,
-    height,
-    width,
-    margin,
-    scales,
-    popup,
-    setPopup,
-  } = React.useContext(ChartContext);
+  const { element, height, width, margin, scales, popup, setPopup } =
+    React.useContext(ChartContext);
   const { data = {}, keys = [], hoverText = '{}' } = props;
 
   if (!keys?.length || !scales?.xScale || !scales?.yScale) {
@@ -62,7 +55,8 @@ function StackedBars(props) {
                   onFocus={() => {}}
                   onBlur={() => {}}
                   onMouseMoveCapture={(event) => {
-                    const elementPosition = element.parentNode.getBoundingClientRect();
+                    const elementPosition =
+                      element.parentNode.getBoundingClientRect();
                     setPopup({
                       id: `${serieIndex}_${rectIndex}_${rect.key}`,
                       clientX: event.clientX - elementPosition.x,

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import Chart from './Chart';
 import StackedBars from './StackedBars';
 
@@ -13,7 +13,7 @@ const View = (props) => {
     y_label_key = 'assessment',
     y_value_key = 'quantity',
   } = props;
-  const data = props.provider_data || {};
+  const data = useMemo(() => props.provider_data || {}, [props.provider_data]);
 
   React.useEffect(() => {
     if (!(data[x_label_key]?.length && data[y_label_key]?.length)) return;

package/src/components/manage/Blocks/StackedBarChart/index.js

@@ -1,7 +1,7 @@
 import StackedBarChart from './View';
 import getSchema from './schema';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -14,4 +14,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

package/src/components/manage/Blocks/StatusList/index.js

@@ -1,7 +1,7 @@
 import StatusListView from './View';
 import getSchema from './schema';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.custom_connected_block = {
     ...config.blocks.blocksConfig.custom_connected_block,
     blocks: {
@@ -14,4 +14,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

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

@@ -15,8 +15,8 @@
       display: inline-flex;
       align-items: center;
       padding: 0.25rem 0.5rem;
-      margin: 0.5rem;
       border-radius: 6px;
+      margin: 0.5rem;
       font-size: 0.9rem;
       font-weight: bold;
 

package/src/components/manage/Blocks/TilesImages/index.js

@@ -2,7 +2,7 @@ import TilesImagesEdit from './Edit';
 import TilesImagesView from './View';
 import worldSVG from '@plone/volto/icons/world.svg';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.blocks.blocksConfig.tiles_images = {
     id: 'tiles_images',
     title: 'Tiles images',
@@ -20,4 +20,4 @@ export default (config) => {
     },
   };
   return config;
-};
+}

package/src/components/manage/Blocks/TilesImages/schema.js

@@ -23,49 +23,51 @@ const imageSchema = {
   required: ['url', 'title'],
 };
 
-export default () => ({
-  title: 'Tiles images',
-  fieldsets: [
-    {
-      id: 'default',
-      title: 'Default',
-      fields: ['theme', 'images'],
-    },
-    {
-      id: 'advanced',
-      title: 'Advanced',
-      fields: ['size', 'hasBorder', 'rounded'],
-    },
-  ],
-  properties: {
-    size: {
-      title: 'Tiles size',
-      type: 'number',
-    },
-    hasBorder: {
-      title: 'With border',
-      type: 'boolean',
-      default: true,
-    },
-    rounded: {
-      title: 'Rounded',
-      type: 'boolean',
-      default: true,
+export default function getSchema() {
+  return {
+    title: 'Tiles images',
+    fieldsets: [
+      {
+        id: 'default',
+        title: 'Default',
+        fields: ['theme', 'images'],
+      },
+      {
+        id: 'advanced',
+        title: 'Advanced',
+        fields: ['size', 'hasBorder', 'rounded'],
+      },
+    ],
+    properties: {
+      size: {
+        title: 'Tiles size',
+        type: 'number',
+      },
+      hasBorder: {
+        title: 'With border',
+        type: 'boolean',
+        default: true,
+      },
+      rounded: {
+        title: 'Rounded',
+        type: 'boolean',
+        default: true,
+      },
+      theme: {
+        title: 'Theme',
+        choices: [
+          ['light', 'Light'],
+          ['grey', 'Grey'],
+          ['dark', 'Dark'],
+        ],
+        default: 'light',
+      },
+      images: {
+        title: 'Images',
+        widget: 'object_list',
+        schema: imageSchema,
+      },
     },
-    theme: {
-      title: 'Theme',
-      choices: [
-        ['light', 'Light'],
-        ['grey', 'Grey'],
-        ['dark', 'Dark'],
-      ],
-      default: 'light',
-    },
-    images: {
-      title: 'Images',
-      widget: 'object_list_inline',
-      schema: imageSchema,
-    },
-  },
-  required: [],
-});
+    required: [],
+  };
+}

package/src/components/theme/AppExtras/index.js

@@ -1,6 +1,6 @@
 import HashLink from './HashLink';
 
-export default (config) => {
+export default function applyConfig(config) {
   config.settings.appExtras = [
     ...(config.settings.appExtras || []),
     {
@@ -10,4 +10,4 @@ export default (config) => {
   ];
 
   return config;
-};
+}

package/src/customizations/@eeacms/volto-group-block/components/manage/Blocks/Group/EditBlockWrapper.jsx

@@ -61,14 +61,8 @@ class EditBlockWrapper extends React.Component {
   blockNode = React.createRef();
 
   render() {
-    const {
-      intl,
-      blockProps,
-      draginfo,
-      extraControls,
-      disabled,
-      children,
-    } = this.props;
+    const { intl, blockProps, draginfo, extraControls, disabled, children } =
+      this.props;
 
     const {
       allowedBlocks,

package/src/less/styles.less

@@ -296,10 +296,10 @@ body.grey-bg {
 
               .item.firstLevel.at-glance {
                 align-self: stretch;
+                border-radius: 0 0 10px 10px;
                 margin-top: -1rem;
                 margin-bottom: -1rem;
                 background: #00a390 0 0 no-repeat padding-box;
-                border-radius: 0 0 10px 10px;
                 color: #fff;
                 cursor: pointer;
 
@@ -358,9 +358,9 @@ body.grey-bg {
     position: relative;
     width: 3em;
     height: 3em;
+    border-radius: 10em;
     margin-bottom: 1.5rem;
     background-color: #fff !important;
-    border-radius: 10em;
     box-shadow: 0px 4px 9px -6px #000000;
 
     &:hover {
@@ -587,22 +587,22 @@ img.slick-image {
 
   > a.active:nth-child(1),
   > a.active:hover:nth-child(1) {
-    background: #4aa47f;
     border-radius: 4px;
+    background: #4aa47f;
     color: #fff;
   }
 
   > a.active:nth-child(2),
   > a.active:hover:nth-child(2) {
-    background: #b78730;
     border-radius: 4px;
+    background: #b78730;
     color: #fff;
   }
 
   > a.active:nth-child(3),
   > a.active:hover:nth-child(3) {
-    background: #2e80ec;
     border-radius: 4px;
+    background: #2e80ec;
     color: #fff;
   }
 }