@eeacms/volto-cca-policy 0.1.77 → 0.1.78

package/CHANGELOG.md

@@ -4,6 +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).
 
+### [0.1.78](https://github.com/eea/volto-cca-policy/compare/0.1.77...0.1.78) - 20 February 2024
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`0b35fb5`](https://github.com/eea/volto-cca-policy/commit/0b35fb51fd604bdf18a05d687c795d1d2d8e161f)]
+
+#### :hammer_and_wrench: Others
+
+- Why did Jenkins become a gardener? Because he wanted to see if his plants could pass the green build! [GhitaB - [`4bf6c95`](https://github.com/eea/volto-cca-policy/commit/4bf6c9595563d24ea6a48363ec715d69fbca888f)]
+- prettier ternary [Tiberiu Ichim - [`015e96a`](https://github.com/eea/volto-cca-policy/commit/015e96a9f38b2fe5cbc49e254227bb1243747250)]
+- oops [Tiberiu Ichim - [`f3b9a55`](https://github.com/eea/volto-cca-policy/commit/f3b9a55009857148b26f2f74064c3ea3869e024a)]
+- Code cleanup [Tiberiu Ichim - [`988c8d9`](https://github.com/eea/volto-cca-policy/commit/988c8d9f310cf9abdf62e588facc1c5693a3e7f6)]
+- Styling for nonclickable menus [Tiberiu Ichim - [`1c33068`](https://github.com/eea/volto-cca-policy/commit/1c33068a85de60adc33d39c3ecf14496ed73d1fb)]
+- Nonclickable menu WIP [Tiberiu Ichim - [`06bfa16`](https://github.com/eea/volto-cca-policy/commit/06bfa16362d0e1be40ed17cb6007814fafd2fe21)]
 ### [0.1.77](https://github.com/eea/volto-cca-policy/compare/0.1.76...0.1.77) - 19 February 2024
 
 #### :bug: Bug Fixes
@@ -347,10 +361,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - 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
@@ -367,6 +384,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - 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)]
@@ -583,6 +603,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`ad1ced0`](https://github.com/eea/volto-cca-policy/commit/ad1ced0971ba116c13a3b5fcc039172cc915c919)]
 
 #### :hammer_and_wrench: Others
 
@@ -1063,6 +1084,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #158294 - Update supported languages list. [GhitaB - [`0a4f91f`](https://github.com/eea/volto-cca-policy/commit/0a4f91f39b7edc367bd4c127d6a8f273c7788361)]
+- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`8f1f9ce`](https://github.com/eea/volto-cca-policy/commit/8f1f9ce6c22805670cc0800d3c779b6d619d0f31)]
 ### [0.1.1](https://github.com/eea/volto-cca-policy/compare/0.1.0...0.1.1) - 13 December 2022
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/theme/Header.jsx

@@ -108,9 +108,9 @@ const EEAHeader = (props) => {
     }
   }, [token, dispatch, pathname, previousToken]);
 
+  const download = subsite?.subsite_logo.scales?.preview?.download;
   const subsiteLogo = subsite?.subsite_logo
-    ? subsite.subsite_logo.scales?.preview?.download ||
-      toPublicURL(`${subsite['@id']}/@@images/subsite_logo`)
+    ? download || toPublicURL(`${subsite['@id']}/@@images/subsite_logo`)
     : null;
 
   return (
@@ -233,11 +233,12 @@ const EEAHeader = (props) => {
         renderMenuItem={(item, options, props) => (
           <UniversalLink
             openLinkInNewTab={false}
-            href={item.url || '/'}
+            href={item.nonclickable ? null : item.url || '/'}
             title={item.nav_title || item.title}
             {...(options || {})}
             className={cx(options?.className, {
               active: item.url === router_pathname,
+              'item-nonclickable': item.nonclickable,
             })}
           >
             {props?.iconPosition !== 'right' && props?.children}

package/src/customizations/@eeacms/volto-eea-design-system/ui/Header/HeaderMenuPopUp.js

@@ -187,9 +187,10 @@ const FirstLevelContent = ({ element, renderMenuItem, pathName }) => {
             overflow_item.title = 'See all';
             x.content = (
               <Accordion.Content>
-                {renderMenuItem(overflow_item, {
-                  className: 'item title-item',
-                })}
+                {!item.nonclickable &&
+                  renderMenuItem(overflow_item, {
+                    className: 'item title-item',
+                  })}
                 <SecondLevelContent
                   element={item}
                   renderMenuItem={renderMenuItem}

package/src/customizations/volto/reducers/navigation/README.md

@@ -0,0 +1 @@
+customized the `getRecursiveItems` to pass the entire object to the navigation component

package/src/customizations/volto/reducers/navigation/navigation.js

@@ -0,0 +1,102 @@
+/**
+ * Navigation reducer.
+ * @module reducers/navigation/navigation
+ */
+
+import { map } from 'lodash';
+import {
+  flattenToAppURL,
+  getBaseUrl,
+  hasApiExpander,
+} from '@plone/volto/helpers';
+
+import {
+  GET_CONTENT,
+  GET_NAVIGATION,
+} from '@plone/volto/constants/ActionTypes';
+
+const initialState = {
+  error: null,
+  items: [],
+  loaded: false,
+  loading: false,
+};
+
+/**
+ * Recursive function that process the items returned by the navigation
+ * endpoint
+ * @function getRecursiveItems
+ * @param {array} items The items inside a navigation response.
+ * @returns {*} The navigation items object (recursive)
+ */
+function getRecursiveItems(items) {
+  return map(items, (item) => ({
+    title: item.title,
+    description: item.description,
+    url: flattenToAppURL(item['@id']),
+    ...item,
+    ...(item.items && { items: getRecursiveItems(item.items) }),
+  }));
+}
+
+/**
+ * Navigation reducer.
+ * @function navigation
+ * @param {Object} state Current state.
+ * @param {Object} action Action to be handled.
+ * @returns {Object} New state.
+ */
+export default function navigation(state = initialState, action = {}) {
+  let hasExpander;
+  switch (action.type) {
+    case `${GET_NAVIGATION}_PENDING`:
+      return {
+        ...state,
+        error: null,
+        loaded: false,
+        loading: true,
+      };
+    case `${GET_CONTENT}_SUCCESS`:
+      hasExpander = hasApiExpander(
+        'navigation',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (hasExpander && !action.subrequest) {
+        return {
+          ...state,
+          error: null,
+          items: getRecursiveItems(
+            action.result['@components'].navigation.items,
+          ),
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
+    case `${GET_NAVIGATION}_SUCCESS`:
+      // Even if the expander is set or not, if the GET_NAVIGATION is
+      // called, we want it to store the data if the actions data is
+      // not set in the expander data (['@components']) but in the "normal"
+      // action result (we look for the object property returned by the endpoint)
+      if (!action.result?.['@components'] && action.result?.items) {
+        return {
+          ...state,
+          error: null,
+          items: getRecursiveItems(action.result.items),
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
+    case `${GET_NAVIGATION}_FAIL`:
+      return {
+        ...state,
+        error: action.error,
+        items: [],
+        loaded: false,
+        loading: false,
+      };
+    default:
+      return state;
+  }
+}

package/theme/extras/header.overrides

@@ -12,3 +12,8 @@
     }
   }
 }
+
+
+.item-nonclickable {
+  pointer-events: none;
+}