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

imio/smartweb/core/webcomponents/package.json

@@ -24,7 +24,7 @@
     "@babel/plugin-transform-react-jsx": "^7.14.5",
     "@babel/preset-env": "^7.14.7",
     "@fullhuman/postcss-purgecss": "^4.0.3",
-    "@svgr/webpack": "^5.5.0",
+    "@svgr/webpack": "^8.1.0",
     "autoprefixer": "^10.3.3",
     "babel-loader": "^8.2.2",
     "clean-webpack-plugin": "^4.0.0",
@@ -36,25 +36,23 @@
     "eslint-plugin-react": "^7.26.1",
     "file-loader": "^6.2.0",
     "json-minimizer-webpack-plugin": "^3.0.0",
-    "less": "^4.1.1",
-    "less-loader": "^10.0.1",
     "mini-css-extract-plugin": "^2.1.0",
-    "postcss": "^8.3.6",
-    "postcss-loader": "^6.1.1",
+    "postcss": "^8.4.31",
+    "postcss-loader": "^7.3.3",
     "prettier": "2.3.2",
-    "purgecss": "^4.0.3",
-    "sass": "^1.36.0",
-    "sass-loader": "^12.1.0",
-    "style-loader": "^3.0.0",
-    "webpack": "^5.53.0",
-    "webpack-cli": "^4.8.0",
-    "webpack-dev-server": "^4.2.1",
-    "xml2js": "^0.4.23"
+    "purgecss": "^5.0.0",
+    "sass": "^1.69.4",
+    "sass-loader": "^13.3.2",
+    "style-loader": "^3.3.3",
+    "webpack": "^5.89.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.1",
+    "xml2js": "^0.6.2"
   },
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
     "@loadable/component": "^5.15.0",
-    "axios": "^0.26.0",
+    "axios": "^1.5.1",
     "babel-polyfill": "^6.26.0",
     "flexbin": "^0.2.0",
     "leaflet": "^1.7.1",
@@ -68,13 +66,12 @@
     "react-leaflet": "^3.2.5",
     "react-markdown": "^8.0.3",
     "react-moment": "^1.1.1",
-    "react-multilevel-select": "^1.0.3",
     "react-router-dom": "^5.3.0",
-    "react-select": "^4.3.1",
+    "react-select": "^5.7.7",
     "react-translated": "^2.5.0",
     "react-web-component": "^2.0.2",
     "react-web-component-style-loader": "^0.1.4-alpha",
     "remove-accents": "^0.4.2",
     "spotlight.js": "^0.7.8"
   }
-}
+}

imio/smartweb/core/webcomponents/src/assets/contentIcon/download.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17.5 17.94"><path d="M14.88 17.94H2.62C1.17 17.94 0 16.76 0 15.32v-4.38h1.75v4.38c0 .48.39.88.88.88h12.25c.48 0 .88-.39.88-.88v-4.38h1.75v4.38c0 1.45-1.18 2.62-2.62 2.62Zm-6.12-5.76L3.14 6.56l1.24-1.24 3.5 3.5V0h1.75v8.83l3.5-3.5 1.24 1.24-5.61 5.61Z" style="fill:#8899a4;stroke-width:0"/></svg>

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

@@ -1,9 +1,9 @@
 import React, { useEffect, useState, useRef } from "react";
-import { HashRouter as Router, Switch, Route } from "react-router-dom";
+import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
 import Filters from "./Filters/Filter";
 import ContactContent from "./ContactContent/ContactContent";
 import ContactList from "./ContactList/ContactList";
-import ContactMap from "./ContactMap/ContactMap";
+import Map from "../../utils/Map";
 import useAxios from "../../hooks/useAxios";
 import "./Annuaire.scss";
 import useFilterQuery from "../../hooks/useFilterQuery";
