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

imio/smartweb/core/webcomponents/src/components/Events/EventList/EventList.jsx

@@ -0,0 +1,67 @@
+import React, { useEffect, useContext } from "react";
+import EventCard from "../EventCard/EventCard";
+import { Link } from "react-router-dom";
+import removeAccents from "remove-accents";
+import { ScrollContext } from "../../../hooks/ScrollContext";
+const ContactList = ({
+    itemsArray,
+    onChange,
+    onHover,
+    showCategoriesOrTopics,
+    contextAuthenticatedUser,
+}) => {
+    const { scrollPos, updateScrollPos } = useContext(ScrollContext);
+
+    function handleClick(event) {
+        onChange(event);
+        updateScrollPos(window.scrollY);
+    }
+
+    function handleHover(event) {
+        onHover(event);
+    }
+
+    useEffect(() => {
+        window.scrollTo({ top: scrollPos, left: 0, behavior: "instant" });
+    }, [itemsArray]);
+
+    return (
+        <React.Fragment>
+            <ul className="r-result-list event-result-list">
+                {itemsArray.map((item, i) => (
+                    <li
+                        key={i}
+                        className="r-list-item-group"
+                        onMouseEnter={() => handleHover(item.UID)}
+                        onMouseLeave={() => handleHover(null)}
+                        onClick={() => handleClick(item.UID)}
+                    >
+                        <Link
+                            className="r-list-item-link"
+                            style={{ textDecoration: "none" }}
+                            to={{
+                                pathname:
+                                    "/" +
+                                    removeAccents(item.title)
+                                        .replace(/[^a-zA-Z ]/g, "")
+                                        .replace(/\s/g, "-")
+                                        .toLowerCase(),
+                                search: `?u=${item.UID}`,
+                                state: {
+                                    idItem: item.UID,
+                                },
+                            }}
+                        ></Link>
+                        <EventCard
+                            item={item}
+                            showCategoriesOrTopics={showCategoriesOrTopics}
+                            key={item.created}
+                            contextAuthenticatedUser={contextAuthenticatedUser}
+                        />
+                    </li>
+                ))}
+            </ul>
+        </React.Fragment>
+    );
+};
+export default ContactList;

imio/smartweb/core/webcomponents/src/components/Events/Events.jsx

@@ -1,44 +1,65 @@
-import React, { useEffect, useState, useRef } from "react";
-import { HashRouter as Router, Switch, Route } from "react-router-dom";
+import React, { useEffect, useState, useContext, useRef } from "react";
+import { BrowserRouter, Routes, Route } from "react-router-dom";
+import { ScrollContext } from "../../hooks/ScrollContext";
 import Filters from "./Filters/Filter";
-import ContactContent from "./ContactContent/ContactContent";
-import ContactList from "./ContactList/ContactList";
-import ContactMap from "./ContactMap/ContactMap";
+import EventContent from "./EventContent/EventContent";
+import EventList from "./EventList/EventList";
+import Map from "../../utils/Map";
 import useAxios from "../../hooks/useAxios";
 import "./Events.scss";
+import "../Filters/MainFilter.scss";
 import useFilterQuery from "../../hooks/useFilterQuery";
 import { Provider, Translate } from "react-translated";
