@firestitch/list 12.2.1 → 12.3.0

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

@@ -3,9 +3,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { ChangeFn, FilterConfig, IFilterSavedFiltersConfig } from '@firestitch/filter';
 import { FsScrollInstance, FsScrollService } from '@firestitch/scroll';
 import { SelectionDialog } from '@firestitch/selection';
-import { Model } from 'tsmodels';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
-import { FsListAfterContentInitFn, FsListAfterFetchFn, FsListConfig, FsListEmptyStateConfig, FsListFetchFn, FsListFetchSubscription, FsListNoResultsConfig, FsListRestoreConfig, FsListScrollableConfig, FsListTrackByFn } from '../interfaces';
+import { FsListAfterContentInitFn, FsListAfterFetchFn, FsListConfig, FsListEmptyStateConfig, FsListFetchFn, FsListFetchSubscription, FsListNoResultsConfig, FsListPersitance, FsListRestoreConfig, FsListScrollableConfig, FsListTrackByFn } from '../interfaces';
 import { ColumnsController } from './columns-controller';
 import { ActionsController } from './index';
 import { DataController } from './data-controller';
@@ -14,7 +13,7 @@ import { SelectionController } from './selection-controller';
 import { SortingController } from './sorting-controller';
 import { PersistanceController } from './persistance-controller';
 import { ExternalParamsController } from './external-params-controller';
