tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Refactoring

pull/12151/head
Chantsova Ekaterina 2 years ago
parent
ecf8a90492
commit
2c561b805c
2 changed files with 31 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      ui-ngx/src/app/shared/components/aggregation/aggregation-type-select.component.ts
  2. 33
      ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts

54
ui-ngx/src/app/shared/components/aggregation/aggregation-type-select.component.ts
View File

@ -14,14 +14,13 @@
/// limitations under the License. /// limitations under the License.
/// ///
import { Component, forwardRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; import { Component, forwardRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms'; import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { coerceBoolean } from '@shared/decorators/coercion'; import { coerceBoolean } from '@shared/decorators/coercion';
import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field'; import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
import { aggregationTranslations, AggregationType } from '@shared/models/time/time.models'; import { aggregationTranslations, AggregationType } from '@shared/models/time/time.models';
import { Subject } from 'rxjs'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { takeUntil } from 'rxjs/operators';
@Component({ @Component({
selector: 'tb-aggregation-type-select', selector: 'tb-aggregation-type-select',
@ -33,7 +32,7 @@ import { takeUntil } from 'rxjs/operators';
multi: true multi: true
}] }]
}) })
export class AggregationTypeSelectComponent implements ControlValueAccessor, OnInit, OnChanges, OnDestroy { export class AggregationTypeSelectComponent implements ControlValueAccessor, OnInit, OnChanges {
aggregationTypeFormGroup: FormGroup; aggregationTypeFormGroup: FormGroup;
@ -77,26 +76,13 @@ export class AggregationTypeSelectComponent implements ControlValueAccessor, OnI
private propagateChange = (v: any) => { }; private propagateChange = (v: any) => { };
private destroy$ = new Subject<void>();
constructor(private translate: TranslateService, constructor(private translate: TranslateService,
private fb: FormBuilder) { private fb: FormBuilder) {
this.aggregationTypeFormGroup = this.fb.group({ this.aggregationTypeFormGroup = this.fb.group({
aggregationType: [null] aggregationType: [null]
}); });
}
registerOnChange(fn: any): void {
this.propagateChange = fn;
}
registerOnTouched(fn: any): void {
}
ngOnInit() {
this.aggregationTypes = this.allowedAggregationTypes?.length ? this.allowedAggregationTypes : this.allAggregationTypes;
this.aggregationTypeFormGroup.get('aggregationType').valueChanges.pipe( this.aggregationTypeFormGroup.get('aggregationType').valueChanges.pipe(
takeUntil(this.destroy$) takeUntilDestroyed()
).subscribe( ).subscribe(
(value) => { (value) => {
let modelValue; let modelValue;
@ -110,17 +96,23 @@ export class AggregationTypeSelectComponent implements ControlValueAccessor, OnI
); );
} }
ngOnChanges(changes: SimpleChanges): void { registerOnChange(fn: any): void {
for (const propName of Object.keys(changes)) { this.propagateChange = fn;
const change = changes[propName]; }
if (!change.firstChange && change.currentValue !== change.previousValue) {
if (propName === 'allowedAggregationTypes') { registerOnTouched(fn: any): void {
this.aggregationTypes = this.allowedAggregationTypes?.length ? this.allowedAggregationTypes : this.allAggregationTypes; }
const currentAggregationType: AggregationType = this.aggregationTypeFormGroup.get('aggregationType').value;
if (currentAggregationType && !this.aggregationTypes.includes(currentAggregationType)) { ngOnInit() {
this.aggregationTypeFormGroup.get('aggregationType').patchValue(this.aggregationTypes[0], {emitEvent: true}); this.aggregationTypes = this.allowedAggregationTypes?.length ? this.allowedAggregationTypes : this.allAggregationTypes;
} }
}
ngOnChanges({allowedAggregationTypes}: SimpleChanges): void {
if (!allowedAggregationTypes.firstChange && allowedAggregationTypes.currentValue !== allowedAggregationTypes.previousValue) {
this.aggregationTypes = this.allowedAggregationTypes?.length ? this.allowedAggregationTypes : this.allAggregationTypes;
const currentAggregationType: AggregationType = this.aggregationTypeFormGroup.get('aggregationType').value;
if (currentAggregationType && !this.aggregationTypes.includes(currentAggregationType)) {
this.aggregationTypeFormGroup.get('aggregationType').patchValue(this.aggregationTypes[0], {emitEvent: true});
} }
} }
} }
@ -159,8 +151,4 @@ export class AggregationTypeSelectComponent implements ControlValueAccessor, OnI
} }
} }
ngOnDestroy() {
this.destroy$.next();
this.destroy$.complete();
}
} }

