@eeacms/volto-cca-policy 0.3.61 → 0.3.63

package/CHANGELOG.md

@@ -4,6 +4,13 @@ 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).
 
+### [0.3.63](https://github.com/eea/volto-cca-policy/compare/0.3.62...0.3.63) - 9 July 2025
+
+#### :hammer_and_wrench: Others
+
+- Bring back geolocation widget [Tiberiu Ichim - [`7d388ac`](https://github.com/eea/volto-cca-policy/commit/7d388ac905688d67fd64a382d853afb562e593e2)]
+### [0.3.62](https://github.com/eea/volto-cca-policy/compare/0.3.61...0.3.62) - 4 July 2025
+
 ### [0.3.61](https://github.com/eea/volto-cca-policy/compare/0.3.60...0.3.61) - 4 July 2025
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/theme/Widgets/GeolocationWidgetMapContainer.jsx

@@ -1,4 +1,5 @@
-import { openlayers as ol } from '@eeacms/volto-openlayers-map';
+import { withOpenLayers } from '@eeacms/volto-openlayers-map';
+// import { openlayers as ol } from '@eeacms/volto-openlayers-map';
 import {
   Controls,
   Interactions,
@@ -9,7 +10,7 @@ import {
 import React, { useState } from 'react';
 import { useMapContext } from '@eeacms/volto-openlayers-map/hocs';
 
-function PinInteraction({ longitude, latitude, onChange }) {
+function PinInteraction({ longitude, latitude, onChange, ol }) {
   const mapContext = useMapContext();
   const { addLayer, addInteraction, map } = mapContext;
 
@@ -63,13 +64,14 @@ function PinInteraction({ longitude, latitude, onChange }) {
       const [longitude, latitude] = lonLat;
       onChange({ latitude, longitude });
     });
-  }, [addInteraction, addLayer, map, onChange, latitude, longitude]);
+  }, [addInteraction, addLayer, map, onChange, latitude, longitude, ol]);
 
   return null;
 }
 
 const TileSetLoader = (props) => {
   const [tileWMSSources, setTileWMSSources] = useState([]);
+  const { ol } = props;
 
   React.useEffect(() => {
     setTileWMSSources([
@@ -83,7 +85,7 @@ const TileSetLoader = (props) => {
         transition: 0,
       }),
     ]);
-  }, []);
+  }, [ol]);
 
   return tileWMSSources ? (
     <MapContainer {...props} source={tileWMSSources[0]} />
@@ -91,7 +93,7 @@ const TileSetLoader = (props) => {
 };
 
 const MapContainer = (props) => {
-  const { longitude, latitude, source, onChange } = props;
+  const { longitude, latitude, source, onChange, ol } = props;
   return (
     <Map
       view={{
@@ -105,6 +107,7 @@ const MapContainer = (props) => {
       <Layers>
         <Controls attribution={false} zoom={false} />
         <PinInteraction
+          ol={ol}
           latitude={latitude}
           longitude={longitude}
           onChange={onChange}
@@ -125,4 +128,4 @@ const MapContainer = (props) => {
   );
 };
 
-export default TileSetLoader;
+export default withOpenLayers(TileSetLoader);

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

@@ -204,16 +204,21 @@ class View extends Component {
   render() {
     const { views } = config;
     if (this.props.error && this.props.error.code === 301) {
-      const base = typeof window !== 'undefined' ? window.location.origin : '';
+      // const base = typeof window !== 'undefined' ? window.location.origin : '';
 
       const redirect = flattenToAppURL(this.props.error.url)
         .replaceAll('/++api++', '/')
+        .replaceAll('//', '/')
         .split('?')[0];
+      const redirParams = {
+        pathname: redirect,
+        search: this.props.location.search,
+      };
+
       // eslint-disable-next-line no-console
-      console.log('Redirecting', redirect);
-      return (
-        <Redirect to={`${base}${redirect}${this.props.location.search}`} />
-      );
+      console.log('Redirecting', redirParams);
+
+      return <Redirect to={redirParams} push={true} />;
     } else if (this.props.error && !this.props.connectionRefused) {
       let FoundView;
       if (this.props.error.status === undefined) {

package/src/index.js

@@ -43,7 +43,7 @@ import BrokenLinks from './components/theme/Views/BrokenLinks';
 
 import { eea_languages, non_eu_langs } from './constants';
 
-// import GeolocationWidget from './components/theme/Widgets/GeolocationWidget';
+import GeolocationWidget from './components/theme/Widgets/GeolocationWidget';
 // import MigrationButtons from './components/MigrationButtons';
 
 const getEnv = () => (typeof window !== 'undefined' ? window.env : process.env);
@@ -430,7 +430,7 @@ const applyConfig = (config) => {
   };
   // Custom widgets
   config.widgets.id.geochars = GeocharsWidget;
-  // config.widgets.id.geolocation = GeolocationWidget;
+  config.widgets.id.geolocation = GeolocationWidget;
   config.widgets.id.promotional_image = PromotionalImageWidget;
 
   if (config.widgets.views?.widget) {