@eeacms/volto-clms-theme 1.1.93 → 1.1.95

package/CHANGELOG.md

@@ -4,11 +4,25 @@ 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).
 
-### [1.1.93](https://github.com/eea/volto-clms-theme/compare/1.1.92...1.1.93) - 12 December 2023
+### [1.1.95](https://github.com/eea/volto-clms-theme/compare/1.1.94...1.1.95) - 14 December 2023
+
+#### :rocket: New Features
+
+- feat: change link behavior [Mikel Larreategi - [`bde84be`](https://github.com/eea/volto-clms-theme/commit/bde84be1c25d52667ed2567296d9149db5a11586)]
 
 #### :bug: Bug Fixes
 
-- fix: fix when there is no qs [Mikel Larreategi - [`457ca3b`](https://github.com/eea/volto-clms-theme/commit/457ca3b81c03efe8754a0f88159308f24a4767c8)]
+- fix:CLMS-2898 [Unai - [`69594d4`](https://github.com/eea/volto-clms-theme/commit/69594d4ffc182249b8ef1b363bd77da55623bc7f)]
+
+#### :hammer_and_wrench: Others
+
+- test fix [Unai - [`9ff446e`](https://github.com/eea/volto-clms-theme/commit/9ff446ed7a05cc38c0855a53397d23a6d333302a)]
+- ul baten barneko ul-a margin gabe [Zaloa Etxaniz - [`b8b4fc6`](https://github.com/eea/volto-clms-theme/commit/b8b4fc6a0fe4e4e3e6229490c23a2467b7807c1b)]
+- lint [Mikel Larreategi - [`7573815`](https://github.com/eea/volto-clms-theme/commit/7573815970fe1fc77fdb290b6e0ef9b5274f43a1)]
+- content area barneko ul guztiek azpian margina [Zaloa Etxaniz - [`491a209`](https://github.com/eea/volto-clms-theme/commit/491a20909997b82c75699e6b8ac0be46011d8219)]
+### [1.1.94](https://github.com/eea/volto-clms-theme/compare/1.1.93...1.1.94) - 12 December 2023
+
+### [1.1.93](https://github.com/eea/volto-clms-theme/compare/1.1.92...1.1.93) - 12 December 2023
 
 ### [1.1.92](https://github.com/eea/volto-clms-theme/compare/1.1.91...1.1.92) - 12 December 2023
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.93",
+  "version": "1.1.95",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -22,7 +22,6 @@ import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 import useCartState from '@eeacms/volto-clms-utils/cart/useCartState';
 import { cleanDuplicatesEntries } from '@eeacms/volto-clms-utils/utils';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import CclModal from '@eeacms/volto-clms-theme/components/CclModal/CclModal';
 
 import { getDownloadtool, postDownloadtool } from '../../actions';
 import { useFilteredPagination } from '../CclUtils/useFilteredPagination';
@@ -277,28 +276,14 @@ const CLMSCartContent = (props) => {
                   <Table.HeaderCell></Table.HeaderCell>
                   <Table.HeaderCell>
                     Projection{' '}
-                    <CclModal
-                      draggable={false}
-                      trigger={
-                        /* eslint-disable jsx-a11y/anchor-is-valid */
-                        <a href="#">
-                          <Popup
-                            content="Explore EPSG details and coordinate systems with a click."
-                            trigger={
-                              <FontAwesomeIcon
-                                icon={['far', 'question-circle']}
-                              />
-                            }
-                          />
-                        </a>
-                      }
-                      size={'small'}
-                    >
-                      <div className="image-modal">
-                        Explore EPSG-related details in our{' '}
-                        <UniversalLink href="/faq">FAQ page</UniversalLink>
-                      </div>
-                    </CclModal>
+                    <UniversalLink href="/en/faq/download/how-to-find-your-epsg-code">
+                      <Popup
+                        content="Explore EPSG details and coordinate systems with a click."
+                        trigger={
+                          <FontAwesomeIcon icon={['far', 'question-circle']} />
+                        }
+                      />
+                    </UniversalLink>
                   </Table.HeaderCell>
                   <Table.HeaderCell>Timeseries</Table.HeaderCell>
                   <Table.HeaderCell></Table.HeaderCell>
@@ -368,31 +353,17 @@ const CLMSCartContent = (props) => {
 
                         <div className="mb-2">
                           <strong>Format: </strong>{' '}
-                          <CclModal
-                            draggable={false}
-                            trigger={
-                              /* eslint-disable jsx-a11y/anchor-is-valid */
-                              <a href="#">
-                                <Popup
-                                  content="Explore Formats details and coordinate systems with a click."
-                                  trigger={
-                                    <FontAwesomeIcon
-                                      color="#000000"
-                                      icon={['far', 'question-circle']}
-                                    />
-                                  }
+                          <UniversalLink href="/en/faq/download/need-information-about-the-file-formats">
+                            <Popup
+                              content="Explore Formats details and coordinate systems with a click."
+                              trigger={
+                                <FontAwesomeIcon
+                                  color="#000000"
+                                  icon={['far', 'question-circle']}
                                 />
-                              </a>
-                            }
-                            size={'small'}
-                          >
-                            <div className="image-modal">
-                              Explore format-related details in our{' '}
-                              <UniversalLink href="/faq">
-                                FAQ page
-                              </UniversalLink>
-                            </div>
-                          </CclModal>
+                              }
+                            />
+                          </UniversalLink>
                         </div>
                         {item?.layer !== null && (
                           <div className="mb-2">

package/src/components/CartIconCounter/CartIconCounter.jsx

@@ -27,6 +27,7 @@ export const CartIconCounter = () => {
   const cartState_ref = useRef(cartState);
   const cart_icon_ref = React.useRef();
   const intl = useSelector((state) => state.intl);
+  const isDownload = useSelector((state) => state?.downloadtool?.loading);
   const user_id = useSelector((state) => state.users.user.id);
   const [showPopup, setshowPopup] = useState(false);
   const [cartDiff, setCartDiff] = useState(0);
@@ -77,7 +78,8 @@ export const CartIconCounter = () => {
     if (
       cartState_ref.current.set.loading &&
       cartState.set.loaded &&
-      cartState.items.length >= cartState_ref.current.items.length
+      cartState.items.length >= cartState_ref.current.items.length &&
+      !isDownload
     ) {
       setCartDiff(cartState.items.length - cartState_ref.current.items.length);
       setCartDiffItems(
@@ -119,7 +121,7 @@ export const CartIconCounter = () => {
             <Icon
               onClick={() => setshowPopup(false)}
               name={clearSVG}
-              size={20}
+              size={'20'}
               style={{ cursor: 'pointer' }}
             />
           </Segment>

package/theme/site/extras/styles.less

@@ -500,6 +500,12 @@ body.contenttype-document .right-content ul {
   left: 0.5rem;
   margin-bottom: 1rem;
 }
+.content-area ul{
+  margin-bottom: 1rem;
+}
+.content-area ul ul{
+  margin-bottom: 0;
+}
 .card-container {
   display: flex;
   flex-wrap: wrap;