@universis/ngx-tables 6.13.6 → 6.13.8

package/bundles/universis-ngx-tables.umd.js

@@ -6160,7 +6160,7 @@
          */
             function (event) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var query, queryParams_3;
+                    var query, queryParams_3, queryParams;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
@@ -6191,7 +6191,9 @@
                                         })];
                                 }
                                 if (this.table.query && query && query.getParams()['$filter']) {
-                                    this.table.query.setParam('$filter', query.getParams()['$filter']);
+                                    queryParams = Object.assign({}, this.table.query.getParams(), query.getParams());
+                                    query.setQueryParams(queryParams);
+                                    this.table.query = query;
                                 }
                                 else {
                                     this.table.query = query;
@@ -6223,7 +6225,7 @@
          */
             function () {
                 return __awaiter(this, void 0, void 0, function () {
-                    var expressions_1, values_1, query;
+                    var expressions_1, values_1, queryParams_4, query_1, param, modelName;
                     var _this = this;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
@@ -6238,6 +6240,7 @@
                                 return [4 /*yield*/, this._advancedSearchValueProvider.getValues()];
                             case 1:
                                 values_1 = _a.sent();
+                                queryParams_4 = [];
                                 this.table.config.criteria.forEach(function (x) {
                                     if (Object.prototype.hasOwnProperty.call(_this.filter, x.name)) {
                                         /** @type {?} */
@@ -6250,22 +6253,39 @@
                                             }));
                                         }
                                         else if (_this.filter[x.name] !== 'undefined') {
-                                            expressions_1.push(_this._template.transform(x.filter, Object.assign({
-                                                value: _this.filter[x.name],
-                                            }, values_1)));
+                                            if (x.type !== 'queryParam') {
+                                                expressions_1.push(_this._template.transform(x.filter, Object.assign({
+                                                    value: _this.filter[x.name],
+                                                }, values_1)));
+                                            }
+                                            else {
+                                                /** @type {?} */
+                                                var value = _this.filter[x.name];
+                                                if (value) {
+                                                    queryParams_4.push(Object.assign(x, { value: value }));
+                                                }
+                                            }
                                         }
                                     }
                                 });
-                                query = void 0;
+                                query_1 = void 0;
+                                query_1 = this._context.model(this.table.config.model).asQueryable();
+                                if (queryParams_4 && queryParams_4.length) {
+                                    param = queryParams_4.find(function (x) {
+                                        return x.model !== null;
+                                    });
+                                    modelName = param ? param.model : this.table.config.model;
+                                    query_1 = this._context.model(modelName).asQueryable();
+                                    queryParams_4.forEach(function (queryParam) {
+                                        query_1.setParam(queryParam.queryParam, queryParam.value);
+                                    });
+                                }
                                 if (expressions_1 && expressions_1.length) {
                                     // create client query
-                                    query = this._context.model(this.table.config.model).asQueryable();
-                                    query.setParam('filter', expressions_1.join(' and '));
-                                }
-                                else {
-                                    query = this._context.model(this.table.config.model).asQueryable();
+                                    // create client query
+                                    query_1.setParam('filter', expressions_1.join(' and '));
                                 }
-                                return [2 /*return*/, query];
+                                return [2 /*return*/, query_1];
                             case 2: return [2 /*return*/];
                         }
                     });
@@ -6292,12 +6312,12 @@
                 if (this.mergeQueryParams && this.table) {
                     this.selectedList = null;
                     /** @type {?} */
-                    var queryParams_4 = { q: null, s: null };
+                    var queryParams_5 = { q: null, s: null };
                     // enumerate criteria
                     this.table.config.criteria.forEach(function (item) {
-                        if (Object.prototype.hasOwnProperty.call(queryParams_4, item.name) === false) {
+                        if (Object.prototype.hasOwnProperty.call(queryParams_5, item.name) === false) {
                             // set null value
-                            Object.defineProperty(queryParams_4, item.name, {
+                            Object.defineProperty(queryParams_5, item.name, {
                                 configurable: true,
                                 enumerable: true,
                                 writable: true,
@@ -6307,7 +6327,7 @@
                     });
                     return this._router.navigate([], {
                         relativeTo: this._activatedRoute,
-                        queryParams: queryParams_4,
+                        queryParams: queryParams_5,
                         queryParamsHandling: 'merge',
                     });
                 }