@eeacms/volto-eea-website-policy 1.3.2 → 1.3.4

package/CHANGELOG.md

@@ -4,6 +4,23 @@ 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.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
+
+- fix(externalRoutes): Consider everything outside /en as external routes - refs #158717 [Alin Voinea - [`cfa1bb7`](https://github.com/eea/volto-eea-website-policy/commit/cfa1bb756d2bf73cd492f1995116e2a17b36d414)]
+
+#### :hammer_and_wrench: Others
+
+- Do not override externalRoutes [Alin Voinea - [`feaa112`](https://github.com/eea/volto-eea-website-policy/commit/feaa1127ca81e67adafc3714a9bd5bcadb4af5a9)]
 ### [1.3.2](https://github.com/eea/volto-eea-website-policy/compare/1.3.1...1.3.2) - 16 February 2023
 
 #### :bug: Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-policy",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "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,18 +5,17 @@ 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
-  if (!config.settings.publicURL.includes('localhost')) {
-    const notInEN = /^(?!.*(\/en|\/static|\/controlpanel|\/cypress)).*$/;
-    config.settings.externalRoutes = [
-      {
-        match: {
-          path: notInEN,
-          exact: false,
-          strict: false,
-        },
+  const notInEN = /^(?!.*(\/en|\/static|\/controlpanel|\/cypress)).*$/;
+  config.settings.externalRoutes = [
+    ...(config.settings.externalRoutes || []),
+    {
+      match: {
+        path: notInEN,
+        exact: false,
+        strict: false,
       },
-    ];
-  }
+    },
+  ];
 
   // #137187 Keycloak integration
   if (runtimeConfig['RAZZLE_KEYCLOAK'] === 'Yes') {
@@ -52,6 +51,11 @@ const applyConfig = (config) => {
   //   (item) => item.code,
   // ) || ['en'];
 
+  // Logo URL
+  if (config.settings.eea) {
+    config.settings.eea.logoTargetUrl = '/en';
+  }
+
   // Block chooser
   config.blocks.blocksConfig.image.mostUsed = false;
   config.blocks.blocksConfig.video.mostUsed = false;