33
ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts
View File

@ -14,13 +14,12 @@
/// limitations under the License. /// limitations under the License.
/// ///
import { Component, forwardRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; import { Component, forwardRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms'; import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
import { QuickTimeInterval, QuickTimeIntervalTranslationMap } from '@shared/models/time/time.models'; import { QuickTimeInterval, QuickTimeIntervalTranslationMap } from '@shared/models/time/time.models';
import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field'; import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
import { coerceBoolean } from '@shared/decorators/coercion'; import { coerceBoolean } from '@shared/decorators/coercion';
import { Subject } from 'rxjs'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { takeUntil } from 'rxjs/operators';
@Component({ @Component({
selector: 'tb-quick-time-interval', selector: 'tb-quick-time-interval',
@ -34,7 +33,7 @@ import { takeUntil } from 'rxjs/operators';
} }
] ]
}) })
export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor, OnChanges, OnDestroy { export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor, OnChanges {
private allIntervals = Object.values(QuickTimeInterval); private allIntervals = Object.values(QuickTimeInterval);
@ -68,14 +67,12 @@ export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor,
private propagateChange = (_: any) => {}; private propagateChange = (_: any) => {};
private destroy$ = new Subject<void>();
constructor(private fb: FormBuilder) { constructor(private fb: FormBuilder) {
this.quickIntervalFormGroup = this.fb.group({ this.quickIntervalFormGroup = this.fb.group({
interval: [ null ] interval: [ null ]
}); });
this.quickIntervalFormGroup.get('interval').valueChanges.pipe( this.quickIntervalFormGroup.get('interval').valueChanges.pipe(
takeUntil(this.destroy$) takeUntilDestroyed()
).subscribe((value) => { ).subscribe((value) => {
let modelValue; let modelValue;
if (!value) { if (!value) {
@ -92,17 +89,12 @@ export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor,
this.intervals = this.allowedIntervals?.length ? this.allowedIntervals : this.allAvailableIntervals; this.intervals = this.allowedIntervals?.length ? this.allowedIntervals : this.allAvailableIntervals;
} }
ngOnChanges(changes: SimpleChanges): void { ngOnChanges({allowedIntervals}: SimpleChanges): void {
for (const propName of Object.keys(changes)) { if (!allowedIntervals.firstChange && allowedIntervals.currentValue !== allowedIntervals.previousValue) {
const change = changes[propName]; this.intervals = this.allowedIntervals?.length ? this.allowedIntervals : this.allAvailableIntervals;
if (!change.firstChange && change.currentValue !== change.previousValue) { const currentInterval: QuickTimeInterval = this.quickIntervalFormGroup.get('interval').value;
if (propName === 'allowedIntervals') { if (currentInterval && !this.intervals.includes(currentInterval)) {
this.intervals = this.allowedIntervals?.length ? this.allowedIntervals : this.allAvailableIntervals; this.quickIntervalFormGroup.get('interval').patchValue(this.intervals[0], {emitEvent: true});
const currentInterval: QuickTimeInterval = this.quickIntervalFormGroup.get('interval').value;
if (currentInterval && !this.intervals.includes(currentInterval)) {
this.quickIntervalFormGroup.get('interval').patchValue(this.intervals[0], {emitEvent: true});
}
}
} }
} }
} }
@ -140,11 +132,6 @@ export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor,
} }
} }
ngOnDestroy() {
this.destroy$.next();
this.destroy$.complete();
}
private getAllAvailableIntervals() { private getAllAvailableIntervals() {
if (this.onlyCurrentInterval) { if (this.onlyCurrentInterval) {
return this.allIntervals.filter(interval => interval.startsWith('CURRENT_')); return this.allIntervals.filter(interval => interval.startsWith('CURRENT_'));

Write Preview
Loading…
Cancel
Save