@eeacms/volto-cca-policy 0.2.28 → 0.2.30

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.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
+
+- style: hover style for RAST steps [kreafox - [`68e24d1`](https://github.com/eea/volto-cca-policy/commit/68e24d11290f24b062ad20b3cea68343a421a578)]
+- style: hover style for RAST steps [kreafox - [`ed4e735`](https://github.com/eea/volto-cca-policy/commit/ed4e735dd7b5e84adb4481b183785ba9e3653df8)]
+
 ### [0.2.28](https://github.com/eea/volto-cca-policy/compare/0.2.27...0.2.28) - 21 May 2024
 
 #### :nail_care: Enhancements

package/package.json

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

@@ -4,7 +4,7 @@ import './styles.less';
 
 const LinkWrap = ({ item, pathname, children, isActive }) => {
   return item ? (
-    <UniversalLink item={item}>
+    <UniversalLink item={item} className="step-link">
       <g className={isActive ? 'link-active' : ''}>
         <title>{item.title}</title>
         {children}
@@ -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"
@@ -330,6 +330,7 @@ export default function RASTMap(props) {
             <path
               d="M210.5 32C222.4 32 232 41.6 232 53.5C232 65.4 222.4 75 210.5 75C198.6 75 189 65.4 189 53.5C189 41.6 198.6 32 210.5 32Z"
               fill="#155246"
+              className="circle"
             />
             <path
               d="M214.2 45V62.1H210.8V48.9L206.7 50.2V47.5L213.8 45H214.2Z"
@@ -348,6 +349,7 @@ export default function RASTMap(props) {
             <path
               d="M260.5 128C272.4 128 282 137.6 282 149.5C282 161.4 272.4 171 260.5 171C248.6 171 239 161.4 239 149.5C239 137.6 248.6 128 260.5 128Z"
               fill="#062435"
+              className="circle"
             />
             <path
               d="M266.5 155.5V158.1H254.8V155.9L260.3 150C260.9 149.4 261.3 148.8 261.6 148.4C261.9 147.9 262.2 147.5 262.3 147.1C262.4 146.7 262.5 146.4 262.5 146C262.5 145.5 262.5 145 262.2 144.7C262 144.3 261.8 144 261.4 143.8C261.1 143.6 260.7 143.5 260.2 143.5C259.7 143.5 259.2 143.6 258.9 143.9C258.5 144.1 258.3 144.5 258.1 144.9C257.9 145.3 257.8 145.8 257.8 146.4H254.4C254.4 145.4 254.6 144.5 255.1 143.6C255.6 142.7 256.3 142.1 257.2 141.6C258.1 141.1 259.1 140.8 260.3 140.8C261.5 140.8 262.5 141 263.3 141.4C264.1 141.8 264.8 142.3 265.2 143.1C265.6 143.8 265.8 144.7 265.8 145.7C265.8 146.7 265.8 146.8 265.5 147.4C265.3 147.9 265.1 148.5 264.7 149C264.4 149.5 264 150.1 263.5 150.6C263 151.1 262.5 151.7 261.9 152.3L258.9 155.6H266.2L266.5 155.5Z"
@@ -361,11 +363,12 @@ 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"
               fill="#0D284E"
+              className="circle"
             />
             <path
               d="M208.4 248H210.2C210.8 248 211.3 248 211.6 247.7C212 247.5 212.3 247.2 212.4 246.9C212.6 246.5 212.7 246.1 212.7 245.6C212.7 245.1 212.7 244.8 212.4 244.4C212.2 244.1 212 243.8 211.6 243.6C211.3 243.4 210.8 243.3 210.3 243.3C209.8 243.3 209.5 243.3 209.2 243.5C208.8 243.7 208.6 243.9 208.4 244.2C208.2 244.5 208.1 244.9 208.1 245.3H204.7C204.7 244.4 204.9 243.5 205.5 242.8C206 242.1 206.7 241.6 207.5 241.2C208.4 240.8 209.3 240.6 210.3 240.6C211.3 240.6 212.5 240.8 213.3 241.2C214.2 241.6 214.8 242.1 215.3 242.8C215.8 243.5 216 244.4 216 245.5C216 246.6 215.9 246.6 215.6 247.1C215.4 247.6 215 248.1 214.5 248.5C214 248.9 213.5 249.2 212.8 249.5C212.1 249.7 211.4 249.9 210.6 249.9H208.3V248.1L208.4 248ZM208.4 250.6V248.9H210.7C211.6 248.9 212.4 249 213.1 249.2C213.8 249.4 214.4 249.7 214.9 250.1C215.4 250.5 215.7 251 216 251.5C216.2 252 216.4 252.6 216.4 253.3C216.4 254 216.2 254.8 215.9 255.4C215.6 256 215.2 256.5 214.6 257C214.1 257.4 213.4 257.8 212.7 258C212 258.2 211.2 258.3 210.3 258.3C209.4 258.3 208.9 258.3 208.2 258C207.5 257.8 206.9 257.5 206.3 257.1C205.7 256.7 205.3 256.2 205 255.6C204.7 255 204.5 254.3 204.5 253.4H207.9C207.9 253.8 208 254.2 208.2 254.6C208.4 254.9 208.7 255.2 209.1 255.4C209.5 255.6 209.9 255.7 210.4 255.7C210.9 255.7 211.4 255.7 211.8 255.4C212.2 255.2 212.5 254.9 212.7 254.6C212.9 254.2 213 253.8 213 253.3C213 252.8 212.9 252.2 212.7 251.8C212.5 251.4 212.1 251.1 211.7 251C211.3 250.8 210.8 250.7 210.2 250.7H208.4V250.6Z"
@@ -379,11 +382,12 @@ 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"
               fill="#434772"
+              className="circle"
             />
             <path
               d="M88.7 251.7V254.3H76.4L76.2 252.2L83.3 240.9H86L83.1 245.8L79.6 251.6H88.7V251.7ZM86.8 241V258.1H83.4V241H86.8Z"
@@ -397,11 +401,12 @@ 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"
               fill="#926830"
+              className="circle"
             />
             <path
               d="M26.8001 150.1L24.1001 149.5L25.1001 140.9H34.7001V143.6H27.9001L27.5001 147.4C27.7001 147.3 28.1001 147.1 28.5001 147C29.0001 146.8 29.5001 146.8 30.0001 146.8C30.8001 146.8 31.6001 146.9 32.2001 147.2C32.8001 147.5 33.4001 147.8 33.8001 148.3C34.3001 148.8 34.6001 149.4 34.8001 150.1C35.0001 150.8 35.2001 151.6 35.2001 152.5C35.2001 153.4 35.1001 154 34.8001 154.7C34.6001 155.4 34.2001 156 33.7001 156.5C33.2001 157 32.6001 157.4 31.9001 157.8C31.2001 158.1 30.3001 158.3 29.3001 158.3C28.3001 158.3 27.9001 158.2 27.2001 158C26.5001 157.8 25.9001 157.5 25.4001 157C24.9001 156.6 24.4001 156 24.1001 155.4C23.8001 154.8 23.6001 154.1 23.6001 153.3H27.0001C27.0001 153.8 27.2001 154.2 27.4001 154.6C27.6001 154.9 27.9001 155.2 28.2001 155.4C28.5001 155.6 28.9001 155.7 29.4001 155.7C29.9001 155.7 30.2001 155.7 30.5001 155.5C30.8001 155.3 31.1001 155.1 31.2001 154.8C31.4001 154.5 31.5001 154.2 31.6001 153.8C31.6001 153.4 31.7001 153 31.7001 152.5C31.7001 152 31.7001 151.6 31.5001 151.2C31.3001 150.8 31.2001 150.5 31.0001 150.2C30.8001 149.9 30.5001 149.7 30.1001 149.6C29.8001 149.5 29.4001 149.4 28.9001 149.4C28.4001 149.4 27.8001 149.4 27.4001 149.7C27.1001 149.9 26.8001 150.1 26.6001 150.4L26.8001 150.1Z"
@@ -415,11 +420,12 @@ 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"
               fill="#64862C"
+              className="circle"
             />
             <path
               d="M85.3001 44.8001H85.8001V47.5001H85.6001C84.7001 47.5001 83.9001 47.6001 83.2001 47.9001C82.5001 48.2001 81.9001 48.5001 81.4001 49.0001C80.9001 49.5001 80.6001 50.1001 80.3001 50.8001C80.1001 51.5001 79.9001 52.3001 79.9001 53.1001V55.9001C79.9001 56.5001 79.9001 57.0001 80.1001 57.5001C80.2001 58.0001 80.4001 58.3001 80.6001 58.7001C80.8001 59.0001 81.1001 59.2001 81.4001 59.4001C81.7001 59.5001 82.1001 59.6001 82.5001 59.6001C82.9001 59.6001 83.2001 59.6001 83.5001 59.4001C83.8001 59.2001 84.1001 59.0001 84.3001 58.7001C84.5001 58.4001 84.7001 58.1001 84.8001 57.7001C84.9001 57.3001 85.0001 56.9001 85.0001 56.4001C85.0001 55.9001 85.0001 55.5001 84.8001 55.1001C84.7001 54.7001 84.5001 54.4001 84.3001 54.1001C84.1001 53.8001 83.8001 53.6001 83.5001 53.4001C83.2001 53.2001 82.8001 53.2001 82.4001 53.2001C82.0001 53.2001 81.4001 53.3001 81.0001 53.6001C80.6001 53.8001 80.3001 54.2001 80.1001 54.5001C79.9001 54.9001 79.8001 55.3001 79.7001 55.7001L78.7001 55.0001C78.7001 54.4001 78.8001 53.8001 79.1001 53.3001C79.3001 52.8001 79.7001 52.3001 80.1001 51.9001C80.5001 51.5001 81.0001 51.1001 81.6001 50.9001C82.2001 50.7001 82.8001 50.5001 83.6001 50.5001C84.4001 50.5001 85.1001 50.7001 85.7001 51.0001C86.3001 51.3001 86.8001 51.7001 87.2001 52.3001C87.6001 52.8001 87.9001 53.4001 88.1001 54.1001C88.3001 54.8001 88.4001 55.5001 88.4001 56.3001C88.4001 57.1001 88.3001 57.9001 88.0001 58.6001C87.7001 59.3001 87.3001 59.9001 86.8001 60.5001C86.3001 61.0001 85.7001 61.4001 85.0001 61.7001C84.3001 62.0001 83.5001 62.1001 82.6001 62.1001C81.7001 62.1001 80.9001 61.9001 80.1001 61.6001C79.4001 61.3001 78.7001 60.8001 78.2001 60.2001C77.7001 59.6001 77.3001 58.9001 77.0001 58.1001C76.7001 57.3001 76.6001 56.4001 76.6001 55.4001V54.1001C76.6001 52.7001 76.8001 51.5001 77.2001 50.3001C77.6001 49.2001 78.2001 48.2001 78.9001 47.3001C79.7001 46.5001 80.6001 45.8001 81.6001 45.3001C82.7001 44.8001 83.9001 44.6001 85.2001 44.6001L85.3001 44.8001Z"
@@ -430,24 +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"
-            />
-            <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 {
-      fill: @green-1;
+      filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 1));
     }
   }
 
   .circle:hover {
-    fill: @green-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 {