Browse Source

Timewindow: group intervals configuration scratch

pull/12151/head
Ekaterina Chantsova 2 years ago
parent
commit
5ff73e97fc
  1. 2
      ui-ngx/src/app/modules/common/modules-map.ts
  2. 36
      ui-ngx/src/app/shared/components/time/interval-options-config-panel.component.html
  3. 10
      ui-ngx/src/app/shared/components/time/interval-options-config-panel.component.scss
  4. 30
      ui-ngx/src/app/shared/components/time/interval-options-config-panel.component.ts
  5. 2
      ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts
  6. 27
      ui-ngx/src/app/shared/components/time/time-intervals-list.component.html
  7. 25
      ui-ngx/src/app/shared/components/time/time-intervals-list.component.scss
  8. 147
      ui-ngx/src/app/shared/components/time/time-intervals-list.component.ts
  9. 4
      ui-ngx/src/app/shared/components/time/timeinterval.component.ts
  10. 3
      ui-ngx/src/app/shared/shared.module.ts
  11. 2
      ui-ngx/src/assets/locale/locale.constant-en_US.json
  12. 11
      ui-ngx/src/form.scss

2
ui-ngx/src/app/modules/common/modules-map.ts

@ -337,6 +337,7 @@ import * as DatapointsLimitComponent from '@shared/components/time/datapoints-li
import * as AggregationTypeSelectComponent from '@shared/components/time/aggregation/aggregation-type-select.component'; import * as AggregationTypeSelectComponent from '@shared/components/time/aggregation/aggregation-type-select.component';
import * as AggregationOptionsConfigComponent from '@shared/components/time/aggregation/aggregation-options-config-panel.component'; import * as AggregationOptionsConfigComponent from '@shared/components/time/aggregation/aggregation-options-config-panel.component';
import * as IntervalOptionsConfigPanelComponent from '@shared/components/time/interval-options-config-panel.component'; import * as IntervalOptionsConfigPanelComponent from '@shared/components/time/interval-options-config-panel.component';
import * as TimeIntervalsListComponent from '@shared/components/time/time-intervals-list.component';
import { IModulesMap } from '@modules/common/modules-map.models'; import { IModulesMap } from '@modules/common/modules-map.models';
import { Observable, map, of } from 'rxjs'; import { Observable, map, of } from 'rxjs';
@ -476,6 +477,7 @@ class ModulesMap implements IModulesMap {
'@shared/components/time/aggregation/aggregation-type-select.component': AggregationTypeSelectComponent, '@shared/components/time/aggregation/aggregation-type-select.component': AggregationTypeSelectComponent,
'@shared/components/time/aggregation/aggregation-options-config-panel.component': AggregationOptionsConfigComponent, '@shared/components/time/aggregation/aggregation-options-config-panel.component': AggregationOptionsConfigComponent,
'@shared/components/time/interval-options-config-panel.component': IntervalOptionsConfigPanelComponent, '@shared/components/time/interval-options-config-panel.component': IntervalOptionsConfigPanelComponent,
'@shared/components/time/time-intervals-list.component': TimeIntervalsListComponent,
'@shared/components/value-input.component': ValueInputComponent, '@shared/components/value-input.component': ValueInputComponent,
'@shared/components/dashboard-autocomplete.component': DashboardAutocompleteComponent, '@shared/components/dashboard-autocomplete.component': DashboardAutocompleteComponent,
'@shared/components/entity/entity-subtype-autocomplete.component': EntitySubTypeAutocompleteComponent, '@shared/components/entity/entity-subtype-autocomplete.component': EntitySubTypeAutocompleteComponent,

36
ui-ngx/src/app/shared/components/time/interval-options-config-panel.component.html

@ -21,32 +21,40 @@
<div class="tb-form-hint tb-primary-fill"> <div class="tb-form-hint tb-primary-fill">
{{ 'timewindow.edit-intervals-list-hint' | translate }} {{ aggregation ? ('timewindow.edit-grouping-intervals-list-hint' | translate) : '' }} {{ 'timewindow.edit-intervals-list-hint' | translate }} {{ aggregation ? ('timewindow.edit-grouping-intervals-list-hint' | translate) : '' }}
</div> </div>
<div class="tb-form-table no-gap no-padding"> <div class="tb-form-table">
<div class="tb-form-table-header"> <div class="tb-form-table-header">
<div class="tb-form-table-header-cell">{{"timewindow.interval" | translate }}</div> <div class="tb-form-table-header-cell tb-interval">{{"timewindow.interval" | translate }}</div>
<ng-container *ngIf="aggregation"> <ng-container *ngIf="aggregation">
<div class="tb-form-table-header-cell">{{"timewindow.allowed-agg-intervals" | translate }}</div> <div class="tb-form-table-header-cell tb-agg-interval">{{"timewindow.allowed-agg-intervals" | translate }}</div>
<div class="tb-form-table-header-cell">{{"timewindow.preferred-agg-interval" | translate }}</div> <div class="tb-form-table-header-cell tb-agg-interval">{{"timewindow.preferred-agg-interval" | translate }}</div>
</ng-container> </ng-container>
</div> </div>
<div class="tb-form-table-body"> <div class="tb-form-table-body" formArrayName="intervals">
<!-- <mat-selection-list formControlName="allowedIntervals">-->
<!-- <mat-list-option *ngFor="let interval of allIntervals" [value]="interval.value" togglePosition="before">-->
<!-- {{ interval.name | translate:interval.translateParams }}-->
<!-- </mat-list-option>-->
<!-- </mat-selection-list>-->
<ng-container *ngFor="let interval of intervalsFormArray.controls; let i = index; trackBy: trackByElement"> <ng-container *ngFor="let interval of intervalsFormArray.controls; let i = index; trackBy: trackByElement">
<div [formGroupName]="i" class="tb-form-table-row"> <div [formGroupName]="i" class="tb-form-table-row">
<div class="tb-form-table-row-cell"> <div class="tb-form-table-row-cell tb-interval">
<mat-checkbox formControlName="enabled"> <mat-checkbox formControlName="enabled">
<mat-label>{{ interval.get('name').value }}</mat-label> <mat-label>{{ interval.get('name').value }}</mat-label>
</mat-checkbox> </mat-checkbox>
</div> </div>
<ng-container *ngIf="aggregation"> <ng-container *ngIf="aggregation">
<div class="tb-form-table-row-cell"></div> <div class="tb-form-table-row-cell tb-agg-interval">
<div class="tb-form-table-row-cell"> <tb-time-intervals-list
class="tb-inline-field"
formControlName="aggIntervals"
[min]="minAggInterval(interval.get('value').value)"
[max]="maxAggInterval(interval.get('value').value)"
useCalendarIntervals
subscriptSizing="dynamic"
appearance="outline"
setAllIfEmpty
returnEmptyIfAllSet>
</tb-time-intervals-list>
</div>
<div class="tb-form-table-row-cell tb-agg-interval">
<tb-timeinterval <tb-timeinterval
formControlName="interval" class="tb-inline-field"
formControlName="preferredAggInterval"
[min]="minAggInterval(interval.get('value').value)" [min]="minAggInterval(interval.get('value').value)"
[max]="maxAggInterval(interval.get('value').value)" [max]="maxAggInterval(interval.get('value').value)"
useCalendarIntervals useCalendarIntervals

10
ui-ngx/src/app/shared/components/time/interval-options-config-panel.component.scss

@ -25,6 +25,16 @@
overflow-y: auto; overflow-y: auto;
} }
.tb-form-table-header-cell, .tb-form-table-row-cell {
&.tb-interval {
flex: 1 1 30%;
width: 30%;
}
&.tb-agg-interval {
flex: 1 1 35%;
}
}
.tb-form-hint { .tb-form-hint {
flex-shrink: 0; flex-shrink: 0;
} }

