imio.smartweb.core 1.2.30__py3-none-any.whl → 1.2.31__py3-none-any.whl

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

@@ -25,7 +25,7 @@ const ContactList = ({ contactArray, 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,

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

@@ -3,7 +3,6 @@ import React, { useEffect, useState } from "react";
 import useAxios from "../../../hooks/useAxios";
 import useFilterQuery from "../../../hooks/useFilterQuery";
 import moment from "moment";
-import Moment from "react-moment";
 import ReactMarkdown from 'react-markdown'
 import Spotlight from "spotlight.js";
 import "../../../../node_modules/flexbin/flexbin.css"

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,

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, createContext, useContex } from "react";
 import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
 import Filters from "./Filters/Filter";
 import NewsContent from "./NewsContent/NewsContent";
@@ -9,18 +9,21 @@ import useFilterQuery from "../../hooks/useFilterQuery";
 import { Provider, Translate } from "react-translated";
 import translation from '../../utils/translation';
 
+export const LanguageContext = createContext("fr");
 export default function News(props) {
     return (
-        <Router basename={props.viewPath}>
-            <Provider language={props.currentLanguage} translation={translation}>
-                <NewsView
-                    queryFilterUrl={props.queryFilterUrl}
-                    queryUrl={props.queryUrl}
-                    proposeUrl={props.proposeUrl}
-                    batchSize={props.batchSize}
-                />
-            </Provider>
-        </Router>
+        <LanguageContext.Provider value={props.currentLanguage}>
+            <Router basename={props.viewPath}>
+                <Provider language={props.currentLanguage} translation={translation}>
+                    <NewsView
+                        queryFilterUrl={props.queryFilterUrl}
+                        queryUrl={props.queryUrl}
+                        proposeUrl={props.proposeUrl}
+                        batchSize={props.batchSize}
+                    />
+                </Provider>
+            </Router>
+        </LanguageContext.Provider>
     );
 }
 const NewsView = (props) => {
@@ -99,62 +102,62 @@ const NewsView = (props) => {
 
     return (
         <div>
-                <div className="r-wrapper r-actu-wrapper">
-                    <div className="r-result r-annuaire-result">
-                        <Switch>
-                            <Route exact path="/">
-                                <div className="r-result-filter actu-result-filter">
-                                    <Filters
-                                        url={props.queryFilterUrl}
-                                        activeFilter={filters}
-                                        onChange={filtersChange}
-                                    />
-                                    {props.proposeUrl &&
-                                        (
-                                            <div className="r-add-news">
-                                                <a target="_blank" href={props.proposeUrl}><Translate text='Proposer une actualité' /></a>
-                                            </div>
-                                        )
-                                    }
-                                    {itemsNumber > 0 ? (
-                                        <p className="r-results-numbers">
-                                            <span>{itemsNumber}</span>{" "}
-                                            {itemsNumber > 1
-                                                ? <Translate text='Actualités trouvées' />
-                                                : <Translate text='Actualité trouvée' />}
-                                        </p>
-                                    ) : (
-                                        <p className="r-results-numbers"><Translate text='Aucun résultat' /></p>
-                                    )}
-                                </div>
-                                <div>{listRender}</div>
-                                <div className="r-load-more">
-                                    {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' />}
-                                            </button>
+            <div className="r-wrapper r-actu-wrapper">
+                <div className="r-result r-annuaire-result">
+                    <Switch>
+                        <Route exact path="/">
+                            <div className="r-result-filter actu-result-filter">
+                                <Filters
+                                    url={props.queryFilterUrl}
+                                    activeFilter={filters}
+                                    onChange={filtersChange}
+                                />
+                                {props.proposeUrl &&
+                                    (
+                                        <div className="r-add-news">
+                                            <a target="_blank" href={props.proposeUrl}><Translate text='Proposer une actualité' /></a>
                                         </div>
-                                    ) : (
+                                    )
+                                }
+                                {itemsNumber > 0 ? (
+                                    <p className="r-results-numbers">
+                                        <span>{itemsNumber}</span>{" "}
+                                        {itemsNumber > 1
+                                            ? <Translate text='Actualités trouvées' />
+                                            : <Translate text='Actualité trouvée' />}
+                                    </p>
+                                ) : (
+                                    <p className="r-results-numbers"><Translate text='Aucun résultat' /></p>
+                                )}
+                            </div>
+                            <div>{listRender}</div>
+                            <div className="r-load-more">
+                                {itemsNumber - props.batchSize > batchStart ? (
+                                    <div>
                                         <span className="no-more-result">
                                             {isLoading ? divLoader : ""}
                                         </span>
-                                    )}
-                                </div>
-                            </Route>
-                            <Route path={"/:name"}>
-                                <NewsContent
-                                    onChange={clickID}
-                                    onReturn={filtersChange}
-                                    queryUrl={props.queryUrl}
-                                />
-                            </Route>
-                        </Switch>
-                    </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>
+                        </Route>
+                        <Route path={"/:name"}>
+                            <NewsContent
+                                onChange={clickID}
+                                onReturn={filtersChange}
+                                queryUrl={props.queryUrl}
+                            />
+                        </Route>
+                    </Switch>
                 </div>
+            </div>
         </div>
     );
 };

imio/smartweb/core/webcomponents/src/components/News/NewsCard/NewsCard.jsx

@@ -1,9 +1,8 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useContext } from "react";
 import moment from "moment";
-import Moment from "react-moment";
-import removeAccents from "remove-accents";
 import ReactMarkdown from 'react-markdown';
-
+import { Translate } from "react-translated";
+import { LanguageContext } from '../News.jsx';
 const NewsCard = ({ item }) => {
     const [limitDescription, setLimitDescription] = useState();
     const numberLimit = 150;
@@ -19,13 +18,13 @@ const NewsCard = ({ item }) => {
             setLimitDescription(description);
         }
     }, [item]);
-    moment.locale('fr')
+    moment.locale(useContext(LanguageContext))
     const created = moment(item.created).startOf('minute').fromNow();
     const lastModified = moment(item.modified).startOf('minute').fromNow();
     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 + ")"
@@ -35,25 +34,25 @@ const NewsCard = ({ item }) => {
             <div className="r-item-text">
                 {category ? <span className="r-item-categorie">{category}</span> : ""}
                 <span className="r-item-title">{title}</span>
-                {description ? 
-                    <ReactMarkdown className="r-item-description">{limitDescription}</ReactMarkdown> 
+                {description ?
+                    <ReactMarkdown className="r-item-description">{limitDescription}</ReactMarkdown>
                     : ""
                 }
                 <div className="r-item-read-more" style={{ textDecoration: "none" }}>
                     {
                         created === lastModified ?
-                        (
-                        <div className="r-card-date-last">
-                            <span>Publié </span>
-                            <span>{created}</span>
-                        </div>
-                        ):
-                        (
-                        <div className="r-card-date-last">
-                            <span>Actualisé </span>
-                            <span>{lastModified}</span>
-                        </div>
-                        )
+                            (
+                                <div className="r-card-date-last">
+                                    <span><Translate text="Publié" /> </span>
+                                    <span>{created}</span>
+                                </div>
+                            ) :
+                            (
+                                <div className="r-card-date-last">
+                                    <span><Translate text="Actualisé" /> </span>
+                                    <span>{lastModified}</span>
+                                </div>
+                            )
                     }
                 </div>
             </div>

imio/smartweb/core/webcomponents/src/components/News/NewsList/NewsList.jsx

@@ -19,7 +19,7 @@ const NewsList = ({ itemsArray, onChange, parentCallback }) => {
                             className="r-news-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,

imio/smartweb/core/webcomponents/src/components/Search/ContactResult/ContactResult.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import useAxios from "../../../hooks/useAxios";
 import Highlighter from "react-highlight-words";
+import { Translate } from "react-translated";
 
 const ContactResult = (props) => {
     const [resultArray, setresultArray] = useState([]);
@@ -27,9 +28,11 @@ const ContactResult = (props) => {
     return (
         <div className="search-contact">
             <div className="r-search-header">
-                <h2 className="r-search-header-title">Contacts</h2>
+                <h2 className="r-search-header-title">
+                    <Translate text="Contacts" />
+                </h2>
                 <p className="r-search-header-count">
-                    {resultArray ? resultArray.length : "0"} résultats
+                    {resultArray > 0 ? <> {resultArray.length} {" "} <Translate text='Résultats' /> </> : <Translate text='Aucun résultat' />} 
                 </p>
             </div>
             <ul className="r-search-list">

imio/smartweb/core/webcomponents/src/components/Search/EventsResult/EventsResult.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import useAxios from "../../../hooks/useAxios";
 import Highlighter from "react-highlight-words";
+import { Translate } from "react-translated";
 
 const EventsResult = (props) => {
     const [resultArray, setresultArray] = useState([]);
@@ -27,9 +28,11 @@ const EventsResult = (props) => {
     return (
         <div className="search-events">
             <div className="r-search-header">
-                <h2 className="r-search-header-title">Événements</h2>
+                <h2 className="r-search-header-title">
+                    <Translate text="Événements" />
+                </h2>
                 <p className="r-search-header-count">
-                    {resultArray ? resultArray.length : "0"} résultats
+                    {resultArray > 0 ? <> {resultArray.length} {" "} <Translate text='Résultats' /> </> : <Translate text='Aucun résultat' />} 
                 </p>
             </div>
             <ul className="r-search-list">

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

@@ -2,6 +2,8 @@ import React, { useEffect, useCallback, useRef, useState } from "react";
 import Select from "react-select";
 import { useHistory } from "react-router-dom";
 import axios from "axios";
+import { Translate, Translator } from "react-translated";
+
 function Filters(props) {
     let history = useHistory();
     const queryString = require("query-string");
@@ -144,43 +146,61 @@ function Filters(props) {
             <div className="col-md-6 py-1 r-search search-bar-filter">
                 <form onSubmit={handleSubmit}>
                     <label>
-                        <input
-                            name="SearchableText"
-                            type="text"
-                            onChange={HandlerText}
-                            value={searchValues.SearchableText}
-                            placeholder={"Recherche"}
-                        />
+                        <Translator>
+                            {({ translate }) => (
+                                <input
+                                    name="SearchableText"
+                                    type="text"
+                                    onChange={HandlerText}
+                                    value={searchValues.SearchableText}
+                                    placeholder={translate({
+                                        text: 'Recherche'
+                                    })}
+                                />
+                            )}
+                        </Translator>
                     </label>
                     <button type="submit"></button>
                 </form>
             </div>
             <div className="col-md-3 col-lg-2 py-1 r-search search-select-filter">
-                <Select
-                    styles={customStyles}
-                    name={"iam"}
-                    className="r-search-select"
-                    isClearable
-                    onChange={onChangeHandlerSelect}
-                    options={iamFilter && iamFilter}
-                    placeholder={"Je suis"}
-                    value={actIam && actIam[0]}
-                />
+                <Translator>
+                    {({ translate }) => (
+                        <Select
+                            styles={customStyles}
+                            name={"iam"}
+                            className="r-search-select"
+                            isClearable
+                            onChange={onChangeHandlerSelect}
+                            options={iamFilter && iamFilter}
+                            placeholder={translate({
+                                text: 'Je suis'
+                            })}
+                            value={actIam && actIam[0]}
+                        />
+                    )}
+                </Translator>
             </div>
             <div className="col-md-3 col-lg-2 py-1 r-search search-select-filter">
-                <Select
-                    styles={customStyles}
-                    name={"topics"}
-                    className="r-search-select"
-                    isClearable
-                    onChange={onChangeHandlerSelect}
-                    options={topicsFilter && topicsFilter}
-                    placeholder={"Thématiques"}
-                    value={actTopi && actTopi[0]}
-                />
+                <Translator>
+                    {({ translate }) => (
+                        <Select
+                            styles={customStyles}
+                            name={"topics"}
+                            className="r-search-select"
+                            isClearable
+                            onChange={onChangeHandlerSelect}
+                            options={topicsFilter && topicsFilter}
+                            placeholder={translate({
+                                text: 'Thématiques'
+                            })}
+                            value={actTopi && actTopi[0]}
+                        />
+                    )}
+                </Translator>
             </div>
         </React.Fragment>
     );
 }
 
-export default Filters;
+export default Filters;

imio/smartweb/core/webcomponents/src/components/Search/NewsResult/NewsResult.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import useAxios from "../../../hooks/useAxios";
 import Highlighter from "react-highlight-words";
+import { Translate } from "react-translated";
 
 const NewsResult = (props) => {
     const [resultArray, setresultArray] = useState([]);
@@ -27,9 +28,11 @@ const NewsResult = (props) => {
     return (
         <div className="search-news">
             <div className="r-search-header">
-                <h2 className="r-search-header-title">Actualités</h2>
+                <h2 className="r-search-header-title">
+                    <Translate text="Actualités"/>
+                </h2>
                 <p className="r-search-header-count">
-                    {resultArray ? resultArray.length : "0"} résultats
+                    {resultArray > 0 ? <> {resultArray.length} {" "} <Translate text='Résultats' /> </> : <Translate text='Aucun résultat' />} 
                 </p>
             </div>
             <ul className="r-search-list">

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

@@ -1,33 +1,37 @@
-import React, { useEffect, useState } from "react";
-import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
+import React, { useState } from "react";
+import { BrowserRouter as Router } from "react-router-dom";
 import Filters from "./Filters/Filter";
 import ContactResult from "./ContactResult/ContactResult";
 import NewsResult from "./NewsResult/NewsResult";
 import EventsResult from "./EventsResult/EventsResult";
 import WebResult from "./WebResult/WebResult";
 import useFilterQuery from "../../hooks/useFilterQuery";
+import { Provider } from "react-translated";
+import translation from '../../utils/translation';
 import "./Search.scss";
 
 export default function Search(props) {
     return (
         <Router>
-            <SearchView
-                queryFilterUrl={props.queryFilterUrl}
-                queryUrl={props.queryUrl}
-                resultOption={JSON.parse(props.resultOption)}
-            />
-        </Router>
+            <Provider language={props.currentLanguage} translation={translation}>
+                <SearchView
+                    queryFilterUrl={props.queryFilterUrl}
+                    queryUrl={props.queryUrl}
+                    resultOption={JSON.parse(props.resultOption)}
+                />
+            </Provider>
+        </Router >
     );
 }
 const SearchView = (props) => {
     const queryString = require("query-string");
     const parsed = queryString.parse(useFilterQuery().toString());
-    const { SearchableText, iam,topics } = parsed;
-    const parsed2 = {'SearchableText':SearchableText,'iam':iam,'topics':topics};
+    const { SearchableText, iam, topics } = parsed;
+    const parsed2 = { 'SearchableText': SearchableText, 'iam': iam, 'topics': topics };
     // const parsed2 = { ...parsed };
     const [filters, setFilters] = useState(parsed2);
     const [batchSize, setBatchSize] = useState(6);
-    
+
     const filtersChange = (value) => {
         setFilters(value);
     };

imio/smartweb/core/webcomponents/src/components/Search/WebResult/WebResult.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import useAxios from "../../../hooks/useAxios";
 import Highlighter from "react-highlight-words";
+import { Translate } from "react-translated";
 
 const WebResult = (props) => {
     const [resultArray, setresultArray] = useState([]);
@@ -27,9 +28,12 @@ const WebResult = (props) => {
     return (
         <div className="search-web">
             <div className="r-search-header">
-                <h2 className="r-search-header-title">Infos pratiques</h2>
+                <h2 className="r-search-header-title">
+                    <Translate text="Infos pratiques" />
+
+                </h2>
                 <p className="r-search-header-count">
-                    {resultArray ? resultArray.length : "0"} résultats
+                    {resultArray > 0 ? <> {resultArray.length} {" "} <Translate text='Résultats' /> </> : <Translate text='Aucun résultat' />} 
                 </p>
             </div>
             <ul className="r-search-list">

imio/smartweb/core/webcomponents/src/utils/translation.js

@@ -1,5 +1,41 @@
 export default {
     // common
+    'Publié' : {
+        en: 'Published',
+        fr: 'Publié',
+        de: 'Veröffentlicht',
+        nl: 'Gepubliceerd',
+    },
+    'Actualisé' : {
+        en: 'Updated',
+        fr: 'Actualisé',
+        de: 'Aktualisiert',
+        nl: 'Bijgewerkt',
+    },
+    'Événements' : {
+        en: 'Events',
+        fr: 'Événements',
+        de: 'Veranstaltungen',
+        nl: 'Evenementen',
+    },
+    'Actualités' : {
+        en: 'News',
+        fr: 'Actualités',
+        de: 'Nachrichten',
+        nl: 'Nieuws',
+    },
+    'Contacts': {
+        en: 'Contacts',
+        fr: 'Contacts',
+        de: 'Kontakte',
+        nl: 'Contacten',
+    },
+    'Infos pratiques': {
+        en: 'Practical information',
+        fr: 'Infos pratiques',
+        de: 'Praktische Informationen',
+        nl: 'Praktische informatie',
+    },
     'Chargement...': {
         en: 'Loading',
         fr: 'Chargement...',
@@ -18,6 +54,12 @@ export default {
         de: "Themen",
         nl: "Thema's",
     },
+    'Je suis': {
+        en: 'I am',
+        fr: 'Je suis',
+        de: 'Ich bin',
+        nl: 'Ik ben',
+    },
     "Catégories": {
         en: 'Categories',
         fr: "Catégories",
@@ -42,6 +84,12 @@ export default {
         de: 'Kein Ergebnis',
         nl: 'Geen resultaat',
     },
+    'Résultats': {
+        en: 'Results',
+        fr: 'Résultats',
+        de: 'Ergebnisse',
+        nl: 'Resultaten',
+    },
     'Retour': {
         en: 'Return',
         fr: 'Retour',

{imio.smartweb.core-1.2.30.dist-info → imio.smartweb.core-1.2.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.30
+Version: 1.2.31
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -189,6 +189,19 @@ Changelog
 =========
 
 
+1.2.31 (2024-02-02)
+-------------------
+
+- Add React Context to manage global language
+  [thomlamb]
+
+- WEB-4063 : Create some views that redirect to main rest (directory, agenda, news) views (thank to registered uid) for e-guichet
+  [boulch]
+
+- SUP-34498 : Fix url construction to fix 404 on external tab click on React items
+  [thomlamb]
+
+
 1.2.30 (2024-01-30)
 -------------------