-import translation from '../../utils/translation';
+import translation from "../../utils/translation";
+import moment from "moment";
+import queryString from "query-string";
 
 export default function Events(props) {
+    // Utilisation de useState pour gérer la valeur du contexte
+    const [scrollPos, setScrollPos] = useState(0);
+    // Fonction pour mettre à jour la position du scroll
+    const updateScrollPos = (newScrollPos) => {
+        setScrollPos(newScrollPos);
+    };
     return (
-        <Router>
+        <BrowserRouter basename={props.viewPath}>
             <Provider language={props.currentLanguage} translation={translation}>
-                <EventsView
-                    queryFilterUrl={props.queryFilterUrl}
-                    queryUrl={props.queryUrl}
-                    proposeUrl={props.proposeUrl}
-                    batchSize={props.batchSize}
-                    displayMap={props.displayMap}
-                />
+                <ScrollContext.Provider value={{ scrollPos, updateScrollPos }}>
+                    <EventsView
+                        queryFilterUrl={props.queryFilterUrl}
+                        queryUrl={props.queryUrl}
+                        proposeUrl={props.proposeUrl}
+                        batchSize={props.batchSize}
+                        displayMap={props.displayMap}
+                        onlyPastEvents={props.onlyPastEvents}
+                        language={props.currentLanguage}
+                        showCategoriesOrTopics={props.showCategoriesOrTopics}
+                        contextAuthenticatedUser={props.contextAuthenticatedUser}
+                    />
+                </ScrollContext.Provider>
             </Provider>
-        </Router>
+        </BrowserRouter>
     );
 }
 function EventsView(props) {
-    const queryString = require("query-string");
     const { u, ...parsed } = Object.assign(
-        { b_start: 0, fullobjects: 1 },
+        {
+            b_start: 0,
+            fullobjects: 1,
+            "event_dates.query": [moment().format("YYYY-MM-DD")],
+            "event_dates.range": props.onlyPastEvents === "True" ? "max" : "min",
+        },
         queryString.parse(useFilterQuery().toString())
     );
-    const [contactArray, setcontactArray] = useState([]);
-    const [contactNumber, setcontactNumber] = useState([]);
+    const { scrollPos, updateScrollPos } = useContext(ScrollContext);
+    const [itemsArray, setItemsArray] = useState([]);
+    const [itemsNumber, setItemsNumber] = useState([]);
     const [clickId, setClickId] = useState(null);
     const [hoverId, setHoverId] = useState(null);
     const [filters, setFilters] = useState(parsed);
     const [batchStart, setBatchStart] = useState(0);
     const [loadMoreLaunch, setLoadMoreLaunch] = useState(false);
-    const displayMap =  props.displayMap === "True" ? true : false;
+    const displayMap = props.displayMap === "True" ? true : false;
     const { response, error, isLoading, isMore } = useAxios(
         {
             method: "get",
@@ -48,6 +69,7 @@ function EventsView(props) {
                 Accept: "application/json",
             },
             params: filters,
+            paramsSerializer: { indexes: null },
             load: loadMoreLaunch,
         },
         []
@@ -57,11 +79,11 @@ function EventsView(props) {
     useEffect(() => {
         if (response !== null) {
             if (isMore) {
-                setcontactArray((contactArray) => [...contactArray, ...response.items]);
+                setItemsArray((itemsArray) => [...itemsArray, ...response.items]);
             } else {
-                setcontactArray(response.items);
+                setItemsArray(response.items);
             }
-            setcontactNumber(response.items_total);
+            setItemsNumber(response.items_total);
         }
     }, [response]);
 
@@ -78,13 +100,14 @@ function EventsView(props) {
     // set state filters when active filter selection
     const filtersChange = (value) => {
         setLoadMoreLaunch(false);
-        setBatchStart((batchStart) => 0);
+        setBatchStart(() => 0);
         setFilters(value);
         window.scrollTo(0, 0);
     };
 
     // set batch
     const loadMore = () => {
+        updateScrollPos(window.scrollY);
         setBatchStart((batchStart) => batchStart + parseInt(props.batchSize));
         setLoadMoreLaunch(true);
     };
@@ -100,103 +123,131 @@ function EventsView(props) {
     }, [batchStart]);
 
     // filter top style
-    let portalHeader = document.getElementById("portal-header");
-    let portalHeaderHeight = portalHeader.offsetHeight;
-
     const filterRef = useRef();
-    const [style, setStyle] = React.useState({ height:0 });
+    const [style, setStyle] = React.useState({ height: 0 });
+    const [headerHeight, setHeaderHeight] = useState(0);
     useEffect(() => {
         setStyle({
             height: filterRef.current.clientHeight,
         });
-    }, [filterRef.current]);
+        setHeaderHeight(filterRef.current.offsetTop);
+    }, [filterRef]);
 
     // coditional list render
     let listRender;
     let MapRender;
-    if (contactArray && contactArray.length > 0) {
+    if (itemsArray && itemsArray.length > 0) {
         listRender = (
-            <ContactList onChange={clickID} contactArray={contactArray} onHover={hoverID} />
+            <EventList
+                onChange={clickID}
+                itemsArray={itemsArray}
+                onHover={hoverID}
+                showCategoriesOrTopics={props.showCategoriesOrTopics}
+                contextAuthenticatedUser={props.contextAuthenticatedUser}
+            />
         );
         MapRender = (
-            <ContactMap
-                headerHeight={style.height + portalHeaderHeight}
+            <Map
+                headerHeight={style.height + headerHeight}
                 clickId={clickId}
                 hoverId={hoverId}
-                items={contactArray}
+                items={itemsArray}
+                queryUrl={props.queryUrl}
             />
         );
     } else if (!isLoading) {
-        listRender = <p><Translate text="Aucun événement n'a été trouvé" /></p>;
+        listRender = (
+            <p>
+                <Translate text="Aucun événement n'a été trouvé" />
+            </p>
+        );
     }
-
-    const divLoader = <div className="lds-roller-container"><div className="lds-roller"><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div></div>;
+    const divLoader = (
+        <div className="lds-roller-container">
+            <div className="lds-roller">
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+            </div>
+        </div>
+    );
     return (
-        <Router>
-            <div className={`ref ${displayMap ? "view-map" : "no-map"}`}>
+        <div className={`ref ${displayMap ? "view-map" : "no-map"}`}>
+            <div
+                className="r-result-filter-container"
+                ref={filterRef}
+                style={{ top: headerHeight }}
+            >
                 <div
-                    className="r-result-filter-container"
-                    ref={filterRef}
-                    style={{ top: portalHeaderHeight }}
+                    id="r-result-filter"
+                    className="r-result-filter container annuaire-result-filter"
                 >
-                    <div
-                        id="r-result-filter"
-                        className="r-result-filter container annuaire-result-filter"
-                    >
-                        <Filters
-                            url={props.queryFilterUrl}
-                            activeFilter={filters}
-                            onChange={filtersChange}
-                        />
-                        {props.proposeUrl &&
-                            (
-                                <div className="r-add-event">
-                                    <a target="_blank" href={props.proposeUrl}><Translate text='Proposer un événement' /></a>
-                                </div>
-                            )
-                        }
-                        {contactNumber > 0 ? (
-                            <p className="r-results-numbers">
-                                <span>{contactNumber}</span>
-                                {contactNumber > 1
-                                    ? <Translate text='événements trouvés' />
-                                    : <Translate text='événement trouvé' />}
-                            </p>
-                        ) : (
-                            <p className="r-results-numbers"><Translate text='Aucun résultat' /></p>
-                        )}
-                    </div>
-                </div>
-                <Switch>
-                    <Route path={"/:name"}>
-                        <div className="r-wrapper container r-annuaire-wrapper">
-                            <div className="r-result r-annuaire-result">
-                                <ContactContent queryUrl={props.queryUrl} onChange={clickID} />
-                            </div>
-                         {displayMap && <div
-                                className="r-map annuaire-map"
-                                style={{
-                                    top: style.height + portalHeaderHeight,
-                                    height: "calc(100vh-" + style.height + portalHeaderHeight,
-                                }}
-                            >
-                                {MapRender}
-                            </div>
-                            }
+                    <Filters
+                        url={props.queryFilterUrl}
+                        activeFilter={filters}
+                        onChange={filtersChange}
+                        language={props.language}
+                        onlyPastEvents={props.onlyPastEvents}
+                    />
+                    {props.proposeUrl && (
+                        <div className="r-add-event">
+                            <a target="_blank" href={props.proposeUrl}>
+                                <Translate text="Proposer un événement" />
+                                <svg
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    width="16"
+                                    height="16"
+                                    fill="currentColor"
+                                    className="bi bi-plus-circle"
+                                    viewBox="0 0 16 16"
+                                >
+                                    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16" />
+                                    <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4" />
+                                </svg>
+                            </a>
                         </div>
-                    </Route>
-                    <Route exact path="*">
+                    )}
+                </div>
+            </div>
+            <Routes>
+                <Route
+                    exact
+                    path="/"
+                    element={
                         <div className="r-wrapper container r-annuaire-wrapper">
                             <div className="r-result r-annuaire-result">
+                                {itemsNumber > 0 ? (
+                                    <p className="r-results-numbers">
+                                        <span>{itemsNumber}</span>
+                                        {itemsNumber > 1 ? (
+                                            <Translate text="événements trouvés" />
+                                        ) : (
+                                            <Translate text="événement trouvé" />
+                                        )}
+                                    </p>
+                                ) : (
+                                    <p className="r-results-numbers">
+                                        <Translate text="Aucun résultat" />
+                                    </p>
+                                )}
                                 <div>{listRender}</div>
                                 <div className="r-load-more">
-                                    {contactNumber - props.batchSize > batchStart ? (
+                                    {itemsNumber - props.batchSize > batchStart ? (
                                         <div>
                                             <span className="no-more-result">
                                                 {isLoading ? divLoader : ""}
                                             </span>
                                             <button onClick={loadMore} className="btn-grad">
-                                                {isLoading ? <Translate text='Chargement...' /> : <Translate text='Plus de résultats' />}
+                                                {isLoading ? (
+                                                    <Translate text="Chargement..." />
+                                                ) : (
+                                                    <Translate text="Plus de résultats" />
+                                                )}
                                             </button>
                                         </div>
                                     ) : (
@@ -206,20 +257,47 @@ function EventsView(props) {
                                     )}
                                 </div>
                             </div>
-                           {displayMap && <div
-                                className="r-map annuaire-map"
-                                style={{
-                                    top: style.height + portalHeaderHeight,
-                                    height: "calc(100vh-" + style.height + portalHeaderHeight,
-                                }}
-                            >
-                                {MapRender}
+                            {displayMap && (
+                                <div
+                                    className="r-map annuaire-map"
+                                    style={{
+                                        top: style.height + headerHeight,
+                                        height: "calc(100vh-" + style.height + headerHeight,
+                                    }}
+                                >
+                                    {MapRender}
+                                </div>
+                            )}
+                        </div>
+                    }
+                ></Route>
+                <Route
+                    path={"/:name"}
+                    element={
+                        <div className="r-wrapper container r-annuaire-wrapper">
+                            <div className="r-result r-annuaire-result">
+                                <EventContent
+                                    queryUrl={props.queryUrl}
+                                    onChange={clickID}
+                                    onlyPastEvents={props.onlyPastEvents}
+                                    contextAuthenticatedUser={props.contextAuthenticatedUser}
+                                />
                             </div>
-                            }
+                            {displayMap && (
+                                <div
+                                    className="r-map annuaire-map"
+                                    style={{
+                                        top: style.height + headerHeight,
+                                        height: "calc(100vh-" + style.height + headerHeight,
+                                    }}
+                                >
+                                    {MapRender}
+                                </div>
+                            )}
                         </div>
-                    </Route>
-                </Switch>
-            </div>
-        </Router>
+                    }
+                ></Route>
+            </Routes>
+        </div>
     );
 }