@den4ik92/ng2-smart-table 19.2.7 → 19.2.9

package/fesm2022/den4ik92-ng2-smart-table.mjs

@@ -503,25 +503,21 @@ class DataSource {
     }
     async prepend(element) {
         this.data.update((old) => [element, ...old]);
-        await promiseDelay(50);
         this.emitOnChanged({ action: SmartTableOnChangedEventName.prepend, newItems: [element] });
         return Promise.resolve(true);
     }
     async appendMany(elements) {
         this.data.update((old) => [...old, ...elements,]);
-        await promiseDelay(50);
         this.emitOnChanged({ action: SmartTableOnChangedEventName.appendMany, newItems: elements });
         return Promise.resolve(true);
     }
     async add(element) {
         this.data.update((old) => [...old, element,]);
-        await promiseDelay(50);
         this.emitOnChanged({ action: SmartTableOnChangedEventName.add, newItems: [element] });
         return Promise.resolve(true);
     }
     async remove(element) {
         this.data.update((old) => old.filter((el) => el !== element));
-        await promiseDelay(50);
         this.emitOnChanged({ action: SmartTableOnChangedEventName.remove, item: element });
         return Promise.resolve(true);
     }
@@ -531,7 +527,6 @@ class DataSource {
     }
     async empty() {
         this.data.set([]);
-        await promiseDelay(50);
         this.emitOnChanged({ action: SmartTableOnChangedEventName.empty });
         return Promise.resolve(true);
     }
@@ -562,7 +557,6 @@ class DataSource {
         }
         this.pagingConf.update((old) => ({ ...old, page: 1 }));
         if (doEmit) {
-            await promiseDelay(50);
             this.emitOnChanged({ action: SmartTableOnChangedEventName.filter });
         }
     }
@@ -603,7 +597,7 @@ class DataSource {
 function filterValues(value, search) {
     return value.toString().toLowerCase().includes(search.toString().toLowerCase());
 }
-function isElementSatisfied(element, filters) {
+async function isElementSatisfied(element, filters) {
     return filters.every((filter) => {
         if (!filter.search?.length) {
             return true;
@@ -633,7 +627,7 @@ function compareValues(direction, a, b) {
     return 0;
 }
 class LocalSorter {
-    static sort(data, field, direction, customCompare) {
+    static async sort(data, field, direction, customCompare) {
         const dir = direction === "asc" ? 1 : -1;
         const compare = customCompare ? customCompare : compareValues;
         return data.sort((a, b) => {
@@ -651,8 +645,7 @@ class LocalDataSource extends DataSource {
     }
     async load(data) {
         this.data.set(data);
-        await promiseDelay(50);
-        this.emitOnChanged({ action: SmartTableOnChangedEventName.load, }, data);
+        this.emitOnChanged({ action: SmartTableOnChangedEventName.load }, data);
         return Promise.resolve(true);
     }
     prepend(element) {
@@ -691,17 +684,17 @@ class LocalDataSource extends DataSource {
     getFilters() {
         return this.filters;
     }
-    emitOnChanged(event, newElements) {
-        let renderData = this.filteredAndSorted();
+    async emitOnChanged(event, newElements) {
+        let renderData = this.filteredAndSorted().slice(0);
         const action = event.action;
         if (['filter', 'refresh', 'load', 'add', 'prepend', 'appendMany'].includes(action)) {
-            renderData = this.filter(newElements || this.data().slice(0));
-            this.filteredAndSorted.set(this.sort(renderData));
-            renderData = this.filteredAndSorted();
+            renderData = await this.filter(newElements || this.data().slice(0));
+            renderData = await this.sort(renderData);
+            this.filteredAndSorted.set(renderData);
         }
-        if (['sort', 'filter', 'refresh', 'load'].includes(action)) {
-            this.filteredAndSorted.update((list) => this.sort(list));
-            renderData = this.filteredAndSorted();
+        if (action === SmartTableOnChangedEventName.sort) {
+            renderData = await this.sort(renderData);
+            this.filteredAndSorted.set(renderData);
         }
         if (this.pagingConf().display &&
             ['page', 'paging', 'refresh', 'load', 'sort', 'filter'].includes(action)) {
@@ -712,19 +705,23 @@ class LocalDataSource extends DataSource {
             this.setPage(this.pagingConf().page - 1);
         }
     }
-    sort(data) {
+    async sort(data) {
         if (this.sortConf) {
-            data = LocalSorter.sort(data, this.sortConf.field, this.sortConf.direction, this.sortConf.compare);
+            return LocalSorter.sort(data, this.sortConf.field, this.sortConf.direction, this.sortConf.compare);
         }
         return data;
     }
-    filter(data) {
-        if (this.filters.length > 0) {
-            return data.filter((item) => {
-                return isElementSatisfied(item, this.filters);
-            });
+    async filter(data) {
+        if (!this.filters.length) {
+            return data;
         }
-        return data;
+        const filtered = [];
+        await Promise.all(data.map(async (element) => {
+            if (await isElementSatisfied(element, this.filters)) {
+                filtered.push(element);
+            }
+        }));
+        return filtered;
     }
     paginate(data) {
         if (this.pagingConf().display) {
@@ -1394,6 +1391,11 @@ class DataSet {
         this.data.set(data);
         this.createRows();
     }
+    setColumnsConfig(columnSettings) {
+        this.columnSettings = columnSettings;
+        this.createColumns(columnSettings);
+        this.createRows();
+    }
     getFirstRow() {
         return this.rows()[0];
     }
@@ -1657,7 +1659,12 @@ class Grid {
     }
     updateSettingsAndDataSet(settings, emittedEvent = 'refresh') {
         this.settings.set(settings);
-        this.dataSet = new DataSet([], settings.columns);
+        if (this.dataSet) {
+            this.dataSet.setColumnsConfig(settings.columns);
+        }
+        else {
+            this.dataSet = new DataSet([], settings.columns);
+        }
         if (this.source) {
             this.source.pagingConf.update((old) => ({
                 ...old,