@universis/ngx-tables 6.13.8 → 6.14.0

package/fesm2015/universis-ngx-tables.js

@@ -23,7 +23,7 @@ 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 { Injectable, Directive, Optional, Input, Output, EventEmitter, Component, ElementRef, ViewChild, ViewEncapsulation, Pipe, ChangeDetectorRef, NgModule, CUSTOM_ELEMENTS_SCHEMA, defineInjectable, inject, HostListener, InjectionToken, Inject, Injector, ViewContainerRef, ChangeDetectionStrategy } from '@angular/core';
+import { Injectable, Directive, Optional, Input, Output, EventEmitter, Component, ElementRef, ViewChild, ViewEncapsulation, Pipe, ChangeDetectorRef, defineInjectable, inject, HostListener, NgModule, CUSTOM_ELEMENTS_SCHEMA, 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';
@@ -1421,8 +1421,9 @@ class AdvancedTableComponent {
      * @param {?} _modalService
      * @param {?} _errorService
      * @param {?} _viewContainerRef
+     * @param {?} _errorHandler
      */
-    constructor(_context, _columnFormatters, _activatedRoute, _translateService, _injector, _advancedFilterValueProvider, _element, _template, _loading, _http, _columnSelector, _configuration, _exportSpreadsheet, _modalService, _errorService, _viewContainerRef) {
+    constructor(_context, _columnFormatters, _activatedRoute, _translateService, _injector, _advancedFilterValueProvider, _element, _template, _loading, _http, _columnSelector, _configuration, _exportSpreadsheet, _modalService, _errorService, _viewContainerRef, _errorHandler) {
         this._context = _context;
         this._columnFormatters = _columnFormatters;
         this._activatedRoute = _activatedRoute;
@@ -1439,6 +1440,7 @@ class AdvancedTableComponent {
         this._modalService = _modalService;
         this._errorService = _errorService;
         this._viewContainerRef = _viewContainerRef;
+        this._errorHandler = _errorHandler;
         this._firstLoad = true;
         this._showFooter = false;
         this._showHeader = true;
@@ -2706,7 +2708,11 @@ class AdvancedTableComponent {
             return;
         }
         /** @type {?} */
-        const q = this._context.model(this.config.model).asQueryable();
+        const queryModel = this._query && this._query.getModel();
+        /** @type {?} */
+        const model = queryModel ? queryModel : this.config.model;
+        /** @type {?} */
+        const q = this._context.model(model).asQueryable();
         Object.keys(this.lastQueryParams).forEach((key) => {
             q.setParam(key, this.lastQueryParams && this.lastQueryParams[key]);
         });
@@ -2875,6 +2881,19 @@ class AdvancedTableComponent {
             }
             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;
                 }
@@ -3218,7 +3237,8 @@ AdvancedTableComponent.ctorParameters = () => [
     { type: ExportSpreadsheetService },
     { type: ModalService },
     { type: ErrorService },
-    { type: ViewContainerRef }
+    { type: ViewContainerRef },
+    { type: ErrorHandler, decorators: [{ type: Optional }] }
 ];
 AdvancedTableComponent.propDecorators = {
     table: [{ type: ViewChild, args: ['table',] }],