@communecter/cocolight-api-client 1.0.30 → 1.0.32

package/src/api/EndpointApi.types.d.ts

@@ -971,25 +971,6 @@ export interface GlobalAutocompleteData {
    * Balises (tags) à utiliser pour filtrer la recherche
    */
   searchTags?: string[];
-  /**
-   * Configuration des plages de résultats pour chaque type de recherche
-   */
-  ranges?: {
-    /**
-     * This interface was referenced by `undefined`'s JSON-Schema definition
-     * via the `patternProperty` "^[^\s]+$".
-     */
-    [k: string]: {
-      /**
-       * Index de départ pour la pagination
-       */
-      indexMin: number;
-      /**
-       * Index de fin pour la pagination
-       */
-      indexMax: number;
-    };
-  };
   /**
    * Liste fixe des types à compter dans les résultats
    */
@@ -1004,13 +985,40 @@ export interface GlobalAutocompleteData {
     | "poi"
   )[];
   /**
-   * Index de départ global pour la pagination
+   * Critère de recherche (actuellement vide)
    */
-  indexMin: 0;
+  searchBy?: "ALL";
+  /**
+   * Index de départ global pour la pagination (toujours 0)
+   */
+  indexMin: number;
+  /**
+   * Index de fin global pour la pagination
+   */
+  indexMax?: number;
   /**
    * Nombre d’éléments à récupérer (limite de pagination)
    */
   indexStep: number;
+  /**
+   * Configuration des plages de résultats pour chaque type de recherche
+   */
+  ranges?: {
+    /**
+     * This interface was referenced by `undefined`'s JSON-Schema definition
+     * via the `patternProperty` "^[^\s]+$".
+     */
+    [k: string]: {
+      /**
+       * Index de départ pour la pagination
+       */
+      indexMin: number;
+      /**
+       * Index de fin pour la pagination
+       */
+      indexMax: number;
+    };
+  };
   /**
    * Type initial de la recherche, vide par défaut
    */

package/src/api/Event.js

@@ -4,6 +4,8 @@ import BaseEntity from "./BaseEntity.js";
 export class Event extends BaseEntity {
   static entityType = "events";
 
+  static entityTag = "Event";
+
   static SCHEMA_CONSTANTS = [
     "ADD_EVENT",
     // "UPDATE_BLOCK_DESCRIPTION",

package/src/api/News.js

@@ -4,6 +4,8 @@ import BaseEntity from "./BaseEntity.js";
 export class News extends BaseEntity {
   static entityType = "news";
 
+  static entityTag = "News";
+
   static SCHEMA_CONSTANTS = [
     "ADD_NEWS"
   ];

package/src/api/Organization.js

@@ -4,6 +4,8 @@ import BaseEntity from "./BaseEntity.js";
 export class Organization extends BaseEntity {
   static entityType = "organizations";
 
+  static entityTag = "Organization";
+
   static SCHEMA_CONSTANTS = [
     "ADD_ORGANIZATION",
     "UPDATE_BLOCK_DESCRIPTION",
@@ -178,32 +180,60 @@ export class Organization extends BaseEntity {
    * 
    * 
    */
-  async getMembers(data = {}, options = {}, isNext = false) {
+  async getMembers(data = {}, options = {}) {
     data.searchType = this._getDefaultFromEndpoint("GET_MEMBERS_ADMIN", "searchType");
     // data.searchBy = "ALL";
-    return this._paginateWith(data, isNext, async (finalData) => {
-
-      const { toBeValidated, isAdmin, isAdminPending, isInviting, roles = [] } = options;
-
-      if(this.isMe){
-        finalData.pathParams = { type: this.getEntityType(), id: this.id };
-        // finalData.filters = {
-        //   [`links.memberOf.${this.id}`]: { "$exists": true },
-        //   [`links.memberOf.${this.id}.toBeValidated`]: { "$exists": false },
-        //   [`links.memberOf.${this.id}.isInviting`]: { "$exists": false }
-        // };
-        finalData.filters = this._buildLinkFilters(this.id, { linkType: "memberOf", toBeValidated, isAdmin, isAdminPending, isInviting, roles });
-      } else {
-        delete finalData?.pathParams;
-        finalData.filters = this._buildLinkFilters(this.id, { linkType: "memberOf", toBeValidated: false, isAdmin, isInviting, roles });
-      }
+    // return this._paginateWith(data, isNext, async (finalData) => {
+
+    //   const { toBeValidated, isAdmin, isAdminPending, isInviting, roles = [] } = options;
+
+    //   if(this.isMe){
+    //     finalData.pathParams = { type: this.getEntityType(), id: this.id };
+    //     // finalData.filters = {
+    //     //   [`links.memberOf.${this.id}`]: { "$exists": true },
+    //     //   [`links.memberOf.${this.id}.toBeValidated`]: { "$exists": false },
+    //     //   [`links.memberOf.${this.id}.isInviting`]: { "$exists": false }
+    //     // };
+    //     finalData.filters = this._buildLinkFilters(this.id, { linkType: "memberOf", toBeValidated, isAdmin, isAdminPending, isInviting, roles });
+    //   } else {
+    //     delete finalData?.pathParams;
+    //     finalData.filters = this._buildLinkFilters(this.id, { linkType: "memberOf", toBeValidated: false, isAdmin, isInviting, roles });
+    //   }
+  
+    //   const fetchFn = this.isMe
+    //     ? () => this.callIsMe(() => this.endpointApi.getMembersAdmin(finalData))
+    //     : () => this.endpointApi.getMembersNoAdmin(finalData);
+
+    //   return fetchFn();
+    // });
+    const paginator = this._createPaginatorEngine({
+      initialData: data,
+      finalizer: async (finalData) => {
+
+        const { toBeValidated, isAdmin, isAdminPending, isInviting, roles = [] } = options;
+
+        if(this.isMe){
+          finalData.pathParams = { type: this.getEntityType(), id: this.id };
+          // finalData.filters = {
+          //   [`links.memberOf.${this.id}`]: { "$exists": true },
+          //   [`links.memberOf.${this.id}.toBeValidated`]: { "$exists": false },
+          //   [`links.memberOf.${this.id}.isInviting`]: { "$exists": false }
+          // };
+          finalData.filters = this._buildLinkFilters(this.id, { linkType: "memberOf", toBeValidated, isAdmin, isAdminPending, isInviting, roles });
+        } else {
+          delete finalData?.pathParams;
+          finalData.filters = this._buildLinkFilters(this.id, { linkType: "memberOf", toBeValidated: false, isAdmin, isInviting, roles });
+        }
   
-      const fetchFn = this.isMe
-        ? () => this.callIsMe(() => this.endpointApi.getMembersAdmin(finalData))
-        : () => this.endpointApi.getMembersNoAdmin(finalData);
+        const fetchFn = this.isMe
+          ? () => this.callIsMe(() => this.endpointApi.getMembersAdmin(finalData))
+          : () => this.endpointApi.getMembersNoAdmin(finalData);
 
-      return fetchFn();
+        return fetchFn();
+      }
     });
+
+    return paginator.next();
   }
 
   /**
@@ -370,8 +400,8 @@ export class Organization extends BaseEntity {
    * @returns {Promise<Object>} - Résultat de la recherche.
    * @throws {ApiError} - Si le slug ou l'id de l'organisation n'est pas défini.
    */
-  async searchCostum(data = {}, isNext = false) {
-    return super.searchCostum(data, isNext);
+  async searchCostum(data = {}) {
+    return super.searchCostum(data);
   }
 
 }

package/src/api/Poi.js

@@ -4,6 +4,8 @@ import BaseEntity from "./BaseEntity.js";
 export class Poi extends BaseEntity {
   static entityType = "poi";
 
+  static entityTag = "Poi";
+
   static SCHEMA_CONSTANTS = [
     "ADD_POI",
     "UPDATE_BLOCK_DESCRIPTION",

package/src/api/Project.js

@@ -4,6 +4,8 @@ import BaseEntity from "./BaseEntity.js";
 export class Project extends BaseEntity {
   static entityType = "projects";
 
+  static entityTag = "Project";
+
   static SCHEMA_CONSTANTS = [
     "ADD_PROJECT",
     "UPDATE_BLOCK_DESCRIPTION",
@@ -188,33 +190,62 @@ export class Project extends BaseEntity {
    * const invitingContributors = await project.getContributors({}, { isInviting: true });
    * 
    */
-  async getContributors(data = {}, options = {}, isNext = false) {
+  async getContributors(data = {}, options = {}) {
     data.searchType = this._getDefaultFromEndpoint("GET_CONTRIBUTORS_ADMIN", "searchType");
     // data.searchBy = "ALL";
-    return this._paginateWith(data, isNext, async (finalData) => {
-
-      const { toBeValidated, isAdmin, isInviting, isAdminPending, roles = [] } = options;
-
-      if(this.isMe){
-        finalData.pathParams = { type: this.getEntityType(), id: this.id };
-        // NOTE : dans le schema je crois que si pas de finalData.filters alors le default ce fait avec finalData.pathParams
-        // finalData.filters = {
-        //   [`links.projects.${this.id}`]: { "$exists": true },
-        //   [`links.projects.${this.id}.toBeValidated`]: { "$exists": false },
-        //   [`links.projects.${this.id}.isInviting`]: { "$exists": false }
-        // };
-        finalData.filters = this._buildLinkFilters(this.id, { linkType: "projects", toBeValidated, isAdmin, isAdminPending, isInviting, roles });
-      } else {
-        delete finalData?.pathParams;
-        finalData.filters = this._buildLinkFilters(this.id, { linkType: "projects", toBeValidated: false, isAdmin, isInviting, roles });
-      }
+    // return this._paginateWith(data, isNext, async (finalData) => {
+
+    //   const { toBeValidated, isAdmin, isInviting, isAdminPending, roles = [] } = options;
+
+    //   if(this.isMe){
+    //     finalData.pathParams = { type: this.getEntityType(), id: this.id };
+    //     // NOTE : dans le schema je crois que si pas de finalData.filters alors le default ce fait avec finalData.pathParams
+    //     // finalData.filters = {
+    //     //   [`links.projects.${this.id}`]: { "$exists": true },
+    //     //   [`links.projects.${this.id}.toBeValidated`]: { "$exists": false },
+    //     //   [`links.projects.${this.id}.isInviting`]: { "$exists": false }
+    //     // };
+    //     finalData.filters = this._buildLinkFilters(this.id, { linkType: "projects", toBeValidated, isAdmin, isAdminPending, isInviting, roles });
+    //   } else {
+    //     delete finalData?.pathParams;
+    //     finalData.filters = this._buildLinkFilters(this.id, { linkType: "projects", toBeValidated: false, isAdmin, isInviting, roles });
+    //   }
+  
+    //   const fetchFn = this.isMe
+    //     ? () => this.callIsMe(() => this.endpointApi.getContributorsAdmin(finalData))
+    //     : () => this.endpointApi.getContributorsNoAdmin(finalData);
+
+    //   return fetchFn();
+    // });
+    const paginator = this._createPaginatorEngine({
+      initialData: data,
+      finalizer: async (finalData) => {
+
+        const { toBeValidated, isAdmin, isInviting, isAdminPending, roles = [] } = options;
+
+        if(this.isMe){
+          finalData.pathParams = { type: this.getEntityType(), id: this.id };
+          // NOTE : dans le schema je crois que si pas de finalData.filters alors le default ce fait avec finalData.pathParams
+          // finalData.filters = {
+          //   [`links.projects.${this.id}`]: { "$exists": true },
+          //   [`links.projects.${this.id}.toBeValidated`]: { "$exists": false },
+          //   [`links.projects.${this.id}.isInviting`]: { "$exists": false }
+          // };
+          finalData.filters = this._buildLinkFilters(this.id, { linkType: "projects", toBeValidated, isAdmin, isAdminPending, isInviting, roles });
+        } else {
+          delete finalData?.pathParams;
+          finalData.filters = this._buildLinkFilters(this.id, { linkType: "projects", toBeValidated: false, isAdmin, isInviting, roles });
+        }
   
-      const fetchFn = this.isMe
-        ? () => this.callIsMe(() => this.endpointApi.getContributorsAdmin(finalData))
-        : () => this.endpointApi.getContributorsNoAdmin(finalData);
+        const fetchFn = this.isMe
+          ? () => this.callIsMe(() => this.endpointApi.getContributorsAdmin(finalData))
+          : () => this.endpointApi.getContributorsNoAdmin(finalData);
 
-      return fetchFn();
+        return fetchFn();
+      }
     });
+
+    return paginator.next();
   }
 
   /**

package/src/api/User.js

@@ -7,6 +7,8 @@ export class User extends BaseEntity {
 
   static entityType = "citoyens";
 
+  static entityTag = "User";
+
   static SCHEMA_CONSTANTS = [
     "UPDATE_BLOCK_DESCRIPTION",
     "UPDATE_BLOCK_INFO",
@@ -282,26 +284,48 @@ export class User extends BaseEntity {
    * Récupérer les organisations d'un utilisateur : Récupère la liste des organisations auxquelles l'utilisateur appartient.
    * Constant : GET_ORGANIZATIONS_ADMIN | GET_ORGANIZATIONS_NO_ADMIN
    */
-  async getOrganizations(data = {}, isNext = false) {
+  async getOrganizations(data = {}) {
     data.searchType = this._getDefaultFromEndpoint("GET_ORGANIZATIONS_NO_ADMIN", "searchType");
     // data.searchBy = "ALL";
-    return this._paginateWith(data, isNext, async (finalData) => {
-      delete finalData?.pathParams;
+    // return this._paginateWith(data, isNext, async (finalData) => {
+    //   delete finalData?.pathParams;
 
-      const fetchFn = this.isMe
-        ? () => this.callIsMe(() => this.endpointApi.getOrganizationsAdmin(finalData))
-        : () => this.endpointApi.getOrganizationsNoAdmin(finalData);
+    //   const fetchFn = this.isMe
+    //     ? () => this.callIsMe(() => this.endpointApi.getOrganizationsAdmin(finalData))
+    //     : () => this.endpointApi.getOrganizationsNoAdmin(finalData);
+  
+    //   if (!this.isMe && !finalData.filters) {
+    //     finalData.filters = {
+    //       [`links.members.${this.id}`]: { "$exists": true },
+    //       [`links.members.${this.id}.toBeValidated`]: { "$exists": false },
+    //       [`links.members.${this.id}.isInviting`]: { "$exists": false }
+    //     };
+    //   }
+
+    //   return fetchFn();
+    // });
+    const paginator = this._createPaginatorEngine({
+      initialData: data,
+      finalizer: async (finalData) => {
+        delete finalData?.pathParams;
+
+        const fetchFn = this.isMe
+          ? () => this.callIsMe(() => this.endpointApi.getOrganizationsAdmin(finalData))
+          : () => this.endpointApi.getOrganizationsNoAdmin(finalData);
   
-      if (!this.isMe && !finalData.filters) {
-        finalData.filters = {
-          [`links.members.${this.id}`]: { "$exists": true },
-          [`links.members.${this.id}.toBeValidated`]: { "$exists": false },
-          [`links.members.${this.id}.isInviting`]: { "$exists": false }
-        };
+        if (!this.isMe && !finalData.filters) {
+          finalData.filters = {
+            [`links.members.${this.id}`]: { "$exists": true },
+            [`links.members.${this.id}.toBeValidated`]: { "$exists": false },
+            [`links.members.${this.id}.isInviting`]: { "$exists": false }
+          };
+        }
+
+        return fetchFn();
       }
-
-      return fetchFn();
     });
+
+    return paginator.next();
   }
 
   /**
@@ -360,25 +384,46 @@ export class User extends BaseEntity {
    * Récupérer les suivis
    * Constant : GET_SUBSCRIPTIONS / GET_SUBSCRIPTIONS_ADMIN
    */
-  async getSubscriptions(data = {}, isNext = false) {
+  async getSubscriptions(data = {}) {
     data.searchType = this._getDefaultFromEndpoint("GET_SUBSCRIPTIONS", "searchType");
     // data.searchBy = "ALL";
-    return this._paginateWith(data, isNext, async (finalData) => {
+    // return this._paginateWith(data, isNext, async (finalData) => {
 
-      delete finalData?.pathParams;
+    //   delete finalData?.pathParams;
   
-      const fetchFn = this.isMe
-        ? () => this.callIsMe(() => this.endpointApi.getSubscriptionsAdmin(finalData))
-        : () => this.endpointApi.getSubscriptions(finalData);
+    //   const fetchFn = this.isMe
+    //     ? () => this.callIsMe(() => this.endpointApi.getSubscriptionsAdmin(finalData))
+    //     : () => this.endpointApi.getSubscriptions(finalData);
   
-      if (!this.isMe && !finalData.filters) {
-        finalData.filters = {
-          [`links.followers.${this.id}`]: { "$exists": true },
-        };
-      }
+    //   if (!this.isMe && !finalData.filters) {
+    //     finalData.filters = {
+    //       [`links.followers.${this.id}`]: { "$exists": true },
+    //     };
+    //   }
+
+    //   return fetchFn();
+    // });
+    const paginator = this._createPaginatorEngine({
+      initialData: data,
+      finalizer: async (finalData) => {
+
+        delete finalData?.pathParams;
+  
+        const fetchFn = this.isMe
+          ? () => this.callIsMe(() => this.endpointApi.getSubscriptionsAdmin(finalData))
+          : () => this.endpointApi.getSubscriptions(finalData);
+  
+        if (!this.isMe && !finalData.filters) {
+          finalData.filters = {
+            [`links.followers.${this.id}`]: { "$exists": true },
+          };
+        }
 
-      return fetchFn();
+        return fetchFn();
+      }
     });
+
+    return paginator.next();
   }
 
   /**