@eeacms/volto-cca-policy 0.1.52 → 0.1.54

package/CHANGELOG.md

@@ -4,6 +4,46 @@ 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.54](https://github.com/eea/volto-cca-policy/compare/0.1.53...0.1.54) - 20 December 2023
+
+#### :rocket: New Features
+
+- feat: add mission projects search config + code refactoring [kreafox - [`bdc1e73`](https://github.com/eea/volto-cca-policy/commit/bdc1e7310e9bc8b3d66f2c63f1955c25ca233be6)]
+
+#### :bug: Bug Fixes
+
+- fix: import [kreafox - [`93e2726`](https://github.com/eea/volto-cca-policy/commit/93e2726b93385bda46b27bab9d8f910d939c4099)]
+
+#### :nail_care: Enhancements
+
+- change: update mission projects facets [kreafox - [`843a297`](https://github.com/eea/volto-cca-policy/commit/843a29710677a10e8714bbf5a2892841bfb1e029)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`8fb22ff`](https://github.com/eea/volto-cca-policy/commit/8fb22ffe57b6be84ed4720a21836579839ecb7ae)]
+- style: Automated code fix [eea-jenkins - [`8bf77c8`](https://github.com/eea/volto-cca-policy/commit/8bf77c8839cec40389a99fae3ab685ed5b69d146)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #259267 - test [Tripon Eugen - [`74e7710`](https://github.com/eea/volto-cca-policy/commit/74e77106b923a9e146e5d30d9f2410cb06e2c34c)]
+- Refs #259267 - test [Tripon Eugen - [`84039ba`](https://github.com/eea/volto-cca-policy/commit/84039bad25b855a708a601891796da4ff2ac8e71)]
+- Refs #260715 - requested updates [Tripon Eugen - [`89214f6`](https://github.com/eea/volto-cca-policy/commit/89214f6e1b032372a40006706e142f98fb42fa12)]
+- Refs #260715 - requested updates [Tripon Eugen - [`c0353d8`](https://github.com/eea/volto-cca-policy/commit/c0353d8a8016d5c51a0fc6d546f5487080ae253c)]
+- Refs #260715 - requested updates [Tripon Eugen - [`a561804`](https://github.com/eea/volto-cca-policy/commit/a561804bfe548678ae7b497f6d0f645ce0ca928b)]
+- test: fix duplications [kreafox - [`bdea7b7`](https://github.com/eea/volto-cca-policy/commit/bdea7b7fbe01a1f7e591c39010ae8c03b7bbcbe2)]
+- test: increase code coverage [kreafox - [`794d1aa`](https://github.com/eea/volto-cca-policy/commit/794d1aafe7c5577aae089cd781dc997e015ea3a2)]
+- Refs #260715 - filter getContent response to get only folders and test [Tripon Eugen - [`cc967d7`](https://github.com/eea/volto-cca-policy/commit/cc967d7c540d9725993ffe0f227f31ef1bd5a317)]
+- Refs #260715 - filter getContent response to get only folders [Tripon Eugen - [`80b5866`](https://github.com/eea/volto-cca-policy/commit/80b58661648f9caf13b28dab8382d4058d070bd5)]
+### [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.54",
   "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,15 @@ export function ContextNavigationComponent(props) {
         activeMenu={activeMenu}
       />
       {items.length ? (
-        <RASTAccordion datasets={items} activeMenu={activeMenu} />
+        <RASTAccordion
+          items={items}
+          curent_location={curent_location}
+          activeMenu={activeMenu}
+        />
       ) : null}
     </>
   );
 }
 
-export default compose(withContentNavigation)(ContextNavigationComponent);
+// withContentNavigation
+export default compose()(ContextNavigationComponent);

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

@@ -1,34 +1,22 @@
 import React from 'react';
 import { Accordion, Icon } from 'semantic-ui-react';
 import RASTAccordionContent from './RASTAccordionContent';
+import { useHistory } from 'react-router-dom';
 
 const RASTAccordion = (props) => {
-  const { datasets = {}, activeMenu } = props;
+  const { items = {}, curent_location, activeMenu } = props;
 
-  const [activeIndex, setActiveIndex] = React.useState([activeMenu]);
+  const history = useHistory();
 
-  const handleActiveIndex = (index) => {
-    setActiveIndex(index);
-  };
-  const handleClick = (e, titleProps) => {
-    const { index } = titleProps;
-
-    const newIndex =
-      activeIndex.indexOf(index) === -1
-        ? [...activeIndex, index]
-        : activeIndex.filter((item) => item !== index);
-
-    handleActiveIndex(newIndex);
-  };
-  const isActive = (id) => {
-    return activeIndex.includes(id);
+  const handleClick = (e, item) => {
+    let itemUrl = '/' + item['@id'].split('/').slice(3).join('/');
+    history.push(itemUrl);
   };
   return (
     <>
-      {datasets.map((dataset, index) => {
-        const { id } = dataset;
-        const active = isActive(index);
-        let datasetPath = '/' + dataset.href.split('/').slice(3).join('/');
+      {items.map((item, index) => {
+        const { id } = item;
+        const active = activeMenu === index;
 
         return (
           <Accordion id={id} key={index} className="secondary">
@@ -38,15 +26,15 @@ const RASTAccordion = (props) => {
               active={active}
               aria-expanded={active}
               index={index}
-              onClick={(e) => handleClick(e, { index, id, dataset })}
+              onClick={(e) => handleClick(e, 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" />
               ) : (
@@ -55,18 +43,13 @@ const RASTAccordion = (props) => {
             </Accordion.Title>
             <Accordion.Content active={active}>
               <RASTAccordionContent
+                curent_location={curent_location}
                 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,15 +11,17 @@ 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',
+          '@type': 'Folder',
+          href: '/my-item-href',
         },
       ],
       activeMenu: 1,
+      curent_location: '/',
     };
 
     const store = mockStore({

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

@@ -1,30 +1,42 @@
+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 { main, curent_location } = props;
+  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">
       <div>
-        <List.Item key={'0'}>
-          <List.Content>
-            <div className="dataset-item">
-              <Link to={flattenToAppURL(getBaseUrl(main.href))}>
-                {main.title}
-              </Link>
-            </div>
-          </List.Content>
-        </List.Item>
-        {items
-          ? items.map((item, index) => {
-              return (
-                <List.Item key={item.id}>
+        {items.length
+          ? items
+              .filter((item) => item['@type'] === 'Folder')
+              .map((item) => (
+                <List.Item
+                  key={item.id}
+                  className={`${
+                    item['@id'].endsWith(curent_location.pathname)
+                      ? 'active'
+                      : ''
+                  }`}
+                >
                   <List.Content>
                     <div className="dataset-item">
                       <Link to={flattenToAppURL(getBaseUrl(item['@id']))}>
@@ -33,12 +45,11 @@ const RASTAccordionContent = (props) => {
                     </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,
         }}

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

@@ -13,3 +13,7 @@
 .circle:hover {
   fill: @green-1;
 }
+
+.rast-block .item.active a {
+  font-weight: bold;
+}

package/src/components/theme/Views/AdaptationOptionView.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import {
   HTMLField,
   ContentMetadata,
@@ -7,7 +7,6 @@ import {
   ShareInfo,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
-import { Fragment } from 'react';
 
 const dataDisplay = [
   {

package/src/search/config.js

@@ -1,19 +1,9 @@
 import { mergeConfig } from '@eeacms/search';
 import { build_runtime_mappings } from '@eeacms/volto-globalsearch/utils';
+import { getClientProxyAddress } from './utils';
 
 import facets from './facets';
 
-// import views from './views';
-// import filters from './filters';
-// import vocabs from './vocabulary';
-
-const getClientProxyAddress = () => {
-  const url = new URL(window.location);
-  url.pathname = '';
-  url.search = '';
-  return url.toString();
-};
-
 const ccaConfig = {
   title: 'ClimateAdapt Main',
 };
@@ -186,7 +176,5 @@ export default function installMainSearch(config) {
       process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress();
   }
 
-  // console.log(config.searchui.ccaSearch);
-
   return config;
 }

package/src/search/{config-health.js → health_observatory/config-health.js}

@@ -1,19 +1,10 @@
 import { mergeConfig } from '@eeacms/search';
 import { build_runtime_mappings } from '@eeacms/volto-globalsearch/utils';
+import { getClientProxyAddress } from './../utils';
 
 import facets from './facets-health';
 import views from './views-health';
 
-// import filters from './filters';
-// import vocabs from './vocabulary';
-
-const getClientProxyAddress = () => {
-  const url = new URL(window.location);
-  url.pathname = '';
-  url.search = '';
-  return url.toString();
-};
-
 const ccaConfig = {
   title: 'ClimateAdapt Health',
   ...views,

package/src/search/{facets-health.js → health_observatory/facets-health.js}

@@ -1,5 +1,5 @@
 import { booleanFacet } from '@eeacms/search';
-import { getTodayWithTime } from './utils';
+import { getTodayWithTime } from './../utils';
 
 const special = [
   {

package/src/search/index.js

@@ -1,30 +1,21 @@
 import installMainSearch from './config';
-import installHealthSearch from './config-health';
-import installMissionStoriesSearch from './config-mission-stories';
-
-// import DatahubCardItem from './components/Result/DatahubCardItem';
-// import DatahubItemView from './components/ItemView/ItemView';
-//
-// import { DatahubResultModel } from './config/models';
-//
-// import { datahub_results } from './store';
-
-// function tweakForNLPService(body, config) {
-//   if (!config.enableNLP) {
-//     delete body.source;
-//     delete body.index;
-//     return body;
-//   }
-//   return body;
-// }
+import installHealthSearch from './health_observatory/config-health';
+import installMissionStoriesSearch from './mission_stories/config-stories';
+import installMissionProjectsSearch from './mission_projects/config-projects';
 
 const applyConfig = (config) => {
   config.settings.searchlib = installHealthSearch(
     installMainSearch(config.settings.searchlib),
   );
+
   config.settings.searchlib = installMissionStoriesSearch(
     config.settings.searchlib,
   );
+
+  config.settings.searchlib = installMissionProjectsSearch(
+    installMainSearch(config.settings.searchlib),
+  );
+
   return config;
 };
 

package/src/search/mission_projects/config-projects.js

@@ -0,0 +1,69 @@
+import { mergeConfig } from '@eeacms/search';
+import { build_runtime_mappings } from '@eeacms/volto-globalsearch/utils';
+import { getClientProxyAddress } from './../utils';
+
+import facets from './facets-projects';
+
+const missionProjectsConfig = {
+  title: 'Mission Projects',
+};
+
+export const clusters = {
+  name: 'op_cluster',
+  field: 'objectProvides',
+  clusters: [
+    // {
+    //   name: 'Type1',
+    //   icon: { name: 'bullhorn' },
+    //   values: ['Video', 'Guidance'],
+    //   defaultResultView: 'horizontalCard',
+    // },
+  ],
+};
+
+export default function installMainSearch(config) {
+  const envConfig = process.env.RAZZLE_ENV_CONFIG
+    ? JSON.parse(process.env.RAZZLE_ENV_CONFIG)
+    : missionProjectsConfig;
+
+  const pjson = require('@eeacms/volto-cca-policy/../package.json');
+
+  envConfig.app_name = pjson.name;
+  envConfig.app_version = pjson.version;
+
+  config.searchui.missionProjects = {
+    ...mergeConfig(envConfig, config.searchui.globalsearchbase),
+    elastic_index: '_es/globalsearch',
+    index_name: 'data_searchui',
+    host: process.env.RAZZLE_ES_PROXY_ADDR || 'http://localhost:3000',
+    vocab: {
+      cluster_name: {
+        cca: 'Climate-ADAPT',
+      },
+    },
+    runtime_mappings: build_runtime_mappings(clusters),
+  };
+
+  const { missionProjects } = config.searchui;
+
+  missionProjects.permanentFilters.push({
+    term: {
+      cca_include_in_mission: 'true',
+    },
+  });
+
+  missionProjects.permanentFilters.push({
+    terms: {
+      objectProvides: ['Research and knowledge project'],
+    },
+  });
+
+  missionProjects.facets = facets;
+
+  if (typeof window !== 'undefined') {
+    config.searchui.missionProjects.host =
+      process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress();
+  }
+
+  return config;
+}

package/src/search/mission_projects/facets-projects.js

@@ -0,0 +1,30 @@
+import { multiTermFacet } from '@eeacms/search';
+
+import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
+
+const facets = [
+  ...globalSearchBaseConfig.facets,
+  multiTermFacet({
+    field: 'cca_adaptation_sectors.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Sectors',
+    alwaysVisible: false,
+  }),
+  multiTermFacet({
+    field: 'cca_climate_impacts.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Climate impacts',
+    alwaysVisible: false,
+  }),
+  multiTermFacet({
+    field: 'cca_adaptation_elements.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Adaptation Elements',
+    alwaysVisible: false,
+  }),
+];
+
+export default facets;

package/src/search/{config-mission-stories.js → mission_stories/config-stories.js}

@@ -1,18 +1,10 @@
 import { mergeConfig } from '@eeacms/search';
-
-import facets from './facets-mission-stories';
-
-const getClientProxyAddress = () => {
-  const url = new URL(window.location);
-  url.pathname = '';
-  url.search = '';
-  return url.toString();
-};
+import { getClientProxyAddress } from './../utils';
+import facets from './facets-stories';
 
 const missionStoriesConfig = {
   title: 'Mission stories',
   ...facets,
-  //   ...views,
 };
 
 export default function installMissionStoriesSearch(config) {

package/src/search/utils.js

@@ -27,3 +27,10 @@ export function getTodayWithTime() {
   ].join('');
   return output;
 }
+
+export function getClientProxyAddress() {
+  const url = new URL(window.location);
+  url.pathname = '';
+  url.search = '';
+  return url.toString();
+}

package/src/search/utils.test.js

@@ -0,0 +1,11 @@
+import { getTodayWithTime } from './utils';
+import '@testing-library/jest-dom/extend-expect';
+
+describe('getTodayWithTime', () => {
+  it('should return the current date in UTC format', () => {
+    const output = getTodayWithTime();
+
+    expect(typeof output).toBe('string');
+    expect(output).toMatch(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/);
+  });
+});