@lls/store 24.6.0-20da3b9c → 24.6.0-3c93fe5b

package/lib/index.js

@@ -742,7 +742,8 @@ var getToken = _.get("auth.token");
 
 // src/selectors/school.ts
 init_define_import_meta();
-import { makeEntitiesFilter } from "@lls/utils";
+import { makeEntitiesFilter, pipe } from "@lls/utils";
+import _2 from "lodash/fp.js";
 
 // src/selectors/crud.ts
 init_define_import_meta();
@@ -777,15 +778,21 @@ var makeUseSearch = (makeSearchElements) => {
 };
 
 // src/selectors/school.ts
-var search = ({ ids }) => makeEntitiesFilter({ id: ids });
+var search = ({ ids, academyIds, sortByQuery }) => {
+  return (schools) => pipe(
+    schools,
+    makeEntitiesFilter({ id: ids, academy: academyIds }),
+    _2.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _2.sortBy(sortByQuery) : _2.identity
+  );
+};
 var { getSchools, getSchool, useSearchSchools } = crud("schools", {
   search
 });
 
 // src/selectors/book.ts
 init_define_import_meta();
-import { createSearchSelector as createSearchSelector2, makeEntitiesFilter as makeEntitiesFilter2, makeGetEntityById as makeGetEntityById2, pipe } from "@lls/utils";
-import _2 from "lodash/fp.js";
+import { createSearchSelector as createSearchSelector2, makeEntitiesFilter as makeEntitiesFilter2, makeGetEntityById as makeGetEntityById2, pipe as pipe2 } from "@lls/utils";
+import _3 from "lodash/fp.js";
 var search2 = ({
   ids,
   levelIds,
@@ -803,7 +810,7 @@ var search2 = ({
   isRenewed,
   isPrimary
 }) => {
-  return (books) => pipe(
+  return (books) => pipe2(
     books,
     makeEntitiesFilter2({
       id: ids,
@@ -821,13 +828,13 @@ var search2 = ({
       isRenewed,
       isPrimary
     }),
-    _2.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _2.sortBy(sortByQuery) : _2.identity
+    _3.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _3.sortBy(sortByQuery) : _3.identity
   );
 };
 var { getBooks, getBook, filterBooks, useSearchBooks, makeSearchBooks } = crud("books", {
   search: search2
 });
-var makeSearchValidBooks = () => createSearchSelector2(makeSearchBooks(), (books) => _2.filter({ valid: true, hasNewDesign: true }, books));
+var makeSearchValidBooks = () => createSearchSelector2(makeSearchBooks(), (books) => _3.filter({ valid: true, hasNewDesign: true }, books));
 var useSearchValidBooks = makeUseSearch(makeSearchValidBooks);
 var makeGetBook = () => makeGetEntityById2("books");
 
@@ -847,18 +854,18 @@ var getCurrentUser = makeGetCurrentUser();
 
 // src/selectors/chapter.ts
 init_define_import_meta();
-import { makeEntitiesFilter as makeEntitiesFilter4, pipe as pipe2 } from "@lls/utils";
-import _3 from "lodash/fp.js";
-var search4 = ({ bookIds, ids, hasTeacherBook, sortByQuery }) => (chapters) => pipe2(
+import { makeEntitiesFilter as makeEntitiesFilter4, pipe as pipe3 } from "@lls/utils";
+import _4 from "lodash/fp.js";
+var search4 = ({ bookIds, ids, hasTeacherBook, sortByQuery }) => (chapters) => pipe3(
   chapters,
   makeEntitiesFilter4(
     {
       book: bookIds,
       id: ids
     },
-    !_3.isNil(hasTeacherBook) && ((chapter2) => !!chapter2?.teacherBook === hasTeacherBook)
+    !_4.isNil(hasTeacherBook) && ((chapter2) => !!chapter2?.teacherBook === hasTeacherBook)
   ),
-  _3.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _3.sortBy(sortByQuery) : _3.identity
+  _4.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _4.sortBy(sortByQuery) : _4.identity
 );
 var { getChapters, getChapter, useSearchChapters } = crud("chapters", {
   search: search4
@@ -866,8 +873,8 @@ var { getChapters, getChapter, useSearchChapters } = crud("chapters", {
 
 // src/selectors/page.ts
 init_define_import_meta();
-import { makeEntitiesFilter as makeEntitiesFilter5, pipe as pipe3 } from "@lls/utils";
-import _4 from "lodash/fp.js";
+import { makeEntitiesFilter as makeEntitiesFilter5, pipe as pipe4 } from "@lls/utils";
+import _5 from "lodash/fp.js";
 var search5 = ({
   ids,
   chapterIds,
@@ -892,7 +899,7 @@ var search5 = ({
   sortByQuery
 }) => {
   let pageById = false;
-  return (pages) => pipe3(
+  return (pages) => pipe4(
     pages,
     makeEntitiesFilter5(
       {
@@ -916,12 +923,12 @@ var search5 = ({
         isDraft
       },
       isParentCreatedFromScratch && ((page2, pages2) => {
-        pageById = pageById || _4.keyBy("id", pages2);
-        return !!_4.get([page2?.originalPage, "isCreatedFromScratch"], pageById);
+        pageById = pageById || _5.keyBy("id", pages2);
+        return !!_5.get([page2?.originalPage, "isCreatedFromScratch"], pageById);
       }),
-      updatedAfter && _4.flow(_4.get("updatedAt"), (date) => new Date(date).getTime() - updatedAfter.getTime() >= 0)
+      updatedAfter && _5.flow(_5.get("updatedAt"), (date) => new Date(date).getTime() - updatedAfter.getTime() >= 0)
     ),
-    _4.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _4.sortBy(sortByQuery) : _4.identity
+    _5.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _5.sortBy(sortByQuery) : _5.identity
   );
 };
 var { getPages, getPage, filterPages, useSearchPages, makeSearchPages } = crud("pages", {
@@ -935,8 +942,8 @@ var { useSearchPages: useSearchModifiedPages } = crud("pages", { search: searchM
 
 // src/selectors/collection.ts
 init_define_import_meta();
-import _5 from "lodash/fp.js";
-var search6 = (_params) => _5.identity;
+import _6 from "lodash/fp.js";
+var search6 = (_params) => _6.identity;
 var { getCollections, getCollection, useSearchCollections } = crud("collections", {
   search: search6
 });
@@ -959,8 +966,8 @@ var { getCommunityProjects, getCommunityProject, useSearchCommunityProjects } =
 
 // src/selectors/contact.ts
 init_define_import_meta();
-import _6 from "lodash/fp.js";
-var search8 = (_params) => _6.identity;
+import _7 from "lodash/fp.js";
+var search8 = (_params) => _7.identity;
 var { getContacts, getContact, useSearchContacts } = crud("contacts", {
   search: search8
 });
@@ -972,7 +979,7 @@ var search9 = ({ ids, read, pageIds }) => {
   return makeEntitiesFilter7({ read, id: ids, page: pageIds });
 };
 var makeSearchCopyNotifications = () => createSearchSelector3(
-  [makeGetCurrentUser(), makeGetAllEntities2("copyNotifications"), (_18, params) => params],
+  [makeGetCurrentUser(), makeGetAllEntities2("copyNotifications"), (_19, params) => params],
   (currentUser, copyNotifications, { pageIds, read }) => {
     const ids = currentUser?.copyNotifications;
     return search9({ ids, read, pageIds })(copyNotifications);
@@ -1000,7 +1007,7 @@ var search11 = ({ ids, read, pageIds }) => {
   return makeEntitiesFilter9({ read, id: ids, page: pageIds });
 };
 var makeSearchDrawerNotifications = () => createSearchSelector4(
-  [makeGetCurrentUser(), makeGetAllEntities3("drawerNotifications"), (_18, params) => params],
+  [makeGetCurrentUser(), makeGetAllEntities3("drawerNotifications"), (_19, params) => params],
   (currentUser, drawerNotifications, { read, pageIds }) => {
     const ids = currentUser?.drawerNotifications;
     return search11({ ids, read, pageIds })(drawerNotifications);
@@ -1015,8 +1022,8 @@ var getFaqs = makeGetAllEntities4("faq");
 
 // src/selectors/garDivision.ts
 init_define_import_meta();
-import _7 from "lodash/fp.js";
-var search12 = (_params) => _7.identity;
+import _8 from "lodash/fp.js";
+var search12 = (_params) => _8.identity;
 var { getGarDivisions, getGarDivision, useSearchGarDivisions } = crud("garDivisions", {
   search: search12
 });
@@ -1025,8 +1032,8 @@ var { getGarDivisions, getGarDivision, useSearchGarDivisions } = crud("garDivisi
 init_define_import_meta();
 var import_reselect2 = __toESM(require_lib(), 1);
 import { makeEntitiesFilter as makeEntitiesFilter10 } from "@lls/utils";
-import _8 from "lodash/fp.js";
-var search13 = ({ ownerIds }) => _8.flow(makeEntitiesFilter10({ owner: ownerIds }), _8.orderBy("createdAt", ["desc"]));
+import _9 from "lodash/fp.js";
+var search13 = ({ ownerIds }) => _9.flow(makeEntitiesFilter10({ owner: ownerIds }), _9.orderBy("createdAt", ["desc"]));
 var { getGroups, getGroup, useSearchGroups } = crud("groups", {
   search: search13
 });
@@ -1039,7 +1046,7 @@ var getUserGroups = (0, import_reselect2.createSelector)(
 init_define_import_meta();
 var import_reselect3 = __toESM(require_lib(), 1);
 import { makeEntitiesFilter as makeEntitiesFilter11 } from "@lls/utils";
-import _9 from "lodash/fp.js";
+import _10 from "lodash/fp.js";
 var search14 = ({
   ids,
   slugs,
@@ -1049,7 +1056,7 @@ var search14 = ({
   isProHighSchool,
   isGenHighSchool,
   isElementarySchool
-}) => _9.flow(
+}) => _10.flow(
   makeEntitiesFilter11({
     id: ids,
     slug: slugs,
@@ -1060,20 +1067,20 @@ var search14 = ({
     isGenHighSchool,
     isElementarySchool
   }),
-  _9.orderBy("order", "desc")
+  _10.orderBy("order", "desc")
 );
 var crudLevels = crud("levels", { search: search14 });
 var { getLevel, useSearchLevels } = crudLevels;
-var getLevels = (0, import_reselect3.createSelector)(crudLevels.getLevels, _9.orderBy("order", "desc"));
+var getLevels = (0, import_reselect3.createSelector)(crudLevels.getLevels, _10.orderBy("order", "desc"));
 
 // src/selectors/mainNotification.ts
 init_define_import_meta();
 var import_reselect4 = __toESM(require_lib(), 1);
 import { makeEntitiesFilter as makeEntitiesFilter12, makeGetAllEntities as makeGetAllEntities5 } from "@lls/utils";
-import _10 from "lodash/fp.js";
+import _11 from "lodash/fp.js";
 var search15 = ({ ids }) => makeEntitiesFilter12({ id: ids });
 var getMainNotifications = (0, import_reselect4.createSelector)(
-  [_10.flow(makeGetCurrentUser(), _10.get("mainNotifications")), makeGetAllEntities5("mainNotifications")],
+  [_11.flow(makeGetCurrentUser(), _11.get("mainNotifications")), makeGetAllEntities5("mainNotifications")],
   (userNotifications, notifications) => search15({ ids: userNotifications })(notifications)
 );
 
@@ -1112,7 +1119,7 @@ var { getLexicalFlowers, useSearchLexicalFlowers } = crud("lexicalFlowers", {
 
 // src/selectors/product.ts
 init_define_import_meta();
-import _11 from "lodash/fp.js";
+import _12 from "lodash/fp.js";
 import { createSearchSelector as createSearchSelector5, makeEntitiesFilter as makeEntitiesFilter16, makeGetAllEntities as makeGetAllEntities6 } from "@lls/utils";
 var getProducts = makeGetAllEntities6("products");
 var search19 = ({
@@ -1136,7 +1143,7 @@ var search19 = ({
     levelIds || subjectIds ? (product2) => !!product2?.books?.some((bookId) => bookIds.has(bookId)) : false
   );
   return (products, books) => {
-    bookIds = new Set(_11.flow(_11.map("id"), _11.map(_11.parseInt(10)))(books));
+    bookIds = new Set(_12.flow(_12.map("id"), _12.map(_12.parseInt(10)))(books));
     return filter(products);
   };
 };
@@ -1172,7 +1179,7 @@ var { getSchoolTypes, getSchoolType, useSearchSchoolTypes, makeSearchSchoolTypes
 // src/selectors/sharedPage.ts
 init_define_import_meta();
 import { createSearchSelector as createSearchSelector6, makeEntitiesFilter as makeEntitiesFilter19 } from "@lls/utils";
-import _12 from "lodash/fp.js";
+import _13 from "lodash/fp.js";
 var search22 = ({
   parentIds,
   userIds,
@@ -1197,7 +1204,7 @@ var makeSearchCurrentUserSharedPages = () => createSearchSelector6(
   (__, params) => params,
   (user2, sharedPages, params) => {
     const sharedUserPageIds = user2?.sharedPages ?? [];
-    return search22({ ...params, ids: _12.intersection(sharedUserPageIds, params.ids || sharedUserPageIds) })(sharedPages);
+    return search22({ ...params, ids: _13.intersection(sharedUserPageIds, params.ids || sharedUserPageIds) })(sharedPages);
   }
 );
 var useSearchCurrentUserSharedPages = makeUseSearch(makeSearchCurrentUserSharedPages);
@@ -1212,8 +1219,8 @@ var { getStudents, getStudent, useSearchStudents } = crud("students", {
 
 // src/selectors/subject.ts
 init_define_import_meta();
-import { limitToTeacherSubjects, makeEntitiesFilter as makeEntitiesFilter21, pipe as pipe4 } from "@lls/utils";
-import _13 from "lodash/fp.js";
+import { limitToTeacherSubjects, makeEntitiesFilter as makeEntitiesFilter21, pipe as pipe5 } from "@lls/utils";
+import _14 from "lodash/fp.js";
 var search24 = ({
   ids,
   slugs,
@@ -1223,7 +1230,7 @@ var search24 = ({
   hasBooks,
   names,
   sortByQuery
-}) => (subjects) => pipe4(
+}) => (subjects) => pipe5(
   subjects,
   makeEntitiesFilter21(
     {
@@ -1233,10 +1240,10 @@ var search24 = ({
       hasBooks,
       schoolTypes
     },
-    !_13.isNil(hasNewsletterUrl) && ((subject2) => Boolean(subject2?.newsletterUrl) === hasNewsletterUrl)
+    !_14.isNil(hasNewsletterUrl) && ((subject2) => Boolean(subject2?.newsletterUrl) === hasNewsletterUrl)
   ),
-  (subjects2) => _13.isNil(isTeacherSubject) ? subjects2 : limitToTeacherSubjects(subjects2),
-  _13.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _13.sortBy(sortByQuery) : _13.identity
+  (subjects2) => _14.isNil(isTeacherSubject) ? subjects2 : limitToTeacherSubjects(subjects2),
+  _14.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _14.sortBy(sortByQuery) : _14.identity
 );
 var { getSubjects, getSubject, useSearchSubjects, makeSearchSubjects } = crud("subjects", {
   search: search24
@@ -1289,8 +1296,8 @@ var { getBuilderIos, getBuilderIo, useSearchBuilderIos } = crud("builderIos", {
 
 // src/selectors/circonscription.ts
 init_define_import_meta();
-import _14 from "lodash/fp.js";
-var search29 = (_params) => _14.identity;
+import _15 from "lodash/fp.js";
+var search29 = (_params) => _15.identity;
 var { getCirconscriptions } = crud("circonscriptions", {
   search: search29
 });
@@ -1298,7 +1305,7 @@ var { getCirconscriptions } = crud("circonscriptions", {
 // src/reducers/entities.ts
 init_define_import_meta();
 import { makeReducer } from "@lls/utils";
-import _15 from "lodash/fp.js";
+import _16 from "lodash/fp.js";
 
 // src/actions/index.ts
 init_define_import_meta();
@@ -1321,16 +1328,16 @@ var resetAuth = makeActionCreator(actionTypes.RESET_AUTH);
 // src/reducers/entities.ts
 var deleteEntityReducer = (state, payload) => {
   const { path } = payload;
-  return _15.omit(path, state);
+  return _16.omit(path, state);
 };
 var updateEntityReducer = (state, payload) => {
   const { path, entity } = payload;
-  const currentEntity = _15.get(path, state);
-  return _15.set(path, _15.merge(currentEntity, entity), state);
+  const currentEntity = _16.get(path, state);
+  return _16.set(path, _16.merge(currentEntity, entity), state);
 };
 var setEntityReducer = (state, payload) => {
   const { path, entity } = payload;
-  return _15.set(path, entity, state);
+  return _16.set(path, entity, state);
 };
 var setEntitiesReducer = (state, payload) => {
   if (typeof payload !== "object") return state;
@@ -1351,7 +1358,7 @@ var setEntitiesReducer = (state, payload) => {
         }
         const diff = Object.keys(entity).some((prop) => {
           const value = entity[prop];
-          if (!_15.isEqual(state[entityName]?.[id]?.[prop], value)) {
+          if (!_16.isEqual(state[entityName]?.[id]?.[prop], value)) {
             return true;
           }
         });
@@ -1383,7 +1390,7 @@ var entities_default = entities;
 // src/reducers/auth.ts
 init_define_import_meta();
 import { makeReducer as makeReducer2 } from "@lls/utils";
-import _16 from "lodash/fp.js";
+import _17 from "lodash/fp.js";
 var initialState = {
   id: void 0,
   role: null,
@@ -1396,15 +1403,15 @@ var initialState = {
   llsUserId: null
 };
 var auth = makeReducer2(initialState, {
-  [actionTypes.SET_AUTH]: _16.assign,
-  [actionTypes.RESET_AUTH]: _16.constant(initialState)
+  [actionTypes.SET_AUTH]: _17.assign,
+  [actionTypes.RESET_AUTH]: _17.constant(initialState)
 });
 var auth_default = auth;
 
 // src/schema/index.ts
 init_define_import_meta();
 var import_normalizr = __toESM(require_normalizr(), 1);
-import _17 from "lodash/fp.js";
+import _18 from "lodash/fp.js";
 var document = new import_normalizr.schema.Entity("documents", {}, { idAttribute: "resourceId" });
 var subject = new import_normalizr.schema.Entity("subjects");
 var level = new import_normalizr.schema.Entity("levels");
@@ -1610,7 +1617,7 @@ var querySchema = {
     }
   }
 };
-var normalizeData = _17.flow((data) => (0, import_normalizr.normalize)(data, querySchema));
+var normalizeData = _18.flow((data) => (0, import_normalizr.normalize)(data, querySchema));
 export {
   auth_default as authReducer,
   entities_default as entitiesReducer,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@lls/store",
   "description": "model de donnée et selecteurs",
   "homepage": "https://github.com/lelivrescolaire/monorepo/tree/dev/libs/store",
-  "version": "24.6.0-20da3b9c",
+  "version": "24.6.0-3c93fe5b",
   "type": "module",
   "types": "./lib/builttypes/store/src/index.d.ts",
   "exports": {
@@ -49,8 +49,8 @@
     "vite": "5.4.10",
     "vite-tsconfig-paths": "5.1.0",
     "vitest": "2.1.4",
-    "@lls/utils": "24.6.0-20da3b9c",
-    "@lls/vitescripts": "24.6.0-20da3b9c"
+    "@lls/utils": "24.6.0-3c93fe5b",
+    "@lls/vitescripts": "24.6.0-3c93fe5b"
   },
   "license": "ISC",
   "dependencies": {