@eeacms/volto-clms-theme 1.1.21 → 1.1.23

package/CHANGELOG.md

@@ -4,11 +4,18 @@ 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.21](https://github.com/eea/volto-clms-theme/compare/1.1.20...1.1.21) - 5 July 2023
+### [1.1.23](https://github.com/eea/volto-clms-theme/compare/1.1.22...1.1.23) - 12 July 2023
+
+#### :hammer_and_wrench: Others
+
+- show collections always [Mikel Larreategi - [`442d2d9`](https://github.com/eea/volto-clms-theme/commit/442d2d9eeb1bba511401b643b21a019b62580709)]
+### [1.1.22](https://github.com/eea/volto-clms-theme/compare/1.1.21...1.1.22) - 10 July 2023
 
 #### :hammer_and_wrench: Others
 
-- home products cards height control [ionlizarazu - [`b37d08b`](https://github.com/eea/volto-clms-theme/commit/b37d08bae7dff7f341e5a3c9f064837273f5b74d)]
+- unneeded condition [ionlizarazu - [`da81a9c`](https://github.com/eea/volto-clms-theme/commit/da81a9c622d27b4e2706e1fd889e08070a5d3f25)]
+### [1.1.21](https://github.com/eea/volto-clms-theme/compare/1.1.20...1.1.21) - 5 July 2023
+
 ### [1.1.20](https://github.com/eea/volto-clms-theme/compare/1.1.19...1.1.20) - 5 July 2023
 
 #### :rocket: New Features

package/package.json

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

package/src/components/Blocks/CclFAQBlock/CclFAQBlockView.jsx

@@ -45,10 +45,21 @@ const CclFAQBlockView = (props) => {
         )
       : [],
   );
-  const [activeIndex, setActiveIndex] = useState([0]);
+  const [activeIndex, setActiveIndex] = useState([]);
   React.useEffect(() => {
     dispatch(getContextNavigation(path.replace('/edit', '')));
   }, [path, dispatch]);
+  React.useEffect(() => {
+    let indexes = [];
+    // eslint-disable-next-line no-unused-expressions
+    contextNavigation?.[cn_key]?.data?.items.forEach((i) => {
+      if (i.items.length > 0) {
+        indexes.push(i.items[0].normalized_id);
+      }
+    });
+    setActiveIndex(indexes);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [contextNavigation?.[cn_key]?.data?.items]);
 
   const titleIcons = config.blocks?.blocksConfig?.accordion?.titleIcons;
 
@@ -80,10 +91,12 @@ const CclFAQBlockView = (props) => {
                           <Accordion fluid styled key={item_key}>
                             <Accordion.Title
                               as={'h2'}
-                              onClick={() => handleClick({ index: item_key })}
+                              onClick={() =>
+                                handleClick({ index: item.normalized_id })
+                              }
                               className={'accordion-title align-arrow-right'}
                             >
-                              {activeIndex.includes(item_key) ? (
+                              {activeIndex.includes(item.normalized_id) ? (
                                 <Icon name={titleIcons.opened.rightPosition} />
                               ) : (
                                 <Icon name={titleIcons.closed.rightPosition} />
@@ -103,7 +116,7 @@ const CclFAQBlockView = (props) => {
                               <span>{item.title}</span>
                             </Accordion.Title>
                             <Accordion.Content
-                              active={activeIndex.includes(item_key)}
+                              active={activeIndex.includes(item.normalized_id)}
                             >
                               <AnimateHeight
                                 animateOpacity

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -222,7 +222,6 @@ const CLMSCartContent = (props) => {
     setCartItems([...cartItems]);
   };
 
-  const hascollection = (collection) => collection.value > 0;
   const ref = React.useRef();
 
   const handleScroll = (ref) => {
@@ -313,11 +312,11 @@ const CLMSCartContent = (props) => {
                         <div className="mb-2">
                           <strong>Type: </strong>
                         </div>
-                        {item?.type_options?.some(hascollection) && (
-                          <div className="mb-2">
-                            <strong>Collection: </strong>
-                          </div>
-                        )}
+
+                        <div className="mb-2">
+                          <strong>Collection: </strong>
+                        </div>
+
                         <div className="mb-2">
                           <strong>Format: </strong>
                         </div>
@@ -336,16 +335,16 @@ const CLMSCartContent = (props) => {
                             setCartItems={setCartItems}
                           />
                         </div>
-                        {item?.type_options?.some(hascollection) && (
-                          <div className="mb-2">
-                            <CollectionNaming
-                              item={item}
-                              datasets_items={datasets_items}
-                              cartItems={cartItems}
-                              setCartItems={setCartItems}
-                            />
-                          </div>
-                        )}
+
+                        <div className="mb-2">
+                          <CollectionNaming
+                            item={item}
+                            datasets_items={datasets_items}
+                            cartItems={cartItems}
+                            setCartItems={setCartItems}
+                          />
+                        </div>
+
                         <div className="mb-2">
                           {formatConversionTable && item && (
                             <FormatNaming