imio.smartweb.core 1.2.37__py3-none-any.whl → 1.2.39__py3-none-any.whl

imio/smartweb/core/webcomponents/src/components/Annuaire/Filters/Filter.jsx

@@ -1,12 +1,12 @@
 import React, { useEffect, useRef, useCallback, useState } from "react";
 import Select from "react-select";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import useAxios from "../../../hooks/useAxios";
 import { Translator } from "react-translated";
+import queryString from 'query-string';
 
 function Filters(props) {
-    let history = useHistory();
-    const queryString = require("query-string");
+    let navigate = useNavigate();
     const [inputValues, setInputValues] = useState(props.activeFilter);
     const [topicsFilter, setTopicsFilter] = useState(null);
     const [taxonomyFilter, setTaxonomyFilter] = useState(null);
@@ -78,7 +78,7 @@ function Filters(props) {
             firstUpdate.current = false;
             return;
         }
-        history.push({
+        navigate({
             pathname: "./",
             search: queryString.stringify(inputValues),
         });
@@ -188,23 +188,23 @@ function Filters(props) {
                 {/* <label>Facilité</label> */}
                 <Translator>
                     {({ translate }) => (
-                <Select
-                    styles={customStyles}
-                    name={"facilities"}
-                    className="select-custom-class library-facilities"
-                    isClearable
-                    onChange={onChangeHandlerSelect}
-                    options={facilitiesFilter && facilitiesFilter}
-                    placeholder={translate({
-                        text: 'Facilités'
-                      })}
-                    value={actFaci && actFaci[0]}
-                />
-                )}
+                        <Select
+                            styles={customStyles}
+                            name={"facilities"}
+                            className="select-custom-class library-facilities"
+                            isClearable
+                            onChange={onChangeHandlerSelect}
+                            options={facilitiesFilter && facilitiesFilter}
+                            placeholder={translate({
+                                text: 'Facilités'
+                            })}
+                            value={actFaci && actFaci[0]}
+                        />
+                    )}
                 </Translator>
             </div>
         </React.Fragment>
     );
 }
 
-export default Filters;
+export default Filters;

imio/smartweb/core/webcomponents/src/components/Annuaire/index.js

@@ -1,2 +1,2 @@
 import loadable from "@loadable/component";
-export default loadable(() => import("./Annuaire"));
+export default loadable(() => import("./Annuaire"));

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

