@eeacms/volto-clms-theme 1.1.286 → 1.1.287

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.287](https://github.com/eea/volto-clms-theme/compare/1.1.286...1.1.287) - 18 May 2026
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`3f56cf8`](https://github.com/eea/volto-clms-theme/commit/3f56cf831a5df1394e9c214bfff848b8feae55a1)]
+
+#### :hammer_and_wrench: Others
+
+- Remove @plone-collective/volto-authomatic dependency [dobri1408 - [`122f114`](https://github.com/eea/volto-clms-theme/commit/122f1149d28d509610a25916fb9cd6d91d58d028)]
+- Add Login component to routes and clean up code [dobri1408 - [`dd6641b`](https://github.com/eea/volto-clms-theme/commit/dd6641baa61ceb97fb0e5ebe83060af904e4c178)]
+- (bug): Fix feedback survey modal crash by guarding missing config and clearing stale open timer [Unai Bolivar - [`a04d0ce`](https://github.com/eea/volto-clms-theme/commit/a04d0ce7513fc992554483593a97d1d775927ccb)]
+- Delete src/components/CLMSLoginView/AuthomaticLoginPlone.jsx [dobri1408 - [`c3fcfaa`](https://github.com/eea/volto-clms-theme/commit/c3fcfaa868c900794132d014f37cefa519b65678)]
 ### [1.1.286](https://github.com/eea/volto-clms-theme/compare/1.1.285...1.1.286) - 15 May 2026
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.286",
+  "version": "1.1.287",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -59,7 +59,6 @@
     "@fortawesome/react-fontawesome": "0.1.14",
     "@ginkgo-bioworks/react-json-schema-form-builder": "2.10.1",
     "@kitconcept/volto-blocks-grid": "7.0.2",
-    "@plone-collective/volto-authomatic": "2.0.1",
     "connected-react-router": "6.8.0",
     "d3-array": "^2.12.1",
     "husky": "7.0.4",

package/src/components/AppExtra/FeedbackSurvey.jsx

@@ -22,7 +22,7 @@ function SurveyModal(props) {
     >
       <ModalContent>
         <ModalDescription>
-          <p>{config.text}</p>
+          <p>{config?.text || ''}</p>
         </ModalDescription>
       </ModalContent>
       <ModalActions>
@@ -42,7 +42,9 @@ function SurveyModal(props) {
             setOpen(false);
             markSurveyAsDone();
             //window.open(config.link, '_blank');
-            window.location.replace(config.link);
+            if (config?.link) {
+              window.location.replace(config.link);
+            }
           }}
         >
           Take survey
@@ -100,20 +102,29 @@ export const FeedbackSurvey = () => {
 
   const location = useLocation();
   useEffect(() => {
+    let modalTimer;
     if (surveyConfig !== undefined) {
       if (surveyConfig.is_active === true) {
         incrementPageviews(20);
         let willOpen = decideToOpenModal();
         if (willOpen) {
-          setTimeout(() => {
+          modalTimer = setTimeout(() => {
             setIsModalOpen(true);
           }, 5000);
         }
       }
     }
+
+    return () => {
+      if (modalTimer) {
+        clearTimeout(modalTimer);
+      }
+    };
   }, [location, surveyConfig]);
 
-  return isModalOpen ? <SurveyModal config={surveyConfig} /> : null;
+  return isModalOpen && surveyConfig ? (
+    <SurveyModal config={surveyConfig} />
+  ) : null;
 };
 
 export default FeedbackSurvey;

package/src/index.js

@@ -4,7 +4,7 @@ import customBlocks, {
 } from '@eeacms/volto-clms-theme/components/Blocks/customBlocks';
 
 // ROUTE VIEWS
-import { ContactForm, Search, Sitemap } from '@plone/volto/components';
+import { ContactForm, Search, Sitemap, Login } from '@plone/volto/components';
 
 // VIEWS
 import CLMSDatasetDetailView from '@eeacms/volto-clms-theme/components/CLMSDatasetDetailView/CLMSDatasetDetailView';
@@ -52,7 +52,6 @@ import { CheckboxHtmlWidget } from './components/Blocks/CustomTemplates/VoltoFor
 import reducers from './reducers';
 import CookieBanner from 'volto-cookie-banner/CookieBannerContainer';
 import CLMSLoginView from './components/CLMSLoginView/CLMSLogin';
-import AuthomaticLoginPlone from './components/CLMSLoginView/AuthomaticLoginPlone';
 
 //SLATE CONFIGURATION
 import installLinkEditor from '@plone/volto-slate/editor/plugins/AdvancedLink';
@@ -257,14 +256,15 @@ const applyConfig = (config) => {
     config,
   );
 
-  const loginRoutes = [
+  config.addonRoutes = [
+    ...config.addonRoutes,
     {
       path: '/login-plone',
-      component: AuthomaticLoginPlone,
+      component: Login,
     },
     {
       path: '/**/login-plone',
-      component: AuthomaticLoginPlone,
+      component: Login,
     },
     {
       path: '/login',
@@ -274,11 +274,6 @@ const applyConfig = (config) => {
       path: '/**/login',
       component: CLMSLoginView,
     },
-  ];
-
-  config.addonRoutes = [
-    ...loginRoutes,
-    ...config.addonRoutes,
     {
       path: '/profile',
       component: ProfileView,

package/src/components/CLMSLoginView/AuthomaticLoginPlone.jsx

@@ -1,110 +0,0 @@
-/**
- * Authomatic login mounted on /login-plone.
- * @module components/CLMSLoginView/AuthomaticLoginPlone
- */
-import React, { useEffect, useState } from 'react';
-import {
-  authomaticRedirect,
-  listAuthOptions,
-  oidcRedirect,
-} from '@plone-collective/volto-authomatic/actions'; // eslint-disable-line import/no-unresolved
-// eslint-disable-next-line import/no-unresolved
-import LoginForm from '@plone-collective/volto-authomatic/components/Login/LoginForm';
-import { injectIntl } from 'react-intl';
-import { useSelector, useDispatch } from 'react-redux';
-import { useLocation } from 'react-router-dom';
-import qs from 'query-string';
-import { useCookies } from 'react-cookie';
-
-function getReturnUrl(location) {
-  const returnUrl = qs.parse(location.search).return_url;
-
-  if (returnUrl) {
-    return returnUrl;
-  }
-
-  const pathname = location.pathname || '/';
-  const loginPloneSuffix = '/login-plone';
-  const loginSuffix = '/login';
-
-  if (pathname === loginPloneSuffix || pathname === loginSuffix) {
-    return '/';
-  }
-
-  if (pathname.endsWith(loginPloneSuffix)) {
-    return pathname.slice(0, -loginPloneSuffix.length) || '/';
-  }
-
-  if (pathname.endsWith(loginSuffix)) {
-    return pathname.slice(0, -loginSuffix.length) || '/';
-  }
-
-  return '/';
-}
-
-function AuthomaticLoginPlone() {
-  const dispatch = useDispatch();
-  const [startedOAuth, setStartedOAuth] = useState(false);
-  const [startedOIDC, setStartedOIDC] = useState(false);
-  const loading = useSelector((state) => state.authOptions.loading);
-  const options = useSelector((state) => state.authOptions.options);
-  const loginOAuthValues = useSelector((state) => state.authomaticRedirect);
-  const loginOIDCValues = useSelector((state) => state.oidcRedirect);
-  const location = useLocation();
-  const [, setCookie] = useCookies();
-
-  useEffect(() => {
-    dispatch(listAuthOptions());
-  }, [dispatch]);
-
-  useEffect(() => {
-    const nextUrl = loginOAuthValues.next_url;
-    const session = loginOAuthValues.session;
-
-    if (nextUrl && session && startedOAuth) {
-      setStartedOAuth(false);
-      setTimeout(() => {
-        window.location.href = nextUrl;
-      }, 500);
-    }
-  }, [startedOAuth, loginOAuthValues]);
-
-  const onSelectProvider = (provider) => {
-    setStartedOAuth(true);
-    setCookie('return_url', getReturnUrl(location), { path: '/' });
-    dispatch(authomaticRedirect(provider.id));
-  };
-
-  useEffect(() => {
-    const nextUrl = loginOIDCValues.next_url;
-
-    if (nextUrl && startedOIDC) {
-      setStartedOIDC(false);
-      setTimeout(() => {
-        window.location.href = nextUrl;
-      }, 500);
-    }
-  }, [startedOIDC, loginOIDCValues]);
-
-  useEffect(() => {
-    if (
-      options !== undefined &&
-      options.length === 1 &&
-      options[0].id === 'oidc'
-    ) {
-      setStartedOIDC(true);
-      dispatch(oidcRedirect('oidc'));
-    }
-  }, [options, dispatch]);
-
-  return (
-    <LoginForm
-      loading={loading}
-      providers={options}
-      action="login"
-      onSelectProvider={onSelectProvider}
-    />
-  );
-}
-
-export default injectIntl(AuthomaticLoginPlone);