@firestitch/list 9.10.1 → 9.11.2

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

@@ -4,7 +4,7 @@ import { ChangeFn, FilterConfig, IFilterSavedFiltersConfig } from '@firestitch/f
 import { FsScrollInstance, FsScrollService } from '@firestitch/scroll';
 import { SelectionDialog } from '@firestitch/selection';
 import { Model } from 'tsmodels';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import { FsListAfterFetchFn, FsListConfig, FsListEmptyStateConfig, FsListFetchFn, FsListFetchSubscription, FsListNoResultsConfig, FsListRestoreConfig, FsListScrollableConfig, FsListTrackByFn } from '../interfaces';
 import { ColumnsController } from './columns-controller';
 import { ActionsController } from './index';
@@ -45,7 +45,6 @@ export declare class List extends Model {
     afterFetchFn: FsListAfterFetchFn;
     initialized$: BehaviorSubject<boolean>;
     loading$: BehaviorSubject<boolean>;
-    filtersQuery: any;
     hasRowActions: any;
     paging: PaginationController;
     columns: ColumnsController;
@@ -68,6 +67,7 @@ export declare class List extends Model {
     emptyStateTemplate: TemplateRef<any>;
     fsScrollInstance: FsScrollInstance;
     onDestroy$: Subject<unknown>;
+    private readonly _filtersQuery;
     private readonly _headerConfig;
     private readonly _groupCellConfig;
     private readonly _cellConfig;
@@ -75,6 +75,8 @@ export declare class List extends Model {
     private _fsScrollSubscription;
     constructor(el: ElementRef, config: FsListConfig, fsScroll: FsScrollService, selectionDialog: SelectionDialog, router: Router, route: ActivatedRoute, persistance: PersistanceController, inDialog: boolean);
     get hasSavedFilters(): boolean;
+    get filtersQuery(): Record<string, any>;
+    get filtersQuery$(): Observable<Record<string, any>>;
     fetchRemote(query: any): any;
     /**
      * Transform templates for using

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

@@ -27,6 +27,7 @@ export declare class ReorderController implements OnDestroy {
     private _enabled$;
     private _manualReorderActivated$;
     private _reorderDisabled$;
+    private _numberOfActiveFilters;
     private _destroy$;
     constructor();
     get enabled(): boolean;
@@ -53,4 +54,5 @@ export declare class ReorderController implements OnDestroy {
      * Disable reorder action and update filter actions state
      */
     disableReorderAction(): void;
+    setNunberOfActiveFilters(activeFilters: number): void;
 }

package/app/components/list/list.component.d.ts

@@ -103,6 +103,7 @@ export declare class FsListComponent implements OnInit, OnDestroy {
     private _subscribeToRemoveRow;
     private _subscribeToGroupExpandStatusChange;
     private _waitFirstLoad;
+    private _listenFiltersQueryChange;
     private _configMergeCustomizer;
     private _restorePersistance;
 }

package/app/interfaces/listconfig.interface.d.ts

@@ -143,7 +143,7 @@ export interface FsListRowActionGroup {
     rowActions: FsListRowAction[];
 }
 export interface FsListRowAction {
-    label?: string;
+    label?: string | FsListRowActionLabelFn;
     type?: ActionType;
     className?: string;
     icon?: string;
@@ -160,6 +160,9 @@ export interface FsListRowAction {
 export interface FsListRowActionLinkFn {
     (row: FsListAbstractRow): FsListRowActionLink;
 }
+export interface FsListRowActionLabelFn {
+    (row: FsListAbstractRow): string;
+}
 export interface FsListRowActionLink {
     link: any[] | string;
     queryParams?: Record<string, any>;

package/app/models/row-action.model.d.ts

@@ -3,7 +3,6 @@ import { ActionType } from '../enums/button-type.enum';
 import { FsListRowActionLink } from '../interfaces';
 export declare class RowAction extends Model {
     icon: string;
-    label: string;
     menu: boolean;
     remove: {
         title: string;
@@ -14,16 +13,19 @@ export declare class RowAction extends Model {
     show: Function;
     restore: boolean;
     rowActions: RowAction[];
+    label: string;
     routerLink: FsListRowActionLink;
     classArray: string[];
     isShown: boolean;
     click: Function;
     private _linkFn;
+    private _labelFn;
     private readonly _isGroup;
     constructor(config?: any);
     get isGroup(): boolean;
     _fromJSON(value: any): void;
     checkShowStatus(row: any, index: any): void;
     updateLink(row: any): void;
+    updateLabel(row: any): void;
     private clickEvent;
 }

package/bundles/firestitch-list.umd.js

@@ -517,6 +517,7 @@
         function RowAction(config) {
             if (config === void 0) { config = {}; }
             var _this = _super.call(this) || this;
+            _this.label = '';
             _this.classArray = [];
             _this.isShown = true;
             _this._isGroup = false;
@@ -549,6 +550,13 @@
                 return _this.clickEvent(row, event, index, rowActionsRef, clickFn);
             };
             this._linkFn = value.link;
+            if (typeof value.label === 'function') {
+                this._labelFn = value.label;
+                this.label = '';
+            }
+            else {
+                this.label = value.label;
+            }
             if (this.className) {
                 this.classArray = this.className.split(' ').reduce(function (acc, elem) {
                     acc.push(elem);
@@ -583,6 +591,19 @@
                 }
             }
         };
+        RowAction.prototype.updateLabel = function (row) {
+            if (!this.isShown) {
+                return;
+            }
+            if (this.isGroup) {
+                this.rowActions.forEach(function (action) {
+                    action.updateLabel(row);
+                });
+            }
+            else if (this._labelFn) {
+                this.label = this._labelFn(row);
+            }
+        };
         RowAction.prototype.clickEvent = function (row, event, index, rowActionsRef, clickFn) {
             // Stop event propagation for parent
             event.stopPropagation();
@@ -599,10 +620,6 @@
             tsmodels.Alias(),
             __metadata("design:type", String)
         ], RowAction.prototype, "icon", void 0);
-        __decorate([
-            tsmodels.Alias(),
-            __metadata("design:type", String)
-        ], RowAction.prototype, "label", void 0);
         __decorate([
             tsmodels.Alias(),
             __metadata("design:type", Boolean)
@@ -3027,6 +3044,7 @@
             // Empty state
             _this.emptyStateEnabled = false;
             _this.onDestroy$ = new rxjs.Subject();
+            _this._filtersQuery = new rxjs.BehaviorSubject(null);
             _this._fromJSON(config);
             _this.initialize(config);
             _this._headerConfig = new StyleConfig(config.header);
@@ -3048,6 +3066,20 @@
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(List.prototype, "filtersQuery", {
+            get: function () {
+                return this._filtersQuery.getValue();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(List.prototype, "filtersQuery$", {
+            get: function () {
+                return this._filtersQuery.asObservable();
+            },
+            enumerable: true,
+            configurable: true
+        });
         List.prototype.fetchRemote = function (query) {
             var options = {
                 state: this.dataController.operation,
@@ -3338,7 +3370,7 @@
             var _this = this;
             var fetch$ = this.fetch$.asObservable();
             // Should wait until saved filters not loaded
-            if (!!this.filters && !!this.savedFilters) {
+            if (!!this.filters) {
                 fetch$ = rxjs.combineLatest([fetch$, this.filtersReady$])
                     .pipe(operators.map(function (_a) {
                     var _b = __read(_a, 1), params = _b[0];
@@ -3511,7 +3543,7 @@
             if (this.filterInitCb) {
                 this.filterInitCb(filters);
             }
-            this.filtersQuery = filters;
+            this._filtersQuery.next(filters);
             this.checkRestoreFilter();
         };
         /**
@@ -3523,7 +3555,7 @@
             if (this.filterChangeCb) {
                 this.filterChangeCb(filterQuery, filterSort);
             }
-            this.filtersQuery = filterQuery;
+            this._filtersQuery.next(filterQuery);
             this.restoreMode = false;
             // Restore option
             this.checkRestoreFilter();
@@ -3598,7 +3630,9 @@
             if (((_c = this.emptyState) === null || _c === void 0 ? void 0 : _c.validate) && this.emptyStateTemplate) {
                 this.emptyStateEnabled = this.emptyState.validate(query, lodashEs.cloneDeep(response.data));
             }
-            this.afterFetchFn(query, this.dataController.visibleRowsData);
+            if (this.afterFetchFn) {
+                this.afterFetchFn(query, this.dataController.visibleRowsData);
+            }
             this.fetchComplete$.next();
             this.loading$.next(false);
         };
@@ -3741,6 +3775,7 @@
             this._enabled$ = new rxjs.BehaviorSubject(false);
             this._manualReorderActivated$ = new rxjs.BehaviorSubject(false);
             this._reorderDisabled$ = new rxjs.BehaviorSubject(false);
+            this._numberOfActiveFilters = 0;
             this._destroy$ = new rxjs.Subject();
         }
         Object.defineProperty(ReorderController.prototype, "enabled", {
@@ -3774,7 +3809,9 @@
                 return this._enabled$
                     .pipe(operators.map(function (enabled) {
                     return enabled && _this.position === exports.ReorderPosition.Left;
-                }), operators.distinctUntilChanged(), operators.shareReplay(), operators.takeUntil(this._destroy$));
+                }), operators.map(function () {
+                    return _this._numberOfActiveFilters === 0;
+                }), operators.distinctUntilChanged(), operators.shareReplay());
             },
             enumerable: true,
             configurable: true
@@ -3785,7 +3822,9 @@
                 return this._enabled$
                     .pipe(operators.map(function (enabled) {
                     return enabled && _this.position === exports.ReorderPosition.Right;
-                }), operators.distinctUntilChanged(), operators.shareReplay(), operators.takeUntil(this._destroy$));
+                }), operators.map(function () {
+                    return _this._numberOfActiveFilters === 0;
+                }), operators.distinctUntilChanged(), operators.shareReplay());
             },
             enumerable: true,
             configurable: true
@@ -3908,6 +3947,10 @@
             this._reorderDisabled$.next(true);
             this._actionsController.updateDisabledState();
         };
+        ReorderController.prototype.setNunberOfActiveFilters = function (activeFilters) {
+            this._numberOfActiveFilters = activeFilters;
+            this.enabled = this.enabled;
+        };
         ReorderController = __decorate([
             core.Injectable(),
             __metadata("design:paramtypes", [])
@@ -4434,6 +4477,7 @@
             this._updateCustomizeAction(listConfig.actions);
             this.list = new List(this._el, listConfig, this.fsScroll, this.selectionDialog, this._router, this._route, this._persistance, this._inDialog);
             this._waitFirstLoad();
+            this._listenFiltersQueryChange();
             this.reorderController.initWithConfig(config.reorder, this.list.dataController, this.list.actions);
             if (this.listColumnDirectives) {
                 this.list.tranformTemplatesToColumns(this.listColumnDirectives);
@@ -4511,6 +4555,17 @@
                 _this.cdRef.markForCheck();
             });
         };
+        FsListComponent.prototype._listenFiltersQueryChange = function () {
+            var _this = this;
+            this.list.filtersQuery$
+                .pipe(operators.takeUntil(this.list.onDestroy$), operators.takeUntil(this._destroy))
+                .subscribe(function (value) {
+                if (value) {
+                    var activeFilters = Object.keys(value).length;
+                    _this.reorderController.setNunberOfActiveFilters(activeFilters);
+                }
+            });
+        };
         FsListComponent.prototype._configMergeCustomizer = function (objValue, srcValue) {
             if (Array.isArray(objValue)) {
                 return objValue;
@@ -5746,7 +5801,10 @@
             return index;
         };
         FsRowActionsComponent.prototype.clickOnTrigger = function (event) {
+            var _this = this;
             event.stopPropagation();
+            this.rowActions
+                .forEach(function (action) { return action.updateLabel(_this.row.data); });
         };
         /**
          * Emit that some row must be removed