@universis/ngx-tables 0.8.1 → 0.8.3

package/fesm5/universis-ngx-tables.js

@@ -24,7 +24,7 @@ import { __extends, __awaiter, __generator, __values, __assign, __spread } from
 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, filter } from 'rxjs/operators';
+import { skip, first, filter } from 'rxjs/operators';
 
 var AdvancedColumnFormatter = /** @class */ (function () {
     function AdvancedColumnFormatter() {
@@ -825,10 +825,20 @@ var ActivatedTableService = /** @class */ (function () {
         var _this = this;
         this._router = _router;
         this._activatedRoute = _activatedRoute;
+        /**
+         * Get the last table that was set as active
+         * Note: Emitted value may be null (e.g. reset on route changes)
+         */
+        this.lastActiveTable = new BehaviorSubject(null);
+        /**
+         * Omit the last emitted value to observe only new active table changes
+         * Note: Emitted value may be null (e.g. reset on route changes)
+         */
+        this.nextActiveTable = this.lastActiveTable.pipe(skip(1));
         _router.events.forEach(function (event) {
             if (event instanceof NavigationStart) {
                 if (_this._activeTable) {
-                    _this._activeTable = null;
+                    _this.activeTable = null;
                 }
             }
         });
@@ -839,6 +849,8 @@ var ActivatedTableService = /** @class */ (function () {
         },
         set: function (tableComponent) {
             this._activeTable = tableComponent;
+            // provide change to observers
+            this.lastActiveTable.next(this._activeTable);
         },
         enumerable: true,
         configurable: true
@@ -1769,8 +1781,9 @@ var AdvancedTableComponent = /** @class */ (function () {
                 if (_this.dataTable) {
                     var info = _this.dataTable.page.info();
                     _this.page.emit(info);
-                    if (drawIndex_1 > 1)
+                    if (drawIndex_1 > 1) {
                         return;
+                    }
                     try {
                         drawIndex_1++;
                         setTimeout(function () { _this.dataTable.columns.adjust(); }, 1);
@@ -1909,7 +1922,7 @@ var AdvancedTableComponent = /** @class */ (function () {
                     // get order expression
                     var order = aoData[2].value;
                     // get skip records param
-                    var skip = aoData[3].value;
+                    var skip$$1 = aoData[3].value;
                     // get page size param
                     var top = aoData[4].value;
                     // get search value
@@ -1918,7 +1931,7 @@ var AdvancedTableComponent = /** @class */ (function () {
                     var q = self._query instanceof ClientDataQueryable ? self._query : self._context.model(self.config.model).asQueryable();
                     // apply paging params
                     if (top) {
-                        q.take(top).skip(skip);
+                        q.take(top).skip(skip$$1);
                     }
                     // apply order params
                     if (order && order.length) {
@@ -2349,7 +2362,7 @@ var AdvancedTableComponent = /** @class */ (function () {
             var index = columnOrder.indexOf(i);
             var visible = _this.dataTable.column(index).visible();
             // set title for select column
-            if (i == 0 && _this.selectable) {
+            if (i === 0 && _this.selectable) {
                 title = '<' + _this._translateService.instant('Tables.SelectColumn') + '>';
             }
             // get column title
@@ -2383,9 +2396,18 @@ var AdvancedTableComponent = /** @class */ (function () {
         });
         this._columnSelector.selectColumns(columns).then(function (event) {
             if (event.result === 'ok') {
+                var sorted = event.columns
+                    .map(function (col) {
+                    return {
+                        key: col.key,
+                        index: col.index
+                    };
+                })
+                    .sort(function (a, b) { return a.index - b.index; });
                 // get column order e.g. [3, 1, 2, 0, 4]
-                var indexes = event.columns.map(function (item) {
-                    return item.index;
+                var indexes = sorted
+                    .map(function (item) {
+                    return event.columns.findIndex(function (next) { return item.key === next.key; });
                 });
                 // reset column visibilty
                 for (var index = 0; index < event.columns.length; index++) {
@@ -2499,12 +2521,10 @@ var AdvancedTableComponent = /** @class */ (function () {
                 cleanupIndexes.push(index);
                 return false;
             }
-            // find item by title
-            var findItem = _this.config.columns.find(function (column) {
-                return column.title && column.title.length && _this._translateService.instant(column.title) === headerItem;
-            });
             // exclude hidden columns
-            if (findItem && findItem.hidden === true) {
+            // note: use the datatable visible() function
+            // instead of the hidden config property, to satisfy the column selector
+            if (!_this.dataTable.column(index).visible()) {
                 cleanupIndexes.push(index);
                 return false;
             }
@@ -5339,7 +5359,10 @@ var AdvancedTableState = /** @class */ (function () {
         this.table.stateSave = true;
         this.table.stateLoadCallback = function (settings, callback) {
             _this.store.pipe(select(selectTable, { id: _this.tableState }), first()).subscribe(function (state) {
-                return callback(state && state.table);
+                callback(state && state.table);
+                if (state && state.table && state.table.ColReorder) {
+                    _this.table.dataTable.colReorder.order(state.table.ColReorder, true);
+                }
             });
         };
         var firstDraw = true;