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

UI: Optimize rxjs observable in unit selector

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2023-07-17 12:30:52 +03:00
parent d8313a3422
commit df9ec02bbc
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui-ngx/src/app/shared/components/unit-input.component.ts
View File

@ -16,9 +16,9 @@
import { Component, ElementRef, forwardRef, Input, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { Component, ElementRef, forwardRef, Input, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { ControlValueAccessor, FormBuilder, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; import { ControlValueAccessor, FormBuilder, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
import { EMPTY, Observable, of, ReplaySubject, switchMap } from 'rxjs'; import { Observable, of, shareReplay, switchMap } from 'rxjs';
import { searchUnits, Unit, unitBySymbol } from '@shared/models/unit.models'; import { searchUnits, Unit, unitBySymbol } from '@shared/models/unit.models';
import { map, mergeMap, share, startWith, tap } from 'rxjs/operators'; import { map, mergeMap, tap } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { ResourcesService } from '@core/services/resources.service'; import { ResourcesService } from '@core/services/resources.service';
@ -75,17 +75,16 @@ export class UnitInputComponent implements ControlValueAccessor, OnInit {
this.updateView(value); this.updateView(value);
}), }),
map(value => (value as Unit)?.symbol ? (value as Unit).symbol : (value ? value as string : '')), map(value => (value as Unit)?.symbol ? (value as Unit).symbol : (value ? value as string : '')),
mergeMap(symbol => this.fetchUnits(symbol) ) mergeMap(symbol => this.fetchUnits(symbol))
); );
} }
writeValue(symbol?: string): void { writeValue(symbol?: string): void {
this.searchText = ''; this.searchText = '';
this.modelValue = symbol; this.modelValue = symbol;
EMPTY.pipe( of(symbol).pipe(
startWith(''), switchMap(value => value
switchMap(() => symbol ? this.unitsConstant().pipe(map(units => unitBySymbol(units, value) ?? value))
? this.unitsConstant().pipe(map(units => unitBySymbol(units, symbol) ?? symbol))
: of(null)) : of(null))
).subscribe(result => { ).subscribe(result => {
this.unitsFormControl.patchValue(result, {emitEvent: false}); this.unitsFormControl.patchValue(result, {emitEvent: false});
@ -158,12 +157,7 @@ export class UnitInputComponent implements ControlValueAccessor, OnInit {
name: this.translate.instant(u.name), name: this.translate.instant(u.name),
tags: u.tags tags: u.tags
}))), }))),
share({ shareReplay(1)
connector: () => new ReplaySubject(1),
resetOnError: false,
resetOnComplete: false,
resetOnRefCountZero: false
})
); );
} }
return this.fetchUnits$; return this.fetchUnits$;