@acorex/platform 19.1.13 → 19.1.14

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -756,13 +756,38 @@ class AXPEntityMasterListViewModel {
             };
         });
     }
-    applyViewFilters() {
+    // const viewFilters = this.view().conditions.map((f) => ({
+    //   field: f.name,
+    //   operator: f.operator,
+    //   value: f.value,
+    // }));
+    async applyViewFilters() {
         const viewFilters = this.view().conditions.map((f) => ({
             field: f.name,
             operator: f.operator,
             value: f.value,
         }));
+        // console.log('this.view().conditions: ', this.view().conditions);
+        // console.log('this.filtersDef: ', this.filtersDef);
+        // let viewFilters: AXPFilterQuery[] = [];
+        // await this.filtersDef.forEach((filter) => {
+        //   viewFilters.push({
+        //     field: filter.field,
+        //     operator: filter.operator,
+        //     value: filter.value,
+        //   });
+        // });
+        // await this.view().conditions.map((f) => {
+        //   let viewFilter = viewFilters.find((el) => el.field === f.name) as AXPFilterQuery;
+        //   viewFilter = {
+        //     ...viewFilter,
+        //     value: f.value,
+        //     operator: f.operator,
+        //   };
+        // });
+        // console.log('viewFilters: ', viewFilters);
         this.simpleFilters.update((prev) => ({ ...prev, filters: viewFilters }));
+        // console.log('this.simpleFilters(): ', this.simpleFilters());
     }
     resetFilters() {
         this.applyViewFilters();
@@ -786,7 +811,7 @@ class AXPEntityMasterListViewModel {
         }
         this.applyFilterAndSort();
     }
-    applyFilterAndSort() {
+    async applyFilterAndSort() {
         this.dataSource.clearFilter();
         this.dataSource.sort(...this.sortedFields()
             .filter((sf) => sf.dir)
@@ -795,15 +820,35 @@ class AXPEntityMasterListViewModel {
             this.inlineFilters.filters?.length && this.inlineFilters,
             this.simpleFilters().filters?.length && this.simpleFilters(),
         ].filter(Boolean);
+        const cleanedAllFilters = this.cleanNestedFilters(allFilters);
         this.lastFiltersApplied.set(this.simpleFilters());
         this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
             field: null,
             logic: 'and',
             operator: null,
-            filters: allFilters,
+            filters: cleanedAllFilters,
         }));
         this.dataSource.refresh();
     }
+    cleanNestedFilters(filters) {
+        return filters
+            .map((filter) => {
+            if (!filter)
+                return undefined;
+            if (filter.filters?.length) {
+                const cleanedNestedFilters = this.cleanNestedFilters(filter.filters);
+                return {
+                    ...filter,
+                    filters: cleanedNestedFilters.filter(Boolean),
+                };
+            }
+            if (filter.value === null || filter.value === undefined || filter.value === 'unknown') {
+                return undefined;
+            }
+            return filter;
+        })
+            .filter(Boolean);
+    }
     resetColumns() {
         this.applyViewColumns();
     }