@@ -12,7 +12,7 @@ import translation from '../../utils/translation';
 
 export default function Annuaire(props) {
     return (
-        <Router>
+        <Router basename={props.viewPath}>
             <Provider language={props.currentLanguage} translation={translation}>
                 <AnnuaireView
                     queryFilterUrl={props.queryFilterUrl}
@@ -38,7 +38,7 @@ function AnnuaireView(props) {
     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",
@@ -78,7 +78,7 @@ function AnnuaireView(props) {
     // set state filters when active filter selection
     const filtersChange = (value) => {
         setLoadMoreLaunch(false);
-        setBatchStart((batchStart) => 0);
+        setBatchStart(() => 0);
         setFilters(value);
         window.scrollTo(0, 0);
     };
@@ -104,7 +104,7 @@ function AnnuaireView(props) {
     let portalHeaderHeight = portalHeader.offsetHeight;
 
     const filterRef = useRef();
-    const [style, setStyle] = React.useState({ height:0 });
+    const [style, setStyle] = React.useState({ height: 0 });
     useEffect(() => {
         setStyle({
             height: filterRef.current.clientHeight,
@@ -119,11 +119,12 @@ function AnnuaireView(props) {
             <ContactList onChange={clickID} contactArray={contactArray} onHover={hoverID} />
         );
         MapRender = (
-            <ContactMap
+            <Map
                 headerHeight={style.height + portalHeaderHeight}
                 clickId={clickId}
                 hoverId={hoverId}
                 items={contactArray}
+                queryUrl={props.queryUrl}
             />
         );
     } else if (!isLoading) {
@@ -132,92 +133,92 @@ function AnnuaireView(props) {
 
     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: portalHeaderHeight }}
+            >
                 <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-contact">
-                                    <a target="_blank" href={props.proposeUrl}><Translate text='Proposer un contact' /></a>
-                                </div>
-                            )
-                        }
-                        {contactNumber > 0 ? (
-                            <p className="r-results-numbers">
-                                <span>{contactNumber}</span>
-                                {contactNumber > 1 
+                    <Filters
+                        url={props.queryFilterUrl}
+                        activeFilter={filters}
+                        onChange={filtersChange}
+                    />
+                    {props.proposeUrl &&
+                        (
+                            <div className="r-add-contact">
+                                <a target="_blank" rel="noreferrer" href={props.proposeUrl}><Translate text='Proposer un contact' /></a>
+                            </div>
+                        )
+                    }
+                    {contactNumber > 0 ? (
+                        <p className="r-results-numbers">
+                            <span>{contactNumber}</span>
+                            {contactNumber > 1
                                 ? <Translate text='contacts trouvés' />
                                 : <Translate text='contact trouvé' />}
-                            </p>
-                        ) : (
-                            <p className="r-results-numbers"><Translate text='Aucun résultat' /></p>
-                        )}
-                    </div>
+                        </p>
+                    ) : (
+                        <p className="r-results-numbers"><Translate text='Aucun résultat' /></p>
+                    )}
                 </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>}
-                        </div>
-                    </Route>
-                    <Route exact path="*">
-                        <div className="r-wrapper container r-annuaire-wrapper">
-                            <div className="r-result r-annuaire-result">
-                                <div>{listRender}</div>
-                                <div className="r-load-more">
-                                    {contactNumber - 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' />}
-                                        </button>
-                                        </div>
-                                    ) : (
+            </div>
+            <Switch>
+                <Route exact path="/">
+                    <div className="r-wrapper container r-annuaire-wrapper">
+                        <div className="r-result r-annuaire-result">
+                            <div>{listRender}</div>
+                            <div className="r-load-more">
+                                {contactNumber - props.batchSize > batchStart ? (
+                                    <div>
                                         <span className="no-more-result">
                                             {isLoading ? divLoader : ""}
                                         </span>
-                                    )}
-                                </div>
+                                        <button onClick={loadMore} className="btn-grad">
+                                            {isLoading ? <Translate text='Chargement...' /> : <Translate text='Plus de résultats' />}
+                                        </button>
+                                    </div>
+                                ) : (
+                                    <span className="no-more-result">
+                                        {isLoading ? divLoader : ""}
+                                    </span>
+                                )}
                             </div>
-                            {displayMap && <div
-                                className="r-map annuaire-map"
-                                style={{
-                                    top: style.height + portalHeaderHeight,
-                                    height: "calc(100vh-" + style.height + portalHeaderHeight,
-                                }}
-                            >
-                                {MapRender}
-                            </div>}
                         </div>
-                    </Route>
-                </Switch>
-            </div>
-        </Router>
+                        {displayMap && <div
+                            className="r-map annuaire-map"
+                            style={{
+                                top: style.height + portalHeaderHeight,
+                                height: "calc(100vh-" + style.height + portalHeaderHeight,
+                            }}
+                        >
+                            {MapRender}
+                        </div>
+                        }
+                    </div>
+                </Route>
+                <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>
+                        }
+                    </div>
+                </Route>
+            </Switch>
+        </div>
     );
 }

imio/smartweb/core/webcomponents/src/components/Annuaire/ContactCard/ContactCard.jsx

@@ -1,32 +1,31 @@
 import React, { useEffect, useState } from "react";
 
-const ContactCard = ({ contactItem }) => {
+const ContactCard = ({ item }) => {
     const [image, setImage] = useState(new Image());
     const [imageClassName, setImageClassName] = useState("");
-    const title = contactItem.title && contactItem.title;
+    const title = item.title && item.title;
     const category =
-        contactItem.taxonomy_contact_category && contactItem.taxonomy_contact_category[0];
-    const number = contactItem.number ? contactItem.number : "";
-    const street = contactItem.street ? contactItem.street : "";
-    const complement = contactItem.complement ? contactItem.complement : "";
-    const zipcode = contactItem.zipcode ? contactItem.zipcode : "";
-    const city = contactItem.city ? contactItem.city : "";
-    const country = contactItem.country ? contactItem.country : "";
-    const phones = contactItem.phones ? contactItem.phones : "";
-    const mails = contactItem.mails ? contactItem.mails : "";
-    const topics = contactItem.topics ? contactItem.topics : "";
-    let countryTitle = contactItem.country && contactItem.country.title
+        item.taxonomy_contact_category && item.taxonomy_contact_category[0];
+    const number = item.number ? item.number : "";
+    const street = item.street ? item.street : "";
+    const complement = item.complement ? item.complement : "";
+    const zipcode = item.zipcode ? item.zipcode : "";
+    const city = item.city ? item.city : "";
+    const phones = item.phones ? item.phones : "";
+    const mails = item.mails ? item.mails : "";
+    const topics = item.topics ? item.topics : "";
+    let countryTitle = item.country && item.country.title
     let itineraryLink =
         "https://www.google.com/maps/dir/?api=1&destination=" +
-        contactItem.street +
+        item.street +
         "+" +
-        contactItem.number +
+        item.number +
         "+" +
-        contactItem.complement +
+        item.complement +
         "+" +
-        contactItem.zipcode +
+        item.zipcode +
         "+" +
-        contactItem.city +
+        item.city +
         "+" +
         countryTitle
 
@@ -36,7 +35,7 @@ const ContactCard = ({ contactItem }) => {
     useEffect(() => {
         const loadImage = async () => {
             const img = new Image();
-            const src = contactItem.image_affiche_scale || contactItem.logo_thumb_scale || "";
+            const src = item.image_affiche_scale || item.logo_thumb_scale || "";
 
             img.src = src;
 
@@ -51,11 +50,11 @@ const ContactCard = ({ contactItem }) => {
             }
         };
 
-        if (contactItem.image_affiche_scale || contactItem.logo_thumb_scale) {
+        if (item.image_affiche_scale || item.logo_thumb_scale) {
             loadImage();
         }
-    }, [contactItem]);
-    
+    }, [item]);
+
     return (
         <div className="r-list-item">
             {image && image.src
@@ -85,7 +84,7 @@ const ContactCard = ({ contactItem }) => {
                             {zipcode ? <span>{zipcode + " "}</span> : ""}
                             {city ? <span>{city}</span> : ""}
                             <div className="itineraty">
-                                <a href={itineraryLink} target="_blank">
+                                <a href={itineraryLink} target="_blank" rel="noreferrer">
                                     Itinéraire
                                 </a>
                             </div>