@slickgrid-universal/graphql 5.4.0 → 5.5.0

package/dist/types/interfaces/graphqlPaginatedResult.interface.d.ts

@@ -15,6 +15,8 @@ export interface GraphqlPaginatedResult {
             pageInfo?: CursorPageInfo;
         };
     };
+    /** when using Infinite Scroll, we'll want to know when we hit the bottom of the scroll to get next subset */
+    infiniteScrollBottomHit?: boolean;
     /** Some metrics of the last executed query (startTime, endTime, executionTime, itemCount, totalItemCount) */
     metrics?: Metrics;
 }

package/dist/types/interfaces/graphqlPaginatedResult.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlPaginatedResult.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/graphqlPaginatedResult.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE3E,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE;QACJ,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,iDAAiD;YACjD,KAAK,EAAE,GAAG,EAAE,CAAC;YAEb,4EAA4E;YAC5E,UAAU,EAAE,MAAM,CAAC;YAInB,8CAA8C;YAC9C,KAAK,CAAC,EAAE;gBACN,8BAA8B;gBAC9B,MAAM,EAAE,MAAM,CAAC;aAChB,CAAA;YAED,iGAAiG;YACjG,QAAQ,CAAC,EAAE,cAAc,CAAC;SAC3B,CAAA;KACF,CAAC;IAEF,6GAA6G;IAC7G,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}
+{"version":3,"file":"graphqlPaginatedResult.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/graphqlPaginatedResult.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE3E,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE;QACJ,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,iDAAiD;YACjD,KAAK,EAAE,GAAG,EAAE,CAAC;YAEb,4EAA4E;YAC5E,UAAU,EAAE,MAAM,CAAC;YAKnB,8CAA8C;YAC9C,KAAK,CAAC,EAAE;gBACN,8BAA8B;gBAC9B,MAAM,EAAE,MAAM,CAAC;aAChB,CAAC;YAEF,iGAAiG;YACjG,QAAQ,CAAC,EAAE,cAAc,CAAC;SAC3B,CAAC;KACH,CAAC;IAEF,6GAA6G;IAC7G,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,6GAA6G;IAC7G,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}

package/dist/types/services/graphql.service.d.ts

@@ -1,6 +1,6 @@
 import type { BackendService, Column, ColumnFilters, ColumnSort, CurrentFilter, CurrentPagination, CurrentSorter, FilterChangedArgs, GridOption, MultiColumnSort, Pagination, PaginationChangedArgs, PaginationCursorChangedArgs, SharedService, SingleColumnSort, SlickGrid } from '@slickgrid-universal/common';
 import { FieldType } from '@slickgrid-universal/common';
-import type { GraphqlDatasetFilter, GraphqlPaginationOption, GraphqlServiceOption } from '../interfaces/index';
+import type { GraphqlDatasetFilter, GraphqlPaginatedResult, GraphqlPaginationOption, GraphqlServiceOption } from '../interfaces/index';
 export declare class GraphqlService implements BackendService {
     protected _currentFilters: ColumnFilters | CurrentFilter[];
     protected _currentPagination: CurrentPagination | null;
@@ -22,6 +22,7 @@ export declare class GraphqlService implements BackendService {
      * @param serviceOptions GraphqlServiceOption
      */
     buildQuery(): string;
+    postProcess(processResult: GraphqlPaginatedResult): void;
     /**
      * From an input array of strings, we want to build a GraphQL query string.
      * The process has to take the dot notation and parse it into a valid GraphQL query
@@ -37,7 +38,7 @@ export declare class GraphqlService implements BackendService {
     clearFilters(): void;
     clearSorters(): void;
     /**
-     * Get an initialization of Pagination options
+     * Get default initial Pagination options
      * @return Pagination Options
      */
     getInitPaginationOptions(): GraphqlDatasetFilter;

package/dist/types/services/graphql.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.service.d.ts","sourceRoot":"","sources":["../../../src/services/graphql.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql.service.d.ts","sourceRoot":"","sources":["../../../src/services/graphql.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slickgrid-universal/graphql",
-  "version": "5.4.0",
+  "version": "5.5.0",
   "description": "GraphQL Service to sync a grid with a GraphQL backend server",
   "main": "./dist/cjs/index.js",
   "types": "./dist/types/index.d.ts",
@@ -38,12 +38,12 @@
     "not dead"
   ],
   "dependencies": {
-    "@slickgrid-universal/common": "~5.4.0",
-    "@slickgrid-universal/utils": "~5.4.0"
+    "@slickgrid-universal/common": "~5.5.0",
+    "@slickgrid-universal/utils": "~5.5.0"
   },
   "funding": {
     "type": "ko_fi",
     "url": "https://ko-fi.com/ghiscoding"
   },
-  "gitHead": "ecc631f55fa398347885e90057f31ac4133caf3c"
+  "gitHead": "bc7ad96ca72c4d7509c160b77a50a2b071028dff"
 }

package/src/interfaces/graphqlPaginatedResult.interface.ts

@@ -10,18 +10,22 @@ export interface GraphqlPaginatedResult {
       totalCount: number;
 
       // ---
-      // When using a Cursor, we'll also have Edges and PageInfo according to a cursor position
+      // When using a Cursor, we'll also have `Edges` and `PageInfo` according to a cursor position
+
       /** Edges information of the current cursor */
       edges?: {
         /** Current cursor position */
         cursor: string;
-      }
+      };
 
       /** Page information of the current cursor, do we have a next page and what is the end cursor? */
       pageInfo?: CursorPageInfo;
-    }
+    };
   };
 
