@eeacms/volto-clms-theme 1.1.83 → 1.1.85

package/CHANGELOG.md

@@ -4,6 +4,21 @@ 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.85](https://github.com/eea/volto-clms-theme/compare/1.1.84...1.1.85) - 27 November 2023
+
+#### :bug: Bug Fixes
+
+- fix: volto-form-block button fix [Unai - [`d08af22`](https://github.com/eea/volto-clms-theme/commit/d08af222ec9ea1e21a703dfa74b4bf4c1c03bd63)]
+
+### [1.1.84](https://github.com/eea/volto-clms-theme/compare/1.1.83...1.1.84) - 27 November 2023
+
+#### :bug: Bug Fixes
+
+- fix: logout cache fix [Unai - [`9da13b1`](https://github.com/eea/volto-clms-theme/commit/9da13b1a94ab442d81c9c142c0f34016caca0ac4)]
+
+#### :hammer_and_wrench: Others
+
+- form button style fix [Unai - [`e9f335c`](https://github.com/eea/volto-clms-theme/commit/e9f335c3183e7356aba43dd091ef83b38846c73c)]
 ### [1.1.83](https://github.com/eea/volto-clms-theme/compare/1.1.82...1.1.83) - 24 November 2023
 
 #### :bug: Bug Fixes

package/package.json

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

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

@@ -1,64 +1,36 @@
-import { Component } from 'react';
-import { connect } from 'react-redux';
-
-import { logout, purgeMessages } from '@plone/volto/actions';
-
-import PropTypes from 'prop-types';
+import { useEffect, useMemo } from 'react';
+import { useDispatch, useSelector, shallowEqual } from 'react-redux';
+import { useHistory } from 'react-router-dom';
 import qs from 'query-string';
+import { logout, purgeMessages } from '@plone/volto/actions';
 
-/**
- * Login container.
- * @module components/theme/Logout/Logout
- */
-
-/**
- * Logout class.
- * @class Logout
- * @extends Component
- */
-class CclLogout extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    logout: PropTypes.func.isRequired,
-    purgeMessages: PropTypes.func.isRequired,
-    query: PropTypes.shape({
-      return_url: PropTypes.string,
-    }),
-  };
-
-  /**
-   * Default properties.
-   * @property {Object} defaultProps Default properties.
-   * @static
-   */
-  static defaultProps = {
-    query: null,
-  };
-
-  componentDidMount() {
-    // eslint-disable-next-line no-restricted-globals
-    this.props.logout();
-    window.location.href = '/';
-    this.props.purgeMessages();
-  }
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    return '';
-  }
-}
-
-export default connect(
-  (state, props) => ({
-    query: qs.parse(props.location.search),
-  }),
-  { logout, purgeMessages },
-)(CclLogout);
+const Logout = ({ location }) => {
+  const token = useSelector((state) => state.userSession.token, shallowEqual);
+  const history = useHistory();
+  const dispatch = useDispatch();
+
+  const returnUrl = useMemo(
+    () =>
+      qs.parse(location.search).return_url ||
+      location.pathname
+        .replace(/\/login\/?$/, '')
+        .replace(/\/logout\/?$/, '') ||
+      '/',
+    [location],
+  );
+
+  useEffect(() => {
+    dispatch(logout());
+    dispatch(purgeMessages());
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (!token) {
+      window.location.href = '/';
+    }
+  }, [history, returnUrl, token]);
+
+  return '';
+};
+
+export default Logout;

package/src/customizations/volto-form-block/components/FormView.jsx

@@ -14,6 +14,7 @@ import config from '@plone/volto/registry';
 
 /* Style */
 import 'volto-form-block/components/FormView.css';
+// import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 
 const messages = defineMessages({
   default_submit_label: {

package/theme/site/extras/forms.less

@@ -21,12 +21,14 @@
 }
 
 .ccl-button.ccl-button-green {
+  border: 1px solid transparent !important;
   background-color: @clmsGreen;
+  border-radius: 0 !important;
   color: white;
 }
 
 .ccl-button.ccl-button-green:hover {
-  border-color: @clmsGreen;
+  border-color: @clmsGreen !important;
   background-color: white;
   color: @clmsGreen;
 }