@provoly/dashboard 1.4.31 → 1.4.33

package/fesm2022/provoly-dashboard.mjs

@@ -5054,30 +5054,33 @@ class SearchService {
     getItemsFilter(id, cumulative) {
         let params = cumulative ?? new HttpParams({ encoder: new FilterParamEncoder() });
         if (this.filters[id]) {
-            this.filters[id]
-                .filter((filter) => filter.value !== null && filter.value !== undefined)
-                .forEach((filter) => {
-                let valuesToAddToParams = filter.value;
-                // INSIDE and OUTSIDE operators uses 2 values but not sent in an array, values are separated by a coma
-                // wich must not be encoded (as if values were in an array)
-                const isMultiValued = ['INSIDE', 'OUTSIDE'].find((val) => val === filter.operator) !== undefined;
-                if (isMultiValued) {
-                    valuesToAddToParams = filter.value.split(',');
-                }
-                // date filter value must be send in ISO-8601 format
-                if (filter.type === 'date') {
-                    valuesToAddToParams = isMultiValued
-                        ? valuesToAddToParams.map((value) => DateUtils.parseToIsoString(value))
-                        : DateUtils.parseToIsoString(valuesToAddToParams);
-                }
-                const value = Array.isArray(valuesToAddToParams)
-                    ? valuesToAddToParams.map((v) => encodeURIComponent(v.toString().split(',').join('\\,'))).join(',')
-                    : encodeURIComponent(valuesToAddToParams.toString().replace(/,/g, '\\,'));
-                params = params.append('filter', `${filter.attribute},${filter.operator},${value}`);
-            });
+            const filtersToAppendToParams = this.filters[id].filter((filter) => filter.value !== null && filter.value !== undefined);
+            params = this.appendItemFilter(filtersToAppendToParams, params);
         }
         return params;
     }
+    appendItemFilter(filters, params) {
+        filters.forEach((filter) => {
+            let valuesToAddToParams = filter.value;
+            // INSIDE and OUTSIDE operators uses 2 values but not sent in an array, values are separated by a coma
+            // wich must not be encoded (as if values were in an array)
+            const isMultiValued = ['INSIDE', 'OUTSIDE'].find((val) => val === filter.operator) !== undefined;
+            if (isMultiValued) {
+                valuesToAddToParams = filter.value.split(',');
+            }
+            // date filter value must be send in ISO-8601 format
+            if (filter.type === 'date') {
+                valuesToAddToParams = isMultiValued
+                    ? valuesToAddToParams.map((value) => DateUtils.parseToIsoString(value))
+                    : DateUtils.parseToIsoString(valuesToAddToParams);
+            }
+            const value = Array.isArray(valuesToAddToParams)
+                ? valuesToAddToParams.map((v) => encodeURIComponent(v.toString().split(',').join('\\,'))).join(',')
+                : encodeURIComponent(valuesToAddToParams.toString().replace(/,/g, '\\,'));
+            params = params.append('filter', `${filter.attribute},${filter.operator},${value}`);
+        });
+        return params;
+    }
     getOrder(quickOrder) {
         let params = new HttpParams({ encoder: new FilterParamEncoder() });
         if (quickOrder) {
@@ -5128,12 +5131,16 @@ class SearchService {
         this.transformations.forEach((func) => (transformed = func(id, transformed)));
         return transformed;
     }
-    autocomplete(attributes, search = '', limit) {
+    autocomplete(attributes, search = '', filters = [], limit) {
+        const params = this.appendItemFilter(filters, new HttpParams({ encoder: new FilterParamEncoder() }));
         return this.store.select(ConfigSelectors.dataUrl).pipe(switchMap((url) => this.httpClient.post(encodeURI(`${url}/data-sources/values`), {
-            attributes: (attributes ?? []).map((attr) => ({ datasource: attr.datasource, attribute: attr.id })),
+            attributes: (attributes ?? []).map((attr) => ({
+                datasource: attr.datasource,
+                attribute: attr.id
+            })),
             value: search,
             limit
-        })));
+        }, { params })));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SearchService, deps: [{ token: i1$1.HttpClient }, { token: i1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SearchService, providedIn: 'root' }); }
@@ -5486,7 +5493,7 @@ class SearchEffects {
             next: action.next
         }))));
         this.getPossibleFilterValues$ = createEffect(() => this.actions$.pipe(ofType(SearchActions.getPossibleFilterValues), withLatestFrom(this.store.select(SearchSelectors.filterValues), this.store.select(DashboardSelectors.rank)), filter(([action, filterValues, rank]) => (action.force || !filterValues[action.filterId] || filterValues[action.filterId].length === 0) && rank === 0), mergeMap(([action]) => this.searchService
-            .autocomplete(action.attributes, '', action.limit)
+            .autocomplete(action.attributes, '', action.valuesFilters, action.limit)
             .pipe(map((values) => SearchActions.setPossibleFilterValues({ filterId: action.filterId, values }))))));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SearchEffects, deps: [{ token: i1$2.Actions }, { token: SearchService }, { token: i1.Store }, { token: WidgetFactoryService }], target: i0.ɵɵFactoryTarget.Injectable }); }