imio.smartweb.core 1.2.12__py3-none-any.whl → 1.2.19__py3-none-any.whl

imio/smartweb/core/webcomponents/src/{components/Events/ContactMap/ContactMap.jsx → utils/Map.jsx}

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from "react";
 import { MapContainer, TileLayer, Marker, Popup, useMap } from "react-leaflet";
+import useFilterQuery from "../hooks/useFilterQuery";
 import L from "leaflet";
-import iconSvg from "../../../assets/pin-react.svg";
-import iconSvgActivated from "../../../assets/pin-react-active.svg";
+import iconSvg from "../assets/pin-react.svg";
+import iconSvgActivated from "../assets/pin-react-active.svg";
 import { Link } from "react-router-dom";
-import "./ContactMap.scss";
+import "./Map.scss";
 import "leaflet/dist/leaflet.css";
 import removeAccents from "remove-accents";
 
@@ -22,26 +23,30 @@ function ChangeMapView({ activeItem, arrayOfLatLngs }) {
     return null;
 }
 
-function ContentMap(props) {
+function Map(props) {
     const [activeItem, setActiveItem] = useState(null);
-    const [hoverItem, setHoverItem] = useState(null);
     const [filterGeoArray, setFilterGeoArray] = useState([]);
     const [allPosition, setAllPosition] = useState(null);
-    
+    const queryString = require("query-string");
+    const { u, ...parsed } = Object.assign(
+        { UID: queryString.parse(useFilterQuery().toString())['u']},
+    );
+    // Delete Imio positions
     useEffect(() => {
         const filterArray = props.items.filter((isgeo) => isgeo.geolocation.latitude && isgeo.geolocation.latitude !== 50.4989185 && isgeo.geolocation.longitude !== 4.7184485);
         setFilterGeoArray(filterArray);
     }, [props]);
 
-    function mapIcon(url) {
+    // Setup Maker Icon
+    const mapIcon = (url) => {
         return new L.Icon({
             iconUrl: url,
             iconSize: [29, 37],
         });
     }
-
+    // Get Marker Icon and Z-index
     const getMarkerIcon = (index) => {
-        if (index === props.clickId) {
+        if (index === parsed.UID) {
             return mapIcon(iconSvgActivated);
         }
         if (index === props.hoverId) {
@@ -60,26 +65,14 @@ function ContentMap(props) {
     };
 
     useEffect(() => {
-        if (props.clickId !== null) {
-            var result =
-                filterGeoArray &&
-                filterGeoArray.filter((obj) => {
-                    return obj.UID === props.clickId;
-                });
-            setActiveItem(result[0]);
-        } else setActiveItem(null);
-    }, [props.clickId]);
+        var result =
+        filterGeoArray &&
+        filterGeoArray.filter((obj) => {
+            return obj.UID === parsed.UID;
+        });
+    setActiveItem(result[0]);
+}, [filterGeoArray]);
 
-    useEffect(() => {
-        if (props.hoverId) {
-            var result =
-                filterGeoArray &&
-                filterGeoArray.filter((obj) => {
-                    return obj.UID === props.hoverId;
-                });
-            setHoverItem(result[0]);
-        } else setHoverItem(null);
-    }, [props.hoverId]);
 
     useEffect(() => {
         if (filterGeoArray.length > 0) {
@@ -94,6 +87,42 @@ function ContentMap(props) {
     }, [filterGeoArray]);
     const position = [50.85034, 4.35171];
 
+    const markers = filterGeoArray.map((mark) => (
+        <Marker
+            key={mark.UID}
+            icon={getMarkerIcon(mark.UID)}
+            zIndexOffset={getMarkerZindex(mark.UID)}
+            position={[
+                mark.geolocation ? mark.geolocation.latitude : "",
+                mark.geolocation ? mark.geolocation.longitude : "",
+            ]}
+            eventHandlers={{
+                mouseover: (e) => {
+                    // Gérer les événements ici
+                },
+            }}
+        >
+            <Popup closeButton={false}>
+                <Link
+                    className="r-map-popup"
+                    style={{ textDecoration: "none" }}
+                    to={{
+                        pathname: removeAccents(
+                            mark.title.replace(/\s/g, "-").toLowerCase()
+                        ),
+                        search: `?u=${mark.UID}`,
+                        state: {
+                            idItem: mark.UID,
+                        },
+                    }}
+                >
+                    <span className="r-map-popup-title">{mark.title}</span>
+                    <p className="r-map-popup-category">{mark.category && mark.category.title}</p>
+                </Link>
+            </Popup>
+        </Marker>
+    ));
+
     return (
         <div>
             <MapContainer
@@ -108,49 +137,16 @@ function ContentMap(props) {
                 {allPosition != null ? (
                     <ChangeMapView
                         activeItem={activeItem}
+                        activeItemUID={parsed.UID}
                         arrayOfLatLngs={allPosition && allPosition}
                     />
                 ) : (
                     ""
                 )}
-                {filterGeoArray &&
-                    filterGeoArray.map((mark) => (
-                        <Marker
-                            key={mark.UID}
-                            icon={getMarkerIcon(mark.UID)}
-                            zIndexOffset={getMarkerZindex(mark.UID)}
-                            position={[
-                                mark.geolocation ? mark.geolocation.latitude : "",
-                                mark.geolocation ? mark.geolocation.longitude : "",
-                            ]}
-                            eventHandlers={{
-                                mouseover: (e) => {
-                                },
-                              }}
-                        >
-                            <Popup closeButton={false}>
-                                <Link
-                                    className="r-map-popup"
-                                    style={{ textDecoration: "none" }}
-                                    to={{
-                                        pathname: removeAccents(
-                                            mark.title.replace(/\s/g, "-").toLowerCase()
-                                        ),
-                                        search: `?u=${mark.UID}`,
-                                        state: {
-                                            idItem: mark.UID,
-                                        },
-                                    }}
-                                >
-                                    <span className="r-map-popup-title">{mark.title}</span>
-                                    <p className="r-map-popup-category">{mark.category && mark.category.title}</p>
-                                </Link>
-                            </Popup>
-                        </ Marker>
-                    ))}
+                {filterGeoArray && markers }
             </MapContainer>
         </div>
     );
 }
 
-export default ContentMap;
+export default Map;

{imio.smartweb.core-1.2.12.dist-info → imio.smartweb.core-1.2.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.12
+Version: 1.2.19
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -189,6 +189,64 @@ Changelog
 =========
 
 
+1.2.19 (2023-12-06)
+-------------------
+
+- WEB-4022 : Fix : Compiled edit.js
+  [boulch]
+
+- WEB-4022 : Fix : bad char in actions.xml (setup/upgrade step)
+  [boulch]
+
+
+1.2.18 (2023-12-05)
+-------------------
+
+- WEB-4022 : Create a new action menu with an utils view that redirect to stats (browser)view
+  [boulch]
+
+- Change HashRouter to BrowserRouter in React & fix related URLs
+  [thomlamb, laulaz]
+
+- WEB-3783 : Add new header viewlet to manage og:tags in REACT views
+  [boulch]
+
+
+1.2.17 (2023-12-01)
+-------------------
+
+- Refactor / optimize React code and upgrade packages
+  [thomlamb]
+
+
+1.2.16 (2023-12-01)
+-------------------
+
+- Handle single item json responses in request forwarders
+  [laulaz]
+
+
+1.2.15 (2023-11-30)
+-------------------
+
+- Handle empty responses in request forwarders
+  [laulaz]
+
+
+1.2.14 (2023-11-30)
+-------------------
+
+- Fix parameters in `POST` / `PATCH` / `DELETE` requests
+  [laulaz]
+
+
+1.2.13 (2023-11-29)
+-------------------
+
+- Use json for request forwarders body
+  [laulaz, boulch]
+
+
 1.2.12 (2023-11-29)
 -------------------