@eeacms/volto-bise-policy 1.0.4 → 1.0.6

package/CHANGELOG.md

@@ -4,7 +4,20 @@ 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-bise-policy/compare/1.0.3...1.0.4) - 25 April 2023
+### [1.0.6](https://github.com/eea/volto-bise-policy/compare/1.0.5...1.0.6) - 23 May 2023
+
+#### :hammer_and_wrench: Others
+
+- update [Miu Razvan - [`427a1e8`](https://github.com/eea/volto-bise-policy/commit/427a1e8f947cf0912fe0ad2455c6a9ac4d934cb7)]
+- es lint [Zoltan Szabo - [`917fba3`](https://github.com/eea/volto-bise-policy/commit/917fba3dcc07eec3de91008eda8afe209865b436)]
+- updated search popup [Zoltan Szabo - [`27618e1`](https://github.com/eea/volto-bise-policy/commit/27618e1aac391c2f89882d2a6478be456f6c60c7)]
+### [1.0.5](https://github.com/eea/volto-bise-policy/compare/1.0.4...1.0.5) - 26 April 2023
+
+#### :nail_care: Enhancements
+
+- refactor(Header.jsx): remove unused lodash find import statement [Miu Razvan - [`708256c`](https://github.com/eea/volto-bise-policy/commit/708256c75bef332c18c0102246ad3cd6cf66ade9)]
+
+### [1.0.4](https://github.com/eea/volto-bise-policy/compare/1.0.3...1.0.4) - 26 April 2023
 
 #### :rocket: New Features
 

package/package.json

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

package/src/customizations/volto/components/theme/Header/Header.jsx

@@ -53,7 +53,7 @@ const EEAHeader = ({ token, history, subsite, content, ...props }) => {
   const previousToken = usePrevious(token);
   const { items } = props;
   const { eea } = config.settings;
-  const { headerOpts } = eea || {};
+  const { headerOpts, headerSearchBox } = eea || {};
   const { logo, logoWhite } = headerOpts || {};
 
   const width = useSelector((state) => state.screen?.width);
@@ -74,7 +74,8 @@ const EEAHeader = ({ token, history, subsite, content, ...props }) => {
     pathname = content_pathname;
   }
 
-  const isHomePageInverse = ['', '/', '/edit', '/edit/'].includes(pathname);
+  const isHomePageInverse =
+    content_pathname === '' && ['', '/'].includes(pathname);
 
   const isMultilingual =
     config.settings.isMultilingual || (isSubsite && subsite.isMultilingual);
@@ -149,6 +150,7 @@ const EEAHeader = ({ token, history, subsite, content, ...props }) => {
                 href="https://europa.eu/european-union/contact/institutions-bodies_en"
                 target="_blank"
                 rel="noreferrer"
+                onKeyDown={(evt) => evt.stopPropagation()}
               >
                 See all EU institutions and bodies
               </a>
@@ -176,14 +178,15 @@ const EEAHeader = ({ token, history, subsite, content, ...props }) => {
                 </Dropdown.Item>
                 {headerOpts.partnerLinks.links.map((item, index) => (
                   <Dropdown.Item key={index}>
-                    <UniversalLink
+                    <a
                       href={item.href}
                       className="site"
-                      target={item.target || '_blank'}
+                      target="_blank"
                       rel="noreferrer"
+                      onKeyDown={(evt) => evt.stopPropagation()}
                     >
                       {item.title}
-                    </UniversalLink>
+                    </a>
                   </Dropdown.Item>
                 ))}
               </div>
@@ -259,6 +262,7 @@ const EEAHeader = ({ token, history, subsite, content, ...props }) => {
       >
         <Header.Main
           pathname={router_pathname}
+          headerSearchBox={headerSearchBox}
           inverted={isHomePageInverse ? true : false}
           transparency={isHomePageInverse ? true : false}
           hideSearch={isSubsite}

package/src/index.js

@@ -1,3 +1,4 @@
+import { getBlocks } from '@plone/volto/helpers';
 import installLink from '@plone/volto-slate/editor/plugins/AdvancedLink';
 import { addStylingFieldsetSchemaEnhancer } from '@eeacms/volto-bise-policy/components/manage/Blocks/schema';
 
@@ -30,15 +31,13 @@ const applyConfig = (config) => {
     headerSearchBox: [
       {
         isDefault: true,
+        // to replace search path change path to whatever you want and match with the page in volto website
         path: '/advanced-search',
-        placeholder: 'Search...',
-      },
-      {
-        path: 'datahub',
-        placeholder: 'Search Datahub...',
+        placeholder: 'Search BISE...',
         description:
           'Looking for more information? Try searching the full EEA website content',
-        buttonTitle: 'Go to full site search',
+        buttonTitle: 'Go to advanced search',
+        buttonUrl: 'https://www.eea.europa.eu/en/advanced-search',
       },
     ],
     logoTargetUrl: '/',
@@ -86,6 +85,28 @@ const applyConfig = (config) => {
   if (config.blocks.blocksConfig.columnsBlock) {
     config.blocks.blocksConfig.columnsBlock.mostUsed = true;
     config.blocks.blocksConfig.columnsBlock.schemaEnhancer = addStylingFieldsetSchemaEnhancer;
+    config.blocks.blocksConfig.columnsBlock.tocEntry = undefined;
+    config.blocks.blocksConfig.columnsBlock.tocEntries = (
+      block = {},
+      tocData,
+    ) => {
+      // integration with volto-block-toc
+      const headlines = tocData.levels || ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
+      // const column_blocks = block?.data?.blocks || {};
+      let entries = [];
+      const sorted_column_blocks = getBlocks(block?.data || {});
+      sorted_column_blocks.forEach((column_block) => {
+        const sorted_blocks = getBlocks(column_block[1]);
+        sorted_blocks.forEach((block) => {
+          const { value, plaintext } = block[1];
+          const type = value?.[0]?.type;
+          if (headlines.includes(type)) {
+            entries.push([parseInt(type.slice(1)), plaintext, block[0]]);
+          }
+        });
+      });
+      return entries;
+    };
   }
 
   // Listing
@@ -99,6 +120,18 @@ const applyConfig = (config) => {
     config.blocks.blocksConfig.hero_image_left.schemaEnhancer = addStylingFieldsetSchemaEnhancer;
   }
 
+  // Plotly bise color
+  config.settings.plotlyCustomColors = [
+    {
+      title: 'Biodiversity Default',
+      colorscale: ['#094238', '#12957D', '#19C4A5'],
+    },
+    {
+      title: '',
+      colorscale: ['#12957D', '#F9EA8A', '#DD552B', '#AEB0B3'],
+    },
+  ];
+
   return [installBlocks, installStyles].reduce(
     (acc, apply) => apply(acc),
     config,

package/theme/extras/tocnav.less

@@ -127,8 +127,9 @@
       .item {
         &:not(:last-child) {
           &:before {
-            top: 6px;
-            height: 60%;
+            top: 50%;
+            transform: translateY(-50%);
+            height: 50%;
             background: rgba(34, 36, 38, 0.8);
           }
         }

package/src/customizations/volto/components/theme/Footer/Footer.jsx

@@ -1,90 +0,0 @@
-/**
- * Footer component.
- * @module components/theme/Footer/Footer
- */
-
-import React from 'react';
-import { useSelector, shallowEqual } from 'react-redux';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import EEAFooter from '@eeacms/volto-eea-design-system/ui/Footer/Footer';
-import config from '@plone/volto/registry';
-
-const Footer = () => {
-  const { eea } = config.settings;
-  const {
-    footerActions = [],
-    copyrightActions = [],
-    socialActions = [],
-    contactActions = [],
-    contactExtraActions = [],
-  } = useSelector(
-    (state) => ({
-      footerActions: state.actions?.actions?.footer_actions,
-      copyrightActions: state.actions?.actions?.copyright_actions,
-      socialActions: state.actions?.actions?.social_actions,
-      contactActions: state.actions?.actions?.contact_actions,
-      contactExtraActions: state.actions?.actions?.contact_extra_actions,
-    }),
-    shallowEqual,
-  );
-  // ZMI > portal_actions > footer_actions
-  const actions = footerActions.length
-    ? footerActions.map((action) => ({
-        title: action.title,
-        link: flattenToAppURL(action.url),
-      }))
-    : eea.footerOpts.actions;
-
-  // ZMI > portal_actions > copyright_actions
-  const copyright = copyrightActions.length
-    ? copyrightActions.map((action) => ({
-        title: action.title,
-        site: action.title,
-        link: flattenToAppURL(action.url),
-      }))
-    : eea.footerOpts.copyright;
-
-  // ZMI > portal_actions > social_actions
-  const social = socialActions.length
-    ? socialActions.map((action) => ({
-        name: action.id,
-        icon: action.icon,
-        link: action.url,
-      }))
-    : eea.footerOpts.social;
-
-  // ZMI > portal_actions > contact_actions
-  const contacts = contactActions.length
-    ? contactActions.map((action, idx) => ({
-        text: action.title,
-        icon: action.icon,
-        link: flattenToAppURL(action.url),
-        children:
-          idx === 0
-            ? contactExtraActions.map((child) => ({
-                text: child.title,
-                icon: child.icon,
-                link: flattenToAppURL(child.url),
-              }))
-            : [],
-      }))
-    : eea.footerOpts.contacts;
-
-  // Update options with actions from backend
-  const options = {
-    ...eea.footerOpts,
-    social,
-    contacts,
-  };
-
-  return (
-    <EEAFooter>
-      <EEAFooter.SubFooter {...options} />
-      <EEAFooter.Header>{eea.footerOpts.header}</EEAFooter.Header>
-      <EEAFooter.Sites sites={eea.footerOpts.sites} />
-      <EEAFooter.Actions actions={actions} copyright={copyright} />
-    </EEAFooter>
-  );
-};
-
-export default Footer;