@firestitch/list 9.12.3 → 9.12.4

package/app/classes/pagination-controller.d.ts

@@ -1,8 +1,7 @@
 import { Observable } from 'rxjs';
-import { Model } from 'tsmodels';
 import { FsListLoadMoreConfig, FsPaging, PageChange, QueryOffsetStrategy, QueryPageStrategy } from '../interfaces';
 import { PaginationStrategy } from '../enums/pagination-strategy.enum';
-export declare class PaginationController extends Model {
+export declare class PaginationController {
     limit: number;
     records: number;
     manual: boolean;
@@ -45,6 +44,7 @@ export declare class PaginationController extends Model {
      * Get query for request
      */
     get query(): QueryPageStrategy | QueryOffsetStrategy;
+    get loadMoreQuery(): QueryPageStrategy | QueryOffsetStrategy;
     /**
      * Query for Page Strategy
      */
@@ -93,7 +93,6 @@ export declare class PaginationController extends Model {
      * Showing 0 results sorted by Name, Ascending
      */
     get statusLabel(): string;
-    _fromJSON(value: any): void;
     initWithConfig(config: FsPaging | false, loadMore: FsListLoadMoreConfig | boolean, infinityScrollEnabled?: boolean): void;
     /**
      * If pagination has prev page when Page Strategy
@@ -114,10 +113,10 @@ export declare class PaginationController extends Model {
     /**
      * Update paging config and all related fields
      * @param config
-     * @param displayed
-     * @param loadMore
+     * @param displayedRecords
+     * @param loadMoreOperation
      */
-    updatePaging(config: any, displayed?: number, loadMore?: boolean): void;
+    updatePaging(config: any, displayedRecords?: number, loadMoreOperation?: boolean): void;
     /**
      * Update pages array with new pages count
      */
@@ -174,6 +173,11 @@ export declare class PaginationController extends Model {
      * Destroy
      */
     destroy(): void;
+    /**
+     * Update paging state
+     * @param params
+     */
+    private _fromParams;
     /**
      * Calc and update offset
      */

package/bundles/firestitch-list.umd.js

@@ -1616,27 +1616,24 @@
         PaginationStrategy["None"] = "none";
     })(exports.PaginationStrategy || (exports.PaginationStrategy = {}));
 
-    var PaginationController = /** @class */ (function (_super) {
-        __extends(PaginationController, _super);
+    var PaginationController = /** @class */ (function () {
         function PaginationController() {
-            var _this = _super.call(this) || this;
-            _this.limit = 25;
-            _this.manual = false;
-            _this.page = 1; // Active page
-            _this.offset = 0;
+            this.limit = 25;
+            this.manual = false;
+            this.page = 1; // Active page
+            this.offset = 0;
             // public pagesArray = [];
-            _this.displayed = 0;
-            _this._pages$ = new rxjs.BehaviorSubject(0); // Total pages
-            _this._strategy = exports.PaginationStrategy.None;
-            _this._removedRows = 0;
-            _this._pageChanged$ = new rxjs.Subject();
-            _this._pageReset$ = new rxjs.Subject();
-            _this._onDestroy$ = new rxjs.Subject();
-            _this._loadMoreEnabled = false;
-            _this._infinityScrollEnabled = false;
-            _this._loadMoreText = 'Load More';
-            _this._limits = [10, 25, 50, 100, 200];
-            return _this;
+            this.displayed = 0;
+            this._pages$ = new rxjs.BehaviorSubject(0); // Total pages
+            this._strategy = exports.PaginationStrategy.None;
+            this._removedRows = 0;
+            this._pageChanged$ = new rxjs.Subject();
+            this._pageReset$ = new rxjs.Subject();
+            this._onDestroy$ = new rxjs.Subject();
+            this._loadMoreEnabled = false;
+            this._infinityScrollEnabled = false;
+            this._loadMoreText = 'Load More';
+            this._limits = [10, 25, 50, 100, 200];
         }
         Object.defineProperty(PaginationController.prototype, "pages", {
             get: function () {
@@ -1651,7 +1648,8 @@
         });
         Object.defineProperty(PaginationController.prototype, "pages$", {
             get: function () {
-                return this._pages$.asObservable();
+                return this._pages$
+                    .pipe(operators.distinctUntilChanged());
             },
             enumerable: true,
             configurable: true
@@ -1722,6 +1720,22 @@
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(PaginationController.prototype, "loadMoreQuery", {
+            get: function () {
+                switch (this.strategy) {
+                    case exports.PaginationStrategy.Page:
+                        return this.query;
+                    case exports.PaginationStrategy.Offset:
+                        var query = this.queryOffsetStrategy;
+                        query.limit = query.offset + query.limit;
+                        query.offset = 0;
+                        return query;
+                }
+                return {};
+            },
+            enumerable: true,
+            configurable: true
+        });
         Object.defineProperty(PaginationController.prototype, "queryPageStrategy", {
             /**
              * Query for Page Strategy
@@ -1884,12 +1898,6 @@
             enumerable: true,
             configurable: true
         });
-        PaginationController.prototype._fromJSON = function (value) {
-            _super.prototype._fromJSON.call(this, value);
-            if (!value.limit) {
-                this.limit = 25;
-            }
-        };
         PaginationController.prototype.initWithConfig = function (config, loadMore, infinityScrollEnabled) {
             if (infinityScrollEnabled === void 0) { infinityScrollEnabled = false; }
             if (config) {
@@ -1899,12 +1907,12 @@
                 if (config.limit) {
                     this.limit = config.limit;
                 }
-                if (loadMore) {
-                    this.setLoadMore(loadMore);
-                }
-                this._infinityScrollEnabled = infinityScrollEnabled;
                 this.strategy = config.strategy;
             }
+            if (loadMore) {
+                this.setLoadMore(loadMore);
+            }
+            this._infinityScrollEnabled = infinityScrollEnabled;
         };
         Object.defineProperty(PaginationController.prototype, "_hasPrevPagePageStrategy", {
             /**
@@ -1949,15 +1957,15 @@
         /**
          * Update paging config and all related fields
          * @param config
-         * @param displayed
-         * @param loadMore
+         * @param displayedRecords
+         * @param loadMoreOperation
          */
-        PaginationController.prototype.updatePaging = function (config, displayed, loadMore) {
-            if (displayed === void 0) { displayed = 0; }
-            if (loadMore === void 0) { loadMore = false; }
-            if (!loadMore) {
-                this._fromJSON(config);
-                this.displayed = displayed;
+        PaginationController.prototype.updatePaging = function (config, displayedRecords, loadMoreOperation) {
+            if (displayedRecords === void 0) { displayedRecords = 0; }
+            if (loadMoreOperation === void 0) { loadMoreOperation = false; }
+            if (!loadMoreOperation) {
+                this._fromParams(config);
+                this.displayed = displayedRecords;
             }
             else {
                 this.records = config.records;
@@ -2144,6 +2152,19 @@
             this._onDestroy$.next();
             this._onDestroy$.complete();
         };
+        /**
+         * Update paging state
+         * @param params
+         */
+        PaginationController.prototype._fromParams = function (params) {
+            var _a;
+            if (!this.loadMoreEnabled) {
+                this.limit = (_a = params.limit, (_a !== null && _a !== void 0 ? _a : 25));
+            }
+            this.records = params.records;
+            this.manual = params.manual;
+            this.pages = params.pages || 0;
+        };
         /**
          * Calc and update offset
          */
@@ -2156,25 +2177,8 @@
         PaginationController.prototype.updateTotalPages = function () {
             this.pages = Math.ceil(this.records / this.limit);
         };
-        __decorate([
-            tsmodels.Alias(),
-            __metadata("design:type", Object)
-        ], PaginationController.prototype, "limit", void 0);
-        __decorate([
-            tsmodels.Alias(),
-            __metadata("design:type", Number)
-        ], PaginationController.prototype, "records", void 0);
-        __decorate([
-            tsmodels.Alias(),
-            __metadata("design:type", Object)
-        ], PaginationController.prototype, "manual", void 0);
-        __decorate([
-            tsmodels.Alias('pages'),
-            __metadata("design:type", Number),
-            __metadata("design:paramtypes", [Number])
-        ], PaginationController.prototype, "pages", null);
         return PaginationController;
-    }(tsmodels.Model));
+    }());
 
 
     (function (SelectionChangeType) {
@@ -3394,9 +3398,18 @@
                 var _a;
                 (_a = _this.selection) === null || _a === void 0 ? void 0 : _a.closeSelectionDialog();
             }), operators.map(function (params) {
-                var query = _this.paging.hasOffsetStrategy && params && params.loadOffset
-                    ? Object.assign({}, _this.filtersQuery, _this.paging.loadDeletedOffsetQuery)
-                    : Object.assign({}, _this.filtersQuery, _this.paging.query);
+                var query = Object.assign({}, _this.filtersQuery);
+                if (_this.paging.hasOffsetStrategy && params && params.loadOffset) {
+                    query = Object.assign(query, _this.paging.loadDeletedOffsetQuery);
+                }
+                else {
+                    if (_this.initialFetch && _this.paging.loadMoreEnabled) {
+                        query = Object.assign(query, _this.paging.loadMoreQuery);
+                    }
+                    else {
+                        query = Object.assign(query, _this.paging.query);
+                    }
+                }
                 if (_this.sorting.sortingColumn) {
                     Object.assign(query, {
                         order: _this.sorting.sortingColumn.name + "," + _this.sorting.sortingColumn.direction
@@ -3423,6 +3436,7 @@
                 return source$;
             }), operators.takeUntil(this.onDestroy$))
                 .subscribe(function (response) {
+                _this.initialFetch = false;
                 _this.completeFetch(response);
             });
         };