@eeacms/volto-clms-theme 1.0.49 → 1.0.50

package/CHANGELOG.md

@@ -4,8 +4,17 @@ 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.0.50](https://github.com/eea/volto-clms-theme/compare/1.0.49...1.0.50)
+
+- cart icon with 0 items [`477f1ef`](https://github.com/eea/volto-clms-theme/commit/477f1efa39d6d5e4adede1b3c4f15e2b524dbcf5)
+- add routing to dataset view [`e65a730`](https://github.com/eea/volto-clms-theme/commit/e65a7304fc338b3262b7f9dad9b5c5029391f3c1)
+- add option without routing [`9675773`](https://github.com/eea/volto-clms-theme/commit/9675773a9531a98cee7f9735b09ebc6c3cfcd6fe)
+
 #### [1.0.49](https://github.com/eea/volto-clms-theme/compare/1.0.48...1.0.49)
 
+> 17 December 2021
+
+- DataSet Metadata view [`#157`](https://github.com/eea/volto-clms-theme/pull/157)
 - labels and conformity pass [`59be2fd`](https://github.com/eea/volto-clms-theme/commit/59be2fd5034fdfed211c4e0b0872504432e254e9)
 - image [`47cc7dc`](https://github.com/eea/volto-clms-theme/commit/47cc7dc37974848f2d90cdf6a035970620489cf8)
 

package/package.json

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

package/src/components/CLMSDatasetDetailView/CLMSDatasetDetailView.jsx

@@ -190,7 +190,7 @@ const CLMSDatasetDetailView = ({ content, token }) => {
             })}
           </Segment.Group>
         )}
-      <CclTabs>
+      <CclTabs routing={true}>
         <div tabTitle="General Info">{DataSetInfoContent(content)}</div>
         <div tabTitle="Metadata">{MetadataContent(content)}</div>
 

package/src/components/CclTab/CclTab.jsx

@@ -4,12 +4,11 @@ import React from 'react';
 import cx from 'classnames';
 
 function CclTab(props) {
-  let { activeTab, tabTitle, onClick, tabId } = props;
+  let { activeTab, tabTitle, onClick, tabId, routing } = props;
 
   function onTabClick() {
     onClick(tabId);
   }
-
   return (
     <div
       className={cx('card', activeTab === tabId && 'active')}
@@ -19,7 +18,11 @@ function CclTab(props) {
       role="button"
       id={tabId}
     >
-      <NavLink to={'#' + tabId}>{tabTitle}</NavLink>
+      {routing ? (
+        <NavLink to={'#' + tabId}>{tabTitle}</NavLink>
+      ) : (
+        <NavLink to={'#'}>{tabTitle}</NavLink>
+      )}
     </div>
   );
 }

package/src/components/CclTab/CclTabs.jsx

@@ -21,24 +21,29 @@ import PropTypes from 'prop-types';
  * 
  */
 const CclTabs = (props) => {
-  let { children } = props;
-  let [activeTab, setActiveTab] = useState(props.children[0].props.tabId || '');
+  let { children, routing = false } = props;
+  let [activeTab, setActiveTab] = useState(
+    props.children[0].props.tabId ||
+      props.children[0].props.tabTitle.replace(' ', ''),
+  );
 
   function onClickTabItem(tab) {
     setActiveTab(tab);
   }
   React.useEffect(() => {
     const hash = window.location.hash.substring(1) || '';
-    if (hash) {
-      setActiveTab(hash);
-    } else {
-      setActiveTab(
-        children
-          .filter((item) => !!item.props.tabTitle)[0]
-          .props?.tabTitle?.replace(' ', ''),
-      );
+    if (routing) {
+      if (hash) {
+        setActiveTab(hash);
+      } else {
+        setActiveTab(
+          children
+            .filter((item) => !!item.props.tabTitle)[0]
+            .props?.tabTitle?.replace(' ', ''),
+        );
+      }
     }
-  }, [children]);
+  }, [children, routing]);
 
   return (
     <div className="ccl-container-flex">
@@ -52,6 +57,7 @@ const CclTabs = (props) => {
                 <CclTab
                   activeTab={activeTab}
                   key={key}
+                  routing={routing}
                   tabId={tabTitle.replace(' ', '')}
                   tabTitle={tabTitle}
                   onClick={onClickTabItem}

package/src/customizations/volto/components/theme/Header/Header.jsx

@@ -5,33 +5,32 @@
  * @module components/theme/Header/Header
  */
 
-import React, { Component, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import { connect, useSelector, useDispatch } from 'react-redux';
+import '@eeacms/volto-clms-theme/../theme/clms/css/header.css';
 
+import { FormattedMessage, injectIntl } from 'react-intl';
 import { Logo, Navigation, SearchWidget } from '@plone/volto/components';
-import jwtDecode from 'jwt-decode';
-import { getUser } from '@plone/volto/actions';
-import { compose } from 'redux';
+import React, { Component, useEffect } from 'react';
+import { connect, useDispatch, useSelector } from 'react-redux';
 
 import { BodyClass } from '@plone/volto/helpers';
-
 import CclLanguageSelector from '@eeacms/volto-clms-theme/components/CclLanguageSelector/CclLanguageSelector';
+import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
 import CclTopMainMenu from '@eeacms/volto-clms-theme/components/CclTopMainMenu/CclTopMainMenu';
-
-import { FormattedMessage, injectIntl } from 'react-intl';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { Link } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import { compose } from 'redux';
 // import { CART_SESSION_KEY } from '@eeacms/volto-clms-theme/utils/useCartState';
 import { getCartItems } from '@eeacms/volto-clms-utils/actions';
-import '@eeacms/volto-clms-theme/../theme/clms/css/header.css';
-import { Link } from 'react-router-dom';
-import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
+import { getUser } from '@plone/volto/actions';
+import jwtDecode from 'jwt-decode';
+
 // import useCartState from '@eeacms/volto-clms-theme/utils/useCartState';
 
 const CartIconCounter = (props) => {
   const { cart_items, users, intl } = useSelector((state) => state);
 
-  const cart = cart_items.items;
+  const cart = cart_items.items || [];
   const user_id = users.user.id;
 
   const dispatch = useDispatch();
@@ -39,7 +38,6 @@ const CartIconCounter = (props) => {
     dispatch(getCartItems(user_id));
   }, [user_id, dispatch]);
   return (
-    cart?.length !== 0 &&
     cart && (
       <>
         <span>
@@ -248,6 +246,7 @@ class Header extends Component {
                   {(this.props.user.id && (
                     <>
                       <li>
+                        <CartIconCounter />
                         <Link
                           to={`/${this.props.locale}/profile`}
                           className="header-login-link"
@@ -280,6 +279,8 @@ class Header extends Component {
                     </>
                   )) || (
                     <li>
+                      <CartIconCounter />
+
                       <Link
                         to={`/${this.props.locale}/login`}
                         className="header-login-link"