@recursyve/nice-data-filter-kit 14.1.1 → 14.1.3

package/fesm2020/recursyve-nice-data-filter-kit.mjs

@@ -2752,6 +2752,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImpor
 const EXPORTS_SETTINGS = new InjectionToken("exports_settings");
 const FILTER_VIEW_ICONS = new InjectionToken("filter_view_icons");
 const FILTER_VIEW_STATE = new InjectionToken("filter_view_state");
+const FILTER_VIEW_STORE = new InjectionToken("filter_view_store");
 
 const initialValue = {
     subStates: {},
@@ -2773,12 +2774,12 @@ const initialValue = {
     queryParams: null,
     resetResult: false
 };
-let NiceFilterViewStore = class NiceFilterViewStore extends EntityStore {
-    constructor(state) {
+class NiceFilterViewStore extends EntityStore {
+    constructor(state, store) {
         super({
             ...initialValue,
             ...state
-        });
+        }, store);
     }
     setFilterConfigLoading(loading) {
         this.update({ filterConfigLoading: loading });
@@ -2806,11 +2807,11 @@ let NiceFilterViewStore = class NiceFilterViewStore extends EntityStore {
                 filterResult
             });
         }
-        if (mode === "accumulated") {
-            this.add(filterResult.values);
+        if (mode === "accumulated" && !resetResult) {
+            this.add([...filterResult.values]);
         }
         else {
-            this.set(filterResult.values);
+            this.set([...filterResult.values]);
         }
     }
     addValue(value, opts) {
@@ -2826,44 +2827,45 @@ let NiceFilterViewStore = class NiceFilterViewStore extends EntityStore {
         });
         this.add(value, opts);
     }
-    upsertValue(value, key = "id") {
+    upsertValue(value, key) {
         const { filterResult } = this.getValue();
         if (!filterResult) {
             return;
         }
+        const idKey = key ?? this.idKey;
         this.update({
             filterResult: {
                 ...filterResult,
-                values: arrayUpsert(filterResult.values, value[key], value)
+                values: arrayUpsert(filterResult.values, value[idKey], value, key)
             }
         });
-        this.upsert(value[key], value);
+        this.upsert(value[idKey], value);
     }
-    removeValue(value, key = "id") {
+    removeValue(value, key) {
         const { filterResult } = this.getValue();
         if (!filterResult) {
             return;
         }
+        const idKey = key ?? this.idKey;
         this.update({
             filterResult: {
                 ...filterResult,
-                values: arrayRemove(filterResult.values, value[key])
+                values: arrayRemove(filterResult.values, value[idKey], key)
             }
         });
-        this.remove(value[key]);
+        this.remove(value[idKey]);
     }
-};
-NiceFilterViewStore.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: NiceFilterViewStore, deps: [{ token: FILTER_VIEW_STATE }], target: i0.ɵɵFactoryTarget.Injectable });
+}
+NiceFilterViewStore.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: NiceFilterViewStore, deps: [{ token: FILTER_VIEW_STATE }, { token: FILTER_VIEW_STORE }], target: i0.ɵɵFactoryTarget.Injectable });
 NiceFilterViewStore.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: NiceFilterViewStore });
-NiceFilterViewStore = __decorate([
-    StoreConfig({ name: "nice-filter-view", resettable: true }),
-    __metadata("design:paramtypes", [Object])
-], NiceFilterViewStore);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: NiceFilterViewStore, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [FILTER_VIEW_STATE]
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: [FILTER_VIEW_STORE]
                 }] }]; } });
 
 class NiceFilterViewQuery extends QueryEntity {
@@ -3086,10 +3088,10 @@ class NiceFilterViewService {
     addValue(value, opts) {
         this.store.addValue(value, opts);
     }
-    upsertValue(value, key = "id") {
+    upsertValue(value, key) {
         this.store.upsertValue(value, key);
     }
-    removeValue(value, key = "id") {
+    removeValue(value, key) {
         this.store.removeValue(value, key);
     }
     resetResult(waitForNextFilter) {
@@ -3225,11 +3227,11 @@ class NiceFilterInfiniteScrollDataViewComponent {
     constructor(query, service) {
         this.query = query;
         this.service = service;
-        this.data$ = this.query.selectAll();
+        this.data$ = this.query.selectAll().pipe(tap(x => console.log(x)));
     }
     async loadNextPage() {
         const { filterParameters } = this.query.getValue();
-        this.service.setMode("paginated");
+        this.service.setMode("accumulated");
         await this.service.setParameters({
             ...filterParameters,
             start: filterParameters.start + filterParameters.length
@@ -3259,6 +3261,10 @@ class NiceFilterSearchComponent {
     ngOnInit() {
         this.searchText$
             .pipe(takeUntil(this.unsubscribeAll$), debounceTime(300), distinctUntilChanged(), tap((search) => {
+            const { mode } = this.query.getValue();
+            if (mode === "accumulated") {
+                this.service.resetPaging();
+            }
             const { filterParameters } = this.query.getValue();
             this.service.setParameters({
                 ...filterParameters,
@@ -3602,6 +3608,10 @@ class NiceFilterViewModule {
             {
                 provide: FILTER_VIEW_STATE,
                 useValue: options.state ?? {}
+            },
+            {
+                provide: FILTER_VIEW_STORE,
+                useValue: options.store ?? { name: "nice-filter-view", resettable: true }
             }
         ].filter(x => !!x);
     }