@eeacms/volto-clms-theme 1.1.160 → 1.1.162

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.162](https://github.com/eea/volto-clms-theme/compare/1.1.161...1.1.162) - 26 June 2024
+
+#### :hammer_and_wrench: Others
+
+- Refs #271250 - Insert scripts on Error pages. [GhitaB - [`f35ff6a`](https://github.com/eea/volto-clms-theme/commit/f35ff6ac7125f09db73465e12314feaf7faea431)]
+### [1.1.161](https://github.com/eea/volto-clms-theme/compare/1.1.160...1.1.161) - 25 June 2024
+
+#### :hammer_and_wrench: Others
+
+- Refs #271250 - Fix jenkins. [GhitaB - [`97abad7`](https://github.com/eea/volto-clms-theme/commit/97abad74f81f2322d5c14f8cd6aefb707d798fc1)]
+- Refs #271250 - Fix jenkins. [GhitaB - [`e80bc5c`](https://github.com/eea/volto-clms-theme/commit/e80bc5cb0e62e24ba889cf17ba79f0eddf68ddba)]
+- Refs #271250 - Fix jenkins. [GhitaB - [`74e2312`](https://github.com/eea/volto-clms-theme/commit/74e2312bc85974268a3779bdb2b7e88eff70a664)]
+- Refs #271250 - Fix jenkins. [GhitaB - [`7f0f9dc`](https://github.com/eea/volto-clms-theme/commit/7f0f9dc40cfe3822fa1d6cd11718d4667238d9c2)]
+- Refs #271250 - Unauthorized page: use login modal instead of link to login page. [GhitaB - [`e620559`](https://github.com/eea/volto-clms-theme/commit/e620559a83de9df5a6c6aa22ca4fbad4cde6d798)]
+- Refs #271250 - Update Contact service helpdesk link in Login page. [GhitaB - [`8a1f765`](https://github.com/eea/volto-clms-theme/commit/8a1f765a3f25cf3677159f0f0d82be2a9769f9b0)]
 ### [1.1.160](https://github.com/eea/volto-clms-theme/compare/1.1.159...1.1.160) - 20 June 2024
 
 #### :bug: Bug Fixes

package/package.json

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

package/src/components/CLMSLoginView/CLMSLogin.jsx

@@ -73,7 +73,10 @@ function CLMSLoginView(props) {
                 </p>
                 <p>
                   If you have othe questions, please contact our
-                  <UniversalLink openLinkInNewTab href="/en/service-desk">
+                  <UniversalLink
+                    openLinkInNewTab
+                    href="/en/contact-service-helpdesk"
+                  >
                     {' '}
                     Service desk
                   </UniversalLink>

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

@@ -6,21 +6,22 @@ import { FormattedMessage } from 'react-intl';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { Container } from 'semantic-ui-react';
-import { UniversalLink } from '@plone/volto/components';
+import './unauthorized-page.less';
 
 import { withServerErrorCode } from '@plone/volto/helpers/Utils/Utils';
-// import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
+import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
 
 /**
  * unauthorized function.
  * @function Unauthorized
  * @returns {string} Markup of the unauthorized page.
  */
-const Unauthorized = () => {
+const Unauthorized = (props) => {
   const error_message = useSelector((state) => state.apierror.message);
+  const { location = undefined } = props;
 
   return (
-    <Container className="view-wrapper">
+    <Container className="view-wrapper unauthorized-page">
       <h1>
         <FormattedMessage id="Unauthorized" defaultMessage="Unauthorized" />
       </h1>
@@ -30,9 +31,7 @@ const Unauthorized = () => {
           id="You are trying to access a protected resource, please {login} first."
           defaultMessage="You are trying to access a protected resource, please {login} first."
           values={{
-            login: (
-              <UniversalLink href="/en/login">Register/Login</UniversalLink>
-            ),
+            login: <CclLoginModal otherPath={location?.pathname} />,
           }}
         />
       </p>

package/src/customizations/volto/components/theme/Unauthorized/__snapshots__/Unauthorized.test.jsx.snap

@@ -2,7 +2,7 @@
 
 exports[`Unauthorized renders a not found component 1`] = `
 <div
-  className="ui container view-wrapper"
+  className="ui container view-wrapper unauthorized-page"
 >
   <h1>
     Unauthorized
@@ -14,15 +14,16 @@ exports[`Unauthorized renders a not found component 1`] = `
     className="description"
   >
     You are trying to access a protected resource, please 
-    <a
-      className={null}
-      href="/en/login"
+    <span
+      className="header-login-link"
+      onBlur={[Function]}
       onClick={[Function]}
-      target={null}
-      title={null}
+      onFocus={[Function]}
+      onMouseEnter={[Function]}
+      onMouseLeave={[Function]}
     >
       Register/Login
-    </a>
+    </span>
      first.
   </p>
   <p>

package/src/customizations/volto/components/theme/Unauthorized/unauthorized-page.less

@@ -0,0 +1,7 @@
+div.unauthorized-page span.header-login-link {
+  color: #a0b128;
+
+  &:hover {
+    color: #7c8921 !important;
+  }
+}

package/src/index.js

@@ -224,6 +224,11 @@ const applyConfig = (config) => {
     'footnote',
   ];
 
+  // Insert scripts on Error pages
+  if (config.settings?.serverConfig?.extractScripts) {
+    config.settings.serverConfig.extractScripts.errorPages = true;
+  }
+
   config = installLinkEditor(config);
 
   config.addonRoutes = [