@universis/ngx-tables 0.8.1 → 0.8.3

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('datatables.net-scroller'), require('datatables.net-colreorder'), require('datatables.net-buttons'), 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('lodash'), 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', 'datatables.net-scroller', 'datatables.net-colreorder', 'datatables.net-buttons', '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', 'lodash', '@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,null,null,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.lodash,global.ng.core,global.ng.router,global.store,global.rxjs.operators));
-}(this, (function (exports,ISO6391,rxjs,jQuery_,datatables_net,datatables_netScroller,datatables_netColreorder,datatables_netButtons,combineLatest,http,client,i1,common,core,forms,i2,routing,forms$1,angularFormio,modal,progressbar,ngxPipes,lodash,i0,i1$1,store,operators) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('iso-639-1/build'), require('jquery'), require('datatables.net'), require('datatables.net-scroller'), require('datatables.net-colreorder'), require('datatables.net-buttons'), require('rxjs'), 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('lodash'), 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', 'jquery', 'datatables.net', 'datatables.net-scroller', 'datatables.net-colreorder', 'datatables.net-buttons', 'rxjs', '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', 'lodash', '@angular/core', '@angular/router', '@ngrx/store', 'rxjs/operators'], factory) :
+    (factory((global.universis = global.universis || {}, global.universis['ngx-tables'] = {}),global.ISO6391,global.jQuery_,null,null,null,null,global.rxjs,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.lodash,global.ng.core,global.ng.router,global.store,global.rxjs.operators));
+}(this, (function (exports,ISO6391,jQuery_,datatables_net,datatables_netScroller,datatables_netColreorder,datatables_netButtons,rxjs,combineLatest,http,client,i1,common,core,forms,i2,routing,forms$1,angularFormio,modal,progressbar,ngxPipes,lodash,i0,i1$1,store,operators) { 'use strict';
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -1034,10 +1034,20 @@
             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 rxjs.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(operators.skip(1));
             _router.events.forEach(function (event) {
                 if (event instanceof i1$1.NavigationStart) {
                     if (_this._activeTable) {
-                        _this._activeTable = null;
+                        _this.activeTable = null;
                     }
                 }
             });
@@ -1048,6 +1058,8 @@
             },
             set: function (tableComponent) {
                 this._activeTable = tableComponent;
+                // provide change to observers
+                this.lastActiveTable.next(this._activeTable);
             },
             enumerable: true,
             configurable: true
@@ -1994,8 +2006,9 @@
                     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);
@@ -2574,7 +2587,7 @@
                 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
@@ -2608,9 +2621,18 @@
             });
             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++) {
@@ -2725,12 +2747,10 @@
                     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;
                 }
@@ -5633,7 +5653,10 @@
             this.table.stateSave = true;
             this.table.stateLoadCallback = function (settings, callback) {
                 _this.store.pipe(store.select(selectTable, { id: _this.tableState }), operators.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;