@universis/ngx-tables 0.7.6 → 0.7.7

package/fesm5/universis-ngx-tables.js

@@ -15,14 +15,14 @@ import { TemplatePipe, LoadingService, ErrorService, DIALOG_BUTTONS, ModalServic
 import { RouterModalOkCancel, RouterModalModule } from '@universis/common/routing';
 import { ServiceUrlPreProcessor, TranslatePreProcessor, AdvancedFormsModule } from '@universis/forms';
 import { FormioModule } from 'angular-formio';
-import { ActivatedRoute, Router, NavigationStart, RouterModule } from '@angular/router';
 import { BsModalRef, BsModalService, ModalModule } from 'ngx-bootstrap/modal';
 import { ProgressbarModule } from 'ngx-bootstrap/progressbar';
 import { GroupByPipe, NgPipesModule } from 'ngx-pipes';
 import { __extends, __awaiter, __generator, __values, __assign, __spread } from 'tslib';
 import { Injectable, Directive, Optional, Input, Pipe, Component, ElementRef, ViewChild, ViewEncapsulation, EventEmitter, Output, NgModule, CUSTOM_ELEMENTS_SCHEMA, defineInjectable, inject, HostListener, ChangeDetectorRef, InjectionToken, Inject, Injector, ChangeDetectionStrategy } from '@angular/core';
+import { ActivatedRoute, Router, NavigationStart, NavigationEnd, RouterModule } from '@angular/router';
 import { createFeatureSelector, createSelector, select, Store } from '@ngrx/store';
-import { first } from 'rxjs/operators';
+import { first, filter } from 'rxjs/operators';
 
 var AdvancedColumnFormatter = /** @class */ (function () {
     function AdvancedColumnFormatter() {
@@ -481,20 +481,20 @@ var AdvancedFilterValueProvider = /** @class */ (function () {
         this.values = {};
         this._template = new TemplatePipe();
     }
-    AdvancedFilterValueProvider.prototype.buildFilter = function (filter) {
-        if (filter) {
-            return this._template.transform(filter, this.values);
+    AdvancedFilterValueProvider.prototype.buildFilter = function (filter$$1) {
+        if (filter$$1) {
+            return this._template.transform(filter$$1, this.values);
         }
     };
-    AdvancedFilterValueProvider.prototype.asyncBuildFilter = function (filter) {
+    AdvancedFilterValueProvider.prototype.asyncBuildFilter = function (filter$$1) {
         return __awaiter(this, void 0, void 0, function () {
             var _a, _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        if (!filter) return [3 /*break*/, 2];
+                        if (!filter$$1) return [3 /*break*/, 2];
                         _b = (_a = this._template).transform;
-                        _c = [filter];
+                        _c = [filter$$1];
                         return [4 /*yield*/, this.getValues()];
                     case 1: return [2 /*return*/, _b.apply(_a, _c.concat([_d.sent()]))];
                     case 2: return [2 /*return*/];
@@ -767,13 +767,13 @@ var AdvancedTableComponent = /** @class */ (function () {
                     // try to split words
                     var words = searchText.split(' ');
                     // join words to a single filter
-                    var filter = words.map(function (word) {
+                    var filter$$1 = words.map(function (word) {
                         return _this._template.transform(_this.config.searchExpression, {
                             text: word,
                         });
                     }).join(' and ');
                     // set filter
-                    this.query.setParam('$filter', filter);
+                    this.query.setParam('$filter', filter$$1);
                 }
             }
             else {
@@ -2169,8 +2169,8 @@ var AdvancedSearchFormComponent = /** @class */ (function (_super) {
                 form: this.form
             });
             this.loading = false;
-            this.filterSubscription = this.filterChange.subscribe(function (filter) {
-                _this.submission.data = filter;
+            this.filterSubscription = this.filterChange.subscribe(function (filter$$1) {
+                _this.submission.data = filter$$1;
                 _this.refreshForm.emit({
                     submission: _this.submission
                 });
@@ -2449,7 +2449,7 @@ var AdvancedTableModalBaseComponent = /** @class */ (function (_super) {
      * @param {object} filter The filter to use in the search
      *
      */
-    AdvancedTableModalBaseComponent.prototype.advancedSearch = function (filter) {
+    AdvancedTableModalBaseComponent.prototype.advancedSearch = function (filter$$1) {
         return __awaiter(this, void 0, void 0, function () {
             var defaultFilterValues, err_1, expressions, predefinedCriteria, query;
             return __generator(this, function (_a) {
@@ -2473,9 +2473,9 @@ var AdvancedTableModalBaseComponent = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 4:
                         expressions = [];
-                        if (filter) {
-                            this.defaultFilter = filter;
-                            predefinedCriteria = this.getFilters(this.tableConfig, defaultFilterValues, filter);
+                        if (filter$$1) {
+                            this.defaultFilter = filter$$1;
+                            predefinedCriteria = this.getFilters(this.tableConfig, defaultFilterValues, filter$$1);
                         }
                         else {
                             // Empty a falsy filter resets the results
@@ -4623,9 +4623,9 @@ var TableActionTypes;
     TableActionTypes["AppendState"] = "[Table] Append State";
 })(TableActionTypes || (TableActionTypes = {}));
 var AppendFilter = /** @class */ (function () {
-    function AppendFilter(id, filter) {
+    function AppendFilter(id, filter$$1) {
         this.id = id;
-        this.filter = filter;
+        this.filter = filter$$1;
         this.type = TableActionTypes.AppendFilter;
     }
     return AppendFilter;
@@ -4746,19 +4746,23 @@ var AdvancedSearchState = /** @class */ (function () {
             // set auto load to false
             this.search.table.autoLoad = false;
             // handle filtering
-            this.search.filterChange.subscribe(function (filter) {
-                _this.onSearchFilter(filter);
+            this.filterChangeSubscription = this.search.filterChange.subscribe(function (filter$$1) {
+                _this.onSearchFilter(filter$$1);
             });
-            // 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(select(selectTable, { id: this.searchState }), first()).subscribe(function (state) {
@@ -4781,14 +4785,30 @@ var AdvancedSearchState = /** @class */ (function () {
                     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();
             }
         });
     };
-    AdvancedSearchState.prototype.onSearchFilter = function (filter) {
-        this.store.dispatch(new AppendFilter(this.searchState, filter));
+    AdvancedSearchState.prototype.onSearchFilter = function (filter$$1) {
+        this.store.dispatch(new AppendFilter(this.searchState, filter$$1));
+    };
+    AdvancedSearchState.prototype.ngOnDestroy = function () {
+        if (this.filterChangeSubscription) {
+            this.filterChangeSubscription.unsubscribe();
+        }
+        if (this.tableInitSubscription) {
+            this.tableInitSubscription.unsubscribe();
+        }
     };
     AdvancedSearchState.decorators = [
         { type: Directive, args: [{
@@ -4807,6 +4827,68 @@ var AdvancedSearchState = /** @class */ (function () {
     return AdvancedSearchState;
 }());
 
+var AdvancedSearchRouterState = /** @class */ (function (_super) {
+    __extends(AdvancedSearchRouterState, _super);
+    function AdvancedSearchRouterState(search, store, _router) {
+        var _this = 
+        // call super constructor
+        _super.call(this, search, store) || this;
+        _this.search = search;
+        _this.store = store;
+        _this._router = _router;
+        _this._enteringState = true;
+        _this._applyState = false;
+        // set search state dynamically according to route
+        _this._routerSubscription = _this._router.events
+            .pipe(filter(function (event) {
+            return event instanceof NavigationStart || event instanceof NavigationEnd;
+        }))
+            .subscribe(function (event) {
+            // capture urls regarding tab changing while the component is active
+            if (event instanceof 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 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: Directive, args: [{
+                    // tslint:disable-next-line: directive-selector
+                    selector: "[routerSearchState]",
+                },] }
+    ];
+    /** @nocollapse */
+    AdvancedSearchRouterState.ctorParameters = function () { return [
+        { type: AdvancedTableSearchComponent },
+        { type: Store, decorators: [{ type: Optional }] },
+        { type: Router }
+    ]; };
+    return AdvancedSearchRouterState;
+}(AdvancedSearchState));
+
 var ɵ0 = FORMATTERS;
 var TablesModule = /** @class */ (function () {
     function TablesModule(_translateService) {
@@ -4872,7 +4954,8 @@ var TablesModule = /** @class */ (function () {
                         ParseTitlePipe,
                         AddItemsComponent,
                         AdvancedSearchState,
-                        AdvancedTableState
+                        AdvancedTableState,
+                        AdvancedSearchRouterState
                     ],
                     exports: [
                         AdvancedTableComponent,
@@ -4890,7 +4973,8 @@ var TablesModule = /** @class */ (function () {
                         AdvancedAggregatorListComponent,
                         AddItemsComponent,
                         AdvancedSearchState,
-                        AdvancedTableState
+                        AdvancedTableState,
+                        AdvancedSearchRouterState
                     ],
                     entryComponents: [
                         AdvancedTableModalBaseComponent,
@@ -4917,6 +5001,6 @@ var TablesModule = /** @class */ (function () {
  * Generated bundle index. Do not edit.
  */
 
-export { AdvancedSearchState as ɵa, AdvancedTableState as ɵc, AdvancedListComponent, AdvancedRowActionComponent, AdvancedSearchFormComponent, AdvancedSelectComponent, AdvancedSelectService, AdvancedTableConfigurationResolver, AdvancedSearchConfigurationResolver, AdvancedColumnFormatter, NestedPropertyFormatter, ButtonFormatter, LinkFormatter, ActionLinkFormatter, ActionButtonFormatter, ActionSplitButtonFormatter, SelectRowFormatter, TemplateFormatter, TrueFalseFormatter, TranslationFormatter, DateTimeFormatter, NgClassFormatter, LanguageFormatter, COLUMN_FORMATTERS, AdvancedTableConfiguration, AdvancedTableComponent, AdvancedTableSettingsComponent, AdvancedTableSearchBaseComponent, AdvancedTableSearchComponent, FORMATTERS, AdvancedFilterValueProvider, AdvancedTableModalBaseTemplate, AdvancedTableModalBaseComponent, SimpleHeaderToolsComponent, TableSimpleHeaderComponent, AdvancedTableNotNullError, AdvancedTableEditorDirective, BtnExpDirective, AdvancedAggregatorComponent, AdvancedAggregatorListComponent, AddItemsComponent, AdvancedAggregatorPipe, ParseTitlePipe, AdvancedAggregatorService, TablesModule, ɵ0, ActivatedTableService, initialState, tableInitialState, tableReducer, tableReducers, featureName, getTablesState, selectTable };
+export { AdvancedSearchState as ɵa, AdvancedTableState as ɵc, AdvancedSearchRouterState as ɵd, AdvancedListComponent, AdvancedRowActionComponent, AdvancedSearchFormComponent, AdvancedSelectComponent, AdvancedSelectService, AdvancedTableConfigurationResolver, AdvancedSearchConfigurationResolver, AdvancedColumnFormatter, NestedPropertyFormatter, ButtonFormatter, LinkFormatter, ActionLinkFormatter, ActionButtonFormatter, ActionSplitButtonFormatter, SelectRowFormatter, TemplateFormatter, TrueFalseFormatter, TranslationFormatter, DateTimeFormatter, NgClassFormatter, LanguageFormatter, COLUMN_FORMATTERS, AdvancedTableConfiguration, AdvancedTableComponent, AdvancedTableSettingsComponent, AdvancedTableSearchBaseComponent, AdvancedTableSearchComponent, FORMATTERS, AdvancedFilterValueProvider, AdvancedTableModalBaseTemplate, AdvancedTableModalBaseComponent, SimpleHeaderToolsComponent, TableSimpleHeaderComponent, AdvancedTableNotNullError, AdvancedTableEditorDirective, BtnExpDirective, AdvancedAggregatorComponent, AdvancedAggregatorListComponent, AddItemsComponent, AdvancedAggregatorPipe, ParseTitlePipe, AdvancedAggregatorService, TablesModule, ɵ0, ActivatedTableService, initialState, tableInitialState, tableReducer, tableReducers, featureName, getTablesState, selectTable };
 
 //# sourceMappingURL=universis-ngx-tables.js.map