@universis/ngx-tables 0.6.18 → 0.6.19

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

@@ -927,32 +927,55 @@
         AdvancedTableComponent.prototype.search = function (searchText) {
             var _this = this;
             this.query = this.query || this._context.model(this.config.model).asQueryable();
-            if (searchText && this.config.searchExpression) {
-                // validate search text in double quotes
-                if (/^"(.*?)"$/.test(searchText)) {
-                    this.query.setParam('$filter', this._template.transform(this.config.searchExpression, {
-                        text: searchText.replace(/^"|"$/g, ''),
-                    }));
+            if (this.serverSide) {
+                if (searchText && this.config.searchExpression) {
+                    // validate search text in double quotes
+                    if (/^"(.*?)"$/.test(searchText)) {
+                        this.query.setParam('$filter', this._template.transform(this.config.searchExpression, {
+                            text: searchText.replace(/^"|"$/g, ''),
+                        }));
+                    }
+                    else {
+                        // try to split words
+                        var words = searchText.split(' ');
+                        // join words to a single filter
+                        var filter = words.map(function (word) {
+                            return _this._template.transform(_this.config.searchExpression, {
+                                text: word,
+                            });
+                        }).join(' and ');
+                        // set filter
+                        this.query.setParam('$filter', filter);
+                    }
                 }
                 else {
-                    // try to split words
-                    var words = searchText.split(' ');
-                    // join words to a single filter
-                    var filter = words.map(function (word) {
-                        return _this._template.transform(_this.config.searchExpression, {
-                            text: word,
-                        });
-                    }).join(' and ');
-                    // set filter
-                    this.query.setParam('$filter', filter);
+                    // clear filter
+                    this.query.setParam('$filter', null);
                 }
+                this._firstLoad = false;
+                this.dataTable.draw();
             }
             else {
-                // clear filter
-                this.query.setParam('$filter', null);
+                // ensure empty table layout
+                this.resetEmptyTable();
+                // search locally
+                this.dataTable.search(searchText.trim()).draw();
+                // get indexes of filtered rows
+                var indexes = Array.from(this.dataTable.context[0].aiDisplay);
+                // set recordsFiltered
+                var recordsFiltered = indexes.length;
+                // set recordsTotal
+                var recordsTotal = indexes.length;
+                // retrieve data from indexes
+                var rows_1 = Array.from(this.dataTable.rows().data());
+                var data = indexes.map(function (index) { return rows_1[index]; });
+                // emit results to load output
+                this.load.emit({
+                    data: data,
+                    recordsFiltered: recordsFiltered,
+                    recordsTotal: recordsTotal
+                });
             }
-            this._firstLoad = false;
-            this.dataTable.draw();
         };
         AdvancedTableComponent.prototype.fetch = function (clearSelected) {
             // if data table is null
@@ -1622,6 +1645,10 @@
                     var query_1 = this._context.model(this.config.model).asQueryable();
                     // select attributes
                     query_1.setParam('$select', this.lastQueryParams.$select);
+                    if (this.lastQueryParams.$expand) {
+                        // apply expand attributes
+                        query_1.setParam('$expand', this.lastQueryParams.$expand);
+                    }
                     // apply filter for row
                     findKeys_1.forEach(function (key) {
                         var column = _this.config.columns.find(function (col) {
@@ -1708,7 +1735,8 @@
             // due to ng data binding
             // empty table template has no translated text during ngOnInit()
             if (this.dataTable && this.dataTable.context[0]) {
-                this.dataTable.context[0].oLanguage.sEmptyTable = this.emptyTable.nativeElement.innerHTML;
+                this.dataTable.context[0].oLanguage.sEmptyTable =
+                    this.dataTable.context[0].oLanguage.sZeroRecords = this.emptyTable.nativeElement.innerHTML;
             }
         };
         AdvancedTableComponent.prototype.clearEmptyTable = function () {
@@ -2268,7 +2296,10 @@
                     var value = _this.formComponent.submission.data[key];
                     // the filter with type is a string and is not empty
                     var isEmptyString = typeof value === 'string' && value.length === 0;
-                    if (!isEmptyString) {
+                    // do not include empty objects in filter
+                    var isEmptyObject = typeof value === 'object' && Object.keys(value).length === 0;
+                    // make isEmptyString, isEmptyObject mutex
+                    if (!isEmptyString && !isEmptyObject) {
                         Object.defineProperty(_this.filter, key, {
                             configurable: true,
                             enumerable: true,