@universis/ngx-tables 6.13.8 → 6.14.0

package/fesm5/universis-ngx-tables.js

@@ -22,8 +22,8 @@ import { BsModalRef, BsModalService, ModalModule } from 'ngx-bootstrap/modal';
 import { ProgressbarModule } from 'ngx-bootstrap/progressbar';
 import { GroupByPipe, NgPipesModule } from 'ngx-pipes';
 import { template, at, cloneDeep, isEmpty } from 'lodash';
-import { __extends, __awaiter, __generator, __values, __assign, __spread } from 'tslib';
-import { Injectable, Directive, Optional, Input, Component, ElementRef, ViewChild, ViewEncapsulation, EventEmitter, Output, Pipe, NgModule, CUSTOM_ELEMENTS_SCHEMA, defineInjectable, inject, HostListener, ChangeDetectorRef, InjectionToken, Inject, Injector, ViewContainerRef, ChangeDetectionStrategy } from '@angular/core';
+import { __extends, __awaiter, __generator, __values, __spread, __assign } from 'tslib';
+import { Injectable, Directive, Optional, Input, Component, EventEmitter, Output, Pipe, ElementRef, ViewChild, ViewEncapsulation, defineInjectable, inject, NgModule, CUSTOM_ELEMENTS_SCHEMA, HostListener, ChangeDetectorRef, InjectionToken, Inject, Injector, ViewContainerRef, ErrorHandler, ChangeDetectionStrategy } from '@angular/core';
 import { ActivatedRoute, Router, NavigationStart, NavigationEnd, RouterModule } from '@angular/router';
 import { createFeatureSelector, createSelector, select, Store } from '@ngrx/store';
 import { skip, first, filter } from 'rxjs/operators';
@@ -1832,7 +1832,7 @@ function getRandomIdentifier() {
     return (Number(String(Math.random()).slice(2))).toString(36);
 }
 var AdvancedTableComponent = /** @class */ (function () {
-    function AdvancedTableComponent(_context, _columnFormatters, _activatedRoute, _translateService, _injector, _advancedFilterValueProvider, _element, _template, _loading, _http, _columnSelector, _configuration, _exportSpreadsheet, _modalService, _errorService, _viewContainerRef) {
+    function AdvancedTableComponent(_context, _columnFormatters, _activatedRoute, _translateService, _injector, _advancedFilterValueProvider, _element, _template, _loading, _http, _columnSelector, _configuration, _exportSpreadsheet, _modalService, _errorService, _viewContainerRef, _errorHandler) {
         var _this = this;
         this._context = _context;
         this._columnFormatters = _columnFormatters;
@@ -1850,6 +1850,7 @@ var AdvancedTableComponent = /** @class */ (function () {
         this._modalService = _modalService;
         this._errorService = _errorService;
         this._viewContainerRef = _viewContainerRef;
+        this._errorHandler = _errorHandler;
         this._firstLoad = true;
         this._showFooter = false;
         this._showHeader = true;
@@ -3231,7 +3232,11 @@ var AdvancedTableComponent = /** @class */ (function () {
                 return;
             }
             /** @type {?} */
-            var q = this._context.model(this.config.model).asQueryable();
+            var queryModel = this._query && this._query.getModel();
+            /** @type {?} */
+            var model = queryModel ? queryModel : this.config.model;
+            /** @type {?} */
+            var q = this._context.model(model).asQueryable();
             Object.keys(this.lastQueryParams).forEach(function (key) {
                 q.setParam(key, _this.lastQueryParams && _this.lastQueryParams[key]);
             });
@@ -3427,6 +3432,19 @@ var AdvancedTableComponent = /** @class */ (function () {
             }
             if (err) {
                 this.lastError = err;
+                if (typeof err.status === 'number') {
+                    if (this._errorHandler) {
+                        // a backward compatibility assignment of rejection property
+                        // following @universis/common#ErrorsHandler.handleError contract
+                        Object.assign(err, {
+                            rejection: {
+                                status: err.status,
+                                statusText: err.statusText
+                            }
+                        });
+                        this._errorHandler.handleError(err);
+                    }
+                }
                 if (innerMessage) {
                     innerMessage.innerHTML = err.error && err.error.message ? err.error.message : err.message;
                 }
@@ -3785,7 +3803,8 @@ var AdvancedTableComponent = /** @class */ (function () {
         { type: ExportSpreadsheetService },
         { type: ModalService },
         { type: ErrorService },
-        { type: ViewContainerRef }
+        { type: ViewContainerRef },
+        { type: ErrorHandler, decorators: [{ type: Optional }] }
     ]; };
     AdvancedTableComponent.propDecorators = {
         table: [{ type: ViewChild, args: ['table',] }],