You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by eb...@apache.org on 2020/07/03 08:28:29 UTC
[incubator-streampipes] branch dev updated: Hiding label column
selection if grouping is active
This is an automated email from the ASF dual-hosted git repository.
ebi 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 c25210c Hiding label column selection if grouping is active
new 62384cc Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
c25210c is described below
commit c25210cebcc97be0fe8e049d06eb3c10cd5a0712
Author: Daniel Ebi <eb...@fzi.de>
AuthorDate: Fri Jul 3 10:30:32 2020 +0200
Hiding label column selection if grouping is active
---
.../widgets/line-chart/line-chart-widget.component.html | 5 ++---
.../components/widgets/line-chart/line-chart-widget.component.ts | 8 ++++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html
index 09b594e..ec480ec 100644
--- a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html
+++ b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.html
@@ -33,14 +33,13 @@
label="Select Label Column"
multiple = false
style="margin-right: 10px;"
+ *ngIf="showLabelColumnSelection"
(changeSelectedProperties)="setSelectedLabelColumn($event)"
[availableProperties]="availableNonNumericColumns"
[selectedProperties]="selectedNonNumericColumn">
</sp-select-properties>
-
-
- <mat-slide-toggle [(ngModel)]="advancedSettingsActive">Advanced</mat-slide-toggle>
+ <mat-slide-toggle [(ngModel)]="advancedSettingsActive" (change)="handlingAdvancedToggleChange()">Advanced</mat-slide-toggle>
<sp-aggregate-configuration
*ngIf="advancedSettingsActive"
[(aggregationValue)]="aggregationValue"
diff --git a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
index fd82d84..94d7b93 100644
--- a/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
+++ b/ui/src/app/data-explorer/components/widgets/line-chart/line-chart-widget.component.ts
@@ -48,7 +48,7 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
private nonNumericKey: string = undefined;
advancedSettingsActive = false;
- showNonNumericData = false;
+ showLabelColumnSelection = true;
selectedStartX = undefined;
selectedEndX = undefined;
@@ -179,7 +179,6 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
}
);
} else {
-
if (this.groupValue === 'None') {
this.setShownComponents(false, false, true);
this.dataLakeRestService.getData(
@@ -653,6 +652,11 @@ export class LineChartWidgetComponent extends BaseDataExplorerWidget implements
return shape;
}
+ handlingAdvancedToggleChange() {
+ this.showLabelColumnSelection = !this.showLabelColumnSelection;
+ this.updateData();
+ }
+
setStartX(startX: string) {
this.selectedStartX = startX;
}