+  /** when using Infinite Scroll, we'll want to know when we hit the bottom of the scroll to get next subset */
+  infiniteScrollBottomHit?: boolean;
+
   /** Some metrics of the last executed query (startTime, endTime, executionTime, itemCount, totalItemCount) */
   metrics?: Metrics;
 }

package/src/services/graphql.service.ts

@@ -9,6 +9,7 @@ import type {
   CurrentSorter,
   FilterChangedArgs,
   GridOption,
+  InfiniteScrollOption,
   MultiColumnSort,
   OperatorString,
   Pagination,
@@ -21,7 +22,6 @@ import type {
 } from '@slickgrid-universal/common';
 import {
   FieldType,
-  // utilities
   mapOperatorType,
   mapOperatorByFieldType,
   OperatorType,
@@ -34,6 +34,7 @@ import type {
   GraphqlCustomFilteringOption,
   GraphqlDatasetFilter,
   GraphqlFilteringOption,
+  GraphqlPaginatedResult,
   GraphqlPaginationOption,
   GraphqlServiceOption,
   GraphqlSortingOption,
@@ -75,7 +76,7 @@ export class GraphqlService implements BackendService {
     this.pagination = pagination;
     this._datasetIdPropName = this._gridOptions.datasetIdPropertyName || 'id';
 
-    if (grid?.getColumns) {
+    if (typeof grid?.getColumns === 'function') {
       this._columnDefinitions = sharedService?.allColumns ?? grid.getColumns() ?? [];
     }
   }
@@ -88,7 +89,6 @@ export class GraphqlService implements BackendService {
     if (!this.options || !this.options.datasetName || !Array.isArray(this._columnDefinitions)) {
       throw new Error('GraphQL Service requires the "datasetName" property to properly build the GraphQL query');
     }
-
     // get the column definitions and exclude some if they were tagged as excluded
     let columnDefinitions = this._columnDefinitions || [];
     columnDefinitions = columnDefinitions.filter((column: Column) => !column.excludeFromQuery);
@@ -99,7 +99,7 @@ export class GraphqlService implements BackendService {
 
     // get all the columnds Ids for the filters to work
     const columnIds: string[] = [];
-    if (columnDefinitions && Array.isArray(columnDefinitions)) {
+    if (Array.isArray(columnDefinitions)) {
       for (const column of columnDefinitions) {
         if (!column.excludeFieldFromQuery) {
           columnIds.push(column.field);
@@ -121,7 +121,7 @@ export class GraphqlService implements BackendService {
     const columnsQuery = this.buildFilterQuery(columnIds);
     let graphqlNodeFields = [];
 
-    if (this._gridOptions.enablePagination !== false) {
+    if (this._gridOptions.enablePagination !== false || this.options.infiniteScroll) {
       if (this.options.useCursor) {
         // ...pageInfo { hasNextPage, endCursor }, edges { cursor, node { _columns_ } }, totalCount: 100
         const edgesQb = new QueryBuilder('edges');
@@ -146,7 +146,7 @@ export class GraphqlService implements BackendService {
     let datasetFilters: GraphqlDatasetFilter = {};
 
     // only add pagination if it's enabled in the grid options
-    if (this._gridOptions.enablePagination !== false) {
+    if (this._gridOptions.enablePagination !== false || this.options.infiniteScroll) {
       datasetFilters = {};
 
       if (this.options.useCursor && this.options.paginationOptions) {
@@ -154,7 +154,10 @@ export class GraphqlService implements BackendService {
       }
       else {
         const paginationOptions = this.options?.paginationOptions;
-        datasetFilters.first = this.options?.paginationOptions?.first ?? this.pagination?.pageSize ?? this.defaultPaginationOptions.first;
+        datasetFilters.first = (this.options?.infiniteScroll as InfiniteScrollOption)?.fetchSize
+          ?? this.options?.paginationOptions?.first
+          ?? this.pagination?.pageSize
+          ?? this.defaultPaginationOptions.first;
         datasetFilters.offset = paginationOptions?.hasOwnProperty('offset') ? +(paginationOptions as any)['offset'] : 0;
       }
     }
@@ -187,6 +190,12 @@ export class GraphqlService implements BackendService {
     return this.trimDoubleQuotesOnEnumField(queryQb.toString(), enumSearchProperties, this.options.keepArgumentFieldDoubleQuotes || false);
   }
 
+  postProcess(processResult: GraphqlPaginatedResult): void {
+    if (processResult.data && this.pagination) {
+      this.pagination.totalItems = processResult.data[this.getDatasetName()]?.totalCount || 0;
+    }
+  }
+
   /**
    * From an input array of strings, we want to build a GraphQL query string.
    * The process has to take the dot notation and parse it into a valid GraphQL query
@@ -225,11 +234,11 @@ export class GraphqlService implements BackendService {
   }
 
   /**
-   * Get an initialization of Pagination options
+   * Get default initial Pagination options
    * @return Pagination Options
    */
   getInitPaginationOptions(): GraphqlDatasetFilter {
-    const paginationFirst = this.pagination ? this.pagination.pageSize : DEFAULT_ITEMS_PER_PAGE;
+    const paginationFirst = (this.options?.infiniteScroll as InfiniteScrollOption)?.fetchSize ?? this.pagination?.pageSize ?? DEFAULT_ITEMS_PER_PAGE;
     return this.options?.useCursor
       ? { first: paginationFirst }
       : { first: paginationFirst, offset: 0 };
@@ -276,7 +285,7 @@ export class GraphqlService implements BackendService {
     };
 
     // unless user specifically set "enablePagination" to False, we'll update pagination options in every other cases
-    if (this._gridOptions && (this._gridOptions.enablePagination || !this._gridOptions.hasOwnProperty('enablePagination'))) {
+    if (this._gridOptions && (this._gridOptions.enablePagination || !this._gridOptions.hasOwnProperty('enablePagination') || this.options?.infiniteScroll)) {
       this.updateOptions({ paginationOptions });
     }
   }
@@ -339,7 +348,7 @@ export class GraphqlService implements BackendService {
    *   }
    */
   processOnPaginationChanged(_event: Event | undefined, args: PaginationChangedArgs | (PaginationCursorChangedArgs & PaginationChangedArgs)): string {
-    const pageSize = +(args.pageSize || ((this.pagination) ? this.pagination.pageSize : DEFAULT_PAGE_SIZE));
+    const pageSize = +((this.options?.infiniteScroll as InfiniteScrollOption)?.fetchSize || args.pageSize || ((this.pagination) ? this.pagination.pageSize : DEFAULT_PAGE_SIZE));
 
     // if first/last defined on args, then it is a cursor based pagination change
     'first' in args || 'last' in args
@@ -370,6 +379,11 @@ export class GraphqlService implements BackendService {
     // loop through all columns to inspect sorters & set the query
     this.updateSorters(sortColumns);
 
+    // when using infinite scroll, we need to go back to 1st page
+    if (this.options?.infiniteScroll) {
+      this.updateOptions({ paginationOptions: { offset: 0 } });
+    }
+
     // build the GraphQL query which we will use in the WebAPI callback
     return this.buildQuery();
   }
@@ -571,7 +585,7 @@ export class GraphqlService implements BackendService {
       // use offset based pagination
       paginationOptions = {
         first: pageSize,
-        offset: (newPage > 1) ? ((newPage - 1) * pageSize!) : 0 // recalculate offset but make sure the result is always over 0
+        offset: (newPage > 1) ? ((newPage - 1) * pageSize) : 0 // recalculate offset but make sure the result is always over 0
       };
     }