ublo-lib 1.17.7 → 1.18.0

package/es/common/components/editable-calendar/calendar.js

@@ -23,8 +23,9 @@ function Calendar({
   const now = new Date();
   const minDate = now;
   if (minDate) minDate.setHours(0, 0, 0, 0);
-  const defaultMonth = Date.THIS_MONTH;
-  const currentMonth = getMonthFromPresets(presets?.dates);
+  const currentMonth = Data.THIS_MONTH;
+  const presetMonth = getMonthFromPresets(presets?.dates);
+  const defaultMonth = currentMonth > presetMonth ? currentMonth : presetMonth;
   const currentYear = Data.THIS_YEAR;
   const [month, setMonth] = React.useState(currentMonth);
   const [year, setYear] = React.useState(currentYear);

package/es/esf/components/{instructors-book-v2 → instructors-book}/api.js

@@ -5,15 +5,16 @@ const {
 const {
   resort
 } = publicRuntimeConfig;
-const host = "https://instructors-book-server.carnet-rouge-esf.com";
-const authorization = "00q2qa545018261l252gg3414t3qa2";
+const carnetRougeApi = "https://services.carnet-rouge-esf.app/api";
+const authorizationCarnetRouge = "6bdecf9053927dcc7e10923a2cc603a4";
 const fetcher = async (url, body) => {
   const res = await fetch(url, {
     method: "POST",
     headers: {
-      "content-type": "application/json;charset=utf-8",
-      Authorization: authorization,
-      schoolcode: resort
+      ...(body ? {
+        "content-type": "application/json;charset=utf-8"
+      } : {}),
+      Authorization: authorizationCarnetRouge
     },
     body: body ? JSON.stringify(body) : undefined
   });
@@ -21,7 +22,8 @@ const fetcher = async (url, body) => {
 };
 export async function fetchInstructors(lang, body = {}) {
   try {
-    return fetcher(`${host}/api/instructors-book/${resort}/${lang}`, {
+    const url = `${carnetRougeApi}/annuaire/public/moniteurs/${resort}/${lang}`;
+    return fetcher(url, {
       ...body,
       project: true
     });
@@ -32,7 +34,8 @@ export async function fetchInstructors(lang, body = {}) {
 }
 export async function fetchInstructor(lang, uri) {
   try {
-    return fetcher(`${host}/api/instructors-book/${resort}/${lang}/${uri}`);
+    const url = `${carnetRougeApi}/annuaire/public/moniteur/${resort}/${lang}/${uri}`;
+    return fetcher(url);
   } catch (e) {
     console.warn(e);
     return {};
@@ -40,7 +43,8 @@ export async function fetchInstructor(lang, uri) {
 }
 export const fetchRandomInstructors = async (lang, tags, nbInstructor) => {
   try {
-    return fetcher(`${host}/api/instructors-book/${resort}/${lang}/byTags`, {
+    const url = `${carnetRougeApi}/annuaire/public/moniteurs/${resort}/${lang}/by-tags`;
+    return fetcher(url, {
       tags,
       size: nbInstructor
     });

package/es/esf/components/{instructors-book-v2 → instructors-book}/book.js

@@ -76,7 +76,7 @@ export default function Book({
       loading: loading
     }), _jsx(List, {
       search: search,
-      instructors: context.instructors,
+      instructors: context.moniteurs,
       trombi: isTrombi
     })]
   });

package/es/esf/components/{instructors-book-v2 → instructors-book}/filters.js

@@ -18,8 +18,8 @@ export default function Filters({
     lang
   } = useUbloContext();
   const {
-    activities,
-    languages
+    disciplines: activities,
+    langues: languages
   } = context;
   const formatedActivities = ["", ...activities.map(({
     code,

package/es/esf/components/instructors-book/index.js

@@ -1,3 +1,6 @@
-import instructorsBook from "./instructors-book";
-export { fetchInstructor, fetchInstructorsContext } from "./instructors-book";
-export default instructorsBook;
+import * as API from "./api";
+import Book from "./book";
+import Sheet from "./sheet";
+import Suggestions from "./suggestions";
+import prefixes from "./prefixes";
+export { Book, Sheet, Suggestions, API, prefixes };

package/es/esf/components/{instructors-book-v2 → instructors-book}/instructor.js

@@ -22,8 +22,8 @@ export default function Instructor({
     lang
   } = useUbloContext();
   const {
-    firstname,
-    lastname,
+    prenom,
+    nom,
     photo,
     uri
   } = instructor;
@@ -66,7 +66,7 @@ export default function Instructor({
           loading: "lazy",
           src: picture,
           className: css.imageBackground,
-          alt: `${firstname} ${lastname}`,
+          alt: `${prenom} ${nom}`,
           width: "170",
           height: "220"
         }), picture ? _jsxs(_Fragment, {
@@ -76,7 +76,7 @@ export default function Instructor({
             loading: "lazy",
             src: picture,
             className: css.image,
-            alt: `${firstname} ${lastname}`,
+            alt: `${prenom} ${nom}`,
             onLoad: stopLoading,
             onError: setFallbackPicture,
             width: "170",
@@ -94,10 +94,10 @@ export default function Instructor({
           className: css.name,
           children: [_jsxs("span", {
             className: css.firstName,
-            children: [Utils.formatNames(firstname), " "]
+            children: [Utils.formatNames(prenom), " "]
           }), _jsx("span", {
             className: css.lastName,
-            children: Utils.formatNames(lastname)
+            children: Utils.formatNames(nom)
           })]
         })
       })]

package/es/esf/components/instructors-book/list.js

@@ -1,178 +1,47 @@
 import * as React from "react";
-import { useEffect, useState } from "react";
-import Container from "./container";
-import Loader from "./loader";
-import { flags, PersonIcon, OverlayIcon } from "./icons";
-import getMessage from "./messages";
-import { formatNames } from "./utils";
-import { filter } from "./list-utils";
+import classNames from "classnames";
+import { useUbloContext } from "ublo/with-ublo";
+import * as Utils from "./utils";
+import Instructor from "./instructor";
+import { message } from "./messages";
+import css from "./list.module.css";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-const List = ({
+export default function List({
+  search = "",
   instructors,
-  activities,
-  languages,
+  fromSuggestions,
+  formSendFunction,
+  formFields,
   trombi,
-  lang,
-  activity,
-  language,
-  selectInstructor,
-  selectFilter
-}) => {
-  const [search, setSearch] = useState("");
-  const [displayedInstructors, setDisplayedInstructors] = useState(filter(instructors));
-  const texts = getMessage(lang);
-  useEffect(() => {
-    const displayedInstructors = filter(instructors, search);
-    setDisplayedInstructors(displayedInstructors);
-  }, [instructors, search]);
-  const changeFilter = filter => e => {
-    if (selectFilter !== undefined) {
-      selectFilter(filter, e.target.value);
-    }
-  };
-  const renderHeader = () => {
-    return _jsxs("div", {
-      className: "instructors-book-list__top",
-      children: [_jsxs("div", {
-        className: "instructors-book-list__top-left",
-        children: [_jsx("h2", {
-          className: "instructors-book-list__title",
-          children: texts["instructors-book-title-1"]
-        }), _jsx("div", {
-          className: "instructors-book-list__tagline",
-          children: texts["instructors-book-title-2"]
-        }), _jsx("div", {
-          className: "instructors-book-list__helper",
-          children: texts["instructors-book-intro"]
-        })]
-      }), _jsxs("div", {
-        className: "instructors-book-list__filters",
-        children: [_jsxs("div", {
-          className: "instructors-book-list__filters-title",
-          children: [texts["instructors-book-search-1"], " ", _jsx("span", {
-            className: "instructors-book-list__filters-title-span",
-            children: texts["instructors-book-search-2"]
-          })]
-        }), _jsx("div", {
-          className: "instructors-book-list__input-filler",
-          children: _jsx("input", {
-            value: search,
-            className: "instructors-book-list__input",
-            placeholder: texts["instructors-book-placeholder-search"],
-            onChange: e => setSearch(e.target.value.toLowerCase())
-          })
-        }), _jsx("label", {
-          htmlFor: "instructors-book-practice-filter",
-          className: "instructors-book-list__label",
-          children: texts["instructors-book-filter-activity"]
-        }), _jsx("div", {
-          className: "instructors-book-list__input-filler instructors-book-list__input-filler--select",
-          children: _jsxs("select", {
-            value: activity,
-            id: "instructors-book-practice-filter",
-            className: "instructors-book-list__input instructors-book-list__input--select",
-            onChange: changeFilter("activity"),
-            children: [_jsx("option", {
-              value: "",
-              children: texts["instructors-book-placeholder-activity"]
-            }), activities && activities.map(({
-              code,
-              label
-            }) => _jsx("option", {
-              value: code,
-              children: label
-            }, code))]
-          })
-        }), _jsx("label", {
-          htmlFor: "instructors-book-language-filter",
-          className: "instructors-book-list__label",
-          children: texts["instructors-book-filter-language"]
-        }), _jsx("div", {
-          className: "instructors-book-list__input-filler instructors-book-list__input-filler--select",
-          children: _jsxs("select", {
-            value: language,
-            id: "instructors-book-language-filter",
-            className: "instructors-book-list__input instructors-book-list__input--select",
-            onChange: changeFilter("language"),
-            children: [_jsx("option", {
-              value: "",
-              children: texts["instructors-book-placeholder-language"]
-            }), languages && languages.map(({
-              code,
-              label
-            }) => _jsx("option", {
-              value: code,
-              children: label
-            }, code))]
-          })
-        })]
-      })]
-    });
-  };
-  const renderInstructor = (instructor, index) => {
-    const {
-      firstname,
-      lastname,
-      photo,
-      activities,
-      languages,
-      uri
-    } = instructor;
-    return _jsxs(Container, {
-      trombi: trombi,
-      className: "instructors-book-list__instructor",
-      ...selectInstructor(uri),
-      children: [_jsxs("div", {
-        className: "instructors-book-list__instructor-image-container",
-        children: [!trombi && _jsx("div", {
-          className: "instructors-book-list__instructor-overlay",
-          children: _jsx(OverlayIcon, {
-            className: "instructors-book-list__instructor-overlay-icon"
-          })
-        }), photo ? _jsx("img", {
-          loading: "lazy",
-          src: photo,
-          className: "instructors-book-list__instructor-image",
-          alt: `${firstname} ${lastname}`
-        }) : _jsx(PersonIcon, {
-          className: "instructors-book-list__instructor-imageplaceholder"
-        })]
-      }), _jsxs("div", {
-        className: "instructors-book-list__instructor-name",
-        children: [formatNames(firstname), " ", _jsx("span", {
-          className: "instructors-book-list__instructor-lastname",
-          children: formatNames(lastname)
-        })]
-      }), trombi && _jsxs(_Fragment, {
-        children: [_jsx("div", {
-          className: "instructors-book-list__instructor-practices",
-          children: activities && activities.map(({
-            label
-          }) => label).join(" - ")
-        }), _jsx("div", {
-          className: "instructors-book-list__instructor-langs",
-          children: languages && languages.map(({
-            code,
-            label
-          }) => {
-            const Flag = flags[code];
-            return _jsx(Flag, {
-              className: "instructors-book-list__instructor-lang",
-              title: label
-            }, code);
-          })
-        })]
-      })]
-    }, uri || `instructor-${index}`);
-  };
+  popup
+}) {
+  const {
+    lang
+  } = useUbloContext();
+  const displayedInstructors = fromSuggestions ? instructors : Utils.filter(instructors, search);
+  const listCountMessageCode = displayedInstructors?.length > 1 ? "instructors" : "instructor";
+  const classes = classNames(css.container, {
+    [css.containerSuggestions]: fromSuggestions
+  });
   return _jsxs("div", {
-    className: "instructors-book-list",
-    children: [renderHeader(), _jsx("div", {
-      className: "instructors-book-list__inner",
-      children: displayedInstructors ? displayedInstructors.map((instructor, index) => renderInstructor(instructor, index)) : _jsx(Loader, {})
+    className: classes,
+    children: [!fromSuggestions && _jsxs("div", {
+      className: css.listCount,
+      children: [_jsx("b", {
+        children: displayedInstructors.length
+      }), " ", message(lang, listCountMessageCode)]
+    }), _jsx("div", {
+      className: css.inner,
+      children: displayedInstructors?.map(instructor => {
+        return _jsx(Instructor, {
+          instructor: instructor,
+          trombi: trombi,
+          formFields: formFields,
+          formSendFunction: formSendFunction,
+          popup: popup
+        }, instructor.uri);
+      })
     })]
   });
-};
-export default List;
+}

package/es/esf/components/instructors-book/messages.js

@@ -1,42 +1,41 @@
-const messages = {
+const locales = {
   fr: {
-    "instructors-book-title-1": "le book",
-    "instructors-book-title-2": "des moniteurs",
-    "instructors-book-intro": "Cliquez sur un moniteur pour afficher ses informations",
-    "instructors-book-search-1": "recherchez",
-    "instructors-book-search-2": "votre moniteur",
-    "instructors-book-filter-activity": "Filtrer par pratique",
-    "instructors-book-filter-language": "Filtrer par langue",
-    "instructors-book-placeholder-search": "Nom, prénom...",
-    "instructors-book-placeholder-activity": "Sélectionnez une pratique",
-    "instructors-book-placeholder-language": "Sélectionnez une langue",
-    "instructors-book-activities": "Mes spécialités sont : ",
-    "instructors-book-about": "À propos",
-    "instructors-book-and": " et ",
-    "instructors-book-back-to-list": "Retour"
+    "search-label": "Chercher un moniteur",
+    "search-placeholder": "Nom, prénom...",
+    "activity-label": "Quelle pratique ?",
+    "language-label": "Quelle langue ?",
+    instructors: "moniteurs trouvés",
+    instructor: "moniteur trouvé",
+    activities: "Activités pratiquées",
+    and: "et",
+    languages: "Langues parlées",
+    about: "À propos",
+    contact: "Quand souhaitez-vous skier avec moi ?",
+    "suggestions-title": "Les moniteurs qui vous proposent ce cours",
+    "suggestions-button": "Voir tous les moniteurs",
+    "see-more": "Voir plus",
+    "go-back": "Retour"
   },
   en: {
-    "instructors-book-title-1": "ski instructors'",
-    "instructors-book-title-2": "book",
-    "instructors-book-intro": "Click an instructor bellow to display his informations",
-    "instructors-book-search-1": "search",
-    "instructors-book-search-2": "your instructor",
-    "instructors-book-filter-activity": "Filter by discipline",
-    "instructors-book-filter-language": "Filter by spoken language",
-    "instructors-book-placeholder-search": "Lastname, firstname...",
-    "instructors-book-placeholder-activity": "Select a discipline",
-    "instructors-book-placeholder-language": "Select a language",
-    "instructors-book-activities": "My disciplines are : ",
-    "instructors-book-about": "About",
-    "instructors-book-and": " and ",
-    "instructors-book-back-to-list": "Go back"
+    "search-label": "Search an instructor",
+    "search-placeholder": "Lastname, firstname...",
+    "activity-label": "Which activity?",
+    "language-label": "Which language?",
+    instructors: "instructors found",
+    instructor: "instructor found",
+    activities: "Activities",
+    and: "and",
+    languages: "Spoken languages",
+    about: "About",
+    contact: "When would you like to ski with me?",
+    "suggestions-title": "The instructors who offer you this course",
+    "suggestions-button": "See all instructors",
+    "see-more": "See more",
+    "go-back": "Go back"
   }
 };
-const getMessage = lang => {
-  if (messages[lang] !== undefined) {
-    return messages[lang];
-  } else {
-    return messages.en;
-  }
-};
-export default getMessage;
+export const message = (lang, id) => {
+  const locale = lang === "fr" ? "fr" : "en";
+  const messages = locales[locale];
+  return messages[id] || `??${id}??`;
+};

package/es/esf/components/{instructors-book-v2 → instructors-book}/sheet.js

@@ -21,11 +21,11 @@ export default function Sheet({
   bookUrl
 }) {
   const {
-    firstname,
-    lastname,
+    prenom,
+    nom,
     photo,
-    languages,
-    activities,
+    langues,
+    disciplines,
     introduction,
     description,
     uri
@@ -65,7 +65,7 @@ export default function Sheet({
             loading: "lazy",
             src: picture,
             className: css.imageBackground,
-            alt: `${firstname} ${lastname}`,
+            alt: `${prenom} ${nom}`,
             width: "170",
             height: "220"
           }), picture ? _jsxs(_Fragment, {
@@ -75,7 +75,7 @@ export default function Sheet({
               loading: "lazy",
               src: picture,
               className: css.image,
-              alt: `${firstname} ${lastname}`,
+              alt: `${prenom} ${nom}`,
               onLoad: stopLoading,
               onError: setFallbackPicture,
               width: "190",
@@ -93,24 +93,24 @@ export default function Sheet({
             className: css.name,
             children: [_jsxs("span", {
               className: css.firstName,
-              children: [Utils.formatNames(firstname), " "]
+              children: [Utils.formatNames(prenom), " "]
             }), _jsx("span", {
               className: css.lastName,
-              children: Utils.formatNames(lastname)
+              children: Utils.formatNames(nom)
             })]
-          }), activities && _jsxs("div", {
+          }), disciplines && _jsxs("div", {
             className: css.activities,
             children: [_jsx("div", {
               className: css.activitiesTitle,
               children: message(lang, "activities")
             }), _jsx("div", {
               className: css.activitiesList,
-              children: activities.map((activity, i) => {
+              children: disciplines.map((discipline, i) => {
                 const {
                   code,
                   label
-                } = activity;
-                const length = activities.length;
+                } = discipline;
+                const length = disciplines.length;
                 return _jsxs("span", {
                   className: css.activity,
                   children: [_jsx("span", {
@@ -119,19 +119,19 @@ export default function Sheet({
                 }, code);
               })
             })]
-          }), languages && _jsxs("div", {
+          }), langues && _jsxs("div", {
             className: css.languages,
             children: [_jsx("div", {
               className: css.languagesTitle,
               children: message(lang, "languages")
             }), _jsx("div", {
               className: css.languagesList,
-              children: languages.map((language, i) => {
+              children: langues.map((langue, i) => {
                 const {
                   code,
                   label
-                } = language;
-                const length = languages.length;
+                } = langue;
+                const length = langues.length;
                 return _jsxs("span", {
                   className: css.language,
                   children: [label, " ", i < length - 1 ? " - " : ""]
@@ -171,7 +171,7 @@ export default function Sheet({
         fields: formFields,
         className: css.form,
         innerClassName: css.formInner,
-        customSend: formSendFunction(firstname, lastname)
+        customSend: formSendFunction(prenom, nom)
       })]
     })]
   });

package/es/esf/components/instructors-book/utils.js

@@ -1,5 +1,51 @@
+const SLASH = "/";
+export function truncate(input, lenght = 140) {
+  return input.length > lenght ? `${input.substring(0, lenght)}...` : input;
+}
+export function sanitizeHTML(text) {
+  const element = document.createElement("div");
+  element.innerHTML = text;
+  return element.textContent;
+}
+export function propsFromQueryString() {
+  if (typeof window === "undefined") return {};
+  const params = new URLSearchParams(document.location.search);
+  const activity = params.get("activity") || undefined;
+  const language = params.get("language") || undefined;
+  return {
+    activity,
+    language
+  };
+}
+export function hasTrailingSlash(path) {
+  return path.length > 1 && path.endsWith(SLASH);
+}
 export const formatNames = name => {
   const lowercasedName = name && name.toLowerCase();
-  return lowercasedName.charAt(0).toUpperCase() + lowercasedName.slice(1);
+  return lowercasedName ? lowercasedName.charAt(0).toUpperCase() + lowercasedName.slice(1) : "";
 };
-export const includesString = (source, included) => source.toLowerCase().includes(included.toLowerCase());
+export function includesString(source, included) {
+  source.toLowerCase().includes(included.toLowerCase());
+}
+function strStartWith(str1, str2) {
+  return str1.toLowerCase().trim().startsWith(str2.toLowerCase().trim());
+}
+function strEquals(str1, str2) {
+  return str1.toLowerCase().trim() === str2.toLowerCase().trim();
+}
+function match(searchingArray, entries) {
+  return searchingArray.reduce((acc, str, index) => {
+    const matched = index === searchingArray.length - 1 ? strStartWith : strEquals;
+    return acc && entries.some(entry => matched(entry, str));
+  }, true);
+}
+export function filter(array, search = "") {
+  const searchingArray = search.split(" ");
+  const filtered = array.all ? array.all.filter(uri => {
+    const instructor = array.byUri[uri];
+    const firstnameWords = instructor.prenom.split(" ");
+    const lastnameWords = instructor.nom.split(" ");
+    return match(searchingArray, [...firstnameWords, ...lastnameWords]);
+  }) : [];
+  return filtered.reduce((acc, uri) => [...acc, array.byUri[uri]], []);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.17.7",
+  "version": "1.18.0",
   "peerDependencies": {
     "dt-design-system": "^2.9.0",
     "leaflet": "^1.9.1",

package/es/esf/components/instructor-suggestions/fetcher.js

@@ -1,16 +0,0 @@
-const buildHost = env => env === "dev" ? "http://localhost:9002" : env === "uat" ? "https://instructors-book-server-uat.carnet-rouge-esf.com" : "https://instructors-book-server.carnet-rouge-esf.com";
-export const fetchRandomInstructors = async (school, lang, tags, nbInstructor, env) => {
-  const res = await fetch(`${buildHost(env)}/api/instructors-book/${school}/${lang}/byTags`, {
-    method: "POST",
-    headers: {
-      "content-type": "application/json;charset=utf-8",
-      Authorization: "00q2qa545018261l252gg3414t3qa2",
-      schoolcode: school
-    },
-    body: JSON.stringify({
-      tags,
-      size: nbInstructor
-    })
-  });
-  return res.json();
-};