@eeacms/volto-cca-policy 0.1.50 → 0.1.51

package/CHANGELOG.md

@@ -4,6 +4,12 @@ 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).
 
+### [0.1.51](https://github.com/eea/volto-cca-policy/compare/0.1.50...0.1.51) - 12 December 2023
+
+#### :hammer_and_wrench: Others
+
+- Refs #260715 - rast block open current path [Tripon Eugen - [`7125d5d`](https://github.com/eea/volto-cca-policy/commit/7125d5d79a31cba7c0f00929260e2c80e323896b)]
+- Refs #260715 - rast block depend on path [Tripon Eugen - [`1c4950d`](https://github.com/eea/volto-cca-policy/commit/1c4950d3b1a5a9ae255ec59b33b96e6710a3258b)]
 ### [0.1.50](https://github.com/eea/volto-cca-policy/compare/0.1.49...0.1.50) - 8 December 2023
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/manage/Blocks/RASTBlock/ContextNavigation.jsx

@@ -1,49 +1,44 @@
 import React from 'react';
 import { compose } from 'redux';
-import { withRouter } from 'react-router';
 
 import RASTMap from './RASTMap';
 import RASTAccordion from './RASTAccordion';
+import { useLocation } from 'react-router-dom';
 
 import { withContentNavigation } from '@plone/volto/components/theme/Navigation/withContentNavigation';
 
-import { useLocation } from 'react-router-dom';
-
 /**
  * A navigation slot implementation, similar to the classic Plone navigation
  * portlet. It uses the same API, so the options are similar to
  * INavigationPortlet
  */
 export function ContextNavigationComponent(props) {
-  const { navigation = {} } = props;
+  const { navigation = {}, location } = props;
   const { items = [] } = navigation;
   let activeMenu = null;
 
-  const location = useLocation();
+  const curent_location = useLocation();
   for (let i = 0; i < items.length; i++) {
     let itemUrl = '/' + items[i].href.split('/').slice(3).join('/');
     items[i].is_active = false;
-    if (location.pathname.includes(itemUrl)) {
+    if (curent_location.pathname.includes(itemUrl)) {
       activeMenu = i;
       items[i].is_active = true;
     }
   }
 
-  return items.length ? (
+  return (
     <>
       <RASTMap
         items={items}
         pathname={location.pathname}
         activeMenu={activeMenu}
       />
-      <RASTAccordion datasets={items} activeMenu={activeMenu} />
+      {items.length ? (
+        <RASTAccordion datasets={items} activeMenu={activeMenu} />
+      ) : null}
     </>
-  ) : (
-    ''
   );
 }
 
-export default compose(
-  withRouter,
-  withContentNavigation,
-)(ContextNavigationComponent);
+export default compose(withContentNavigation)(ContextNavigationComponent);

package/src/components/manage/Blocks/RASTBlock/RASTView.jsx

@@ -4,18 +4,27 @@ import ContextNavigation from './ContextNavigation';
 
 export default function RASTView(props) {
   const { data } = props;
-  const top_level = data?.top_level;
+  let root_path = data?.root_path;
+  let top_level = 1;
+  if (typeof root_path === 'undefined') {
+    root_path = '/';
+  }
+  top_level = (root_path.match(/\//g) || []).length - 1;
 
   return (
     <div className="block rast-block">
       <ContextNavigation
         params={{
           // name: 'CurrentTitle',
-          includeTop: false,
-          currentFolderOnly: false,
-          topLevel: top_level ? top_level : 2,
+          // includeTop: false,
+          // currentFolderOnly: false,
+          topLevel: top_level,
+          // topLevel: 2,
           // rootPath: '/en/about/test-rast/',
         }}
+        location={{
+          pathname: root_path,
+        }}
       />
     </div>
   );

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

@@ -1,4 +1,4 @@
-const fields = ['top_level'];
+const fields = ['root_path'];
 
 export default {
   title: 'RAST',
@@ -12,10 +12,11 @@ export default {
   ],
 
   properties: {
-    top_level: {
-      title: 'Top Level',
+    root_path: {
+      title: 'Rooth path',
       type: 'string',
-      description: 'Ex 2 for /en/about/rast',
+      description:
+        'Ex: /en/knowledge-and-data/regional-adaptation-support-tool',
       required: true,
       noValueOption: false,
     },