@provoly/dashboard 1.4.1 → 1.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/core/store/aggregation/backend-aggregation.service.mjs +3 -2
- package/esm2022/lib/core/store/search/search.service.mjs +12 -6
- package/fesm2022/provoly-dashboard.mjs +12 -6
- package/fesm2022/provoly-dashboard.mjs.map +1 -1
- package/lib/core/store/search/search.service.d.ts +1 -1
- package/package.json +25 -25
|
@@ -9,6 +9,7 @@ import { FieldSelectors } from '../field/field.selectors';
|
|
|
9
9
|
import { DEFAULT_NAMED_QUERY_ID, EXPLORE_NAMED_QUERY_ID } from '../search/search.constants';
|
|
10
10
|
import { PryAggregationService } from './base-aggregation.service';
|
|
11
11
|
import { debounceTime } from 'rxjs/operators';
|
|
12
|
+
import { FilterParamEncoder } from '../search/filter-param-encoder';
|
|
12
13
|
import * as i0 from "@angular/core";
|
|
13
14
|
import * as i1 from "@ngrx/store";
|
|
14
15
|
import * as i2 from "../../components/snackbar/snackbar.service";
|
|
@@ -55,7 +56,7 @@ export class PryBackendAggregationService extends PryAggregationService {
|
|
|
55
56
|
console.warn('Aggregation needs a target datasource.');
|
|
56
57
|
return of({ operation: options.ordinate?.operation ?? 'none', values: [] });
|
|
57
58
|
}
|
|
58
|
-
let params = new HttpParams();
|
|
59
|
+
let params = new HttpParams({ encoder: new FilterParamEncoder() });
|
|
59
60
|
if (options.abscissa && options.abscissa.attribute) {
|
|
60
61
|
params = params.set('aggregatedBy', options.abscissa.attribute);
|
|
61
62
|
}
|
|
@@ -114,4 +115,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.3", ngImpor
|
|
|
114
115
|
providedIn: 'root'
|
|
115
116
|
}]
|
|
116
117
|
}], ctorParameters: () => [{ type: i1.Store }, { type: i2.PrySnackbarService }, { type: i3.PryI18nService }, { type: i4.HttpClient }, { type: i5.SearchService }] });
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend-aggregation.service.js","sourceRoot":"","sources":["../../../../../../../../projects/provoly/dashboard/lib/core/store/aggregation/backend-aggregation.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpParams } from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { Store } from '@ngrx/store';\nimport { map, Observable, of, share } from 'rxjs';\nimport { DashboardSelectors } from '../../../dashboard/store/dashboard.selectors';\nimport { PrySnackbarService } from '../../components/snackbar/snackbar.service';\nimport { PryI18nService } from '../../i18n/i18n.service';\nimport { FilterContext } from '../../model/filter.interface';\nimport { ResultSets } from '../../model/result-set.interface';\nimport { ChartAggregatedWidgetOptions, Operation } from '../../model/widget-aggregated-chart-manifest.interface';\nimport { Class } from '../class/class.interface';\nimport { ClassSelectors } from '../class/class.selectors';\nimport { ConfigSelectors } from '../config/config.selectors';\nimport { Field } from '../field/field.interface';\nimport { FieldSelectors } from '../field/field.selectors';\nimport { DEFAULT_NAMED_QUERY_ID, EXPLORE_NAMED_QUERY_ID } from '../search/search.constants';\nimport { SearchService } from '../search/search.service';\nimport { AggregationResult, PryAggregationService } from './base-aggregation.service';\nimport { debounceTime } from 'rxjs/operators';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PryBackendAggregationService extends PryAggregationService {\n  private rs: ResultSets = {};\n  private classes: Class[] = [];\n  private fields: Field[] = [];\n  private filters: { [datasource: string]: FilterContext[] } = {};\n  private dataUrl: string = '';\n\n  private cache: {\n    [key: string]: {\n      response: Observable<AggregationResult>;\n      time: number;\n    };\n  } = {};\n\n  constructor(\n    private store: Store,\n    private snackBar: PrySnackbarService,\n    private translateService: PryI18nService,\n    private httpClient: HttpClient,\n    private searchService: SearchService\n  ) {\n    super();\n\n    this.store.select(DashboardSelectors.resultSets).subscribe((rs) => (this.rs = rs as ResultSets));\n    this.store.select(ClassSelectors.classes).subscribe((classes) => (this.classes = classes));\n    this.store.select(FieldSelectors.fields).subscribe((fields) => (this.fields = fields));\n    this.store.select(DashboardSelectors.datasourceFilters).subscribe((filters) => (this.filters = filters));\n    this.store.select(ConfigSelectors.dataUrl).subscribe((dataUrl) => (this.dataUrl = dataUrl));\n  }\n\n  override aggregate(datasources: string[], options: ChartAggregatedWidgetOptions): Observable<AggregationResult> {\n    const targetDatasource = datasources.find((ds) => ![DEFAULT_NAMED_QUERY_ID, EXPLORE_NAMED_QUERY_ID].includes(ds));\n\n    if (datasources.length > 1) {\n      this.snackBar.open({\n        type: 'warning',\n        message: this.translateService.instant('@pry.message.backend-only-1-datasource'),\n        timeout: 4000\n      });\n    }\n\n    if (datasources.includes(DEFAULT_NAMED_QUERY_ID) || datasources.includes(EXPLORE_NAMED_QUERY_ID)) {\n      this.snackBar.open({\n        type: 'warning',\n        message: this.translateService.instant('@pry.message.cannot-aggregate-virtual-ds'),\n        timeout: 4000\n      });\n    }\n\n    if (!targetDatasource) {\n      console.warn('Aggregation needs a target datasource.');\n      return of({ operation: options.ordinate?.operation ?? 'none', values: [] } as AggregationResult);\n    }\n\n    let params = new HttpParams();\n    if (options.abscissa && options.abscissa.attribute) {\n      params = params.set('aggregatedBy', options.abscissa.attribute);\n    } else {\n      console.warn('Aggregation needs an aggregatedBy member.');\n      if (options.ordinate.operation !== Operation.EXTENT) {\n        return of({ operation: options.ordinate.operation, values: [] } as AggregationResult);\n      }\n    }\n    if (options.abscissa && options.abscissa.interval) {\n      if (typeof options.abscissa.interval === 'string') params = params.set('dateInterval', options.abscissa.interval);\n      if (typeof options.abscissa.interval === 'number') params = params.set('interval', options.abscissa.interval);\n    }\n    const operation = options.ordinate.operation?.replace(/^none$/, Operation.SUM);\n    params = params.set('operation', operation);\n    if (!!options.ordinate.attribute) {\n      params = params.set('valueField', options.ordinate.attribute);\n    }\n    if (operation === Operation.DISTINCT) {\n      params = params.set('valueField', options.abscissa.attribute);\n    }\n    if (options.groupBy) {\n      params = params.set('groupBy', options.groupBy.attribute);\n    }\n    if (options.graph && options.graph.sort) {\n      params = params.set('order', `${options.graph.sort.direction},${(options.graph.sort.value ?? '').toUpperCase()}`);\n    }\n    if (options.abscissa && options.abscissa.limit) {\n      params = params.set('limit', `${options.abscissa.limit}`);\n    }\n    params = this.searchService.getItemsFilter(targetDatasource, params, false);\n\n    const key = `${this.dataUrl}_${targetDatasource}_${params.toString()}`;\n    if (!this.cache[key] || this.cache[key].time + 1000 < new Date().getTime()) {\n      this.cache[key] = {\n        response: this.httpClient\n          .get<AggregationResult>(`${this.dataUrl}/data-sources/id/${targetDatasource}/items/aggregate`, {\n            params\n          })\n          .pipe(\n            debounceTime(100),\n            map((result) => ({\n              ...result,\n              operation: options.ordinate.operation === Operation.NONE ? Operation.NONE : result.operation\n            })),\n            share()\n          ),\n        time: new Date().getTime()\n      };\n    }\n    return this.cache[key].response;\n  }\n}\n"]}
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend-aggregation.service.js","sourceRoot":"","sources":["../../../../../../../../projects/provoly/dashboard/lib/core/store/aggregation/backend-aggregation.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpParams } from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { Store } from '@ngrx/store';\nimport { map, Observable, of, share } from 'rxjs';\nimport { DashboardSelectors } from '../../../dashboard/store/dashboard.selectors';\nimport { PrySnackbarService } from '../../components/snackbar/snackbar.service';\nimport { PryI18nService } from '../../i18n/i18n.service';\nimport { FilterContext } from '../../model/filter.interface';\nimport { ResultSets } from '../../model/result-set.interface';\nimport { ChartAggregatedWidgetOptions, Operation } from '../../model/widget-aggregated-chart-manifest.interface';\nimport { Class } from '../class/class.interface';\nimport { ClassSelectors } from '../class/class.selectors';\nimport { ConfigSelectors } from '../config/config.selectors';\nimport { Field } from '../field/field.interface';\nimport { FieldSelectors } from '../field/field.selectors';\nimport { DEFAULT_NAMED_QUERY_ID, EXPLORE_NAMED_QUERY_ID } from '../search/search.constants';\nimport { SearchService } from '../search/search.service';\nimport { AggregationResult, PryAggregationService } from './base-aggregation.service';\nimport { debounceTime } from 'rxjs/operators';\nimport { FilterParamEncoder } from '../search/filter-param-encoder';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PryBackendAggregationService extends PryAggregationService {\n  private rs: ResultSets = {};\n  private classes: Class[] = [];\n  private fields: Field[] = [];\n  private filters: { [datasource: string]: FilterContext[] } = {};\n  private dataUrl: string = '';\n\n  private cache: {\n    [key: string]: {\n      response: Observable<AggregationResult>;\n      time: number;\n    };\n  } = {};\n\n  constructor(\n    private store: Store,\n    private snackBar: PrySnackbarService,\n    private translateService: PryI18nService,\n    private httpClient: HttpClient,\n    private searchService: SearchService\n  ) {\n    super();\n\n    this.store.select(DashboardSelectors.resultSets).subscribe((rs) => (this.rs = rs as ResultSets));\n    this.store.select(ClassSelectors.classes).subscribe((classes) => (this.classes = classes));\n    this.store.select(FieldSelectors.fields).subscribe((fields) => (this.fields = fields));\n    this.store.select(DashboardSelectors.datasourceFilters).subscribe((filters) => (this.filters = filters));\n    this.store.select(ConfigSelectors.dataUrl).subscribe((dataUrl) => (this.dataUrl = dataUrl));\n  }\n\n  override aggregate(datasources: string[], options: ChartAggregatedWidgetOptions): Observable<AggregationResult> {\n    const targetDatasource = datasources.find((ds) => ![DEFAULT_NAMED_QUERY_ID, EXPLORE_NAMED_QUERY_ID].includes(ds));\n\n    if (datasources.length > 1) {\n      this.snackBar.open({\n        type: 'warning',\n        message: this.translateService.instant('@pry.message.backend-only-1-datasource'),\n        timeout: 4000\n      });\n    }\n\n    if (datasources.includes(DEFAULT_NAMED_QUERY_ID) || datasources.includes(EXPLORE_NAMED_QUERY_ID)) {\n      this.snackBar.open({\n        type: 'warning',\n        message: this.translateService.instant('@pry.message.cannot-aggregate-virtual-ds'),\n        timeout: 4000\n      });\n    }\n\n    if (!targetDatasource) {\n      console.warn('Aggregation needs a target datasource.');\n      return of({ operation: options.ordinate?.operation ?? 'none', values: [] } as AggregationResult);\n    }\n\n    let params = new HttpParams({ encoder: new FilterParamEncoder() });\n    if (options.abscissa && options.abscissa.attribute) {\n      params = params.set('aggregatedBy', options.abscissa.attribute);\n    } else {\n      console.warn('Aggregation needs an aggregatedBy member.');\n      if (options.ordinate.operation !== Operation.EXTENT) {\n        return of({ operation: options.ordinate.operation, values: [] } as AggregationResult);\n      }\n    }\n    if (options.abscissa && options.abscissa.interval) {\n      if (typeof options.abscissa.interval === 'string') params = params.set('dateInterval', options.abscissa.interval);\n      if (typeof options.abscissa.interval === 'number') params = params.set('interval', options.abscissa.interval);\n    }\n    const operation = options.ordinate.operation?.replace(/^none$/, Operation.SUM);\n    params = params.set('operation', operation);\n    if (!!options.ordinate.attribute) {\n      params = params.set('valueField', options.ordinate.attribute);\n    }\n    if (operation === Operation.DISTINCT) {\n      params = params.set('valueField', options.abscissa.attribute);\n    }\n    if (options.groupBy) {\n      params = params.set('groupBy', options.groupBy.attribute);\n    }\n    if (options.graph && options.graph.sort) {\n      params = params.set('order', `${options.graph.sort.direction},${(options.graph.sort.value ?? '').toUpperCase()}`);\n    }\n    if (options.abscissa && options.abscissa.limit) {\n      params = params.set('limit', `${options.abscissa.limit}`);\n    }\n    params = this.searchService.getItemsFilter(targetDatasource, params, false);\n\n    const key = `${this.dataUrl}_${targetDatasource}_${params.toString()}`;\n    if (!this.cache[key] || this.cache[key].time + 1000 < new Date().getTime()) {\n      this.cache[key] = {\n        response: this.httpClient\n          .get<AggregationResult>(`${this.dataUrl}/data-sources/id/${targetDatasource}/items/aggregate`, {\n            params\n          })\n          .pipe(\n            debounceTime(100),\n            map((result) => ({\n              ...result,\n              operation: options.ordinate.operation === Operation.NONE ? Operation.NONE : result.operation\n            })),\n            share()\n          ),\n        time: new Date().getTime()\n      };\n    }\n    return this.cache[key].response;\n  }\n}\n"]}
|
|
@@ -39,9 +39,15 @@ export class SearchService {
|
|
|
39
39
|
this.filters[id]
|
|
40
40
|
.filter((filter) => filter.value !== null && filter.value !== undefined)
|
|
41
41
|
.forEach((filter) => {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
42
|
+
let valuesToAddToParams = filter.value;
|
|
43
|
+
// INSIDE and OUTSIDE operators uses 2 values but not sent in an array, values are separated by a coma
|
|
44
|
+
// wich must not be encoded (as if values were in an array)
|
|
45
|
+
if (['INSIDE', 'OUTSIDE'].find((val) => val === filter.operator) !== undefined) {
|
|
46
|
+
valuesToAddToParams = filter.value.split(',');
|
|
47
|
+
}
|
|
48
|
+
const value = Array.isArray(valuesToAddToParams)
|
|
49
|
+
? valuesToAddToParams.map((v) => encodeURIComponent(v.toString().split(',').join('\\,'))).join(',')
|
|
50
|
+
: encodeURIComponent(valuesToAddToParams.toString().replace(/,/g, '\\,'));
|
|
45
51
|
params = params.append('filter', `${filter.attribute},${filter.operator},${value}`);
|
|
46
52
|
});
|
|
47
53
|
}
|
|
@@ -51,8 +57,8 @@ export class SearchService {
|
|
|
51
57
|
}
|
|
52
58
|
return params;
|
|
53
59
|
}
|
|
54
|
-
getOrder(quickOrder
|
|
55
|
-
let params =
|
|
60
|
+
getOrder(quickOrder) {
|
|
61
|
+
let params = new HttpParams({ encoder: new FilterParamEncoder() });
|
|
56
62
|
if (quickOrder) {
|
|
57
63
|
params = params.append('order', `${quickOrder.attribute},${quickOrder.asc ?? ''}`);
|
|
58
64
|
}
|
|
@@ -109,4 +115,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.3", ngImpor
|
|
|
109
115
|
providedIn: 'root'
|
|
110
116
|
}]
|
|
111
117
|
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: i2.Store }] });
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"search.service.js","sourceRoot":"","sources":["../../../../../../../../projects/provoly/dashboard/lib/core/store/search/search.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpParams } from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { Store } from '@ngrx/store';\nimport { combineLatest, map, mergeMap, Observable, of, switchMap } from 'rxjs';\nimport { DashboardSelectors } from '../../../dashboard/store/dashboard.selectors';\nimport { FilterContext } from '../../model/filter.interface';\nimport { ResultOrder } from '../../model/result-order.interface';\nimport { ResultSet } from '../../model/result-set.interface';\nimport { MonoClassSearchPayload } from '../../model/search-mono-class.model';\nimport { FullTextSearchPayload, MultiClassSearchPayload } from '../../model/search-multi-class.model';\nimport { ConfigState } from '../config/config.reducer';\nimport { ConfigSelectors } from '../config/config.selectors';\nimport { DEFAULT_NAMED_QUERY_ID } from './search.constants';\nimport { SearchState } from './search.reducer';\nimport { FilterParamEncoder } from './filter-param-encoder';\n\nexport type ResultsetTransformation = (id: string, result: ResultSet) => ResultSet;\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class SearchService {\n  transformations: ResultsetTransformation[] = [];\n  filters: { [datasource: string]: FilterContext[] } = {};\n  limits: { [p: string]: number } = {};\n\n  constructor(\n    private httpClient: HttpClient,\n    private store: Store<ConfigState | SearchState>\n  ) {\n    store.select(DashboardSelectors.datasourceFilters).subscribe((filters) => {\n      this.filters = filters;\n    });\n    store.select(ConfigSelectors.limits).subscribe((limits) => {\n      this.limits = limits;\n    });\n  }\n\n  getItems(id: string, quickOrder?: ResultOrder, excludeGeo?: boolean): Observable<ResultSet> {\n    const params = this.getItemsFilter(id, this.getOrder(quickOrder)).append('excludeGeo', excludeGeo ?? false);\n\n    if (!id) {\n      console.warn('Not sending items request with no datasource attached.');\n      return of({ items: {}, relations: [] } as ResultSet);\n    }\n\n    return this.store.select(ConfigSelectors.dataUrl).pipe(\n      mergeMap((url) => this.httpClient.get<ResultSet>(encodeURI(`${url}/data-sources/id/${id}/items`), { params })),\n      map((rs) => this.applyTransformations('current', rs))\n    );\n  }\n\n  getItemsSerializedParams(id: string, quickOrder: { [id: string]: ResultOrder | undefined } = {}): string {\n    return '|' + this.getItemsFilter(id, this.getOrder(quickOrder[id])).toString() + '|';\n  }\n\n  getItemsFilter(id: string, cumulative?: HttpParams, includeLimit = true): HttpParams {\n    let params = cumulative ?? new HttpParams({ encoder: new FilterParamEncoder() });\n    if (this.filters[id]) {\n      this.filters[id]\n        .filter((filter) => filter.value !== null && filter.value !== undefined)\n        .forEach((filter) => {\n          const value = Array.isArray(filter.value)\n            ? filter.value.map((v) => encodeURIComponent(v.toString().split(',').join('\\\\,'))).join(',')\n            : encodeURIComponent(filter.value!.toString().replace(/,/g, '\\\\,'));\n          params = params.append('filter', `${filter.attribute},${filter.operator},${value}`);\n        });\n    }\n    if (includeLimit) {\n      const limit = this.limits[id] ?? this.limits['default'];\n      params = params.append('limit', limit);\n    }\n    return params;\n  }\n\n  getOrder(quickOrder: ResultOrder | undefined, cumulative?: HttpParams): HttpParams {\n    let params = cumulative ?? new HttpParams({ encoder: new FilterParamEncoder() });\n    if (quickOrder) {\n      params = params.append('order', `${quickOrder.attribute},${quickOrder.asc ?? ''}`);\n    }\n    return params;\n  }\n\n  /**\n   * Launch a search request (and saves it as current search)\n   * @param condition\n   */\n  search(condition: MonoClassSearchPayload | MultiClassSearchPayload | FullTextSearchPayload): Observable<ResultSet> {\n    return combineLatest([\n      this.store.select(ConfigSelectors.dataUrl),\n      this.store.select(DashboardSelectors.quickOrder),\n      this.store.select(ConfigSelectors.limits)\n    ]).pipe(\n      mergeMap(([url, quickOrder, limits]) => {\n        const params = {} as { [key: string]: string };\n        if (quickOrder[DEFAULT_NAMED_QUERY_ID]) {\n          params['order'] = `${quickOrder[DEFAULT_NAMED_QUERY_ID]?.attribute},${\n            quickOrder[DEFAULT_NAMED_QUERY_ID]?.asc ?? ''\n          }`;\n        }\n        const _condition = { ...condition, limit: limits[DEFAULT_NAMED_QUERY_ID] ?? limits['default'] };\n        return this.httpClient.post<ResultSet>(encodeURI(`${url}/items/search`), _condition, { params });\n      }),\n      map((rs) => this.applyTransformations(DEFAULT_NAMED_QUERY_ID, rs))\n    );\n  }\n\n  /**\n   * Allows to add a transformation function when getting results from backend\n   * @param func\n   */\n  addTransformation(func: ResultsetTransformation) {\n    this.transformations.push(func);\n  }\n\n  /**\n   * Apply all transformation functions\n   * @param id\n   * @param rs\n   */\n  applyTransformations(id: string, rs: ResultSet) {\n    let transformed = rs;\n    this.transformations.forEach((func) => (transformed = func(id, transformed)));\n    return transformed;\n  }\n\n  autocomplete(\n    attributes:\n      | {\n          id: string;\n          datasource: string;\n        }[]\n      | undefined,\n    search: string = '',\n    limit?: number\n  ) {\n    return this.store.select(ConfigSelectors.dataUrl).pipe(\n      switchMap((url) =>\n        this.httpClient.post<string[]>(encodeURI(`${url}/data-sources/values`), {\n          attributes: (attributes ?? []).map((attr) => ({ datasource: attr.datasource, attribute: attr.id })),\n          value: search,\n          limit\n        })\n      )\n    );\n  }\n}\n"]}
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"search.service.js","sourceRoot":"","sources":["../../../../../../../../projects/provoly/dashboard/lib/core/store/search/search.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpParams } from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { Store } from '@ngrx/store';\nimport { combineLatest, map, mergeMap, Observable, of, switchMap } from 'rxjs';\nimport { DashboardSelectors } from '../../../dashboard/store/dashboard.selectors';\nimport { FilterContext } from '../../model/filter.interface';\nimport { ResultOrder } from '../../model/result-order.interface';\nimport { ResultSet } from '../../model/result-set.interface';\nimport { MonoClassSearchPayload } from '../../model/search-mono-class.model';\nimport { FullTextSearchPayload, MultiClassSearchPayload } from '../../model/search-multi-class.model';\nimport { ConfigState } from '../config/config.reducer';\nimport { ConfigSelectors } from '../config/config.selectors';\nimport { DEFAULT_NAMED_QUERY_ID } from './search.constants';\nimport { SearchState } from './search.reducer';\nimport { FilterParamEncoder } from './filter-param-encoder';\n\nexport type ResultsetTransformation = (id: string, result: ResultSet) => ResultSet;\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class SearchService {\n  transformations: ResultsetTransformation[] = [];\n  filters: { [datasource: string]: FilterContext[] } = {};\n  limits: { [p: string]: number } = {};\n\n  constructor(\n    private httpClient: HttpClient,\n    private store: Store<ConfigState | SearchState>\n  ) {\n    store.select(DashboardSelectors.datasourceFilters).subscribe((filters) => {\n      this.filters = filters;\n    });\n    store.select(ConfigSelectors.limits).subscribe((limits) => {\n      this.limits = limits;\n    });\n  }\n\n  getItems(id: string, quickOrder?: ResultOrder, excludeGeo?: boolean): Observable<ResultSet> {\n    const params = this.getItemsFilter(id, this.getOrder(quickOrder)).append('excludeGeo', excludeGeo ?? false);\n\n    if (!id) {\n      console.warn('Not sending items request with no datasource attached.');\n      return of({ items: {}, relations: [] } as ResultSet);\n    }\n\n    return this.store.select(ConfigSelectors.dataUrl).pipe(\n      mergeMap((url) => this.httpClient.get<ResultSet>(encodeURI(`${url}/data-sources/id/${id}/items`), { params })),\n      map((rs) => this.applyTransformations('current', rs))\n    );\n  }\n\n  getItemsSerializedParams(id: string, quickOrder: { [id: string]: ResultOrder | undefined } = {}): string {\n    return '|' + this.getItemsFilter(id, this.getOrder(quickOrder[id])).toString() + '|';\n  }\n\n  getItemsFilter(id: string, cumulative?: HttpParams, includeLimit = true): HttpParams {\n    let params = cumulative ?? new HttpParams({ encoder: new FilterParamEncoder() });\n    if (this.filters[id]) {\n      this.filters[id]\n        .filter((filter) => filter.value !== null && filter.value !== undefined)\n        .forEach((filter) => {\n          let valuesToAddToParams = filter.value;\n          // INSIDE and OUTSIDE operators uses 2 values but not sent in an array, values are separated by a coma\n          // wich must not be encoded (as if values were in an array)\n          if (['INSIDE', 'OUTSIDE'].find((val) => val === filter.operator) !== undefined) {\n            valuesToAddToParams = (filter.value as string).split(',');\n          }\n          const value = Array.isArray(valuesToAddToParams)\n            ? valuesToAddToParams.map((v) => encodeURIComponent(v.toString().split(',').join('\\\\,'))).join(',')\n            : encodeURIComponent(valuesToAddToParams!.toString().replace(/,/g, '\\\\,'));\n          params = params.append('filter', `${filter.attribute},${filter.operator},${value}`);\n        });\n    }\n    if (includeLimit) {\n      const limit = this.limits[id] ?? this.limits['default'];\n      params = params.append('limit', limit);\n    }\n    return params;\n  }\n\n  getOrder(quickOrder: ResultOrder | undefined): HttpParams {\n    let params = new HttpParams({ encoder: new FilterParamEncoder() });\n    if (quickOrder) {\n      params = params.append('order', `${quickOrder.attribute},${quickOrder.asc ?? ''}`);\n    }\n    return params;\n  }\n\n  /**\n   * Launch a search request (and saves it as current search)\n   * @param condition\n   */\n  search(condition: MonoClassSearchPayload | MultiClassSearchPayload | FullTextSearchPayload): Observable<ResultSet> {\n    return combineLatest([\n      this.store.select(ConfigSelectors.dataUrl),\n      this.store.select(DashboardSelectors.quickOrder),\n      this.store.select(ConfigSelectors.limits)\n    ]).pipe(\n      mergeMap(([url, quickOrder, limits]) => {\n        const params = {} as { [key: string]: string };\n        if (quickOrder[DEFAULT_NAMED_QUERY_ID]) {\n          params['order'] = `${quickOrder[DEFAULT_NAMED_QUERY_ID]?.attribute},${\n            quickOrder[DEFAULT_NAMED_QUERY_ID]?.asc ?? ''\n          }`;\n        }\n        const _condition = { ...condition, limit: limits[DEFAULT_NAMED_QUERY_ID] ?? limits['default'] };\n        return this.httpClient.post<ResultSet>(encodeURI(`${url}/items/search`), _condition, { params });\n      }),\n      map((rs) => this.applyTransformations(DEFAULT_NAMED_QUERY_ID, rs))\n    );\n  }\n\n  /**\n   * Allows to add a transformation function when getting results from backend\n   * @param func\n   */\n  addTransformation(func: ResultsetTransformation) {\n    this.transformations.push(func);\n  }\n\n  /**\n   * Apply all transformation functions\n   * @param id\n   * @param rs\n   */\n  applyTransformations(id: string, rs: ResultSet) {\n    let transformed = rs;\n    this.transformations.forEach((func) => (transformed = func(id, transformed)));\n    return transformed;\n  }\n\n  autocomplete(\n    attributes:\n      | {\n          id: string;\n          datasource: string;\n        }[]\n      | undefined,\n    search: string = '',\n    limit?: number\n  ) {\n    return this.store.select(ConfigSelectors.dataUrl).pipe(\n      switchMap((url) =>\n        this.httpClient.post<string[]>(encodeURI(`${url}/data-sources/values`), {\n          attributes: (attributes ?? []).map((attr) => ({ datasource: attr.datasource, attribute: attr.id })),\n          value: search,\n          limit\n        })\n      )\n    );\n  }\n}\n"]}
|
|
@@ -4184,9 +4184,15 @@ class SearchService {
|
|
|
4184
4184
|
this.filters[id]
|
|
4185
4185
|
.filter((filter) => filter.value !== null && filter.value !== undefined)
|
|
4186
4186
|
.forEach((filter) => {
|
|
4187
|
-
|
|
4188
|
-
|
|
4189
|
-
|
|
4187
|
+
let valuesToAddToParams = filter.value;
|
|
4188
|
+
// INSIDE and OUTSIDE operators uses 2 values but not sent in an array, values are separated by a coma
|
|
4189
|
+
// wich must not be encoded (as if values were in an array)
|
|
4190
|
+
if (['INSIDE', 'OUTSIDE'].find((val) => val === filter.operator) !== undefined) {
|
|
4191
|
+
valuesToAddToParams = filter.value.split(',');
|
|
4192
|
+
}
|
|
4193
|
+
const value = Array.isArray(valuesToAddToParams)
|
|
4194
|
+
? valuesToAddToParams.map((v) => encodeURIComponent(v.toString().split(',').join('\\,'))).join(',')
|
|
4195
|
+
: encodeURIComponent(valuesToAddToParams.toString().replace(/,/g, '\\,'));
|
|
4190
4196
|
params = params.append('filter', `${filter.attribute},${filter.operator},${value}`);
|
|
4191
4197
|
});
|
|
4192
4198
|
}
|
|
@@ -4196,8 +4202,8 @@ class SearchService {
|
|
|
4196
4202
|
}
|
|
4197
4203
|
return params;
|
|
4198
4204
|
}
|
|
4199
|
-
getOrder(quickOrder
|
|
4200
|
-
let params =
|
|
4205
|
+
getOrder(quickOrder) {
|
|
4206
|
+
let params = new HttpParams({ encoder: new FilterParamEncoder() });
|
|
4201
4207
|
if (quickOrder) {
|
|
4202
4208
|
params = params.append('order', `${quickOrder.attribute},${quickOrder.asc ?? ''}`);
|
|
4203
4209
|
}
|
|
@@ -5613,7 +5619,7 @@ class PryBackendAggregationService extends PryAggregationService {
|
|
|
5613
5619
|
console.warn('Aggregation needs a target datasource.');
|
|
5614
5620
|
return of({ operation: options.ordinate?.operation ?? 'none', values: [] });
|
|
5615
5621
|
}
|
|
5616
|
-
let params = new HttpParams();
|
|
5622
|
+
let params = new HttpParams({ encoder: new FilterParamEncoder() });
|
|
5617
5623
|
if (options.abscissa && options.abscissa.attribute) {
|
|
5618
5624
|
params = params.set('aggregatedBy', options.abscissa.attribute);
|
|
5619
5625
|
}
|