30
ui-ngx/src/app/shared/components/time/interval-options-config-panel.component.ts

@ -90,22 +90,20 @@ export class IntervalOptionsConfigPanelComponent implements OnInit {
intervals: this.fb.array([]) intervals: this.fb.array([])
}); });
if (this.aggregation) { const intervalControls: Array<AbstractControl> = [];
const intervalControls: Array<AbstractControl> = []; for (const interval of this.allIntervals) {
for (const interval of this.allIntervals) { const intervalConfig: TimewindowAllowedAggIntervalOption = this.allowedAggIntervals?.hasOwnProperty(interval.value)
const intervalConfig: TimewindowAllowedAggIntervalOption = this.allowedAggIntervals?.hasOwnProperty(interval.value) ? this.allIntervalValues[interval.value]
? this.allIntervalValues[interval.value] : null;
: null; intervalControls.push(this.fb.group({
intervalControls.push(this.fb.group({ name: [this.translate.instant(interval.name, interval.translateParams)],
name: [this.translate.instant(interval.name, interval.translateParams)], value: [interval.value],
value: [interval.value], enabled: [this.allowedIntervals?.length ? this.allowedIntervals.includes(interval.value) : true],
enabled: [this.allowedIntervals?.length ? this.allowedIntervals.includes(interval.value) : true], aggIntervals: [intervalConfig ? intervalConfig.aggIntervals : []],
aggIntervals: [intervalConfig ? intervalConfig.aggIntervals : []], preferredAggInterval: [intervalConfig ? intervalConfig.preferredAggInterval : null]
preferredAggInterval: [intervalConfig ? intervalConfig.preferredAggInterval : null] }));
}));
}
this.intervalOptionsConfigForm.setControl('intervals', this.fb.array(intervalControls), {emitEvent: false});
} }
this.intervalOptionsConfigForm.setControl('intervals', this.fb.array(intervalControls), {emitEvent: false});
} }
get intervalsFormArray(): UntypedFormArray { get intervalsFormArray(): UntypedFormArray {
@ -151,7 +149,7 @@ export class IntervalOptionsConfigPanelComponent implements OnInit {
this.intervalOptionsConfigForm.markAsDirty(); this.intervalOptionsConfigForm.markAsDirty();
} }
private getQuickIntervals() { private getQuickIntervals(): Array<QuickTimeInterval> {
const allQuickIntervals = Object.values(QuickTimeInterval); const allQuickIntervals = Object.values(QuickTimeInterval);
if (this.timewindowType === TimewindowType.REALTIME) { if (this.timewindowType === TimewindowType.REALTIME) {
return allQuickIntervals.filter(interval => interval.startsWith('CURRENT_')); return allQuickIntervals.filter(interval => interval.startsWith('CURRENT_'));

2
ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts

@ -36,7 +36,7 @@ import { isEqual } from '@core/utils';
}) })
export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor, OnChanges { export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor, OnChanges {
private allIntervals = Object.values(QuickTimeInterval); private allIntervals = Object.values(QuickTimeInterval) as QuickTimeInterval[];
modelValue: QuickTimeInterval; modelValue: QuickTimeInterval;
timeIntervalTranslationMap = QuickTimeIntervalTranslationMap; timeIntervalTranslationMap = QuickTimeIntervalTranslationMap;

27
ui-ngx/src/app/shared/components/time/time-intervals-list.component.html

@ -0,0 +1,27 @@
<!--
Copyright © 2016-2024 The Thingsboard Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<section [formGroup]="timeintervalFormGroup">
<mat-form-field class="flex flex-1" [subscriptSizing]="subscriptSizing" [appearance]="appearance">
<mat-label *ngIf="predefinedName" translate>{{ predefinedName }}</mat-label>
<mat-select formControlName="intervals" multiple>
<mat-option *ngFor="let interval of intervals" [value]="interval.value">
{{ interval.name | translate:interval.translateParams }}
</mat-option>
</mat-select>
</mat-form-field>
</section>

25
ui-ngx/src/app/shared/components/time/time-intervals-list.component.scss

@ -0,0 +1,25 @@
/**
* Copyright © 2016-2024 The Thingsboard Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@import '../../../../scss/constants';
:host {
@media #{$mat-xs} {
min-width: 0;
width: 100%;
}
}

147
ui-ngx/src/app/shared/components/time/time-intervals-list.component.ts

@ -0,0 +1,147 @@
///
/// Copyright © 2016-2024 The Thingsboard Authors
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
import { Component, forwardRef, Input, OnInit } from '@angular/core';
import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
import { TimeService } from '@core/services/time.service';
import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
import { coerceBoolean, coerceNumber } from '@shared/decorators/coercion';
import { Interval, TimeInterval } from '@shared/models/time/time.models';
import { isDefined } from '@core/utils';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@Component({
selector: 'tb-time-intervals-list',
templateUrl: './time-intervals-list.component.html',
styleUrls: ['./time-intervals-list.component.scss'],
providers: [
{
provide: NG_VALUE_ACCESSOR,
useExisting: forwardRef(() => TimeIntervalsListComponent),
multi: true
}
]
})
export class TimeIntervalsListComponent implements OnInit, ControlValueAccessor {
@Input()
@coerceNumber()
min: number;
@Input()
@coerceNumber()
max: number;
@Input() predefinedName: string;
@Input()
@coerceBoolean()
setAllIfEmpty = false;
@Input()
@coerceBoolean()
returnEmptyIfAllSet = false;
@Input()
@coerceBoolean()
useCalendarIntervals = false;
@Input() disabled: boolean;
@Input()
subscriptSizing: SubscriptSizing = 'fixed';
@Input()
appearance: MatFormFieldAppearance = 'fill';
intervals: Array<TimeInterval>;
timeintervalFormGroup: FormGroup;
private modelValue: Array<Interval>;
private rendered = false;
private propagateChangeValue: any;
private propagateChange = (value: any) => {
this.propagateChangeValue = value;
};
constructor(private timeService: TimeService,
private fb: FormBuilder) {
this.timeintervalFormGroup = this.fb.group({
intervals: [ [] ]
});
this.timeintervalFormGroup.get('intervals').valueChanges.pipe(
takeUntilDestroyed()
).subscribe(() => this.updateView());
}
ngOnInit(): void {
this.updateIntervalsList();
}
registerOnChange(fn: any): void {
this.propagateChange = fn;
if (isDefined(this.propagateChangeValue)) {
this.propagateChange(this.propagateChangeValue);
}
}
registerOnTouched(fn: any): void {
}
setDisabledState(isDisabled: boolean): void {
this.disabled = isDisabled;
if (this.disabled) {
this.timeintervalFormGroup.disable({emitEvent: false});
} else {
this.timeintervalFormGroup.enable({emitEvent: false});
}
}
writeValue(intervals: Array<Interval>): void {
this.modelValue = intervals;
this.rendered = true;
this.setIntervals(this.modelValue);
}
private updateIntervalsList() {
this.intervals = this.timeService.getIntervals(this.min, this.max, this.useCalendarIntervals);
}
private setIntervals(intervals: Array<Interval>) {
this.timeintervalFormGroup.get('intervals').patchValue(
(this.setAllIfEmpty && !intervals?.length) ? this.intervals : intervals,
{emitEvent: false});
}
private updateView() {
if (!this.rendered) {
return;
}
let value: Array<Interval>;
const intervals: Array<Interval> = this.timeintervalFormGroup.get('intervals').value;
if (!this.returnEmptyIfAllSet || intervals.length < this.intervals.length) {
value = intervals;
} else {
value = [];
}
this.modelValue = value;
this.propagateChange(this.modelValue);
}
}

4
ui-ngx/src/app/shared/components/time/timeinterval.component.ts

@ -74,10 +74,6 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor, OnCh
@Input() predefinedName: string; @Input() predefinedName: string;
@Input()
@coerceBoolean()
isEdit = false;
@Input({transform : booleanAttribute}) @Input({transform : booleanAttribute})
disabledAdvanced = false; disabledAdvanced = false;

3
ui-ngx/src/app/shared/shared.module.ts

@ -221,6 +221,7 @@ import { DatapointsLimitComponent } from '@shared/components/time/datapoints-lim
import { AggregationTypeSelectComponent } from '@shared/components/time/aggregation/aggregation-type-select.component'; import { AggregationTypeSelectComponent } from '@shared/components/time/aggregation/aggregation-type-select.component';
import { AggregationOptionsConfigPanelComponent } from '@shared/components/time/aggregation/aggregation-options-config-panel.component'; import { AggregationOptionsConfigPanelComponent } from '@shared/components/time/aggregation/aggregation-options-config-panel.component';
import { IntervalOptionsConfigPanelComponent } from '@shared/components/time/interval-options-config-panel.component'; import { IntervalOptionsConfigPanelComponent } from '@shared/components/time/interval-options-config-panel.component';
import { TimeIntervalsListComponent } from '@shared/components/time/time-intervals-list.component';
export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService) { export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService) {
return markedOptionsService; return markedOptionsService;
@ -306,6 +307,7 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
TimewindowPanelComponent, TimewindowPanelComponent,
TimewindowConfigDialogComponent, TimewindowConfigDialogComponent,
TimeintervalComponent, TimeintervalComponent,
TimeIntervalsListComponent,
TimezoneComponent, TimezoneComponent,
TimezonePanelComponent, TimezonePanelComponent,
QuickTimeIntervalComponent, QuickTimeIntervalComponent,
@ -516,6 +518,7 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
TimewindowPanelComponent, TimewindowPanelComponent,
TimewindowConfigDialogComponent, TimewindowConfigDialogComponent,
TimeintervalComponent, TimeintervalComponent,
TimeIntervalsListComponent,
TimezoneComponent, TimezoneComponent,
TimezonePanelComponent, TimezonePanelComponent,
QuickTimeIntervalComponent, QuickTimeIntervalComponent,

2
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -4548,7 +4548,7 @@
"edit-aggregation-functions-list-hint": "List of available options can be specified.", "edit-aggregation-functions-list-hint": "List of available options can be specified.",
"allowed-aggregation-functions": "Allowed aggregation functions", "allowed-aggregation-functions": "Allowed aggregation functions",
"edit-intervals-list": "Edit intervals list", "edit-intervals-list": "Edit intervals list",
"allowed-agg-intervals": "Allowed aggregation intervals", "allowed-agg-intervals": "Allowed grouping intervals",
"preferred-agg-interval": "Preferred intervals", "preferred-agg-interval": "Preferred intervals",
"edit-intervals-list-hint": "List of available interval options can be specified.", "edit-intervals-list-hint": "List of available interval options can be specified.",
"edit-grouping-intervals-list-hint": "It is possible to configure the grouping intervals list and default grouping interval." "edit-grouping-intervals-list-hint": "It is possible to configure the grouping intervals list and default grouping interval."

11
ui-ngx/src/form.scss

@ -799,4 +799,15 @@
} }
} }
} }
.mat-mdc-form-field-has-icon-suffix {
.mat-mdc-form-field-icon-suffix:empty {
padding: 0;
}
.mat-mdc-text-field-wrapper:has(.mat-mdc-form-field-icon-suffix:empty) {
&.mdc-text-field--outlined, &:not(.mdc-text-field--outlined) {
padding-right: 16px;
}
}
}
} }

Loading…
Cancel
Save