You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2021/10/13 12:14:22 UTC
[incubator-streampipes] branch dev updated: [hotfix] Fix filter in
data explorer
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new ff17cee [hotfix] Fix filter in data explorer
ff17cee is described below
commit ff17ceeb886d6b307ed1a92bc00a873d36f64671
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Oct 13 14:14:05 2021 +0200
[hotfix] Fix filter in data explorer
---
.../filter-selection-panel/filter-selection-panel.component.ts | 7 ++-----
.../data-explorer/services/data-view-query-generator.service.ts | 4 ++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts b/ui/src/app/data-explorer/components/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
index 1cfb3e0..70ca68a 100644
--- a/ui/src/app/data-explorer/components/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
+++ b/ui/src/app/data-explorer/components/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
@@ -17,11 +17,7 @@
*/
import { Component, Input } from '@angular/core';
-import {
- FieldConfig,
- SelectedFilter,
- SourceConfig
-} from '../../../../models/dataview-dashboard.model';
+import { FieldConfig, SelectedFilter, SourceConfig } from '../../../../models/dataview-dashboard.model';
@Component({
selector: 'sp-filter-selection-panel',
@@ -31,6 +27,7 @@ import {
export class FilterSelectionPanelComponent {
@Input() sourceConfig: SourceConfig;
+ @Input() widgetId: string;
constructor() {
}
diff --git a/ui/src/app/data-explorer/services/data-view-query-generator.service.ts b/ui/src/app/data-explorer/services/data-view-query-generator.service.ts
index 5ca298e..a937ec0 100644
--- a/ui/src/app/data-explorer/services/data-view-query-generator.service.ts
+++ b/ui/src/app/data-explorer/services/data-view-query-generator.service.ts
@@ -60,6 +60,10 @@ export class DataViewQueryGeneratorService {
}
}
+ if (queryConfig.selectedFilters.length > 0) {
+ queryBuilder.withFilters(queryConfig.selectedFilters);
+ }
+
if (sourceConfig.queryType === 'single') {
queryBuilder.withLimit(1);
} else if (sourceConfig.queryType === 'raw') {