@universis/ngx-tables 0.7.6 → 0.7.7

package/bundles/universis-ngx-tables.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('iso-639-1/build'), require('rxjs'), require('jquery'), require('datatables.net'), require('lodash'), require('datatables.net-scroller'), require('rxjs/add/observable/combineLatest'), require('@angular/common/http'), require('@themost/client'), require('@themost/angular'), require('@angular/common'), require('@ngx-translate/core'), require('@angular/forms'), require('@universis/common'), require('@universis/common/routing'), require('@universis/forms'), require('angular-formio'), require('@angular/router'), require('ngx-bootstrap/modal'), require('ngx-bootstrap/progressbar'), require('ngx-pipes'), require('@angular/core'), require('@ngrx/store'), require('rxjs/operators')) :
-    typeof define === 'function' && define.amd ? define('@universis/ngx-tables', ['exports', 'iso-639-1/build', 'rxjs', 'jquery', 'datatables.net', 'lodash', 'datatables.net-scroller', 'rxjs/add/observable/combineLatest', '@angular/common/http', '@themost/client', '@themost/angular', '@angular/common', '@ngx-translate/core', '@angular/forms', '@universis/common', '@universis/common/routing', '@universis/forms', 'angular-formio', '@angular/router', 'ngx-bootstrap/modal', 'ngx-bootstrap/progressbar', 'ngx-pipes', '@angular/core', '@ngrx/store', 'rxjs/operators'], factory) :
-    (factory((global.universis = global.universis || {}, global.universis['ngx-tables'] = {}),global.ISO6391,global.rxjs,global.jQuery_,null,global.lodash,null,global.rxjs['add/observable/combineLatest'],global.ng.common.http,global.client,global.i1,global.ng.common,global.core,global.ng.forms,global.i2,global.routing,global.forms$1,global.angularFormio,global.ng.router,global.modal,global.progressbar,global.ngxPipes,global.ng.core,global.store,global.rxjs.operators));
-}(this, (function (exports,ISO6391,rxjs,jQuery_,datatables_net,lodash,datatables_netScroller,combineLatest,http,client,i1,common,core,forms,i2,routing,forms$1,angularFormio,i1$1,modal,progressbar,ngxPipes,i0,store,operators) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('iso-639-1/build'), require('rxjs'), require('jquery'), require('datatables.net'), require('lodash'), require('datatables.net-scroller'), require('rxjs/add/observable/combineLatest'), require('@angular/common/http'), require('@themost/client'), require('@themost/angular'), require('@angular/common'), require('@ngx-translate/core'), require('@angular/forms'), require('@universis/common'), require('@universis/common/routing'), require('@universis/forms'), require('angular-formio'), require('ngx-bootstrap/modal'), require('ngx-bootstrap/progressbar'), require('ngx-pipes'), require('@angular/core'), require('@angular/router'), require('@ngrx/store'), require('rxjs/operators')) :
+    typeof define === 'function' && define.amd ? define('@universis/ngx-tables', ['exports', 'iso-639-1/build', 'rxjs', 'jquery', 'datatables.net', 'lodash', 'datatables.net-scroller', 'rxjs/add/observable/combineLatest', '@angular/common/http', '@themost/client', '@themost/angular', '@angular/common', '@ngx-translate/core', '@angular/forms', '@universis/common', '@universis/common/routing', '@universis/forms', 'angular-formio', 'ngx-bootstrap/modal', 'ngx-bootstrap/progressbar', 'ngx-pipes', '@angular/core', '@angular/router', '@ngrx/store', 'rxjs/operators'], factory) :
+    (factory((global.universis = global.universis || {}, global.universis['ngx-tables'] = {}),global.ISO6391,global.rxjs,global.jQuery_,null,global.lodash,null,global.rxjs['add/observable/combineLatest'],global.ng.common.http,global.client,global.i1,global.ng.common,global.core,global.ng.forms,global.i2,global.routing,global.forms$1,global.angularFormio,global.modal,global.progressbar,global.ngxPipes,global.ng.core,global.ng.router,global.store,global.rxjs.operators));
+}(this, (function (exports,ISO6391,rxjs,jQuery_,datatables_net,lodash,datatables_netScroller,combineLatest,http,client,i1,common,core,forms,i2,routing,forms$1,angularFormio,modal,progressbar,ngxPipes,i0,i1$1,store,operators) { 'use strict';
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -5009,19 +5009,23 @@
                 // set auto load to false
                 this.search.table.autoLoad = false;
                 // handle filtering
-                this.search.filterChange.subscribe(function (filter) {
+                this.filterChangeSubscription = this.search.filterChange.subscribe(function (filter) {
                     _this.onSearchFilter(filter);
                 });
-                // handle table state (via directive)
-                var tableState = new AdvancedTableState(this.search.table, this.store);
-                tableState.tableState = this.searchState;
-                tableState.ngOnInit();
+                // apply table state
+                this.applyTableState();
                 // handle table init
-                this.search.table.init.subscribe(function () {
+                this.tableInitSubscription = this.search.table.init.subscribe(function () {
                     return _this.onTableInit();
                 });
             }
         };
+        AdvancedSearchState.prototype.applyTableState = function () {
+            // handle table state (via directive)
+            var tableState = new AdvancedTableState(this.search.table, this.store);
+            tableState.tableState = this.searchState;
+            tableState.ngOnInit();
+        };
         AdvancedSearchState.prototype.onTableInit = function () {
             var _this = this;
             this.store.pipe(store.select(selectTable, { id: this.searchState }), operators.first()).subscribe(function (state) {
@@ -5044,8 +5048,16 @@
                         return _this.search.search();
                     }
                     if (state.filter) {
-                        _this.search.filter = state.filter;
+                        if (Object.keys(state.filter).length) {
+                            // set collapsed to false (advanced search)
+                            _this.search.collapsed = false;
+                            _this.search.filter = state.filter;
+                            return _this.search.search();
+                        }
                     }
+                    // ensure empty filter at this moment
+                    // because search() function triggers a store dispatch
+                    _this.search.filter = {};
                     return _this.search.search();
                 }
             });
@@ -5053,6 +5065,14 @@
         AdvancedSearchState.prototype.onSearchFilter = function (filter) {
             this.store.dispatch(new AppendFilter(this.searchState, filter));
         };
+        AdvancedSearchState.prototype.ngOnDestroy = function () {
+            if (this.filterChangeSubscription) {
+                this.filterChangeSubscription.unsubscribe();
+            }
+            if (this.tableInitSubscription) {
+                this.tableInitSubscription.unsubscribe();
+            }
+        };
         AdvancedSearchState.decorators = [
             { type: i0.Directive, args: [{
                         // tslint:disable-next-line: directive-selector
@@ -5072,6 +5092,70 @@
         return AdvancedSearchState;
     }());
 
+    var AdvancedSearchRouterState = /** @class */ (function (_super) {
+        __extends(AdvancedSearchRouterState, _super);
+        function AdvancedSearchRouterState(search, store$$1, _router) {
+            var _this = 
+            // call super constructor
+            _super.call(this, search, store$$1) || this;
+            _this.search = search;
+            _this.store = store$$1;
+            _this._router = _router;
+            _this._enteringState = true;
+            _this._applyState = false;
+            // set search state dynamically according to route
+            _this._routerSubscription = _this._router.events
+                .pipe(operators.filter(function (event) {
+                return event instanceof i1$1.NavigationStart || event instanceof i1$1.NavigationEnd;
+            }))
+                .subscribe(function (event) {
+                // capture urls regarding tab changing while the component is active
+                if (event instanceof i1$1.NavigationStart && !_this._enteringState) {
+                    // set search state
+                    _this.searchState = event.url;
+                    // toogle applyState
+                    _this._applyState = true;
+                }
+                // capture url of the first activation of the component (e.g. coming from another route)
+                if (event instanceof i1$1.NavigationEnd && _this._enteringState) {
+                    // set search state
+                    _this.searchState = event.urlAfterRedirects;
+                    // toggle enteringState
+                    _this._enteringState = false;
+                }
+                if (_this._applyState) {
+                    // apply new table state
+                    _super.prototype.applyTableState.call(_this);
+                    _this._applyState = false;
+                }
+            });
+            return _this;
+        }
+        AdvancedSearchRouterState.prototype.ngOnDestroy = function () {
+            // destroy own subscriptions
+            if (this._routerSubscription) {
+                this._routerSubscription.unsubscribe();
+            }
+            // destroy parent subscriptions
+            return _super.prototype.ngOnDestroy.call(this);
+        };
+        AdvancedSearchRouterState.decorators = [
+            { type: i0.Directive, args: [{
+                        // tslint:disable-next-line: directive-selector
+                        selector: "[routerSearchState]",
+                    },] }
+        ];
+        /** @nocollapse */
+        AdvancedSearchRouterState.ctorParameters = function () {
+            return [
+                { type: AdvancedTableSearchComponent },
+                { type: store.Store, decorators: [{ type: i0.Optional }] },
+                { type: i1$1.Router }
+            ];
+        };
+        return AdvancedSearchRouterState;
+    }(AdvancedSearchState));
+
     var ɵ0 = FORMATTERS;
     var TablesModule = /** @class */ (function () {
         function TablesModule(_translateService) {
@@ -5137,7 +5221,8 @@
                             ParseTitlePipe,
                             AddItemsComponent,
                             AdvancedSearchState,
-                            AdvancedTableState
+                            AdvancedTableState,
+                            AdvancedSearchRouterState
                         ],
                         exports: [
                             AdvancedTableComponent,
@@ -5155,7 +5240,8 @@
                             AdvancedAggregatorListComponent,
                             AddItemsComponent,
                             AdvancedSearchState,
-                            AdvancedTableState
+                            AdvancedTableState,
+                            AdvancedSearchRouterState
                         ],
                         entryComponents: [
                             AdvancedTableModalBaseComponent,
@@ -5186,6 +5272,7 @@
 
     exports.ɵa = AdvancedSearchState;
     exports.ɵc = AdvancedTableState;
+    exports.ɵd = AdvancedSearchRouterState;
     exports.AdvancedListComponent = AdvancedListComponent;
     exports.AdvancedRowActionComponent = AdvancedRowActionComponent;
     exports.AdvancedSearchFormComponent = AdvancedSearchFormComponent;