You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/05/27 14:28:27 UTC
[incubator-streampipes] branch STREAMPIPES-537-NEW updated: [hotfix] Restore selected fields in data selection panel
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-537-NEW
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/STREAMPIPES-537-NEW by this push:
new e207fed5a [hotfix] Restore selected fields in data selection panel
e207fed5a is described below
commit e207fed5ad8f10b8d107274e831fbe51a0c28ef0
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Fri May 27 16:28:15 2022 +0200
[hotfix] Restore selected fields in data selection panel
---
.../field-selection-panel/field-selection-panel.component.ts | 2 +-
.../components/time-selector/timeRangeSelector.component.html | 2 +-
.../components/time-selector/timeRangeSelector.component.scss | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ui/src/app/data-explorer/components/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts b/ui/src/app/data-explorer/components/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts
index 62bb9041c..e924f13c9 100644
--- a/ui/src/app/data-explorer/components/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts
+++ b/ui/src/app/data-explorer/components/designer-panel/data-settings/field-selection-panel/field-selection-panel.component.ts
@@ -60,7 +60,7 @@ export class FieldSelectionPanelComponent implements OnInit {
this.sourceConfig.measure.eventSchema.eventProperties.forEach(property => {
// this ensures that dimension properties are not aggregated, this is not possible with the influxdb, See [STREAMPIPES-524]
if (this.sourceConfig.queryType === 'raw' || property.propertyScope !== 'DIMENSION_PROPERTY') {
- const isSelected = checkFields.some(v => v.runtimeName === property.runtimeName);
+ const isSelected = checkFields.some(v => (v.runtimeName === property.runtimeName && v.selected));
this.addField(property, isSelected);
}
});
diff --git a/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html
index 492a18d35..a7feeac41 100644
--- a/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html
+++ b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.html
@@ -22,7 +22,7 @@
*ngFor="let item of possibleTimeButtons"
[color]="selectedTimeButton.value === item.value ? 'accent' : ''"
[attr.data-cy]="item.value.replace(' ', '_')"
- class="button-margin smaller-button-font-size"
+ [ngClass]="'button-margin smaller-button-font-size'"
(click)="this.setCurrentDateRange(item)">{{item.value}}</button>
</div>
<div class="time-wrapper" fxFlex fxLayoutAlign="center center">
diff --git a/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.scss b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.scss
index 4768cb973..eeb2dd6ae 100644
--- a/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.scss
+++ b/ui/src/app/data-explorer/components/time-selector/timeRangeSelector.component.scss
@@ -31,14 +31,14 @@
}
.button-margin {
- border-radius: 0;
- padding-left: 4px;
- padding-right:4px;
- border-right: 1px solid #cccccc;
+ border-radius: 0 !important;
+ padding-left: 4px !important;
+ padding-right:4px !important;
+ border-right: 1px solid #cccccc !important;
}
.button-margin:last-of-type {
- border-right: 0;
+ border-right: 0 !important;
}
.time-range-wrapper {