@universis/ngx-tables 0.7.6 → 0.7.7

package/fesm2015/universis-ngx-tables.js

@@ -16,13 +16,13 @@ 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 { Injectable, Directive, Optional, Input, Output, EventEmitter, Pipe, Component, ViewChild, ViewEncapsulation, ChangeDetectorRef, ElementRef, Inject, InjectionToken, Injector, NgModule, CUSTOM_ELEMENTS_SCHEMA, defineInjectable, inject, HostListener, 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';
 
 class AdvancedColumnFormatter {
     static template(expr) {
@@ -445,15 +445,15 @@ class AdvancedFilterValueProvider {
         this.values = {};
         this._template = new TemplatePipe();
     }
-    buildFilter(filter) {
-        if (filter) {
-            return this._template.transform(filter, this.values);
+    buildFilter(filter$$1) {
+        if (filter$$1) {
+            return this._template.transform(filter$$1, this.values);
         }
     }
-    asyncBuildFilter(filter) {
+    asyncBuildFilter(filter$$1) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (filter) {
-                return this._template.transform(filter, yield this.getValues());
+            if (filter$$1) {
+                return this._template.transform(filter$$1, yield this.getValues());
             }
         });
     }
@@ -686,13 +686,13 @@ class AdvancedTableComponent {
                     // try to split words
                     const words = searchText.split(' ');
                     // join words to a single filter
-                    const filter = words.map((word) => {
+                    const filter$$1 = words.map((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 {
@@ -2070,8 +2070,8 @@ class AdvancedSearchFormComponent extends AdvancedTableSearchBaseComponent {
                 form: this.form
             });
             this.loading = false;
-            this.filterSubscription = this.filterChange.subscribe(filter => {
-                this.submission.data = filter;
+            this.filterSubscription = this.filterChange.subscribe(filter$$1 => {
+                this.submission.data = filter$$1;
                 this.refreshForm.emit({
                     submission: this.submission
                 });
@@ -2447,7 +2447,7 @@ class AdvancedTableModalBaseComponent extends RouterModalOkCancel {
      * @param {object} filter The filter to use in the search
      *
      */
-    advancedSearch(filter) {
+    advancedSearch(filter$$1) {
         return __awaiter(this, void 0, void 0, function* () {
             // Do nothing in absence of configuration.
             if (!this.tableConfig && !Array.isArray(this.tableConfig.criteria)) {
@@ -2464,9 +2464,9 @@ class AdvancedTableModalBaseComponent extends RouterModalOkCancel {
             }
             const expressions = [];
             let predefinedCriteria;
-            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
@@ -4408,9 +4408,9 @@ var TableActionTypes;
     TableActionTypes["AppendState"] = "[Table] Append State";
 })(TableActionTypes || (TableActionTypes = {}));
 class AppendFilter {
-    constructor(id, filter) {
+    constructor(id, filter$$1) {
         this.id = id;
-        this.filter = filter;
+        this.filter = filter$$1;
         this.type = TableActionTypes.AppendFilter;
     }
 }
@@ -4523,19 +4523,23 @@ class AdvancedSearchState {
             // set auto load to false
             this.search.table.autoLoad = false;
             // handle filtering
-            this.search.filterChange.subscribe((filter) => {
-                this.onSearchFilter(filter);
+            this.filterChangeSubscription = this.search.filterChange.subscribe((filter$$1) => {
+                this.onSearchFilter(filter$$1);
             });
-            // handle table state (via directive)
-            const 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(() => {
+            this.tableInitSubscription = this.search.table.init.subscribe(() => {
                 return this.onTableInit();
             });
         }
     }
+    applyTableState() {
+        // handle table state (via directive)
+        const tableState = new AdvancedTableState(this.search.table, this.store);
+        tableState.tableState = this.searchState;
+        tableState.ngOnInit();
+    }
     onTableInit() {
         this.store.pipe(select(selectTable, { id: this.searchState }), first()).subscribe((state) => {
             // use order
@@ -4557,14 +4561,30 @@ class AdvancedSearchState {
                     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();
             }
         });
     }
-    onSearchFilter(filter) {
-        this.store.dispatch(new AppendFilter(this.searchState, filter));
+    onSearchFilter(filter$$1) {
+        this.store.dispatch(new AppendFilter(this.searchState, filter$$1));
+    }
+    ngOnDestroy() {
+        if (this.filterChangeSubscription) {
+            this.filterChangeSubscription.unsubscribe();
+        }
+        if (this.tableInitSubscription) {
+            this.tableInitSubscription.unsubscribe();
+        }
     }
 }
 AdvancedSearchState.decorators = [
@@ -4582,6 +4602,62 @@ AdvancedSearchState.propDecorators = {
     searchState: [{ type: Input }]
 };
 
+class AdvancedSearchRouterState extends AdvancedSearchState {
+    constructor(search, store, _router) {
+        // call super constructor
+        super(search, store);
+        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((event) => event instanceof NavigationStart || event instanceof NavigationEnd))
+            .subscribe((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.applyTableState();
+                this._applyState = false;
+            }
+        });
+    }
+    ngOnDestroy() {
+        // destroy own subscriptions
+        if (this._routerSubscription) {
+            this._routerSubscription.unsubscribe();
+        }
+        // destroy parent subscriptions
+        return super.ngOnDestroy();
+    }
+}
+AdvancedSearchRouterState.decorators = [
+    { type: Directive, args: [{
+                // tslint:disable-next-line: directive-selector
+                selector: "[routerSearchState]",
+            },] }
+];
+/** @nocollapse */
+AdvancedSearchRouterState.ctorParameters = () => [
+    { type: AdvancedTableSearchComponent },
+    { type: Store, decorators: [{ type: Optional }] },
+    { type: Router }
+];
+
 const ɵ0 = FORMATTERS;
 class TablesModule {
     constructor(_translateService) {
@@ -4645,7 +4721,8 @@ TablesModule.decorators = [
                     ParseTitlePipe,
                     AddItemsComponent,
                     AdvancedSearchState,
-                    AdvancedTableState
+                    AdvancedTableState,
+                    AdvancedSearchRouterState
                 ],
                 exports: [
                     AdvancedTableComponent,
@@ -4663,7 +4740,8 @@ TablesModule.decorators = [
                     AdvancedAggregatorListComponent,
                     AddItemsComponent,
                     AdvancedSearchState,
-                    AdvancedTableState
+                    AdvancedTableState,
+                    AdvancedSearchRouterState
                 ],
                 entryComponents: [
                     AdvancedTableModalBaseComponent,
@@ -4688,6 +4766,6 @@ TablesModule.ctorParameters = () => [
  * 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