@@ -19,7 +19,7 @@ const ContactCard = ({ item }) => {
     return (
         <div className="r-list-item">
             <div
-                className={item.image_vignette_scale?"r-item-img":"r-item-img r-item-img-placeholder"}
+                className={item.image_vignette_scale ? "r-item-img" : "r-item-img r-item-img-placeholder"}
                 style={{
                     backgroundImage: item.image_vignette_scale
                         ? "url(" + item.image_vignette_scale + ")"
@@ -40,4 +40,4 @@ const ContactCard = ({ item }) => {
     );
 };
 
-export default ContactCard;
+export default ContactCard;

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

@@ -1,4 +1,4 @@
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import React, { useEffect, useState } from "react";
 import useAxios from "../../../hooks/useAxios";
 import useFilterQuery from "../../../hooks/useFilterQuery";
@@ -7,10 +7,10 @@ import ReactMarkdown from 'react-markdown'
 import Spotlight from "spotlight.js";
 import "../../../../node_modules/flexbin/flexbin.css"
 import { Translate } from "react-translated";
+import queryString from 'query-string';
 
 const ContactContent = ({ queryUrl, onChange }) => {
-	let history = useHistory();
-	const queryString = require("query-string");
+	let navigate = useNavigate();
 	const { u, ...parsed } = Object.assign(
 		{ UID: queryString.parse(useFilterQuery().toString())['u'], fullobjects: 1 },
 	);
@@ -49,10 +49,10 @@ const ContactContent = ({ queryUrl, onChange }) => {
 		}
 	}, [item]);
 
-    function handleClick() {
-        history.push("./");
-        onChange(null);
-    }
+	function handleClick() {
+		navigate("..");
+		onChange(null);
+	}
 	moment.locale('be');
 	const start = moment.utc(item.start).format('DD-MM-YYYY');
 	const end = moment.utc(item.end).format('DD-MM-YYYY');
@@ -390,4 +390,4 @@ const ContactContent = ({ queryUrl, onChange }) => {
 		</div>
 	);
 };
-export default ContactContent;
+export default ContactContent;

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

@@ -25,7 +25,7 @@ const ContactList = ({ itemsArray, onChange, onHover, parentCallback }) => {
                             className="r-list-item-link"
                             style={{ textDecoration: "none" }}
                             to={{
-                                pathname: "/"+removeAccents(item.title).replace(/[^a-zA-Z ]/g, "").replace(/\s/g, "-").toLowerCase(),
+                                pathname: "/" + removeAccents(item.title).replace(/[^a-zA-Z ]/g, "").replace(/\s/g, "-").toLowerCase(),
                                 search: `?u=${item.UID}`,
                                 state: {
                                     idItem: item.UID,
@@ -39,4 +39,4 @@ const ContactList = ({ itemsArray, onChange, onHover, parentCallback }) => {
         </React.Fragment>
     );
 };
-export default ContactList;
+export default ContactList;

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

@@ -1,5 +1,9 @@
 import React, { useEffect, useState, useRef } from "react";
-import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
+import {
+    BrowserRouter,
+    Routes,
+    Route,
+} from "react-router-dom";
 import Filters from "./Filters/Filter";
 import EventContent from "./EventContent/EventContent";
 import EventList from "./EventList/EventList";
@@ -10,10 +14,12 @@ import useFilterQuery from "../../hooks/useFilterQuery";
 import { Provider, Translate } from "react-translated";
 import translation from '../../utils/translation';
 import moment from "moment";
+import queryString from 'query-string';
+
 
 export default function Events(props) {
     return (
-        <Router basename={props.viewPath}>
+        <BrowserRouter basename={props.viewPath}>
             <Provider language={props.currentLanguage} translation={translation}>
                 <EventsView
                     queryFilterUrl={props.queryFilterUrl}
@@ -21,16 +27,16 @@ export default function Events(props) {
                     proposeUrl={props.proposeUrl}
                     batchSize={props.batchSize}
                     displayMap={props.displayMap}
+                    onlyPastEvents={props.onlyPastEvents}
                     language={props.currentLanguage}
                 />
             </Provider>
-        </Router>
+        </BrowserRouter>
     );
 }
 function EventsView(props) {
-    const queryString = require("query-string");
     const { u, ...parsed } = Object.assign(
-        { b_start: 0, fullobjects: 1, "event_dates.query":[moment().format('YYYY-MM-DD')],"event_dates.range":"min"},
+        { 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 [itemsArray, setItemsArray] = useState([]);
@@ -151,6 +157,7 @@ function EventsView(props) {
                         activeFilter={filters}
                         onChange={filtersChange}
                         language={props.language}
+                        onlyPastEvents={props.onlyPastEvents}
                     />
                     {props.proposeUrl &&
                         (
@@ -171,9 +178,8 @@ function EventsView(props) {
                     )}
                 </div>
             </div>
-            <Switch>
-
-                <Route exact path="/">
+            <Routes>
+                <Route exact path="/" element={
                     <div className="r-wrapper container r-annuaire-wrapper">
                         <div className="r-result r-annuaire-result">
                             <div>{listRender}</div>
@@ -205,8 +211,10 @@ function EventsView(props) {
                         </div>
                         }
                     </div>
+                }>
+
                 </Route>
-                <Route path={"/:name"}>
+                <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} />
@@ -222,8 +230,9 @@ function EventsView(props) {
                         </div>
                         }
                     </div>
+                }>
                 </Route>
-            </Switch>
+            </Routes>
         </div>
     );
-}
+}