@universis/ngx-tables 0.6.18 → 0.6.19

package/fesm2015/universis-ngx-tables.js

@@ -667,32 +667,55 @@ class AdvancedTableComponent {
     // simple search
     search(searchText) {
         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
+                    const words = searchText.split(' ');
+                    // join words to a single filter
+                    const filter = words.map((word) => {
+                        return this._template.transform(this.config.searchExpression, {
+                            text: word,
+                        });
+                    }).join(' and ');
+                    // set filter
+                    this.query.setParam('$filter', filter);
+                }
             }
             else {
-                // try to split words
-                const words = searchText.split(' ');
-                // join words to a single filter
-                const filter = words.map((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
+            const indexes = Array.from(this.dataTable.context[0].aiDisplay);
+            // set recordsFiltered
+            const recordsFiltered = indexes.length;
+            // set recordsTotal
+            const recordsTotal = indexes.length;
+            // retrieve data from indexes
+            const rows = Array.from(this.dataTable.rows().data());
+            const data = indexes.map(index => rows[index]);
+            // emit results to load output
+            this.load.emit({
+                data: data,
+                recordsFiltered: recordsFiltered,
+                recordsTotal: recordsTotal
+            });
         }
-        this._firstLoad = false;
-        this.dataTable.draw();
     }
     fetch(clearSelected) {
         // if data table is null
@@ -1355,6 +1378,10 @@ class AdvancedTableComponent {
                 const query = this._context.model(this.config.model).asQueryable();
                 // select attributes
                 query.setParam('$select', this.lastQueryParams.$select);
+                if (this.lastQueryParams.$expand) {
+                    // apply expand attributes
+                    query.setParam('$expand', this.lastQueryParams.$expand);
+                }
                 // apply filter for row
                 findKeys.forEach((key) => {
                     const column = this.config.columns.find((col) => {
@@ -1441,7 +1468,8 @@ class AdvancedTableComponent {
         // 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;
         }
     }
     clearEmptyTable() {
@@ -1983,7 +2011,10 @@ class AdvancedSearchFormComponent extends AdvancedTableSearchBaseComponent {
                 const value = this.formComponent.submission.data[key];
                 // the filter with type is a string and is not empty
                 const isEmptyString = typeof value === 'string' && value.length === 0;
-                if (!isEmptyString) {
+                // do not include empty objects in filter
+                const 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,