@provoly/dashboard 0.11.0 → 0.11.2
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/admin/components/admin-abac-rules/store/abac-rules.effects.d.ts +2 -2
- package/admin/components/admin-dataset/store/admin-dataset.effects.d.ts +6 -6
- package/admin/components/admin-metadata/store/metadata.effects.d.ts +6 -6
- package/admin/components/admin-metadata-rules/store/metadata-rules.effects.d.ts +3 -3
- package/admin/components/admin-metadata-user/store/admin-metadata-user.effects.d.ts +6 -6
- package/esm2022/lib/core/components/modalStatus/modalStatus.component.mjs +3 -3
- package/esm2022/lib/core/errors/http-error-interceptor.service.mjs +13 -9
- package/esm2022/lib/core/model/filter.interface.mjs +1 -1
- package/esm2022/lib/core/store/search/search.service.mjs +15 -15
- package/esm2022/lib/dashboard/components/widgets/data-widget.component.mjs +2 -3
- package/esm2022/lib/dashboard/store/dashboard.reducers.mjs +21 -15
- package/esm2022/lib/dashboard/store/dashboard.selectors.mjs +4 -4
- package/esm2022/lib/dashboard/store/manifest.service.mjs +5 -3
- package/esm2022/widgets/widget-aggregated-chart/service/backend-aggregation.service.mjs +8 -15
- package/fesm2022/provoly-dashboard-widgets-widget-aggregated-chart.mjs +6 -13
- package/fesm2022/provoly-dashboard-widgets-widget-aggregated-chart.mjs.map +1 -1
- package/fesm2022/provoly-dashboard.mjs +60 -49
- package/fesm2022/provoly-dashboard.mjs.map +1 -1
- package/lib/core/model/filter.interface.d.ts +1 -1
- package/lib/core/store/search/search.service.d.ts +3 -5
- package/package.json +13 -13
- package/search/search-fulltext/store/search-fulltext.effects.d.ts +2 -2
- package/search/search-mono-class/store/search-mono-class.effects.d.ts +6 -6
- package/search/search-multi-class/store/search-multi-class.effects.d.ts +2 -2
- package/widgets/widget-aggregated-chart/service/backend-aggregation.service.d.ts +3 -3
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { HttpParams } from '@angular/common/http';
|
|
2
2
|
import { Injectable } from '@angular/core';
|
|
3
|
-
import { ClassSelectors, ConfigSelectors, DashboardSelectors, DEFAULT_NAMED_QUERY_ID, EXPLORE_NAMED_QUERY_ID, FieldSelectors,
|
|
3
|
+
import { ClassSelectors, ConfigSelectors, DashboardSelectors, DEFAULT_NAMED_QUERY_ID, EXPLORE_NAMED_QUERY_ID, FieldSelectors, Operation } from '@provoly/dashboard';
|
|
4
4
|
import { map, of, switchMap } from 'rxjs';
|
|
5
5
|
import { PryAggregationService } from './base-aggregation.service';
|
|
6
6
|
import * as i0 from "@angular/core";
|
|
@@ -8,12 +8,13 @@ import * as i1 from "@ngrx/store";
|
|
|
8
8
|
import * as i2 from "@provoly/dashboard";
|
|
9
9
|
import * as i3 from "@angular/common/http";
|
|
10
10
|
export class PryBackendAggregationService extends PryAggregationService {
|
|
11
|
-
constructor(store, snackBar, translateService, httpClient) {
|
|
11
|
+
constructor(store, snackBar, translateService, httpClient, searchService) {
|
|
12
12
|
super();
|
|
13
13
|
this.store = store;
|
|
14
14
|
this.snackBar = snackBar;
|
|
15
15
|
this.translateService = translateService;
|
|
16
16
|
this.httpClient = httpClient;
|
|
17
|
+
this.searchService = searchService;
|
|
17
18
|
this.rs = {};
|
|
18
19
|
this.classes = [];
|
|
19
20
|
this.fields = [];
|
|
@@ -21,7 +22,7 @@ export class PryBackendAggregationService extends PryAggregationService {
|
|
|
21
22
|
this.store.select(DashboardSelectors.resultSets).subscribe((rs) => (this.rs = rs));
|
|
22
23
|
this.store.select(ClassSelectors.classes).subscribe((classes) => (this.classes = classes));
|
|
23
24
|
this.store.select(FieldSelectors.fields).subscribe((fields) => (this.fields = fields));
|
|
24
|
-
this.store.select(DashboardSelectors.
|
|
25
|
+
this.store.select(DashboardSelectors.datasourceFilters).subscribe((filters) => (this.filters = filters));
|
|
25
26
|
}
|
|
26
27
|
aggregate(datasources, options) {
|
|
27
28
|
const targetDatasource = datasources.find((ds) => ![DEFAULT_NAMED_QUERY_ID, EXPLORE_NAMED_QUERY_ID].includes(ds));
|
|
@@ -73,11 +74,7 @@ export class PryBackendAggregationService extends PryAggregationService {
|
|
|
73
74
|
if (options.groupBy) {
|
|
74
75
|
params = params.set('groupBy', options.groupBy.attribute);
|
|
75
76
|
}
|
|
76
|
-
|
|
77
|
-
this.filters[targetDatasource].forEach((filter) => {
|
|
78
|
-
params = params.append('filter', filter.attribute + ',' + filter.operator + ',' + filter.value);
|
|
79
|
-
});
|
|
80
|
-
}
|
|
77
|
+
params = this.searchService.getItemsFilter(targetDatasource, params);
|
|
81
78
|
return this.store.select(ConfigSelectors.dataUrl).pipe(switchMap((url) => this.httpClient
|
|
82
79
|
.get(`${url}/data-sources/id/${targetDatasource}/items/aggregate`, {
|
|
83
80
|
params
|
|
@@ -87,11 +84,7 @@ export class PryBackendAggregationService extends PryAggregationService {
|
|
|
87
84
|
operation: options.ordinate.operation === Operation.NONE ? Operation.NONE : result.operation
|
|
88
85
|
})))));
|
|
89
86
|
}
|
|
90
|
-
|
|
91
|
-
let value = ItemUtils.getAttributeValue(item, attribute);
|
|
92
|
-
return Array.isArray(value) ? value[0] : value;
|
|
93
|
-
}
|
|
94
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryBackendAggregationService, deps: [{ token: i1.Store }, { token: i2.PrySnackbarService }, { token: i2.PryI18nService }, { token: i3.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
87
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryBackendAggregationService, deps: [{ token: i1.Store }, { token: i2.PrySnackbarService }, { token: i2.PryI18nService }, { token: i3.HttpClient }, { token: i2.SearchService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
95
88
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryBackendAggregationService, providedIn: 'root' }); }
|
|
96
89
|
}
|
|
97
90
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryBackendAggregationService, decorators: [{
|
|
@@ -99,5 +92,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImpor
|
|
|
99
92
|
args: [{
|
|
100
93
|
providedIn: 'root'
|
|
101
94
|
}]
|
|
102
|
-
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.PrySnackbarService }, { type: i2.PryI18nService }, { type: i3.HttpClient }]; } });
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend-aggregation.service.js","sourceRoot":"","sources":["../../../../../../../projects/provoly/dashboard/widgets/widget-aggregated-chart/service/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 {\n  Attribute,\n  ChartAggregatedWidgetOptions,\n  Class,\n  ClassSelectors,\n  ConfigSelectors,\n  DashboardSelectors,\n  DEFAULT_NAMED_QUERY_ID,\n  EXPLORE_NAMED_QUERY_ID,\n  Field,\n  FieldSelectors,\n  FilterContext,\n  Item,\n  ItemUtils,\n  Operation,\n  PryI18nService,\n  PrySnackbarService,\n  ResultSets\n} from '@provoly/dashboard';\nimport { map, Observable, of, switchMap } from 'rxjs';\nimport { AggregationResult, PryAggregationService } from './base-aggregation.service';\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\n  constructor(\n    private store: Store,\n    private snackBar: PrySnackbarService,\n    private translateService: PryI18nService,\n    private httpClient: HttpClient\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.filters).subscribe((filters) => (this.filters = filters));\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 (!options.abscissa || !options.ordinate) {\n      console.warn('Abscissa and ordinate must both be defined');\n      return of({ operation: 'none', values: [] } as AggregationResult);\n    }\n\n    if (!targetDatasource) {\n      console.warn('Aggregation needs a target datasource.');\n      return of({ operation: options.ordinate.operation, values: [] } as AggregationResult);\n    }\n\n    let params = new HttpParams();\n    if (options.abscissa.attribute) {\n      params = params.set('aggregatedBy', options.abscissa.attribute);\n    } else {\n      console.warn('Aggregation needs an aggregatedBy member.');\n      return of({ operation: options.ordinate.operation, values: [] } as AggregationResult);\n    }\n    if (options.abscissa.limit) {\n      if (options.abscissa.limit.isTimeLimit) {\n        params = params.set('dateInterval', options.abscissa.limit.interval);\n      } else {\n        params = params.set('interval', options.abscissa.limit.at);\n        params = params.set('limitOrder', options.abscissa.limit.order);\n        params = params.set('limitOthers', options.abscissa.limit.others);\n      }\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 (options.groupBy) {\n      params = params.set('groupBy', options.groupBy.attribute);\n    }\n    if (this.filters[targetDatasource]) {\n      this.filters[targetDatasource].forEach((filter) => {\n        params = params.append('filter', filter.attribute + ',' + filter.operator + ',' + filter.value);\n      });\n    }\n\n    return this.store.select(ConfigSelectors.dataUrl).pipe(\n      switchMap((url) =>\n        this.httpClient\n          .get<AggregationResult>(`${url}/data-sources/id/${targetDatasource}/items/aggregate`, {\n            params\n          })\n          .pipe(\n            map((result) => ({\n              ...result,\n              operation: options.ordinate.operation === Operation.NONE ? Operation.NONE : result.operation\n            }))\n          )\n      )\n    );\n  }\n\n  getValueFromAttribute(item: Item, attribute: Attribute) {\n    let value = ItemUtils.getAttributeValue(item, attribute);\n    return Array.isArray(value) ? value[0] : value;\n  }\n}\n"]}
|
|
95
|
+
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.PrySnackbarService }, { type: i2.PryI18nService }, { type: i3.HttpClient }, { type: i2.SearchService }]; } });
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend-aggregation.service.js","sourceRoot":"","sources":["../../../../../../../projects/provoly/dashboard/widgets/widget-aggregated-chart/service/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 {\n  ChartAggregatedWidgetOptions,\n  Class,\n  ClassSelectors,\n  ConfigSelectors,\n  DashboardSelectors,\n  DEFAULT_NAMED_QUERY_ID,\n  EXPLORE_NAMED_QUERY_ID,\n  Field,\n  FieldSelectors,\n  FilterContext,\n  Operation,\n  PryI18nService,\n  PrySnackbarService,\n  ResultSets,\n  SearchService\n} from '@provoly/dashboard';\nimport { map, Observable, of, switchMap } from 'rxjs';\nimport { AggregationResult, PryAggregationService } from './base-aggregation.service';\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\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  }\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 (!options.abscissa || !options.ordinate) {\n      console.warn('Abscissa and ordinate must both be defined');\n      return of({ operation: 'none', values: [] } as AggregationResult);\n    }\n\n    if (!targetDatasource) {\n      console.warn('Aggregation needs a target datasource.');\n      return of({ operation: options.ordinate.operation, values: [] } as AggregationResult);\n    }\n\n    let params = new HttpParams();\n    if (options.abscissa.attribute) {\n      params = params.set('aggregatedBy', options.abscissa.attribute);\n    } else {\n      console.warn('Aggregation needs an aggregatedBy member.');\n      return of({ operation: options.ordinate.operation, values: [] } as AggregationResult);\n    }\n    if (options.abscissa.limit) {\n      if (options.abscissa.limit.isTimeLimit) {\n        params = params.set('dateInterval', options.abscissa.limit.interval);\n      } else {\n        params = params.set('interval', options.abscissa.limit.at);\n        params = params.set('limitOrder', options.abscissa.limit.order);\n        params = params.set('limitOthers', options.abscissa.limit.others);\n      }\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 (options.groupBy) {\n      params = params.set('groupBy', options.groupBy.attribute);\n    }\n    params = this.searchService.getItemsFilter(targetDatasource, params);\n\n    return this.store.select(ConfigSelectors.dataUrl).pipe(\n      switchMap((url) =>\n        this.httpClient\n          .get<AggregationResult>(`${url}/data-sources/id/${targetDatasource}/items/aggregate`, {\n            params\n          })\n          .pipe(\n            map((result) => ({\n              ...result,\n              operation: options.ordinate.operation === Operation.NONE ? Operation.NONE : result.operation\n            }))\n          )\n      )\n    );\n  }\n}\n"]}
|
|
@@ -1127,12 +1127,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImpor
|
|
|
1127
1127
|
}], ctorParameters: function () { return [{ type: i1.Store }]; } });
|
|
1128
1128
|
|
|
1129
1129
|
class PryBackendAggregationService extends PryAggregationService {
|
|
1130
|
-
constructor(store, snackBar, translateService, httpClient) {
|
|
1130
|
+
constructor(store, snackBar, translateService, httpClient, searchService) {
|
|
1131
1131
|
super();
|
|
1132
1132
|
this.store = store;
|
|
1133
1133
|
this.snackBar = snackBar;
|
|
1134
1134
|
this.translateService = translateService;
|
|
1135
1135
|
this.httpClient = httpClient;
|
|
1136
|
+
this.searchService = searchService;
|
|
1136
1137
|
this.rs = {};
|
|
1137
1138
|
this.classes = [];
|
|
1138
1139
|
this.fields = [];
|
|
@@ -1140,7 +1141,7 @@ class PryBackendAggregationService extends PryAggregationService {
|
|
|
1140
1141
|
this.store.select(DashboardSelectors.resultSets).subscribe((rs) => (this.rs = rs));
|
|
1141
1142
|
this.store.select(ClassSelectors.classes).subscribe((classes) => (this.classes = classes));
|
|
1142
1143
|
this.store.select(FieldSelectors.fields).subscribe((fields) => (this.fields = fields));
|
|
1143
|
-
this.store.select(DashboardSelectors.
|
|
1144
|
+
this.store.select(DashboardSelectors.datasourceFilters).subscribe((filters) => (this.filters = filters));
|
|
1144
1145
|
}
|
|
1145
1146
|
aggregate(datasources, options) {
|
|
1146
1147
|
const targetDatasource = datasources.find((ds) => ![DEFAULT_NAMED_QUERY_ID, EXPLORE_NAMED_QUERY_ID].includes(ds));
|
|
@@ -1192,11 +1193,7 @@ class PryBackendAggregationService extends PryAggregationService {
|
|
|
1192
1193
|
if (options.groupBy) {
|
|
1193
1194
|
params = params.set('groupBy', options.groupBy.attribute);
|
|
1194
1195
|
}
|
|
1195
|
-
|
|
1196
|
-
this.filters[targetDatasource].forEach((filter) => {
|
|
1197
|
-
params = params.append('filter', filter.attribute + ',' + filter.operator + ',' + filter.value);
|
|
1198
|
-
});
|
|
1199
|
-
}
|
|
1196
|
+
params = this.searchService.getItemsFilter(targetDatasource, params);
|
|
1200
1197
|
return this.store.select(ConfigSelectors.dataUrl).pipe(switchMap((url) => this.httpClient
|
|
1201
1198
|
.get(`${url}/data-sources/id/${targetDatasource}/items/aggregate`, {
|
|
1202
1199
|
params
|
|
@@ -1206,11 +1203,7 @@ class PryBackendAggregationService extends PryAggregationService {
|
|
|
1206
1203
|
operation: options.ordinate.operation === Operation.NONE ? Operation.NONE : result.operation
|
|
1207
1204
|
})))));
|
|
1208
1205
|
}
|
|
1209
|
-
|
|
1210
|
-
let value = ItemUtils.getAttributeValue(item, attribute);
|
|
1211
|
-
return Array.isArray(value) ? value[0] : value;
|
|
1212
|
-
}
|
|
1213
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryBackendAggregationService, deps: [{ token: i1.Store }, { token: i2.PrySnackbarService }, { token: i2.PryI18nService }, { token: i3.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1206
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryBackendAggregationService, deps: [{ token: i1.Store }, { token: i2.PrySnackbarService }, { token: i2.PryI18nService }, { token: i3.HttpClient }, { token: i2.SearchService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1214
1207
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryBackendAggregationService, providedIn: 'root' }); }
|
|
1215
1208
|
}
|
|
1216
1209
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: PryBackendAggregationService, decorators: [{
|
|
@@ -1218,7 +1211,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImpor
|
|
|
1218
1211
|
args: [{
|
|
1219
1212
|
providedIn: 'root'
|
|
1220
1213
|
}]
|
|
1221
|
-
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.PrySnackbarService }, { type: i2.PryI18nService }, { type: i3.HttpClient }]; } });
|
|
1214
|
+
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.PrySnackbarService }, { type: i2.PryI18nService }, { type: i3.HttpClient }, { type: i2.SearchService }]; } });
|
|
1222
1215
|
|
|
1223
1216
|
/**
|
|
1224
1217
|
* Generated bundle index. Do not edit.
|