@eeacms/volto-eea-website-policy 1.3.3 → 1.4.0

package/CHANGELOG.md

@@ -4,6 +4,31 @@ 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.4.0](https://github.com/eea/volto-eea-website-policy/compare/1.3.4...1.4.0) - 21 February 2023
+
+#### :rocket: New Features
+
+- feat(contact-form): Redirect to /en/about/contact-us - refs #160689 [Alin Voinea - [`14ae1f0`](https://github.com/eea/volto-eea-website-policy/commit/14ae1f01c34f9b146207daee538f5988e1df821e)]
+
+#### :bug: Bug Fixes
+
+- fix(logout): Fix login / logout redirect loop on demo-www [Alin Voinea - [`ab3d0fe`](https://github.com/eea/volto-eea-website-policy/commit/ab3d0fe4a79ed29b63bb0673f748481439d61b3d)]
+
+#### :nail_care: Enhancements
+
+- refactor(contact-form): Moved to volto-eea-website-theme - refs #160689 [Alin Voinea - [`e7c2e18`](https://github.com/eea/volto-eea-website-policy/commit/e7c2e1851d2db95055ad11bfdd9c7ccf123195f6)]
+
+#### :hammer_and_wrench: Others
+
+- Release 1.4.0 [Alin Voinea - [`8add7f3`](https://github.com/eea/volto-eea-website-policy/commit/8add7f353887ade8399ab3ad56c96b9dcaba461b)]
+### [1.3.4](https://github.com/eea/volto-eea-website-policy/compare/1.3.3...1.3.4) - 17 February 2023
+
+#### :bug: Bug Fixes
+
+- fix(LinkView): Consider /en/ only links as internal - refs #158717 [Alin Voinea - [`a39598a`](https://github.com/eea/volto-eea-website-policy/commit/a39598ade9430bc9c3f20d63e33cb19774cd365a)]
+- fix(LinkView): Try to use window.location.replace to redirect Links - refs #158717 [Alin Voinea - [`7210193`](https://github.com/eea/volto-eea-website-policy/commit/7210193090295fcd116aa831296b70238508f037)]
+- fix(LinkView): Copy unchanged from volto 16.11.0 [Alin Voinea - [`3cf2634`](https://github.com/eea/volto-eea-website-policy/commit/3cf263464f1729b503561088582ca6657212fbd1)]
+
 ### [1.3.3](https://github.com/eea/volto-eea-website-policy/compare/1.3.2...1.3.3) - 17 February 2023
 
 #### :bug: Bug Fixes
@@ -58,7 +83,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Release 1.1.0 [Alin Voinea - [`0291b3b`](https://github.com/eea/volto-eea-website-policy/commit/0291b3bb7b4c6ab09ca98728885cea4051eac8e3)]
-- yarn 3 [Alin Voinea - [`593aa58`](https://github.com/eea/volto-eea-website-policy/commit/593aa58eaa4d28aced0603b7f7dd125c857a6f54)]
 ### [1.0.4](https://github.com/eea/volto-eea-website-policy/compare/1.0.3...1.0.4) - 22 November 2022
 
 #### :nail_care: Enhancements
@@ -104,7 +128,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`d153f54`](https://github.com/eea/volto-eea-website-policy/commit/d153f54e55e918fa4746e05488c734624eaf14a9)]
 ### [0.4.0](https://github.com/eea/volto-eea-website-policy/compare/0.3.3...0.4.0) - 19 September 2022
 
 #### :hammer_and_wrench: Others
@@ -180,7 +203,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - format index.js [Andrei Grigore - [`db4481a`](https://github.com/eea/volto-eea-website-policy/commit/db4481aeeba59a769272659f33278c902fc69bec)]
 - Update index.js [Alexandru Ghica - [`dc09886`](https://github.com/eea/volto-eea-website-policy/commit/dc0988640a76a9914381b120f58bb61a9ab1eb39)]
 - Added externalRoutes [Alexandru Ghica - [`b68135b`](https://github.com/eea/volto-eea-website-policy/commit/b68135b013fafa93a41ea602ea2fad30879abe0f)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`575cca6`](https://github.com/eea/volto-eea-website-policy/commit/575cca674602ca2e1c2a41300c47ba594ff49aa0)]
 ### [0.1.1](https://github.com/eea/volto-eea-website-policy/compare/0.1.0...0.1.1) - 4 March 2022
 
 #### :hammer_and_wrench: Others
@@ -193,5 +215,4 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- yarn bootstrap [Alin Voinea - [`9b4d197`](https://github.com/eea/volto-eea-website-policy/commit/9b4d197cbc7992566cb36524d190078d5ad21a44)]
 - Initial commit [Alin Voinea - [`3800692`](https://github.com/eea/volto-eea-website-policy/commit/3800692f7a4de6460815bd6061facacb986cbef0)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-policy",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "@eeacms/volto-eea-website-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/customizations/volto/components/theme/View/LinkView.jsx

@@ -0,0 +1,92 @@
+/**
+ * Link View.
+ * @module components/theme/View/LinkView
+ */
+
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
+import { Container } from 'semantic-ui-react';
+import { UniversalLink } from '@plone/volto/components';
+import { FormattedMessage } from 'react-intl';
+import config from '@plone/volto/registry';
+
+/**
+ * View container class.
+ * @class View
+ * @extends Component
+ */
+class LinkView extends Component {
+  /**
+   * Property types.
+   * @property {Object} propTypes Property types.
+   * @static
+   */
+  static propTypes = {
+    content: PropTypes.shape({
+      title: PropTypes.string,
+      description: PropTypes.string,
+      remoteUrl: PropTypes.string,
+    }),
+    token: PropTypes.string,
+  };
+
+  /**
+   * Default properties.
+   * @property {Object} defaultProps Default properties.
+   * @static
+   */
+  static defaultProps = {
+    content: null,
+    token: null,
+  };
+
+  componentDidMount() {
+    if (!this.props.token) {
+      const { remoteUrl } = this.props.content;
+      if (isInternalURL(remoteUrl) && remoteUrl.includes('/en/')) {
+        this.props.history.replace(flattenToAppURL(remoteUrl));
+      } else if (!__SERVER__) {
+        window.location.replace(flattenToAppURL(remoteUrl));
+      }
+    }
+  }
+
+  /**
+   * Render method.
+   * @method render
+   * @returns {string} Markup for the component.
+   */
+  render() {
+    const { remoteUrl } = this.props.content;
+    const { openExternalLinkInNewTab } = config.settings;
+    return (
+      <Container id="page-document">
+        <h1 className="documentFirstHeading">{this.props.content.title}</h1>
+        {this.props.content.description && (
+          <p className="documentDescription">
+            {this.props.content.description}
+          </p>
+        )}
+        {remoteUrl && (
+          <p>
+            <FormattedMessage
+              id="The link address is:"
+              defaultMessage="The link address is:"
+            />{' '}
+            <UniversalLink
+              href={remoteUrl}
+              openLinkInNewTab={
+                openExternalLinkInNewTab && !isInternalURL(remoteUrl)
+              }
+            >
+              {flattenToAppURL(remoteUrl)}
+            </UniversalLink>
+          </p>
+        )}
+      </Container>
+    );
+  }
+}
+
+export default LinkView;

package/src/index.js

@@ -5,7 +5,7 @@ import { addStylingFieldsetSchemaEnhancer } from '@eeacms/volto-eea-website-poli
 
 const applyConfig = (config) => {
   // #158717#note-25 any path that isn't static, en or controlpanel is treated as external
-  const notInEN = /^(?!.*(\/en|\/static|\/controlpanel|\/cypress)).*$/;
+  const notInEN = /^(?!.*(\/en|\/static|\/controlpanel|\/cypress|\/login|\/logout|\/contact-form)).*$/;
   config.settings.externalRoutes = [
     ...(config.settings.externalRoutes || []),
     {
@@ -17,6 +17,9 @@ const applyConfig = (config) => {
     },
   ];
 
+  // #160689 Redirect contact-form to contact-us
+  config.settings.contactForm = '/en/about/contact-us';
+
   // #137187 Keycloak integration
   if (runtimeConfig['RAZZLE_KEYCLOAK'] === 'Yes') {
     config.settings.externalRoutes = [