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

UI: refactoring of widget action component

Browse Source
This commit is contained in:
Dmitriymush 2024-02-19 15:58:42 +02:00
parent eae3d9cdb9
commit 73bef368de
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.ts
View File

@ -34,7 +34,7 @@ import {
import { WidgetService } from '@core/http/widget.service'; import { WidgetService } from '@core/http/widget.service';
import { WidgetActionCallbacks } from '@home/components/widget/action/manage-widget-actions.component.models'; import { WidgetActionCallbacks } from '@home/components/widget/action/manage-widget-actions.component.models';
import { map, mergeMap, share, startWith, takeUntil, tap } from 'rxjs/operators'; import { map, mergeMap, share, startWith, takeUntil, tap } from 'rxjs/operators';
import { Observable, of, Subject, Subscription } from 'rxjs'; import { Observable, of, ReplaySubject, Subject, Subscription } from 'rxjs';
import { Dashboard } from '@shared/models/dashboard.models'; import { Dashboard } from '@shared/models/dashboard.models';
import { DashboardService } from '@core/http/dashboard.service'; import { DashboardService } from '@core/http/dashboard.service';
import { DashboardUtilsService } from '@core/services/dashboard-utils.service'; import { DashboardUtilsService } from '@core/services/dashboard-utils.service';
@ -186,7 +186,7 @@ export class WidgetActionComponent implements ControlValueAccessor, OnInit, Vali
} }
onDashboardStateInputFocus(): void { onDashboardStateInputFocus(): void {
this.actionTypeFormGroup.get('targetDashboardId').updateValueAndValidity({onlySelf: true, emitEvent: true}); this.actionTypeFormGroup.get('targetDashboardStateId').updateValueAndValidity({onlySelf: true, emitEvent: true});
} }
stateDisplayTypeName(displayType: stateDisplayType): string { stateDisplayTypeName(displayType: stateDisplayType): string {
@ -228,16 +228,16 @@ export class WidgetActionComponent implements ControlValueAccessor, OnInit, Vali
this.fb.control(action ? action.stateEntityParamName : null, []) this.fb.control(action ? action.stateEntityParamName : null, [])
); );
if (type === WidgetActionType.openDashboard) { if (type === WidgetActionType.openDashboard) {
const targetDashboardId = action ? action.targetDashboardId : null;
this.actionTypeFormGroup.addControl( this.actionTypeFormGroup.addControl(
'openNewBrowserTab', 'openNewBrowserTab',
this.fb.control(action ? action.openNewBrowserTab : false, []) this.fb.control(action ? action.openNewBrowserTab : false, [])
); );
this.actionTypeFormGroup.addControl( this.actionTypeFormGroup.addControl(
'targetDashboardId', 'targetDashboardId',
this.fb.control(action ? action.targetDashboardId : null, this.fb.control(targetDashboardId, [Validators.required])
[Validators.required])
); );
this.setupSelectedDashboardStateIds(); this.setupSelectedDashboardStateIds(targetDashboardId);
} else { } else {
if (type === WidgetActionType.openDashboardState) { if (type === WidgetActionType.openDashboardState) {
const displayType = this.getStateDisplayType(action); const displayType = this.getStateDisplayType(action);
@ -367,9 +367,10 @@ export class WidgetActionComponent implements ControlValueAccessor, OnInit, Vali
); );
} }
private setupSelectedDashboardStateIds() { private setupSelectedDashboardStateIds(targetDashboardId: string | null) {
this.selectedDashboardStateIds = this.selectedDashboardStateIds =
this.actionTypeFormGroup.get('targetDashboardId').valueChanges.pipe( this.actionTypeFormGroup.get('targetDashboardId').valueChanges.pipe(
startWith(targetDashboardId),
tap((dashboardId) => { tap((dashboardId) => {
if (!dashboardId) { if (!dashboardId) {
this.actionTypeFormGroup.get('targetDashboardStateId') this.actionTypeFormGroup.get('targetDashboardStateId')
@ -400,7 +401,12 @@ export class WidgetActionComponent implements ControlValueAccessor, OnInit, Vali
return []; return [];
} }
}), }),
share() share({
connector: () => new ReplaySubject(1),
resetOnError: false,
resetOnComplete: false,
resetOnRefCountZero: false
})
); );
} }