@lls/store 24.7.0 → 24.8.0-0530ef1e

package/lib/index.js

@@ -750,12 +750,12 @@ init_define_import_meta();
 import { createSearchSelector, makeGetAllEntities, makeGetEntityById } from "@lls/utils";
 import { useMemo } from "react";
 import { useSelector } from "react-redux";
-var crud = (entityName, { search: search30 }) => {
+var crud = (entityName, { search: search31 }) => {
   const getElements = makeGetAllEntities(entityName);
   const makeSearchElements = () => createSearchSelector(
     makeGetAllEntities(entityName),
     (_state, params) => params,
-    (elements, params) => search30(params)(elements)
+    (elements, params) => search31(params)(elements)
   );
   const methodName = `${entityName.charAt(0).toUpperCase()}${entityName.slice(1)}`;
   const getElementById = makeGetEntityById(entityName);
@@ -765,7 +765,7 @@ var crud = (entityName, { search: search30 }) => {
     [`search${methodName}`]: makeSearchElements(),
     [`get${methodName.replace(/s$/, "")}`]: getElementById,
     [`makeSearch${methodName}`]: makeSearchElements,
-    [`filter${methodName}`]: search30,
+    [`filter${methodName}`]: search31,
     [`useSearch${methodName}`]: useSearch
   };
   return back;
@@ -979,7 +979,7 @@ var search9 = ({ ids, read, pageIds }) => {
   return makeEntitiesFilter7({ read, id: ids, page: pageIds });
 };
 var makeSearchCopyNotifications = () => createSearchSelector3(
-  [makeGetCurrentUser(), makeGetAllEntities2("copyNotifications"), (_19, params) => params],
+  [makeGetCurrentUser(), makeGetAllEntities2("copyNotifications"), (_20, params) => params],
   (currentUser, copyNotifications, { pageIds, read }) => {
     const ids = currentUser?.copyNotifications;
     return search9({ ids, read, pageIds })(copyNotifications);
@@ -990,10 +990,21 @@ var useSearchCopyNotifications = makeUseSearch(makeSearchCopyNotifications);
 // src/selectors/document.ts
 init_define_import_meta();
 import { makeEntitiesFilter as makeEntitiesFilter8 } from "@lls/utils";
-var search10 = ({ ids, resourceIds }) => {
+var search10 = ({
+  ids,
+  uuids,
+  resourceIds,
+  levelIds,
+  formats,
+  documentTypes
+}) => {
   return makeEntitiesFilter8({
     id: ids,
-    resourceId: resourceIds
+    resourceId: resourceIds,
+    levels: levelIds,
+    uuidV2: uuids,
+    format: formats,
+    documentType: documentTypes
   });
 };
 var { useSearchDocuments } = crud("documents", {
@@ -1007,7 +1018,7 @@ var search11 = ({ ids, read, pageIds }) => {
   return makeEntitiesFilter9({ read, id: ids, page: pageIds });
 };
 var makeSearchDrawerNotifications = () => createSearchSelector4(
-  [makeGetCurrentUser(), makeGetAllEntities3("drawerNotifications"), (_19, params) => params],
+  [makeGetCurrentUser(), makeGetAllEntities3("drawerNotifications"), (_20, params) => params],
   (currentUser, drawerNotifications, { read, pageIds }) => {
     const ids = currentUser?.drawerNotifications;
     return search11({ ids, read, pageIds })(drawerNotifications);
@@ -1045,9 +1056,22 @@ var getUserGroups = (0, import_reselect2.createSelector)(
 // src/selectors/level.ts
 init_define_import_meta();
 var import_reselect3 = __toESM(require_lib(), 1);
-import { makeEntitiesFilter as makeEntitiesFilter11 } from "@lls/utils";
+import { createSearchSelector as createSearchSelector5, makeEntitiesFilter as makeEntitiesFilter12, makeGetAllEntities as makeGetAllEntities5 } from "@lls/utils";
 import _10 from "lodash/fp.js";
-var search14 = ({
+
+// src/selectors/schoolType.ts
+init_define_import_meta();
+import { makeEntitiesFilter as makeEntitiesFilter11 } from "@lls/utils";
+var search14 = ({ slugs }) => makeEntitiesFilter11({ slug: slugs });
+var { getSchoolTypes, getSchoolType, useSearchSchoolTypes, makeSearchSchoolTypes, searchSchoolTypes } = crud(
+  "schoolTypes",
+  {
+    search: search14
+  }
+);
+
+// src/selectors/level.ts
+var search15 = ({
   ids,
   slugs,
   isPreSchool,
@@ -1055,9 +1079,10 @@ var search14 = ({
   isHighSchool,
   isProHighSchool,
   isGenHighSchool,
-  isElementarySchool
+  isElementarySchool,
+  schoolTypes
 }) => _10.flow(
-  makeEntitiesFilter11({
+  makeEntitiesFilter12({
     id: ids,
     slug: slugs,
     isPreSchool,
@@ -1065,35 +1090,49 @@ var search14 = ({
     isHighSchool,
     isProHighSchool,
     isGenHighSchool,
-    isElementarySchool
+    isElementarySchool,
+    schoolTypes
   }),
   _10.orderBy("order", "desc")
 );
-var crudLevels = crud("levels", { search: search14 });
-var { getLevel, useSearchLevels } = crudLevels;
-var getLevels = (0, import_reselect3.createSelector)(crudLevels.getLevels, _10.orderBy("order", "desc"));
+var makeSearchLevels = () => {
+  const searchSchoolTypes2 = makeSearchSchoolTypes();
+  return createSearchSelector5(
+    makeGetAllEntities5("levels"),
+    (state, { schoolTypes }) => schoolTypes ? searchSchoolTypes2(state, { slugs: schoolTypes }) : void 0,
+    (_state, params) => params,
+    (levels, schoolTypes, params) => search15({ ...params, schoolTypes: schoolTypes?.length ? schoolTypes?.map(({ id }) => id) : void 0 })(levels)
+  );
+};
+var crudLevels = crud("levels", { search: search15 });
+var { getLevel, searchLevels } = crudLevels;
+var getLevels = (0, import_reselect3.createSelector)(
+  crudLevels.getLevels,
+  _10.orderBy("order", "desc")
+);
+var useSearchLevels = makeUseSearch(makeSearchLevels);
 
 // 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 { makeEntitiesFilter as makeEntitiesFilter13, makeGetAllEntities as makeGetAllEntities6 } from "@lls/utils";
 import _11 from "lodash/fp.js";
-var search15 = ({ ids }) => makeEntitiesFilter12({ id: ids });
+var search16 = ({ ids }) => makeEntitiesFilter13({ id: ids });
 var getMainNotifications = (0, import_reselect4.createSelector)(
-  [_11.flow(makeGetCurrentUser(), _11.get("mainNotifications")), makeGetAllEntities5("mainNotifications")],
-  (userNotifications, notifications) => search15({ ids: userNotifications })(notifications)
+  [_11.flow(makeGetCurrentUser(), _11.get("mainNotifications")), makeGetAllEntities6("mainNotifications")],
+  (userNotifications, notifications) => search16({ ids: userNotifications })(notifications)
 );
 
 // src/selectors/news.ts
 init_define_import_meta();
-import { makeEntitiesFilter as makeEntitiesFilter13 } from "@lls/utils";
-var search16 = ({ ids }) => makeEntitiesFilter13({ id: ids });
+import { makeEntitiesFilter as makeEntitiesFilter14 } from "@lls/utils";
+var search17 = ({ ids }) => makeEntitiesFilter14({ id: ids });
 var {
   getNews: getAllNews,
   getNew: getNews,
   useSearchNews
 } = crud("news", {
-  search: search16
+  search: search17
 });
 
 // src/selectors/panorama.ts
@@ -1103,26 +1142,26 @@ var getPanorama = makeGetEntityById3("panoramas");
 
 // src/selectors/premiumResource.ts
 init_define_import_meta();
-import { makeEntitiesFilter as makeEntitiesFilter14 } from "@lls/utils";
-var search17 = ({ bookIds }) => makeEntitiesFilter14({ book: bookIds });
+import { makeEntitiesFilter as makeEntitiesFilter15 } from "@lls/utils";
+var search18 = ({ bookIds }) => makeEntitiesFilter15({ book: bookIds });
 var { getPremiumResources, getPremiumResource, useSearchPremiumResources } = crud("premiumResources", {
-  search: search17
+  search: search18
 });
 
 // src/selectors/lexicalFlower.ts
 init_define_import_meta();
-import { makeEntitiesFilter as makeEntitiesFilter15 } from "@lls/utils";
-var search18 = ({ ids }) => makeEntitiesFilter15({ id: ids });
+import { makeEntitiesFilter as makeEntitiesFilter16 } from "@lls/utils";
+var search19 = ({ ids }) => makeEntitiesFilter16({ id: ids });
 var { getLexicalFlowers, useSearchLexicalFlowers } = crud("lexicalFlowers", {
-  search: search18
+  search: search19
 });
 
 // src/selectors/product.ts
 init_define_import_meta();
 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 = ({
+import { createSearchSelector as createSearchSelector6, makeEntitiesFilter as makeEntitiesFilter17, makeGetAllEntities as makeGetAllEntities7 } from "@lls/utils";
+var getProducts = makeGetAllEntities7("products");
+var search20 = ({
   ids,
   eans,
   isAdoptant,
@@ -1132,7 +1171,7 @@ var search19 = ({
   productTypes
 }) => {
   let bookIds;
-  const filter = makeEntitiesFilter16(
+  const filter = makeEntitiesFilter17(
     {
       id: ids,
       ean: eans,
@@ -1149,36 +1188,28 @@ var search19 = ({
 };
 var makeSearchProducts = () => {
   const searchBooks = makeSearchBooks();
-  return createSearchSelector5(
-    makeGetAllEntities6("products"),
+  return createSearchSelector6(
+    makeGetAllEntities7("products"),
     (state, { levelIds, subjectIds }) => searchBooks(state, { levelIds, subjectIds }),
     (_state, params) => params,
-    (products, books, params) => search19(params)(products, books)
+    (products, books, params) => search20(params)(products, books)
   );
 };
 var useSearchProducts = makeUseSearch(makeSearchProducts);
 
 // src/selectors/resource.ts
 init_define_import_meta();
-import { makeEntitiesFilter as makeEntitiesFilter17 } from "@lls/utils";
-var search20 = ({ chapterIds }) => makeEntitiesFilter17({
+import { makeEntitiesFilter as makeEntitiesFilter18 } from "@lls/utils";
+var search21 = ({ chapterIds }) => makeEntitiesFilter18({
   chapter: chapterIds
 });
 var { getResources, getResource, useSearchResources } = crud("resources", {
-  search: search20
-});
-
-// src/selectors/schoolType.ts
-init_define_import_meta();
-import { makeEntitiesFilter as makeEntitiesFilter18 } from "@lls/utils";
-var search21 = ({ slugs }) => makeEntitiesFilter18({ slug: slugs });
-var { getSchoolTypes, getSchoolType, useSearchSchoolTypes, makeSearchSchoolTypes } = crud("schoolTypes", {
   search: search21
 });
 
 // src/selectors/sharedPage.ts
 init_define_import_meta();
-import { createSearchSelector as createSearchSelector6, makeEntitiesFilter as makeEntitiesFilter19 } from "@lls/utils";
+import { createSearchSelector as createSearchSelector7, makeEntitiesFilter as makeEntitiesFilter19 } from "@lls/utils";
 import _13 from "lodash/fp.js";
 var search22 = ({
   parentIds,
@@ -1198,7 +1229,7 @@ var search22 = ({
 var { getSharedPages, getSharedPage, useSearchSharedPages } = crud("sharedPages", {
   search: search22
 });
-var makeSearchCurrentUserSharedPages = () => createSearchSelector6(
+var makeSearchCurrentUserSharedPages = () => createSearchSelector7(
   getCurrentUser,
   getSharedPages,
   (__, params) => params,
@@ -1302,10 +1333,18 @@ var { getCirconscriptions } = crud("circonscriptions", {
   search: search29
 });
 
+// src/selectors/documentType.ts
+init_define_import_meta();
+import _16 from "lodash/fp.js";
+var search30 = (_params) => _16.identity;
+var { getDocumentTypes, getDocumentType } = crud("documentTypes", {
+  search: search30
+});
+
 // src/reducers/entities.ts
 init_define_import_meta();
 import { makeReducer } from "@lls/utils";
-import _16 from "lodash/fp.js";
+import _17 from "lodash/fp.js";
 
 // src/actions/index.ts
 init_define_import_meta();
@@ -1328,16 +1367,16 @@ var resetAuth = makeActionCreator(actionTypes.RESET_AUTH);
 // src/reducers/entities.ts
 var deleteEntityReducer = (state, payload) => {
   const { path } = payload;
-  return _16.omit(path, state);
+  return _17.omit(path, state);
 };
 var updateEntityReducer = (state, payload) => {
   const { path, entity } = payload;
-  const currentEntity = _16.get(path, state);
-  return _16.set(path, _16.merge(currentEntity, entity), state);
+  const currentEntity = _17.get(path, state);
+  return _17.set(path, _17.merge(currentEntity, entity), state);
 };
 var setEntityReducer = (state, payload) => {
   const { path, entity } = payload;
-  return _16.set(path, entity, state);
+  return _17.set(path, entity, state);
 };
 var setEntitiesReducer = (state, payload) => {
   if (typeof payload !== "object") return state;
@@ -1358,7 +1397,7 @@ var setEntitiesReducer = (state, payload) => {
         }
         const diff = Object.keys(entity).some((prop) => {
           const value = entity[prop];
-          if (!_16.isEqual(state[entityName]?.[id]?.[prop], value)) {
+          if (!_17.isEqual(state[entityName]?.[id]?.[prop], value)) {
             return true;
           }
         });
@@ -1390,7 +1429,7 @@ var entities_default = entities;
 // src/reducers/auth.ts
 init_define_import_meta();
 import { makeReducer as makeReducer2 } from "@lls/utils";
-import _17 from "lodash/fp.js";
+import _18 from "lodash/fp.js";
 var initialState = {
   id: void 0,
   role: null,
@@ -1403,16 +1442,18 @@ var initialState = {
   llsUserId: null
 };
 var auth = makeReducer2(initialState, {
-  [actionTypes.SET_AUTH]: _17.assign,
-  [actionTypes.RESET_AUTH]: _17.constant(initialState)
+  [actionTypes.SET_AUTH]: _18.assign,
+  [actionTypes.RESET_AUTH]: _18.constant(initialState)
 });
 var auth_default = auth;
 
 // src/schema/index.ts
 init_define_import_meta();
 var import_normalizr = __toESM(require_normalizr(), 1);
-import _18 from "lodash/fp.js";
-var document = new import_normalizr.schema.Entity("documents", {}, { idAttribute: "resourceId" });
+import _19 from "lodash/fp.js";
+var document = new import_normalizr.schema.Entity("documents");
+var documentType = new import_normalizr.schema.Entity("documentTypes");
+var subDocumentType = new import_normalizr.schema.Entity("subDocumentTypes");
 var subject = new import_normalizr.schema.Entity("subjects");
 var level = new import_normalizr.schema.Entity("levels");
 var book = new import_normalizr.schema.Entity("books");
@@ -1471,8 +1512,14 @@ var garDivisionSchema = define(garDivision, {
   students: [user],
   school
 });
+var documentTypeSchema = define(documentType, {
+  subDocumentType
+});
 var documentSchema = define(document, {
-  page
+  page,
+  levels: [level],
+  documentType,
+  subDocumentType
 });
 var chapterSchema = define(chapter, {
   book,
@@ -1562,6 +1609,9 @@ var newsSchema = define(news, {
 var premiumResourceSchema = define(premiumResource, {
   book
 });
+var levelSchema = define(level, {
+  schoolTypes: [schoolType]
+});
 var querySchema = {
   viewer: {
     addCorrectionsToGroup: group,
@@ -1577,6 +1627,8 @@ var querySchema = {
     createUser: user,
     createLexicalFlower: lexicalFlower,
     documents: { hits: [document] },
+    documentTypes: { hits: [documentType] },
+    subDocumentTypes: { hits: [subDocumentType] },
     explorerResults: [explorerResult],
     levels: [level],
     me: user,
@@ -1617,7 +1669,7 @@ var querySchema = {
     }
   }
 };
-var normalizeData = _18.flow((data) => (0, import_normalizr.normalize)(data, querySchema));
+var normalizeData = _19.flow((data) => (0, import_normalizr.normalize)(data, querySchema));
 export {
   auth_default as authReducer,
   entities_default as entitiesReducer,
@@ -1639,6 +1691,8 @@ export {
   getContact,
   getContacts,
   getCurrentUser,
+  getDocumentType,
+  getDocumentTypes,
   getDraft,
   getDrafts,
   getFaqs,
@@ -1683,6 +1737,7 @@ export {
   makeGetCurrentUser,
   makeSearchBooks,
   makeSearchDrawerNotifications,
+  makeSearchLevels,
   makeSearchPages,
   makeSearchSchoolTypes,
   makeSearchSubjects,
@@ -1690,6 +1745,8 @@ export {
   makeUseSearch,
   normalizeData,
   querySchema,
+  searchLevels,
+  searchSchoolTypes,
   setEntitiesReducer,
   useSearchBooks,
   useSearchBuilderIos,

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.7.0",
+  "version": "24.8.0-0530ef1e",
   "type": "module",
   "types": "./lib/builttypes/store/src/index.d.ts",
   "exports": {
@@ -46,11 +46,10 @@
     "redux": "5.0.1",
     "reselect": "4.1.8",
     "typescript": "5.6.3",
-    "vite": "5.4.10",
-    "vite-tsconfig-paths": "5.1.1",
-    "vitest": "2.1.4",
-    "@lls/utils": "24.7.0",
-    "@lls/vitescripts": "24.7.0"
+    "vite": "5.4.11",
+    "vite-tsconfig-paths": "5.1.3",
+    "@lls/utils": "24.8.0-0530ef1e",
+    "@lls/vitescripts": "24.8.0-0530ef1e"
   },
   "license": "ISC",
   "dependencies": {
@@ -60,7 +59,6 @@
     "build": "node build.mjs",
     "lint": "pnpm biome check --apply src __tests__",
     "dts": "pnpm tsc --project tsconfig.production.json",
-    "test": "pnpm vitest run",
-    "v2test": "bun test"
+    "test": "bun test"
   }
 }