@lls/store 24.1.67-bdf1676c → 24.1.67-c17f13d8

package/lib/builttypes/store/src/selectors/book.d.ts

@@ -10,7 +10,7 @@ type SearchParams = AllowUndefined<Pick<Book, 'isWorkbook' | 'isWorkplan' | 'has
     uris?: Book['uri'][];
     isValid?: Book['valid'];
     hasNoTeacherBook?: boolean;
-    sortByQuery?: ((a: Book[]) => Book[]) | keyof Book;
+    sortByQuery?: ((a: Book, b: Book) => boolean) | keyof Book;
     publishers?: Publisher[];
 }>;
 declare const getBooks: (state: import("@lls/utils").TState<Book>) => Book[], getBook: (state: import("@lls/utils").TState<Book>, entityId: number | string | undefined | null) => Book | undefined, filterBooks: ({ ids, levelIds, subjectIds, years, isValid, isWorkbook, isWorkplan, hasNoTeacherBook, sortByQuery, hasNewDesign, slugs, uris, publishers, isRenewed, isPrimary }: SearchParams) => ((books: Book[]) => Book[]), useSearchBooks: (params: {

package/lib/builttypes/store/src/selectors/page.d.ts

@@ -8,9 +8,8 @@ type SearchParams = AllowUndefined<Pick<Page, 'isOriginal' | 'hasNewDesign' | 'p
     oldLessonIds?: Page['oldLesson'][];
     bookIds?: Page['book'][];
     thematicNames: Page['thematicName'][];
-    sortByQuery?: (a: Page[]) => Page[] | keyof Page;
 }>;
-export declare const getPages: (state: import("@lls/utils").TState<Page>) => Page[], getPage: (state: import("@lls/utils").TState<Page>, entityId: number | string | undefined | null) => Page | undefined, filterPages: ({ ids, chapterIds, isValid, oldLessonIds, premium, thematicNames, bookIds, isOriginal, hasNewDesign, slugs, isLearningAssessment, isCreatedFromScratch, userIds, parentIds, originalPageIds, sharedUserIds, sharedGroups, isDraft, isParentCreatedFromScratch, updatedAfter, sortByQuery }: SearchParams & SearchModifiedPagesParams) => ((pages: Page[]) => Page[]), useSearchPages: (params: {
+export declare const getPages: (state: import("@lls/utils").TState<Page>) => Page[], getPage: (state: import("@lls/utils").TState<Page>, entityId: number | string | undefined | null) => Page | undefined, filterPages: ({ ids, chapterIds, isValid, oldLessonIds, premium, thematicNames, bookIds, isOriginal, hasNewDesign, slugs, isLearningAssessment, isCreatedFromScratch, userIds, parentIds, originalPageIds, sharedUserIds, sharedGroups, isDraft, isParentCreatedFromScratch, updatedAfter }: SearchParams & SearchModifiedPagesParams) => ((pages: Page[]) => Page[]), useSearchPages: (params: {
     hasNewDesign?: boolean | undefined;
     isOriginal?: boolean | undefined;
     premium?: boolean | null | undefined;
@@ -23,7 +22,6 @@ export declare const getPages: (state: import("@lls/utils").TState<Page>) => Pag
     oldLessonIds?: Page["oldLesson"][] | undefined;
     bookIds?: Page["book"][] | undefined;
     thematicNames?: (string | undefined)[] | undefined;
-    sortByQuery?: {} | undefined;
 } & SearchModifiedPagesParams) => Page[], makeSearchPages: () => ((state: import("../types/store").EntitiesState, params: {
     hasNewDesign?: boolean | undefined;
     isOriginal?: boolean | undefined;
@@ -37,7 +35,6 @@ export declare const getPages: (state: import("@lls/utils").TState<Page>) => Pag
     oldLessonIds?: Page["oldLesson"][] | undefined;
     bookIds?: Page["book"][] | undefined;
     thematicNames?: (string | undefined)[] | undefined;
-    sortByQuery?: {} | undefined;
 } & SearchModifiedPagesParams) => Page[]) & import("reselect").OutputSelectorFields<(args_0: Page[], args_1: {
     hasNewDesign?: boolean | undefined;
     isOriginal?: boolean | undefined;
@@ -51,7 +48,6 @@ export declare const getPages: (state: import("@lls/utils").TState<Page>) => Pag
     oldLessonIds?: Page["oldLesson"][] | undefined;
     bookIds?: Page["book"][] | undefined;
     thematicNames?: (string | undefined)[] | undefined;
-    sortByQuery?: {} | undefined;
 } & SearchModifiedPagesParams) => Page[], {
     clearCache: () => void;
 }> & {
@@ -70,7 +66,6 @@ export declare const getDrafts: (state: import("@lls/utils").TState<Page>) => Pa
     oldLessonIds?: Page["oldLesson"][] | undefined;
     bookIds?: Page["book"][] | undefined;
     thematicNames?: (string | undefined)[] | undefined;
-    sortByQuery?: {} | undefined;
 } & SearchModifiedPagesParams) => Page[];
 type SearchModifiedPagesParams = {
     chapterIds?: Page['chapter'][];

package/lib/builttypes/store/src/selectors/subject.d.ts

@@ -7,7 +7,7 @@ export declare const getSubjects: (state: import("@lls/utils").TState<Subject>)
     schoolTypes?: (string | undefined)[] | undefined;
     hasBooks?: Subject["hasBooks"];
     names?: ("Autre" | "Design et métiers d'art" | "Langues et cultures de l'Antiquité" | "Littérature, langues et cultures de l'Antiquité" | "Sciences de l'ingénieur" | "Support à l'action managériale" | "Allemand" | "Anglais" | "Arts appliqués et culture artistique" | "Arts plastiques" | "Arts" | "Autre enseignement professionnel" | "Biochimie-Biologie" | "Biologie et physiopathologie humaines" | "Biologie-Écologie" | "Biotechnologies" | "Bâtiment" | "CEJM" | "Chinois" | "Commerce international" | "Communication" | "Comptabilité" | "Conjugaison" | "Culture générale et expression" | "Documentation" | "Droit" | "Economie et Gestion" | "Enseignement Scientifique" | "Enseignement scientifique" | "Enseignements spécifiques STL" | "Espagnol" | "Français" | "Gestion administrative" | "Gestion commerciale" | "Gestion de la PME" | "Gestion" | "Grammaire" | "Géographie" | "Histoire des Arts" | "Histoire" | "Histoire-Géographie, géopolitique et sciences politiques" | "Histoire-Géographie-EMC" | "Humanités, littérature et philosophie" | "Hôtellerie restauration" | "Informatique" | "Ingénierie et développement durable" | "Innovation technologique" | "Italien" | "Langue vivante rare" | "Langues, littératures et cultures étrangères et régionales" | "Logistique" | "Maintenance" | "Management commercial opérationnel" | "Management" | "Mathématiques" | "Mercatique" | "Mécanique" | "Numérique et sciences informatiques" | "Négociation et relation client" | "Orthographe" | "Outils et langages numériques" | "PSE" | "Philosophie" | "Physique-Chimie pour la santé" | "Physique-Chimie" | "Prévention Santé Environnement" | "Relation client" | "SES" | "SNT" | "SVT" | "Sciences appliquées" | "Sciences de gestion et numérique" | "Sciences de la vie et de la Terre" | "Sciences et Technologie" | "Sciences et techniques sanitaires et sociales" | "Sciences numériques et technologie" | "Sciences physiques et chimiques en laboratoire" | "Sciences physiques" | "Sciences économiques et sociales" | "Sciences" | "Technologie" | "Transport" | "Économie et gestion hôtellière" | "Économie" | "Économie-Droit" | "Économie-Gestion" | "Éducation civique" | "Éducation musicale" | null | undefined)[] | undefined;
-    sortByQuery?: "id" | "slug" | "url" | "name" | "schoolTypes" | "hasBooks" | "newsletterUrl" | "tags" | {} | undefined;
+    sortByQuery?: "id" | "slug" | "url" | "name" | "schoolTypes" | "hasBooks" | "newsletterUrl" | {} | undefined;
 }) => Subject[], makeSearchSubjects: () => ((state: import("../types/store").EntitiesState, params: {
     ids?: Subject["id"][] | undefined;
     slugs?: Subject["slug"][] | undefined;
@@ -16,7 +16,7 @@ export declare const getSubjects: (state: import("@lls/utils").TState<Subject>)
     schoolTypes?: (string | undefined)[] | undefined;
     hasBooks?: Subject["hasBooks"];
     names?: ("Autre" | "Design et métiers d'art" | "Langues et cultures de l'Antiquité" | "Littérature, langues et cultures de l'Antiquité" | "Sciences de l'ingénieur" | "Support à l'action managériale" | "Allemand" | "Anglais" | "Arts appliqués et culture artistique" | "Arts plastiques" | "Arts" | "Autre enseignement professionnel" | "Biochimie-Biologie" | "Biologie et physiopathologie humaines" | "Biologie-Écologie" | "Biotechnologies" | "Bâtiment" | "CEJM" | "Chinois" | "Commerce international" | "Communication" | "Comptabilité" | "Conjugaison" | "Culture générale et expression" | "Documentation" | "Droit" | "Economie et Gestion" | "Enseignement Scientifique" | "Enseignement scientifique" | "Enseignements spécifiques STL" | "Espagnol" | "Français" | "Gestion administrative" | "Gestion commerciale" | "Gestion de la PME" | "Gestion" | "Grammaire" | "Géographie" | "Histoire des Arts" | "Histoire" | "Histoire-Géographie, géopolitique et sciences politiques" | "Histoire-Géographie-EMC" | "Humanités, littérature et philosophie" | "Hôtellerie restauration" | "Informatique" | "Ingénierie et développement durable" | "Innovation technologique" | "Italien" | "Langue vivante rare" | "Langues, littératures et cultures étrangères et régionales" | "Logistique" | "Maintenance" | "Management commercial opérationnel" | "Management" | "Mathématiques" | "Mercatique" | "Mécanique" | "Numérique et sciences informatiques" | "Négociation et relation client" | "Orthographe" | "Outils et langages numériques" | "PSE" | "Philosophie" | "Physique-Chimie pour la santé" | "Physique-Chimie" | "Prévention Santé Environnement" | "Relation client" | "SES" | "SNT" | "SVT" | "Sciences appliquées" | "Sciences de gestion et numérique" | "Sciences de la vie et de la Terre" | "Sciences et Technologie" | "Sciences et techniques sanitaires et sociales" | "Sciences numériques et technologie" | "Sciences physiques et chimiques en laboratoire" | "Sciences physiques" | "Sciences économiques et sociales" | "Sciences" | "Technologie" | "Transport" | "Économie et gestion hôtellière" | "Économie" | "Économie-Droit" | "Économie-Gestion" | "Éducation civique" | "Éducation musicale" | null | undefined)[] | undefined;
-    sortByQuery?: "id" | "slug" | "url" | "name" | "schoolTypes" | "hasBooks" | "newsletterUrl" | "tags" | {} | undefined;
+    sortByQuery?: "id" | "slug" | "url" | "name" | "schoolTypes" | "hasBooks" | "newsletterUrl" | {} | undefined;
 }) => Subject[]) & import("reselect").OutputSelectorFields<(args_0: Subject[], args_1: {
     ids?: Subject["id"][] | undefined;
     slugs?: Subject["slug"][] | undefined;
@@ -25,7 +25,7 @@ export declare const getSubjects: (state: import("@lls/utils").TState<Subject>)
     schoolTypes?: (string | undefined)[] | undefined;
     hasBooks?: Subject["hasBooks"];
     names?: ("Autre" | "Design et métiers d'art" | "Langues et cultures de l'Antiquité" | "Littérature, langues et cultures de l'Antiquité" | "Sciences de l'ingénieur" | "Support à l'action managériale" | "Allemand" | "Anglais" | "Arts appliqués et culture artistique" | "Arts plastiques" | "Arts" | "Autre enseignement professionnel" | "Biochimie-Biologie" | "Biologie et physiopathologie humaines" | "Biologie-Écologie" | "Biotechnologies" | "Bâtiment" | "CEJM" | "Chinois" | "Commerce international" | "Communication" | "Comptabilité" | "Conjugaison" | "Culture générale et expression" | "Documentation" | "Droit" | "Economie et Gestion" | "Enseignement Scientifique" | "Enseignement scientifique" | "Enseignements spécifiques STL" | "Espagnol" | "Français" | "Gestion administrative" | "Gestion commerciale" | "Gestion de la PME" | "Gestion" | "Grammaire" | "Géographie" | "Histoire des Arts" | "Histoire" | "Histoire-Géographie, géopolitique et sciences politiques" | "Histoire-Géographie-EMC" | "Humanités, littérature et philosophie" | "Hôtellerie restauration" | "Informatique" | "Ingénierie et développement durable" | "Innovation technologique" | "Italien" | "Langue vivante rare" | "Langues, littératures et cultures étrangères et régionales" | "Logistique" | "Maintenance" | "Management commercial opérationnel" | "Management" | "Mathématiques" | "Mercatique" | "Mécanique" | "Numérique et sciences informatiques" | "Négociation et relation client" | "Orthographe" | "Outils et langages numériques" | "PSE" | "Philosophie" | "Physique-Chimie pour la santé" | "Physique-Chimie" | "Prévention Santé Environnement" | "Relation client" | "SES" | "SNT" | "SVT" | "Sciences appliquées" | "Sciences de gestion et numérique" | "Sciences de la vie et de la Terre" | "Sciences et Technologie" | "Sciences et techniques sanitaires et sociales" | "Sciences numériques et technologie" | "Sciences physiques et chimiques en laboratoire" | "Sciences physiques" | "Sciences économiques et sociales" | "Sciences" | "Technologie" | "Transport" | "Économie et gestion hôtellière" | "Économie" | "Économie-Droit" | "Économie-Gestion" | "Éducation civique" | "Éducation musicale" | null | undefined)[] | undefined;
-    sortByQuery?: "id" | "slug" | "url" | "name" | "schoolTypes" | "hasBooks" | "newsletterUrl" | "tags" | {} | undefined;
+    sortByQuery?: "id" | "slug" | "url" | "name" | "schoolTypes" | "hasBooks" | "newsletterUrl" | {} | undefined;
 }) => Subject[], {
     clearCache: () => void;
 }> & {

package/lib/index.js

@@ -866,7 +866,7 @@ 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 { makeEntitiesFilter as makeEntitiesFilter5 } from "@lls/utils";
 import _4 from "lodash/fp.js";
 var search5 = ({
   ids,
@@ -888,40 +888,35 @@ var search5 = ({
   sharedGroups,
   isDraft,
   isParentCreatedFromScratch,
-  updatedAfter,
-  sortByQuery
+  updatedAfter
 }) => {
   let pageById = false;
-  return (pages) => pipe3(
-    pages,
-    makeEntitiesFilter5(
-      {
-        id: ids,
-        chapter: chapterIds,
-        valid: isValid,
-        isOriginal,
-        hasNewDesign,
-        slug: slugs,
-        oldLesson: oldLessonIds,
-        isLearningAssessment,
-        isCreatedFromScratch,
-        premium,
-        thematicName: thematicNames,
-        book: bookIds,
-        parent: parentIds,
-        user: userIds,
-        originalPage: originalPageIds,
-        sharedUsers: sharedUserIds,
-        sharedGroups,
-        isDraft
-      },
-      isParentCreatedFromScratch && ((page2, pages2) => {
-        pageById = pageById || _4.keyBy("id", pages2);
-        return !!_4.get([page2?.originalPage, "isCreatedFromScratch"], pageById);
-      }),
-      updatedAfter && _4.flow(_4.get("updatedAt"), (date) => new Date(date).getTime() - updatedAfter.getTime() >= 0)
-    ),
-    _4.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _4.sortBy(sortByQuery) : _4.identity
+  return makeEntitiesFilter5(
+    {
+      id: ids,
+      chapter: chapterIds,
+      valid: isValid,
+      isOriginal,
+      hasNewDesign,
+      slug: slugs,
+      oldLesson: oldLessonIds,
+      isLearningAssessment,
+      isCreatedFromScratch,
+      premium,
+      thematicName: thematicNames,
+      book: bookIds,
+      parent: parentIds,
+      user: userIds,
+      originalPage: originalPageIds,
+      sharedUsers: sharedUserIds,
+      sharedGroups,
+      isDraft
+    },
+    isParentCreatedFromScratch && ((page2, pages) => {
+      pageById = pageById || _4.keyBy("id", pages);
+      return !!_4.get([page2?.originalPage, "isCreatedFromScratch"], pageById);
+    }),
+    updatedAfter && _4.flow(_4.get("updatedAt"), (date) => new Date(date).getTime() - updatedAfter.getTime() >= 0)
   );
 };
 var { getPages, getPage, filterPages, useSearchPages, makeSearchPages } = crud("pages", {
@@ -1212,7 +1207,7 @@ 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 { limitToTeacherSubjects, makeEntitiesFilter as makeEntitiesFilter21, pipe as pipe3 } from "@lls/utils";
 import _13 from "lodash/fp.js";
 var search24 = ({
   ids,
@@ -1223,7 +1218,7 @@ var search24 = ({
   hasBooks,
   names,
   sortByQuery
-}) => (subjects) => pipe4(
+}) => (subjects) => pipe3(
   subjects,
   makeEntitiesFilter21(
     {

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.1.67-bdf1676c",
+  "version": "24.1.67-c17f13d8",
   "type": "module",
   "types": "./lib/builttypes/store/src/index.d.ts",
   "exports": {
@@ -47,8 +47,8 @@
     "vite": "5.4.6",
     "vite-tsconfig-paths": "5.0.1",
     "vitest": "2.1.1",
-    "@lls/utils": "24.1.67-bdf1676c",
-    "@lls/vitescripts": "24.1.67-bdf1676c"
+    "@lls/utils": "24.1.67-c17f13d8",
+    "@lls/vitescripts": "24.1.67-c17f13d8"
   },
   "license": "ISC",
   "dependencies": {