@eeacms/volto-clms-theme 1.1.169 → 1.1.171

package/CHANGELOG.md

@@ -4,6 +4,20 @@ 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.171](https://github.com/eea/volto-clms-theme/compare/1.1.170...1.1.171) - 18 July 2024
+
+#### :hammer_and_wrench: Others
+
+- CLMS-27147 (task): static dependency for useEffect [Unai Bolivar - [`db3614d`](https://github.com/eea/volto-clms-theme/commit/db3614dbb6816086839acb4e939d5a6c6465c5c1)]
+- CLMS-27147 (task): reuploading [Unai Bolivar - [`eafdeeb`](https://github.com/eea/volto-clms-theme/commit/eafdeeb87091f0e082c41b37c65b571d715b44ee)]
+- CLMS-27147 (bug): extracted comples expression from dependency array [Unai Bolivar - [`f68b933`](https://github.com/eea/volto-clms-theme/commit/f68b9330d11063885a47620e56391e0c60b96076)]
+- CLMS-271247 (task): When the selected format is NetCDF, the projection combo should have EPSG:4326 value [Unai Bolivar - [`e37590a`](https://github.com/eea/volto-clms-theme/commit/e37590ab0069dcadbcb99308f5698e93d9274afc)]
+### [1.1.170](https://github.com/eea/volto-clms-theme/compare/1.1.169...1.1.170) - 18 July 2024
+
+#### :hammer_and_wrench: Others
+
+- Add userSessionResetMiddleware [Tiberiu Ichim - [`330db04`](https://github.com/eea/volto-clms-theme/commit/330db049bee6007b00e37ebbc65aa0afd82b104e)]
+- Add customUserSession reducer to delete more cookies on logout [Tiberiu Ichim - [`97e826b`](https://github.com/eea/volto-clms-theme/commit/97e826b0db947cc72ec421797a346bc72cc51ce6)]
 ### [1.1.169](https://github.com/eea/volto-clms-theme/compare/1.1.168...1.1.169) - 16 July 2024
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/CLMSDownloadCartView/Fields/FormatNaming.jsx

@@ -26,6 +26,7 @@ export const FormatNaming = ({
             (obj) => obj.unique_id === item?.unique_id,
           );
           cartItems[objIndex].format = data.value;
+          //debugger;
           setCartItems([...cartItems]);
         }}
       />

package/src/components/CLMSDownloadCartView/Fields/ProjectionNaming.jsx

@@ -20,7 +20,9 @@ const _ProjectionNaming = ({
   const setProjectionValue = (unique_id, value, cI) => {
     const new_cartItems = [...cI];
     const objIndex = cI.findIndex((obj) => obj.unique_id === unique_id);
-    if (new_cartItems[objIndex]) new_cartItems[objIndex].projection = value;
+    if (new_cartItems[objIndex]) {
+      new_cartItems[objIndex].projection = value;
+    }
     setCartItems([...new_cartItems]);
   };
   const utm = getUtm(item, utmProjections);
@@ -44,44 +46,53 @@ const _ProjectionNaming = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [choices]);
 
+  const datasetProjections = JSON.stringify(
+    projections_uid?.[item.dataset_uid],
+  );
+
   useEffect(() => {
-    if (
-      projections_uid?.[item.dataset_uid] &&
-      projections_uid?.[item.dataset_uid].length > 0
-    ) {
+    if (datasetProjections && datasetProjections.length > 0) {
       setLoading(true);
-      setChoices(
-        projections_uid?.[item.dataset_uid]
-          ?.sort((a, b) => {
-            if (Number(a.split(':')[1]) > Number(b.split(':')[1])) {
-              return 1;
-            } else {
-              return -1;
-            }
-          })
-          .filter((p) => utm.includes(p) || baseSources.includes(p))
-          .map((p) => {
-            const re = new RegExp(p.split(':')[1]);
-            return {
-              key: p,
-              value: p,
-              default: re.test(item.original_projection) ? true : false,
-              text: re.test(item.original_projection)
-                ? `${p} (Source system of the dataset)`
-                : p,
-              className: re.test(item.original_projection)
-                ? 'original_projection'
-                : 'projection',
-            };
-          }),
+      const newBaseSources = ['EPSG:4326'];
+      const sortedProjections = projections_uid[item.dataset_uid].sort((a, b) =>
+        Number(a.split(':')[1]) > Number(b.split(':')[1]) ? 1 : -1,
       );
+
+      const filteredProjections =
+        item.format === 'Netcdf' ||
+        item.format.token === 'Netcdf' ||
+        item.format.title === 'Netcdf'
+          ? sortedProjections.filter(
+              (p) => utm.includes(p) || newBaseSources.includes(p),
+            )
+          : sortedProjections.filter(
+              (p) => utm.includes(p) || baseSources.includes(p),
+            );
+
+      const choices = filteredProjections.map((p) => {
+        const re = new RegExp(p.split(':')[1]);
+        return {
+          key: p,
+          value: p,
+          default: re.test(item.original_projection),
+          text: re.test(item.original_projection)
+            ? `${p} (Source system of the dataset)`
+            : p,
+          className: re.test(item.original_projection)
+            ? 'original_projection'
+            : 'projection',
+        };
+      });
+
+      setChoices(choices);
+      setLoading(false);
     } else {
       setLoading(true);
     }
     return () => {};
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [JSON.stringify(projections_uid?.[item.dataset_uid]), item.unique_id]);
+  }, [datasetProjections, item.unique_id, item.format]);
 
   useEffect(() => {
     !item.projection && choices.length > 0 && choices.find((ch) => ch.default)

package/src/index.js

@@ -59,6 +59,7 @@ import CustomMatomoAppExtra from './components/AppExtra/AppExtra';
 import FeedbackSurvey from './components/AppExtra/FeedbackSurvey';
 
 import ImageView from '@plone/volto/components/theme/View/ImageView';
+import userSessionResetMiddleware from './store/userSessionResetMiddleware';
 
 const applyConfig = (config) => {
   config.views = {
@@ -344,6 +345,16 @@ const applyConfig = (config) => {
     ...config.settings.loadables,
   };
 
+  config.settings.storeExtenders.push((middlewareStack) => {
+    const index = middlewareStack.findIndex((f) => f.name === 'protectLoadEnd');
+    const stack = [
+      ...middlewareStack.slice(0, index - 1),
+      userSessionResetMiddleware,
+      ...middlewareStack.slice(index - 1),
+    ];
+    return stack;
+  });
+
   return config;
 };
 export default applyConfig;

package/src/reducers/index.js

@@ -20,6 +20,7 @@ import { importWMSLayersReducer } from './import_wms_layers/import_wms_layers_re
 import { importWMSFieldsReducer } from './import_wms_fields/import_wms_fields_reducer';
 import { deleteProfileReducer } from './profile/delete_profile_reducer';
 import navroot from './navroot/navroot';
+import customUserSession from './userSession';
 
 /**
  * Root reducer.
@@ -49,6 +50,7 @@ const reducers = {
   importWMSFields: importWMSFieldsReducer,
   profile_delete: deleteProfileReducer,
   navroot,
+  customUserSession,
 };
 
 export default reducers;

package/src/reducers/userSession.js

@@ -0,0 +1,27 @@
+import { LOGOUT } from '@plone/volto/constants/ActionTypes';
+import Cookies from 'universal-cookie';
+
+const initialState = {
+  token: null,
+  login: {
+    loaded: false,
+    loading: false,
+    error: null,
+  },
+};
+
+export default function customUserSession(state = initialState, action = {}) {
+  switch (action.type) {
+    case `${LOGOUT}_SUCCESS`:
+      const cookies = new Cookies();
+      const allCookies = cookies.getAll();
+      Object.keys(allCookies).forEach((name) => {
+        if (/__ac/.test(name) || /ZopeId/.test(name)) {
+          cookies.remove(name);
+        }
+      });
+      return state;
+    default:
+      return state;
+  }
+}

package/src/store/userSessionResetMiddleware.js

@@ -0,0 +1,44 @@
+// backport of https://github.com/plone/volto/pull/6079
+import Cookies from 'universal-cookie';
+
+const LOCATION_CHANGE = '@@router/LOCATION_CHANGE';
+
+const userSessionReset = ({ dispatch, getState }) => (next) => (action) => {
+  if (typeof action === 'function') {
+    return next(action);
+  }
+
+  switch (action.type) {
+    case LOCATION_CHANGE:
+      if (action.request?.subrequest || __SERVER__) {
+        return next(action);
+      }
+
+      const cookies = new Cookies();
+      const token = cookies.get('auth_token');
+      const state = getState();
+
+      if (token && !state.userSession?.token) {
+        const loginAction = {
+          type: 'LOGIN_SUCCESS',
+          result: {
+            token,
+          },
+        };
+        dispatch(loginAction);
+      } else if (!token && state.userSession?.token) {
+        const logoutAction = {
+          type: 'LOGOUT_SUCCESS',
+          result: {
+            token,
+          },
+        };
+        dispatch(logoutAction);
+      }
+      return next(action);
+    default:
+      return next(action);
+  }
+};
+
+export default userSessionReset;