@firestitch/list 9.12.3 → 9.12.4

package/fesm5/firestitch-list.js

@@ -18,7 +18,7 @@ import { FsPrompt, FsPromptModule } from '@firestitch/prompt';
 import { FsFileModule } from '@firestitch/file';
 import { isString, isObject, isBoolean, isNumber, isFunction, get, cloneDeep, mergeWith, random, merge as merge$1 } from 'lodash-es';
 import { Subject, BehaviorSubject, Observable, merge, from, combineLatest, of } from 'rxjs';
-import { takeUntil, tap, take, map, debounceTime, switchMap, mapTo, catchError, distinctUntilChanged, shareReplay, skip, filter } from 'rxjs/operators';
+import { takeUntil, tap, distinctUntilChanged, take, map, debounceTime, switchMap, mapTo, catchError, shareReplay, skip, filter } from 'rxjs/operators';
 import { SelectionDialog } from '@firestitch/selection';
 import { getNormalizedPath } from '@firestitch/common';
 import { DrawerRef } from '@firestitch/drawer';
@@ -1423,27 +1423,24 @@ var PaginationStrategy;
     PaginationStrategy["None"] = "none";
 })(PaginationStrategy || (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 BehaviorSubject(0); // Total pages
-        _this._strategy = PaginationStrategy.None;
-        _this._removedRows = 0;
-        _this._pageChanged$ = new Subject();
-        _this._pageReset$ = new Subject();
-        _this._onDestroy$ = new 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 BehaviorSubject(0); // Total pages
+        this._strategy = PaginationStrategy.None;
+        this._removedRows = 0;
+        this._pageChanged$ = new Subject();
+        this._pageReset$ = new Subject();
+        this._onDestroy$ = new 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 () {
@@ -1458,7 +1455,8 @@ var PaginationController = /** @class */ (function (_super) {
     });
     Object.defineProperty(PaginationController.prototype, "pages$", {
         get: function () {
-            return this._pages$.asObservable();
+            return this._pages$
+                .pipe(distinctUntilChanged());
         },
         enumerable: true,
         configurable: true
@@ -1529,6 +1527,22 @@ var PaginationController = /** @class */ (function (_super) {
         enumerable: true,
         configurable: true
     });
+    Object.defineProperty(PaginationController.prototype, "loadMoreQuery", {
+        get: function () {
+            switch (this.strategy) {
+                case PaginationStrategy.Page:
+                    return this.query;
+                case 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
@@ -1691,12 +1705,6 @@ var PaginationController = /** @class */ (function (_super) {
         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) {
@@ -1706,12 +1714,12 @@ var PaginationController = /** @class */ (function (_super) {
             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", {
         /**
@@ -1756,15 +1764,15 @@ var PaginationController = /** @class */ (function (_super) {
     /**
      * 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;
@@ -1951,6 +1959,19 @@ var PaginationController = /** @class */ (function (_super) {
         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
      */
@@ -1963,25 +1984,8 @@ var PaginationController = /** @class */ (function (_super) {
     PaginationController.prototype.updateTotalPages = function () {
         this.pages = Math.ceil(this.records / this.limit);
     };
-    __decorate([
-        Alias(),
-        __metadata("design:type", Object)
-    ], PaginationController.prototype, "limit", void 0);
-    __decorate([
-        Alias(),
-        __metadata("design:type", Number)
-    ], PaginationController.prototype, "records", void 0);
-    __decorate([
-        Alias(),
-        __metadata("design:type", Object)
-    ], PaginationController.prototype, "manual", void 0);
-    __decorate([
-        Alias('pages'),
-        __metadata("design:type", Number),
-        __metadata("design:paramtypes", [Number])
-    ], PaginationController.prototype, "pages", null);
     return PaginationController;
-}(Model));
+}());
 
 var SelectionChangeType;
 (function (SelectionChangeType) {
@@ -3201,9 +3205,18 @@ var List = /** @class */ (function (_super) {
             var _a;
             (_a = _this.selection) === null || _a === void 0 ? void 0 : _a.closeSelectionDialog();
         }), 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
@@ -3230,6 +3243,7 @@ var List = /** @class */ (function (_super) {
             return source$;
         }), takeUntil(this.onDestroy$))
             .subscribe(function (response) {
+            _this.initialFetch = false;
             _this.completeFetch(response);
         });
     };