@eeacms/volto-cca-policy 0.2.29 → 0.2.30

package/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.2.30](https://github.com/eea/volto-cca-policy/compare/0.2.29...0.2.30) - 22 May 2024
+
+#### :bug: Bug Fixes
+
+- fix: warning message (clip-path -> clipPath) [kreafox - [`b94d85a`](https://github.com/eea/volto-cca-policy/commit/b94d85a42c10e3b96c196ba6c02c31d26da65a82)]
+- fix: issues with RAST block [kreafox - [`5e99b27`](https://github.com/eea/volto-cca-policy/commit/5e99b2709848488c515cffcc6913adf6ef45568a)]
+
 ### [0.2.29](https://github.com/eea/volto-cca-policy/compare/0.2.28...0.2.29) - 21 May 2024
 
 #### :house: Internal changes
@@ -1251,13 +1258,10 @@ 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
@@ -1274,9 +1278,6 @@ 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)]
@@ -1493,7 +1494,6 @@ 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
 
@@ -1974,7 +1974,6 @@ 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.2.29",
+  "version": "0.2.30",
   "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/RASTAccordion.jsx

@@ -4,9 +4,8 @@ import RASTAccordionContent from './RASTAccordionContent';
 import { useHistory } from 'react-router-dom';
 
 const RASTAccordion = (props) => {
-  const { items = {}, curent_location, activeMenu, show_subfolders } = props;
-
   const history = useHistory();
+  const { items = {}, curent_location, activeMenu, show_subfolders } = props;
 
   const handleClick = (e, item) => {
     let itemUrl = '/' + item['@id'].split('/').slice(3).join('/');

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

@@ -5,7 +5,8 @@ import { compose } from 'redux';
 import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers';
 import { useDispatch, useSelector } from 'react-redux';
 import { getContent } from '@plone/volto/actions';
-// import useChildren from './RASTView';
+
+import cx from 'classnames';
 
 const RASTAccordionContent = (props) => {
   const { main, curent_location } = props;
@@ -21,31 +22,28 @@ const RASTAccordionContent = (props) => {
   items = useSelector(
     (state) => state.content?.subrequests?.[location]?.data?.items || [],
   );
-  // const items = useChildren(location);
+
   return (
     <div className="dataset-content">
       <div>
         {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']))}>
-                        {item.title}
-                      </Link>
-                    </div>
-                  </List.Content>
-                </List.Item>
-              ))
+              .map((item) => {
+                const active = item['@id'].endsWith(curent_location.pathname);
+                return (
+                  <List.Item
+                    key={item.id}
+                    className={cx('substep', {
+                      active: active,
+                    })}
+                  >
+                    <Link to={flattenToAppURL(getBaseUrl(item['@id']))}>
+                      {item.title}
+                    </Link>
+                  </List.Item>
+                );
+              })
           : null}
       </div>
     </div>

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

@@ -48,7 +48,7 @@ export default function RASTMap(props) {
         fill="none"
         xmlns="http://www.w3.org/2000/svg"
       >
-        <g clip-path="url(#clip0_18_2)">
+        <g clipPath="url(#clip0_18_2)">
           <path d="M290 0H0V280H290V0Z" fill="white" />
           <path
             d="M192.8 31.5C178.3 25.5 162.7 22.3 147 22H145C129.3 22.3 113.7 25.5 99.2001 31.5C84.0001 37.8 70.3001 47 58.6001 58.6L72.7001 72.7C82.5001 62.9 94.0001 55.2 106.8 49.9C119.2 44.8 132.5 42 146 41.9C159.4 42 172.8 44.7 185.2 49.9C197.9 55.2 209.5 62.9 219.3 72.7L233.4 58.6C221.8 47 208 37.8 192.8 31.5Z"
@@ -363,7 +363,7 @@ export default function RASTMap(props) {
           <LinkWrap
             item={items[2]}
             pathname={currentPath}
-            isActive={currentMenu === 1 ? true : false}
+            isActive={currentMenu === 2 ? true : false}
           >
             <path
               d="M210.5 228C222.4 228 232 237.6 232 249.5C232 261.4 222.4 271 210.5 271C198.6 271 189 261.4 189 249.5C189 237.6 198.6 228 210.5 228Z"
@@ -382,7 +382,7 @@ export default function RASTMap(props) {
           <LinkWrap
             item={items[3]}
             pathname={currentPath}
-            isActive={currentMenu === 1 ? true : false}
+            isActive={currentMenu === 3 ? true : false}
           >
             <path
               d="M82.5 228C94.4 228 104 237.6 104 249.5C104 261.4 94.4 271 82.5 271C70.6 271 61 261.4 61 249.5C61 237.6 70.6 228 82.5 228Z"
@@ -401,7 +401,7 @@ export default function RASTMap(props) {
           <LinkWrap
             item={items[4]}
             pathname={currentPath}
-            isActive={currentMenu === 1 ? true : false}
+            isActive={currentMenu === 4 ? true : false}
           >
             <path
               d="M29.5 128C41.4 128 51 137.6 51 149.5C51 161.4 41.4 171 29.5 171C17.6 171 8 161.4 8 149.5C8 137.6 17.6 128 29.5 128Z"
@@ -420,7 +420,7 @@ export default function RASTMap(props) {
           <LinkWrap
             item={items[5]}
             pathname={currentPath}
-            isActive={currentMenu === 1 ? true : false}
+            isActive={currentMenu === 5 ? true : false}
           >
             <path
               d="M82.5 32C94.4 32 104 41.6 104 53.5C104 65.4 94.4 75 82.5 75C70.6 75 61 65.4 61 53.5C61 41.6 70.6 32 82.5 32Z"
@@ -436,25 +436,6 @@ export default function RASTMap(props) {
               fill="white"
             />
           </LinkWrap>
-          <LinkWrap
-            item={items[6]}
-            pathname={currentPath}
-            isActive={currentMenu === 1 ? true : false}
-          >
-            <path
-              d="M33.5001 183.1C33.6001 183.1 33.8001 183.1 33.8001 182.9L34.8001 179.2L37.7001 181.7H38.1001V181.3L34.9001 178.6H34.7001C34.7001 178.6 34.6001 178.6 34.5001 178.8L33.4001 182.9V183C33.4001 183 33.4001 183.1 33.6001 183.2L33.5001 183.1Z"
-              fill="white"
-              className="circle"
-            />
-            <path
-              d="M33.4001 120.45C33.4001 120.45 33.3601 120.45 33.3401 120.45C33.2101 120.42 33.1201 120.28 33.1501 120.15C37.4601 101.73 46.4001 84.4701 59.0101 70.2401C59.1001 70.1401 59.2601 70.1301 59.3601 70.2201C59.4601 70.3101 59.4701 70.4701 59.3801 70.5701C46.8301 84.7401 37.9301 101.92 33.6401 120.26C33.6101 120.38 33.5101 120.45 33.4001 120.45Z"
-              fill="white"
-            />
-            <path
-              d="M55.2002 71.5001C55.2002 71.6001 55.4002 71.7001 55.5002 71.7001L59.1002 70.6001L58.6002 74.4001C58.6002 74.5001 58.6002 74.7001 58.8002 74.7001C58.9002 74.7001 59.1002 74.7001 59.1002 74.5001L59.7002 70.3001V70.1001H59.5002L55.5002 71.4001H55.4002V71.6001L55.2002 71.5001Z"
-              fill="white"
-            />
-          </LinkWrap>
         </g>
         <defs>
           <clipPath id="clip0_18_2">

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

@@ -8,9 +8,9 @@
     fill: #183 !important;
   }
 
-  a rect.circle {
-    pointer-events: all !important;
-  }
+  // a rect.circle {
+  //   pointer-events: all !important;
+  // }
 
   // svg,
   // svg * {
@@ -20,17 +20,29 @@
   .link-active {
     .circle,
     .circle:hover {
-      filter: drop-shadow(0px 0px 6px rgba(0, 0, 0, 1));
+      filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 1));
     }
   }
 
   .circle:hover {
-    filter: drop-shadow(0px 0px 6px rgba(0, 0, 0, 1));
+    filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 1));
   }
 
   .item.active a {
     font-weight: bold;
   }
+
+  .ui.accordion .active.content {
+    padding: 1rem 1rem !important;
+  }
+
+  .substep a {
+    color: inherit;
+  }
+
+  .substep:not(:last-child) {
+    padding-bottom: 0.8em;
+  }
 }
 
 .rast-map-block {