-export declare class List extends Model {
+export declare class List {
     private el;
     private config;
     private fsScroll;
@@ -26,19 +25,17 @@ export declare class List extends Model {
     heading: string;
     trackBy: string;
     subheading: string;
-    inlineFilters: any;
     rowActionsRaw: any[];
     groupActionsRaw: any[];
     rowClass: any;
     rowEvents: any;
     restore: FsListRestoreConfig;
-    columnTemplates: any;
-    persist: boolean;
+    persist: FsListPersitance;
     filters: any[];
     filterInitCb: ChangeFn;
     filterChangeCb: ChangeFn;
     savedFilters: IFilterSavedFiltersConfig;
-    scrollable: FsListScrollableConfig | false;
+    scrollable: FsListScrollableConfig;
     noResults: FsListNoResultsConfig;
     emptyState: FsListEmptyStateConfig;
     fetchFn: FsListFetchFn;

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

@@ -36,7 +36,7 @@ export interface FsListConfig {
     fetch?: FsListFetchFn;
     afterFetch?: FsListAfterFetchFn;
     afterContentInit?: FsListAfterContentInitFn;
-    scrollable?: FsListScrollableConfig | boolean;
+    scrollable?: FsListScrollableConfig;
     selection?: FsListSelectionConfig;
     initialFetch?: boolean;
     rowEvents?: {

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

@@ -1,7 +1,6 @@
-import { Model } from 'tsmodels';
 import { ActionType } from '../enums/button-type.enum';
 import { FsListRowActionFile, FsListRowActionLink } from '../interfaces';
-export declare class RowAction extends Model {
+export declare class RowAction {
     icon: string;
     menu: boolean;
     remove: {
@@ -24,7 +23,7 @@ export declare class RowAction extends Model {
     private readonly _isGroup;
     constructor(config?: any);
     get isGroup(): boolean;
-    _fromJSON(value: any): void;
+    _init(value: any): void;
     checkShowStatus(row: any, index: any): void;
     updateLink(row: any): void;
     updateLabel(row: any): void;

package/app/models/styleConfig.model.d.ts

@@ -1,5 +1,4 @@
-import { Model } from 'tsmodels';
-export declare class StyleConfig extends Model {
+export declare class StyleConfig {
     colspan: any;
     align: string;
     className: string | string[];
@@ -22,6 +21,7 @@ export declare class StyleConfig extends Model {
      * @param prior2
      */
     mergeClassByPriority(prior1: StyleConfig, prior2: StyleConfig): void;
+    private _init;
     /**
      * Merge params into array
      * @param to

package/bundles/firestitch-list.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/router'), require('@angular/material/button'), require('@angular/material/checkbox'), require('@angular/material/core'), require('@angular/material/dialog'), require('@angular/material/icon'), require('@angular/material/menu'), require('@angular/material/tooltip'), require('@angular/material/progress-spinner'), require('@angular/flex-layout'), require('@firestitch/filter'), require('@firestitch/scroll'), require('@firestitch/menu'), require('@firestitch/prompt'), require('@firestitch/file'), require('lodash-es'), require('rxjs'), require('rxjs/operators'), require('@firestitch/common'), require('tsmodels'), require('@firestitch/store'), require('@firestitch/selection'), require('@firestitch/drawer'), require('@angular/flex-layout/extended'), require('@angular/flex-layout/flex')) :
-    typeof define === 'function' && define.amd ? define('@firestitch/list', ['exports', '@angular/core', '@angular/common', '@angular/router', '@angular/material/button', '@angular/material/checkbox', '@angular/material/core', '@angular/material/dialog', '@angular/material/icon', '@angular/material/menu', '@angular/material/tooltip', '@angular/material/progress-spinner', '@angular/flex-layout', '@firestitch/filter', '@firestitch/scroll', '@firestitch/menu', '@firestitch/prompt', '@firestitch/file', 'lodash-es', 'rxjs', 'rxjs/operators', '@firestitch/common', 'tsmodels', '@firestitch/store', '@firestitch/selection', '@firestitch/drawer', '@angular/flex-layout/extended', '@angular/flex-layout/flex'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.firestitch = global.firestitch || {}, global.firestitch.list = {}), global.ng.core, global.ng.common, global.ng.router, global.ng.material.button, global.ng.material.checkbox, global.ng.material.core, global.ng.material.dialog, global.ng.material.icon, global.ng.material.menu, global.ng.material.tooltip, global.ng.material.progressSpinner, global.ng.flexLayout, global.i2, global.i2$4, global.i2$3, global.i1$1, global.i4$1, global.lodashEs, global.rxjs, global.rxjs.operators, global.common, global.tsmodels, global.i1, global.i3$3, global.i9, global.ng.flexLayout.extended, global.ng.flexLayout.flex));
-})(this, (function (exports, i0, i3$1, i6$1, i2$2, i2$1, i4$2, i4, i3, menu, i6, progressSpinner, flexLayout, i2, i2$4, i2$3, i1$1, i4$1, lodashEs, rxjs, operators, common, tsmodels, i1, i3$3, i9, i5, i3$2) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/router'), require('@angular/material/button'), require('@angular/material/checkbox'), require('@angular/material/core'), require('@angular/material/dialog'), require('@angular/material/icon'), require('@angular/material/menu'), require('@angular/material/tooltip'), require('@angular/material/progress-spinner'), require('@angular/flex-layout'), require('@firestitch/filter'), require('@firestitch/scroll'), require('@firestitch/menu'), require('@firestitch/prompt'), require('@firestitch/file'), require('lodash-es'), require('rxjs'), require('rxjs/operators'), require('@firestitch/common'), require('@firestitch/store'), require('@firestitch/selection'), require('@firestitch/drawer'), require('@angular/flex-layout/extended'), require('@angular/flex-layout/flex')) :
+    typeof define === 'function' && define.amd ? define('@firestitch/list', ['exports', '@angular/core', '@angular/common', '@angular/router', '@angular/material/button', '@angular/material/checkbox', '@angular/material/core', '@angular/material/dialog', '@angular/material/icon', '@angular/material/menu', '@angular/material/tooltip', '@angular/material/progress-spinner', '@angular/flex-layout', '@firestitch/filter', '@firestitch/scroll', '@firestitch/menu', '@firestitch/prompt', '@firestitch/file', 'lodash-es', 'rxjs', 'rxjs/operators', '@firestitch/common', '@firestitch/store', '@firestitch/selection', '@firestitch/drawer', '@angular/flex-layout/extended', '@angular/flex-layout/flex'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.firestitch = global.firestitch || {}, global.firestitch.list = {}), global.ng.core, global.ng.common, global.ng.router, global.ng.material.button, global.ng.material.checkbox, global.ng.material.core, global.ng.material.dialog, global.ng.material.icon, global.ng.material.menu, global.ng.material.tooltip, global.ng.material.progressSpinner, global.ng.flexLayout, global.i2, global.i2$4, global.i2$3, global.i1$1, global.i4$1, global.lodashEs, global.rxjs, global.rxjs.operators, global.common, global.i1, global.i3$3, global.i9, global.ng.flexLayout.extended, global.ng.flexLayout.flex));
+})(this, (function (exports, i0, i3$1, i6$1, i2$2, i2$1, i4$2, i4, i3, menu, i6, progressSpinner, flexLayout, i2, i2$4, i2$3, i1$1, i4$1, lodashEs, rxjs, operators, common, i1, i3$3, i9, i5, i3$2) { 'use strict';
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -360,16 +360,13 @@
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
 
-    var StyleConfig = /** @class */ (function (_super) {
-        __extends(StyleConfig, _super);
+    var StyleConfig = /** @class */ (function () {
         function StyleConfig(config) {
             if (config === void 0) { config = {}; }
-            var _this = _super.call(this) || this;
-            _this.className = []; // Can't be used in tempaltes!
-            _this.classesArray = []; // Can be used in tempaltes
-            _this.classesString = '';
-            _this._fromJSON(config);
-            return _this;
+            this.className = []; // Can't be used in tempaltes!
+            this.classesArray = []; // Can be used in tempaltes
+            this.classesString = '';
+            this._init(config);
         }
         /**
          * Create static array of styles for using in templates
@@ -419,6 +416,11 @@
             }
             this.className = targetValue;
         };
+        StyleConfig.prototype._init = function (config) {
+            this.colspan = config.colspan;
+            this.align = config.align;
+            this.className = config.className;
+        };
         /**
          * Merge params into array
          * @param to
@@ -433,19 +435,7 @@
             }
         };
         return StyleConfig;
-    }(tsmodels.Model));
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], StyleConfig.prototype, "colspan", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", String)
-    ], StyleConfig.prototype, "align", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], StyleConfig.prototype, "className", void 0);
+    }());
 
     exports.SortingDirection = void 0;
     (function (SortingDirection) {
@@ -676,20 +666,17 @@
         ActionType["MiniFab"] = "mini-fab";
     })(exports.ActionType || (exports.ActionType = {}));
 
-    var RowAction = /** @class */ (function (_super) {
-        __extends(RowAction, _super);
+    var RowAction = /** @class */ (function () {
         function RowAction(config) {
             if (config === void 0) { config = {}; }
-            var _this = _super.call(this) || this;
-            _this.label = '';
-            _this.classArray = [];
-            _this.isShown = true;
-            _this._isGroup = false;
-            _this._fromJSON(config);
-            if (Array.isArray(_this.rowActions)) {
-                _this._isGroup = true;
+            this.label = '';
+            this.classArray = [];
+            this.isShown = true;
+            this._isGroup = false;
+            this._init(config);
+            if (Array.isArray(this.rowActions)) {
+                this._isGroup = true;
             }
-            return _this;
         }
         Object.defineProperty(RowAction.prototype, "isGroup", {
             get: function () {
@@ -698,15 +685,17 @@
             enumerable: false,
             configurable: true
         });
-        RowAction.prototype._fromJSON = function (value) {
+        RowAction.prototype._init = function (value) {
             var _this = this;
-            _super.prototype._fromJSON.call(this, value);
-            if (value.type === void 0) {
-                this.type = exports.ActionType.Basic;
-            }
-            if (this.menu === void 0) {
-                this.menu = true;
-            }
+            var _a, _b, _c;
+            this.icon = value.icon;
+            this.menu = (_a = value.menu) !== null && _a !== void 0 ? _a : true;
+            this.remove = value.remove;
+            this.className = value.className;
+            this.type = (_b = value.type) !== null && _b !== void 0 ? _b : exports.ActionType.Basic;
+            this.show = value.show;
+            this.restore = value.restore;
+            this.rowActions = (_c = value.rowActions) === null || _c === void 0 ? void 0 : _c.map(function (action) { return new RowAction(action); });
             // Re-assign click function
             var clickFn = value.click;
             this.click = function (row, event, index, rowActionsRef) {
@@ -791,39 +780,7 @@
             }
         };
         return RowAction;
-    }(tsmodels.Model));
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", String)
-    ], RowAction.prototype, "icon", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Boolean)
-    ], RowAction.prototype, "menu", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], RowAction.prototype, "remove", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", String)
-    ], RowAction.prototype, "className", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", String)
-    ], RowAction.prototype, "type", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Function)
-    ], RowAction.prototype, "show", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Boolean)
-    ], RowAction.prototype, "restore", void 0);
-    __decorate([
-        tsmodels.Alias('rowActions', RowAction),
-        __metadata("design:type", Array)
-    ], RowAction.prototype, "rowActions", void 0);
+    }());
 
     var ColumnsController = /** @class */ (function () {
         function ColumnsController() {
@@ -3478,56 +3435,51 @@
     }());
 
     var SHOW_DELETED_FILTERS_KEY = '$$_show_deleted_$$';
-    var List = /** @class */ (function (_super) {
-        __extends(List, _super);
+    var List = /** @class */ (function () {
         function List(el, config, fsScroll, selectionDialog, router, route, persistance, inDialog) {
             if (config === void 0) { config = {}; }
-            var _this = _super.call(this) || this;
-            _this.el = el;
-            _this.config = config;
-            _this.fsScroll = fsScroll;
-            _this.selectionDialog = selectionDialog;
-            _this.router = router;
-            _this.route = route;
-            _this.persistance = persistance;
-            _this.inDialog = inDialog;
-            _this.filters = [];
-            _this.scrollable = false;
+            this.el = el;
+            this.config = config;
+            this.fsScroll = fsScroll;
+            this.selectionDialog = selectionDialog;
+            this.router = router;
+            this.route = route;
+            this.persistance = persistance;
+            this.inDialog = inDialog;
+            this.filters = [];
             // @Alias('rows') private _rows: any;
-            _this.initialized$ = new rxjs.BehaviorSubject(false);
-            _this.loading$ = new rxjs.BehaviorSubject(false);
-            _this.paging = new PaginationController();
-            _this.columns = new ColumnsController();
-            _this.actions = new ActionsController();
-            _this.dataController = new DataController();
-            _this.sorting = new SortingController();
-            _this.filterConfig = null;
-            _this.fetch$ = new rxjs.Subject();
-            _this.fetchComplete$ = new rxjs.Subject();
-            _this.filtersReady$ = new rxjs.Subject();
-            _this.status = true;
-            _this.chips = false;
-            _this.filterInput = true;
-            _this.queryParam = false;
-            _this.restoreMode = false;
-            _this.initialFetch = true;
+            this.initialized$ = new rxjs.BehaviorSubject(false);
+            this.loading$ = new rxjs.BehaviorSubject(false);
+            this.paging = new PaginationController();
+            this.columns = new ColumnsController();
+            this.actions = new ActionsController();
+            this.dataController = new DataController();
+            this.sorting = new SortingController();
+            this.filterConfig = null;
+            this.fetch$ = new rxjs.Subject();
+            this.fetchComplete$ = new rxjs.Subject();
+            this.filtersReady$ = new rxjs.Subject();
+            this.status = true;
+            this.chips = false;
+            this.filterInput = true;
+            this.queryParam = false;
+            this.restoreMode = false;
+            this.initialFetch = true;
             // 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);
-            _this._groupCellConfig = new StyleConfig(config.cell);
-            _this._cellConfig = new StyleConfig(config.cell);
-            _this._footerConfig = new StyleConfig(config.footer);
-            _this.initialized$.next(true);
-            _this.subscribe();
-            if (_this.initialFetch) {
-                _this.dataController.setOperation(exports.FsListState.Load);
-                _this.fetch$.next();
+            this.emptyStateEnabled = false;
+            this.onDestroy$ = new rxjs.Subject();
+            this._filtersQuery = new rxjs.BehaviorSubject(null);
+            this.initialize(config);
+            this._headerConfig = new StyleConfig(config.header);
+            this._groupCellConfig = new StyleConfig(config.cell);
+            this._cellConfig = new StyleConfig(config.cell);
+            this._footerConfig = new StyleConfig(config.footer);
+            this.initialized$.next(true);
+            this.subscribe();
+            if (this.initialFetch) {
+                this.dataController.setOperation(exports.FsListState.Load);
+                this.fetch$.next();
             }
-            return _this;
         }
         Object.defineProperty(List.prototype, "hasSavedFilters", {
             get: function () {
@@ -3720,6 +3672,24 @@
          * @param config
          */
         List.prototype.initialize = function (config) {
+            var _a;
+            this.heading = config.heading;
+            this.trackBy = config.trackBy;
+            this.subheading = config.subheading;
+            this.rowActionsRaw = config.rowActions;
+            this.rowClass = config.rowClass;
+            this.rowEvents = config.rowEvents;
+            this.restore = config.restore;
+            this.persist = config.persist;
+            this.filters = (_a = config.filters) !== null && _a !== void 0 ? _a : [];
+            this.filterInitCb = config.filterInit;
+            this.filterChangeCb = config.filterChange;
+            this.savedFilters = config.savedFilters;
+            this.scrollable = config.scrollable;
+            this.noResults = config.noResults;
+            this.emptyState = config.emptyState;
+            this.fetchFn = config.fetch;
+            this.afterFetchFn = config.afterFetch;
             this.columns.initConfig(config.column);
             this.initDefaultOptions(config);
             this.initRestore();
@@ -4011,7 +3981,7 @@
                 persist: this.persist,
                 items: this.filters || [],
                 savedFilters: this.savedFilters,
-                inline: this.inlineFilters,
+                // inline: this.inlineFilters,
                 actions: this.actions.actions,
                 queryParam: this.queryParam,
                 sorts: sortValues,
@@ -4169,83 +4139,7 @@
             }
         };
         return List;
-    }(tsmodels.Model));
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", String)
-    ], List.prototype, "heading", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", String)
-    ], List.prototype, "trackBy", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", String)
-    ], List.prototype, "subheading", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], List.prototype, "inlineFilters", void 0);
-    __decorate([
-        tsmodels.Alias('rowActions'),
-        __metadata("design:type", Array)
-    ], List.prototype, "rowActionsRaw", void 0);
-    __decorate([
-        tsmodels.Alias('rowClass'),
-        __metadata("design:type", Object)
-    ], List.prototype, "rowClass", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], List.prototype, "rowEvents", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], List.prototype, "restore", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], List.prototype, "columnTemplates", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Boolean)
-    ], List.prototype, "persist", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], List.prototype, "filters", void 0);
-    __decorate([
-        tsmodels.Alias('filterInit'),
-        __metadata("design:type", Function)
-    ], List.prototype, "filterInitCb", void 0);
-    __decorate([
-        tsmodels.Alias('filterChange'),
-        __metadata("design:type", Function)
-    ], List.prototype, "filterChangeCb", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], List.prototype, "savedFilters", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], List.prototype, "scrollable", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], List.prototype, "noResults", void 0);
-    __decorate([
-        tsmodels.Alias(),
-        __metadata("design:type", Object)
-    ], List.prototype, "emptyState", void 0);
-    __decorate([
-        tsmodels.Alias('fetch'),
-        __metadata("design:type", Function)
-    ], List.prototype, "fetchFn", void 0);
-    __decorate([
-        tsmodels.Alias('afterFetch'),
-        __metadata("design:type", Function)
-    ], List.prototype, "afterFetchFn", void 0);
+    }());
 
     exports.ReorderPosition = void 0;
     (function (ReorderPosition) {