@eeacms/volto-cca-policy 0.1.52 → 0.1.53

package/CHANGELOG.md

@@ -4,6 +4,16 @@ 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.53](https://github.com/eea/volto-cca-policy/compare/0.1.52...0.1.53) - 19 December 2023
+
+#### :hammer_and_wrench: Others
+
+- Refs #260715 - switch browse folder to getContent test subrequests [Tripon Eugen - [`7744481`](https://github.com/eea/volto-cca-policy/commit/7744481bbebe3a0eedd3d440d58ae3b9adf43a18)]
+- Refs #260715 - switch browse folder to getContent test [Tripon Eugen - [`ca17c9c`](https://github.com/eea/volto-cca-policy/commit/ca17c9c9a2972129fdbcef1d7dcceb2af1062cf2)]
+- Refs #260715 - switch browse folder to getContent jenkins [Tripon Eugen - [`866118c`](https://github.com/eea/volto-cca-policy/commit/866118c4d5537d00c7bb7ffed272c16cd9516194)]
+- Refs #260715 - switch browse folder to getContent [Tripon Eugen - [`4c6cb1b`](https://github.com/eea/volto-cca-policy/commit/4c6cb1b74812c020f670b1e660fae74eca7bbd8d)]
+- WIP [Tiberiu Ichim - [`baef385`](https://github.com/eea/volto-cca-policy/commit/baef385bc65818b1a7b294fd6fcbbe65aef731f2)]
+- WIP [Tiberiu Ichim - [`d64813d`](https://github.com/eea/volto-cca-policy/commit/d64813d66b32c785124adfa4e1e2d95bab512592)]
 ### [0.1.52](https://github.com/eea/volto-cca-policy/compare/0.1.51...0.1.52) - 15 December 2023
 
 #### :rocket: New Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "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

@@ -5,21 +5,18 @@ import RASTMap from './RASTMap';
 import RASTAccordion from './RASTAccordion';
 import { useLocation } from 'react-router-dom';
 
-import { withContentNavigation } from '@plone/volto/components/theme/Navigation/withContentNavigation';
-
 /**
  * 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 = {}, location } = props;
-  const { items = [] } = navigation;
+  const { location, items } = props;
   let activeMenu = null;
 
   const curent_location = useLocation();
   for (let i = 0; i < items.length; i++) {
-    let itemUrl = '/' + items[i].href.split('/').slice(3).join('/');
+    let itemUrl = '/' + items[i]['@id'].split('/').slice(3).join('/');
     items[i].is_active = false;
     if (curent_location.pathname.includes(itemUrl)) {
       activeMenu = i;
@@ -35,10 +32,11 @@ export function ContextNavigationComponent(props) {
         activeMenu={activeMenu}
       />
       {items.length ? (
-        <RASTAccordion datasets={items} activeMenu={activeMenu} />
+        <RASTAccordion items={items} activeMenu={activeMenu} />
       ) : null}
     </>
   );
 }
 
-export default compose(withContentNavigation)(ContextNavigationComponent);
+// withContentNavigation
+export default compose()(ContextNavigationComponent);

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

@@ -3,7 +3,7 @@ import { Accordion, Icon } from 'semantic-ui-react';
 import RASTAccordionContent from './RASTAccordionContent';
 
 const RASTAccordion = (props) => {
-  const { datasets = {}, activeMenu } = props;
+  const { items = {}, activeMenu } = props;
 
   const [activeIndex, setActiveIndex] = React.useState([activeMenu]);
 
@@ -25,10 +25,9 @@ const RASTAccordion = (props) => {
   };
   return (
     <>
-      {datasets.map((dataset, index) => {
-        const { id } = dataset;
+      {items.map((item, index) => {
+        const { id } = item;
         const active = isActive(index);
-        let datasetPath = '/' + dataset.href.split('/').slice(3).join('/');
 
         return (
           <Accordion id={id} key={index} className="secondary">
@@ -38,15 +37,15 @@ const RASTAccordion = (props) => {
               active={active}
               aria-expanded={active}
               index={index}
-              onClick={(e) => handleClick(e, { index, id, dataset })}
+              onClick={(e) => handleClick(e, { index, id, item })}
               onKeyDown={(e) => {
                 if (e.keyCode === 13 || e.keyCode === 32) {
                   e.preventDefault();
-                  handleClick(e, { index, id, dataset });
+                  handleClick(e, { index, id, item });
                 }
               }}
             >
-              <span className="dataset-title">{dataset.title}</span>
+              <span className="item-title">{item.title}</span>
               {active ? (
                 <Icon className="ri-arrow-up-s-line" />
               ) : (
@@ -56,17 +55,11 @@ const RASTAccordion = (props) => {
             <Accordion.Content active={active}>
               <RASTAccordionContent
                 key={index}
-                params={{
-                  name: 'CurrentTitle',
-                  includeTop: false,
-                  currentFolderOnly: true,
-                  topLevel: 3,
-                  bottomLevel: 6,
-                  rootPath: datasetPath,
-                  title: dataset.title,
+                main={{
+                  title: item.title,
+                  href: item['@id'],
+                  url: item.url,
                 }}
-                location={{ pathname: datasetPath }}
-                main={{ title: dataset.title, href: dataset['@id'] }}
               />
             </Accordion.Content>
           </Accordion>

package/src/components/manage/Blocks/RASTBlock/RASTAccordion.test.jsx

@@ -11,12 +11,12 @@ const mockStore = configureStore();
 describe('RASTAccordion', () => {
   it('should render the component', () => {
     const data = {
-      datasets: [
+      items: [
         {
-          id: 'my-dataset',
+          id: 'my-item',
           title: 'Hello',
-          '@id': '/my-dataset',
-          href: '/my-dataset-href',
+          '@id': '/my-item',
+          href: '/my-item-href',
         },
       ],
       activeMenu: 1,

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

@@ -1,13 +1,27 @@
+import React from 'react';
 import { List } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 import { compose } from 'redux';
 import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers';
-
-import { withContentNavigation } from '@plone/volto/components/theme/Navigation/withContentNavigation';
+import { useDispatch, useSelector } from 'react-redux';
+import { getContent } from '@plone/volto/actions';
+// import useChildren from './RASTView';
 
 const RASTAccordionContent = (props) => {
   const { main } = props;
-  const items = props.navigation?.items;
+  const dispatch = useDispatch();
+  const location = main.url;
+  let items = [];
+
+  React.useEffect(() => {
+    const action = getContent(location, null, location);
+    dispatch(action);
+  }, [location, dispatch]);
+
+  items = useSelector(
+    (state) => state.content?.subrequests?.[location]?.data?.items || [],
+  );
+  // const items = useChildren(location);
 
   return (
     <div className="dataset-content">
@@ -21,24 +35,22 @@ const RASTAccordionContent = (props) => {
             </div>
           </List.Content>
         </List.Item>
-        {items
-          ? items.map((item, index) => {
-              return (
-                <List.Item key={item.id}>
-                  <List.Content>
-                    <div className="dataset-item">
-                      <Link to={flattenToAppURL(getBaseUrl(item['@id']))}>
-                        {item.title}
-                      </Link>
-                    </div>
-                  </List.Content>
-                </List.Item>
-              );
-            })
+        {items.length
+          ? items.map((item) => (
+              <List.Item key={item.id}>
+                <List.Content>
+                  <div className="dataset-item">
+                    <Link to={flattenToAppURL(getBaseUrl(item['@id']))}>
+                      {item.title}
+                    </Link>
+                  </div>
+                </List.Content>
+              </List.Item>
+            ))
           : null}
       </div>
     </div>
   );
 };
 
-export default compose(withContentNavigation)(RASTAccordionContent);
+export default compose()(RASTAccordionContent);

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

@@ -1,27 +1,35 @@
 import React from 'react';
 import './styles.less';
 import ContextNavigation from './ContextNavigation';
+import { useDispatch, useSelector } from 'react-redux';
+import { getContent } from '@plone/volto/actions';
+
+function useChildren(location) {
+  const dispatch = useDispatch();
+  React.useEffect(() => {
+    const action = getContent(location, null, location);
+    dispatch(action);
+  }, [location, dispatch]);
+
+  const items = useSelector(
+    (state) => state.content.subrequests?.[location]?.data?.items || [],
+  );
+  return items;
+}
 
 export default function RASTView(props) {
   const { data } = props;
   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;
+
+  const items = useChildren(root_path);
 
   return (
     <div className="block rast-block">
       <ContextNavigation
-        params={{
-          // name: 'CurrentTitle',
-          // includeTop: false,
-          // currentFolderOnly: false,
-          topLevel: top_level,
-          // topLevel: 2,
-          // rootPath: '/en/about/test-rast/',
-        }}
+        items={items}
         location={{
           pathname: root_path,
         }}