@eeacms/volto-cca-policy 0.1.48 → 0.1.50

package/CHANGELOG.md

@@ -4,6 +4,49 @@ 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.50](https://github.com/eea/volto-cca-policy/compare/0.1.49...0.1.50) - 8 December 2023
+
+#### :hammer_and_wrench: Others
+
+- test: increase coverage [kreafox - [`b80a73b`](https://github.com/eea/volto-cca-policy/commit/b80a73b8cf69d09ca1b30ccaf73771367ffb0f35)]
+- Make test pass [Tiberiu Ichim - [`9adf2ce`](https://github.com/eea/volto-cca-policy/commit/9adf2cec0d2d4f5c920a1524599765a5e0ae5508)]
+- Refs #260715 rast-block jest test [Tripon Eugen - [`307a8b9`](https://github.com/eea/volto-cca-policy/commit/307a8b953c9d1ef8e51411d8e14e699aaeae235b)]
+- Refs #260715 - sonar qube warnings [Tripon Eugen - [`09dfe3a`](https://github.com/eea/volto-cca-policy/commit/09dfe3a91a0ccc54f6c87ca5a8cabfcdb3e7f3e5)]
+- Refs #260715 rast-block wip [Tripon Eugen - [`20955a3`](https://github.com/eea/volto-cca-policy/commit/20955a3dd39bb8ccaa807efea463b6e8b678a59b)]
+- Refs #260715 rast-block wip [Tripon Eugen - [`5dd47cb`](https://github.com/eea/volto-cca-policy/commit/5dd47cbe32a78664646f9fa75f4ee2e73d0475f2)]
+- Refs #260715 rast-block wip [Tripon Eugen - [`a932a26`](https://github.com/eea/volto-cca-policy/commit/a932a2619b776aab5042b9f24e29df4d6962829f)]
+- Refs #260715 rast-block wip [Tripon Eugen - [`f19d54e`](https://github.com/eea/volto-cca-policy/commit/f19d54e0b9a6a86bf344eb85b6a1cda7f3de91bf)]
+- Refs #260715 rast-block wip [Tripon Eugen - [`2828537`](https://github.com/eea/volto-cca-policy/commit/2828537b6c084cd1a82162d552fb4ef025b71f9f)]
+- Refs #260715 rast-block updates [Tripon Eugen - [`1e803e5`](https://github.com/eea/volto-cca-policy/commit/1e803e5bd3d3fb7558f261c76c68866be7beb8b5)]
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`0a15e1b`](https://github.com/eea/volto-cca-policy/commit/0a15e1b2ad081233685e80d5b3c60a8663f6b896)]
+- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`9554e44`](https://github.com/eea/volto-cca-policy/commit/9554e44c92a621a52b2adb5a4830fb084ee5734b)]
+### [0.1.49](https://github.com/eea/volto-cca-policy/compare/0.1.48...0.1.49) - 15 November 2023
+
+#### :house: Internal changes
+
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7b820a6`](https://github.com/eea/volto-cca-policy/commit/7b820a6369c2ddd5203b1a4abe352cb4bb43db7a)]
+- chore: husky, lint-staged use fixed versions [valentinab25 - [`f0a8061`](https://github.com/eea/volto-cca-policy/commit/f0a8061c275c236deb00087c23fac9860a073106)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #259267 - test volto-slate blocks add createParagraph [Tripon Eugen - [`c855b41`](https://github.com/eea/volto-cca-policy/commit/c855b41cb925767a45e1b16e6f79cd7e9c602fc7)]
+- Refs #259267 - test cypress config set multilingual default [Tripon Eugen - [`1d4fd5a`](https://github.com/eea/volto-cca-policy/commit/1d4fd5a712c4f3edcf9cd208b759c2a6d75eefb2)]
+- Refs #259267 - jenkins cypress e2e [Tripon Eugen - [`08ea88e`](https://github.com/eea/volto-cca-policy/commit/08ea88e1e3fcf6b53c347c4a99b0c80a972f17fd)]
+- Refs #259267 - backend_profiles multiple addons separated by space [Tripon Eugen - [`a2e3a85`](https://github.com/eea/volto-cca-policy/commit/a2e3a85992c5513e6d0a2c697e8770f709d70d45)]
+- Refs #259267 - test cypress config [Tripon Eugen - [`1434f26`](https://github.com/eea/volto-cca-policy/commit/1434f2624035572056633c0eb2598585c7e04722)]
+- Refs #259267 - remove multilingual testing version [Tripon Eugen - [`86fd752`](https://github.com/eea/volto-cca-policy/commit/86fd7524680174ac7e34aa415798427dd44b890a)]
+- Refs #259267 - jenkins test add multilingual and set version [Tripon Eugen - [`9611e95`](https://github.com/eea/volto-cca-policy/commit/9611e954879e03b0ebcf95da4ea580e26e3eb765)]
+- Refs #259267 - jenkins test change className condition [Tripon Eugen - [`402832a`](https://github.com/eea/volto-cca-policy/commit/402832a29a83116cd8daa30a1e5296ca54742f02)]
+- Refs #259267 - jenkins test volto version and longer timeout [Tripon Eugen - [`94b042d`](https://github.com/eea/volto-cca-policy/commit/94b042de785baebd1644d5aede93908dbe2035d2)]
+- Refs #259267 - jenkins test [Tripon Eugen - [`cacd31e`](https://github.com/eea/volto-cca-policy/commit/cacd31e7b1afe0983674ed5c7632d2e1d7fa752e)]
+- Refs #259267 - jenkins [Tripon Eugen - [`5b3affe`](https://github.com/eea/volto-cca-policy/commit/5b3affee8401239de10097884c1b7f2349d15ec0)]
+- Refs #259267 - add When, lead image and title to files [Tripon Eugen - [`2cedb23`](https://github.com/eea/volto-cca-policy/commit/2cedb237f898af9057e13fba94b615ef71077204)]
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`4d607a5`](https://github.com/eea/volto-cca-policy/commit/4d607a576e9d0a5c34e48c41b409e7df616ee3d6)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`b7f74d5`](https://github.com/eea/volto-cca-policy/commit/b7f74d53513a6edbfbca5cb6d19687929bb1e5db)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`db65617`](https://github.com/eea/volto-cca-policy/commit/db656173391f65157098d95d388c25f6429753d8)]
+- Refs #259267 - cca event blocks attachments and check not mandatoty fields [Tripon Eugen - [`3138e5a`](https://github.com/eea/volto-cca-policy/commit/3138e5afb5bfbdbed14e27ed457b16867b7fa414)]
+- Refs #256681 - Fix error in CCA Event view menu. ([React Intl] An id must be provided to format a message.) [GhitaB - [`517eeb8`](https://github.com/eea/volto-cca-policy/commit/517eeb817264a47bbfd6b9b7d22aaf22d44ed224)]
+- Refs #161485 - Fix ECDE name conflict. [GhitaB - [`8bfd99f`](https://github.com/eea/volto-cca-policy/commit/8bfd99ff68bb82a04d1c0ed625fa514fcf46289e)]
 ### [0.1.48](https://github.com/eea/volto-cca-policy/compare/0.1.47...0.1.48) - 16 October 2023
 
 #### :house: Internal changes

package/cypress.config.js

@@ -2,12 +2,12 @@ const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
   viewportWidth: 1280,
-  defaultCommandTimeout: 5000,
+  defaultCommandTimeout: 8888,
   chromeWebSecurity: false,
   reporter: 'junit',
-  video: true,
+  video: false,
   retries: {
-    runMode: 1,
+    runMode: 2,
     openMode: 0,
   },
   reporterOptions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.48",
+  "version": "0.1.50",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -24,11 +24,13 @@
     "@eeacms/volto-accordion-block",
     "@eeacms/volto-slate-label",
     "@eeacms/volto-eea-design-system",
+    "@eeacms/volto-eea-website-theme",
     "@eeacms/volto-globalsearch"
   ],
   "dependencies": {
     "@eeacms/volto-accordion-block": "*",
     "@eeacms/volto-eea-design-system": "*",
+    "@eeacms/volto-eea-website-theme": "*",
     "@eeacms/volto-globalsearch": "*",
     "@eeacms/volto-openlayers-map": "*",
     "@eeacms/volto-slate-label": "*",
@@ -43,8 +45,8 @@
     "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "cypress-fail-fast": "^5.0.1",
-    "husky": "*",
-    "lint-staged": "*",
+    "husky": "^8.0.3",
+    "lint-staged": "^14.0.1",
     "md5": "^2.3.0"
   },
   "lint-staged": {

package/src/components/manage/Blocks/C3SIndicatorsGlossaryBlock/C3SIndicatorsGlossaryBlockView.jsx

@@ -6,7 +6,7 @@ export default function C3SIndicatorsGlossaryBlockView(props) {
 
   const getIndicatorsData = () => {
     const url =
-      '/++api++/en/knowledge/european-climate-data-explorer/@c3s_indicators_glossary_table';
+      '/++api++/en/knowledge/european-climate-data-explorer/@c3s_indicators_glossary_table_api';
 
     axios
       .get(url)

package/src/components/manage/Blocks/C3SIndicatorsOverviewBlock/C3SIndicatorsOverviewBlockView.jsx

@@ -12,7 +12,7 @@ export default function C3SIndicatorsOverviewBlockView(props) {
     const url =
       '/++api++/en/knowledge/european-climate-data-explorer/' +
       category +
-      '/@c3s_indicators_overview';
+      '/@c3s_indicators_overview_api';
 
     axios
       .get(url)

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

@@ -48,7 +48,7 @@
 
     span {
       float: left;
-      font-family: OpenSansM;
+      font-family: OpenSansM, sans-serif;
       font-size: 12px;
     }
 

package/src/components/manage/Blocks/CountryMapProfile/styles.css

@@ -140,7 +140,6 @@
   }
 
   .country-noportal {
-    //background-color: #999;
     background-color: #c0c0c0;
   }
 }
@@ -156,7 +155,6 @@
 }
 
 .country-noportal path {
-  //fill: #999;
   cursor: pointer;
   fill: #e0e0e0;
 }

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

@@ -0,0 +1,49 @@
+import React from 'react';
+import { compose } from 'redux';
+import { withRouter } from 'react-router';
+
+import RASTMap from './RASTMap';
+import RASTAccordion from './RASTAccordion';
+
+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 { items = [] } = navigation;
+  let activeMenu = null;
+
+  const 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)) {
+      activeMenu = i;
+      items[i].is_active = true;
+    }
+  }
+
+  return items.length ? (
+    <>
+      <RASTMap
+        items={items}
+        pathname={location.pathname}
+        activeMenu={activeMenu}
+      />
+      <RASTAccordion datasets={items} activeMenu={activeMenu} />
+    </>
+  ) : (
+    ''
+  );
+}
+
+export default compose(
+  withRouter,
+  withContentNavigation,
+)(ContextNavigationComponent);

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

@@ -0,0 +1,79 @@
+import React from 'react';
+import { Accordion, Icon } from 'semantic-ui-react';
+import RASTAccordionContent from './RASTAccordionContent';
+
+const RASTAccordion = (props) => {
+  const { datasets = {}, activeMenu } = props;
+
+  const [activeIndex, setActiveIndex] = React.useState([activeMenu]);
+
+  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);
+  };
+  return (
+    <>
+      {datasets.map((dataset, index) => {
+        const { id } = dataset;
+        const active = isActive(index);
+        let datasetPath = '/' + dataset.href.split('/').slice(3).join('/');
+
+        return (
+          <Accordion id={id} key={index} className="secondary">
+            <Accordion.Title
+              role="button"
+              tabIndex={0}
+              active={active}
+              aria-expanded={active}
+              index={index}
+              onClick={(e) => handleClick(e, { index, id, dataset })}
+              onKeyDown={(e) => {
+                if (e.keyCode === 13 || e.keyCode === 32) {
+                  e.preventDefault();
+                  handleClick(e, { index, id, dataset });
+                }
+              }}
+            >
+              <span className="dataset-title">{dataset.title}</span>
+              {active ? (
+                <Icon className="ri-arrow-up-s-line" />
+              ) : (
+                <Icon className="ri-arrow-down-s-line" />
+              )}
+            </Accordion.Title>
+            <Accordion.Content active={active}>
+              <RASTAccordionContent
+                key={index}
+                params={{
+                  name: 'CurrentTitle',
+                  includeTop: false,
+                  currentFolderOnly: true,
+                  topLevel: 3,
+                  bottomLevel: 6,
+                  rootPath: datasetPath,
+                  title: dataset.title,
+                }}
+                location={{ pathname: datasetPath }}
+                main={{ title: dataset.title, href: dataset['@id'] }}
+              />
+            </Accordion.Content>
+          </Accordion>
+        );
+      })}
+    </>
+  );
+};
+
+export default RASTAccordion;

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

@@ -0,0 +1,42 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import { Provider } from 'react-intl-redux';
+import RASTAccordion from './RASTAccordion';
+
+const mockStore = configureStore();
+
+describe('RASTAccordion', () => {
+  it('should render the component', () => {
+    const data = {
+      datasets: [
+        {
+          id: 'my-dataset',
+          title: 'Hello',
+          '@id': '/my-dataset',
+          href: '/my-dataset-href',
+        },
+      ],
+      activeMenu: 1,
+    };
+
+    const store = mockStore({
+      userSession: { token: '1234' },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+
+    const { container } = render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <RASTAccordion {...data} />
+        </MemoryRouter>
+      </Provider>,
+    );
+    expect(container.querySelector('.accordion')).toBeInTheDocument();
+  });
+});

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

@@ -0,0 +1,44 @@
+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';
+
+const RASTAccordionContent = (props) => {
+  const { main } = props;
+  const items = props.navigation?.items;
+
+  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}>
+                  <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);