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

UI: Fixed not updated action source in widget action

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2024-03-08 12:37:23 +02:00
parent e364d15da5
commit 59154be6c8
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
View File

@ -20,11 +20,11 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { import {
FormBuilder,
FormControl,
FormGroup,
FormGroupDirective, FormGroupDirective,
NgForm, NgForm,
UntypedFormBuilder,
UntypedFormControl,
UntypedFormGroup,
ValidatorFn, ValidatorFn,
Validators Validators
} from '@angular/forms'; } from '@angular/forms';
@ -32,13 +32,15 @@ import { Subject } from 'rxjs';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { DialogComponent } from '@app/shared/components/dialog.component'; import { DialogComponent } from '@app/shared/components/dialog.component';
import { import {
toWidgetActionDescriptor,
WidgetActionCallbacks, WidgetActionCallbacks,
WidgetActionDescriptorInfo, WidgetActionDescriptorInfo,
WidgetActionsData WidgetActionsData
} from '@home/components/widget/action/manage-widget-actions.component.models'; } from '@home/components/widget/action/manage-widget-actions.component.models';
import { UtilsService } from '@core/services/utils.service'; import { UtilsService } from '@core/services/utils.service';
import { import {
actionDescriptorToAction, defaultWidgetAction, actionDescriptorToAction,
defaultWidgetAction,
WidgetActionSource, WidgetActionSource,
widgetType widgetType
} from '@shared/models/widget.models'; } from '@shared/models/widget.models';
@ -65,7 +67,7 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
private destroy$ = new Subject<void>(); private destroy$ = new Subject<void>();
widgetActionFormGroup: UntypedFormGroup; widgetActionFormGroup: FormGroup;
isAdd: boolean; isAdd: boolean;
action: WidgetActionDescriptorInfo; action: WidgetActionDescriptorInfo;
@ -83,7 +85,7 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
@Inject(MAT_DIALOG_DATA) public data: WidgetActionDialogData, @Inject(MAT_DIALOG_DATA) public data: WidgetActionDialogData,
@SkipSelf() private errorStateMatcher: ErrorStateMatcher, @SkipSelf() private errorStateMatcher: ErrorStateMatcher,
public dialogRef: MatDialogRef<WidgetActionDialogComponent, WidgetActionDescriptorInfo>, public dialogRef: MatDialogRef<WidgetActionDialogComponent, WidgetActionDescriptorInfo>,
public fb: UntypedFormBuilder) { public fb: FormBuilder) {
super(store, router, dialogRef); super(store, router, dialogRef);
this.isAdd = data.isAdd; this.isAdd = data.isAdd;
if (this.isAdd) { if (this.isAdd) {
@ -100,19 +102,14 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
} }
ngOnInit(): void { ngOnInit(): void {
this.widgetActionFormGroup = this.fb.group({}); this.widgetActionFormGroup = this.fb.group({
this.widgetActionFormGroup.addControl('actionSourceId', actionSourceId: [this.action.actionSourceId, Validators.required],
this.fb.control(this.action.actionSourceId, [Validators.required])); name: [this.action.name, [this.validateActionName(), Validators.required]],
this.widgetActionFormGroup.addControl('name', icon: [this.action.icon, Validators.required],
this.fb.control(this.action.name, [this.validateActionName(), Validators.required])); useShowWidgetActionFunction: [this.action.useShowWidgetActionFunction],
this.widgetActionFormGroup.addControl('icon', showWidgetActionFunction: [this.action.showWidgetActionFunction || 'return true;'],
this.fb.control(this.action.icon, [Validators.required])); widgetAction: [actionDescriptorToAction(toWidgetActionDescriptor(this.action)), Validators.required]
this.widgetActionFormGroup.addControl('useShowWidgetActionFunction', });
this.fb.control(this.action.useShowWidgetActionFunction, []));
this.widgetActionFormGroup.addControl('showWidgetActionFunction',
this.fb.control(this.action.showWidgetActionFunction || 'return true;', []));
this.widgetActionFormGroup.addControl('widgetAction',
this.fb.control(actionDescriptorToAction(this.action), [Validators.required]));
this.updateShowWidgetActionForm(); this.updateShowWidgetActionForm();
this.widgetActionFormGroup.get('actionSourceId').valueChanges.pipe( this.widgetActionFormGroup.get('actionSourceId').valueChanges.pipe(
takeUntil(this.destroy$) takeUntil(this.destroy$)
@ -159,9 +156,9 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
} }
private validateActionName(): ValidatorFn { private validateActionName(): ValidatorFn {
return (c: UntypedFormControl) => { return (c: FormControl) => {
const newName = c.value; const newName = c.value;
const valid = this.checkActionName(newName, this.widgetActionFormGroup.get('actionSourceId').value); const valid = this.checkActionName(newName, c.parent?.get('actionSourceId').value);
return !valid ? { return !valid ? {
actionNameNotUnique: true actionNameNotUnique: true
} : null; } : null;
@ -182,7 +179,7 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
return actionNameIsUnique; return actionNameIsUnique;
} }
isErrorState(control: UntypedFormControl | null, form: FormGroupDirective | NgForm | null): boolean { isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
const originalErrorState = this.errorStateMatcher.isErrorState(control, form); const originalErrorState = this.errorStateMatcher.isErrorState(control, form);
const customErrorState = !!(control && control.invalid && this.submitted); const customErrorState = !!(control && control.invalid && this.submitted);
return originalErrorState || customErrorState; return originalErrorState || customErrorState;