dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: ota-package-autocomplete fixed override of formValue on new deviceProfile input value

Browse Source
This commit is contained in:
Dmitriymush 2023-12-28 17:50:33 +02:00
parent f11ee730b5
commit 05722968a2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui-ngx/src/app/shared/components/ota-package/ota-package-autocomplete.component.ts
View File

@ -17,7 +17,7 @@
import { Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { merge, Observable, of, Subject } from 'rxjs'; import { merge, Observable, of, Subject } from 'rxjs';
import { catchError, debounceTime, map, share, switchMap, tap } from 'rxjs/operators'; import { catchError, debounceTime, map, share, switchMap, takeUntil, tap } from 'rxjs/operators';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
@ -61,7 +61,7 @@ export class OtaPackageAutocompleteComponent implements ControlValueAccessor, On
@Input() @Input()
set type(value ) { set type(value ) {
this.otaUpdateType = value ? value : OtaUpdateType.FIRMWARE; this.otaUpdateType = value ? value : OtaUpdateType.FIRMWARE;
this.reset(); this.cleanFilteredPackages.next([]);
} }
private deviceProfile: string; private deviceProfile: string;
@ -73,7 +73,7 @@ export class OtaPackageAutocompleteComponent implements ControlValueAccessor, On
@Input() @Input()
set deviceProfileId(value: string) { set deviceProfileId(value: string) {
this.deviceProfile = value; this.deviceProfile = value;
this.reset(); this.cleanFilteredPackages.next([]);
} }
@Input() @Input()
@ -116,6 +116,8 @@ export class OtaPackageAutocompleteComponent implements ControlValueAccessor, On
private dirty = false; private dirty = false;
private cleanFilteredPackages: Subject<Array<OtaPackageInfo>> = new Subject(); private cleanFilteredPackages: Subject<Array<OtaPackageInfo>> = new Subject();
private destroy$ = new Subject<void>();
private propagateChange = (v: any) => { }; private propagateChange = (v: any) => { };
constructor(private store: Store<AppState>, constructor(private store: Store<AppState>,
@ -158,7 +160,8 @@ export class OtaPackageAutocompleteComponent implements ControlValueAccessor, On
}), }),
map(value => value ? (typeof value === 'string' ? value : value.title) : ''), map(value => value ? (typeof value === 'string' ? value : value.title) : ''),
switchMap(name => this.fetchPackages(name)), switchMap(name => this.fetchPackages(name)),
share() share(),
takeUntil(this.destroy$)
); );
this.filteredPackages = merge(this.cleanFilteredPackages, getPackages); this.filteredPackages = merge(this.cleanFilteredPackages, getPackages);
@ -167,6 +170,8 @@ export class OtaPackageAutocompleteComponent implements ControlValueAccessor, On
ngOnDestroy() { ngOnDestroy() {
this.cleanFilteredPackages.complete(); this.cleanFilteredPackages.complete();
this.cleanFilteredPackages = null; this.cleanFilteredPackages = null;
this.destroy$.next();
this.destroy$.complete();
} }
getCurrentEntity(): OtaPackageInfo | null { getCurrentEntity(): OtaPackageInfo | null {