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

Merge branch 'fix/ruleNodeDisable' of github.com:kalutkaz/thingsboard into kalutkaz-fix/ruleNodeDisable

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2023-08-25 16:22:31 +03:00
commit 186614a18d
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.ts
View File

@ -165,6 +165,9 @@ export class RuleNodeConfigComponent implements ControlValueAccessor, OnInit, On
} else { } else {
this.ruleNodeConfigFormGroup.enable({emitEvent: false}); this.ruleNodeConfigFormGroup.enable({emitEvent: false});
} }
if (this.definedConfigComponent) {
this.definedConfigComponent.disabled = this.disabled;
}
} }
writeValue(value: RuleNodeConfiguration): void { writeValue(value: RuleNodeConfiguration): void {
@ -222,6 +225,7 @@ export class RuleNodeConfigComponent implements ControlValueAccessor, OnInit, On
this.definedConfigComponent.ruleChainId = this.ruleChainId; this.definedConfigComponent.ruleChainId = this.ruleChainId;
this.definedConfigComponent.ruleChainType = this.ruleChainType; this.definedConfigComponent.ruleChainType = this.ruleChainType;
this.definedConfigComponent.configuration = this.configuration; this.definedConfigComponent.configuration = this.configuration;
this.definedConfigComponent.disabled = this.disabled;
this.changeSubscription = this.definedConfigComponent.configurationChanged.subscribe((configuration) => { this.changeSubscription = this.definedConfigComponent.configurationChanged.subscribe((configuration) => {
this.updateModel(configuration); this.updateModel(configuration);
}); });

2
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
View File

@ -22,7 +22,7 @@
</button> </button>
</div> </div>
<form [formGroup]="ruleNodeFormGroup" class="mat-padding"> <form [formGroup]="ruleNodeFormGroup" class="mat-padding">
<fieldset [disabled]="(isLoading$ | async) || !isEdit || isReadOnly"> <fieldset [disabled]="(isLoading$ | async)">
<section> <section>
<section class="title-row"> <section class="title-row">
<mat-form-field fxFlex class="mat-block"> <mat-form-field fxFlex class="mat-block">

13
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.ts
View File

@ -14,7 +14,7 @@
/// limitations under the License. /// limitations under the License.
/// ///
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChange, SimpleChanges, ViewChild } from '@angular/core';
import { PageComponent } from '@shared/components/page.component'; import { PageComponent } from '@shared/components/page.component';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
@ -119,6 +119,17 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
} }
} }
} }
this.disableControl(changes.isEdit, changes.isReadOnly);
}
private disableControl(isEdit: SimpleChange, isReadOnly: SimpleChange) {
if (isEdit.currentValue !== isEdit.previousValue || isReadOnly.currentValue !== isReadOnly.previousValue) {
if (!isEdit.currentValue || isReadOnly.currentValue) {
this.ruleNodeFormGroup.disable({emitEvent: false});
} else {
this.ruleNodeFormGroup.enable({emitEvent: false});
}
}
} }
validate() { validate() {

9
ui-ngx/src/app/shared/models/rule-node.models.ts
View File

@ -74,6 +74,7 @@ export interface IRuleNodeConfigurationComponent {
ruleNodeId: string; ruleNodeId: string;
ruleChainId: string; ruleChainId: string;
hasScript: boolean; hasScript: boolean;
disabled: boolean;
testScriptLabel?: string; testScriptLabel?: string;
changeScript?: EventEmitter<void>; changeScript?: EventEmitter<void>;
ruleChainType: RuleChainType; ruleChainType: RuleChainType;
@ -101,6 +102,14 @@ export abstract class RuleNodeConfigurationComponent extends PageComponent imple
private configurationSet = false; private configurationSet = false;
set disabled(value: boolean) {
if (value) {
this.configForm().disable({emitEvent: false});
} else {
this.configForm().enable({emitEvent: false});
}
};
set configuration(value: RuleNodeConfiguration) { set configuration(value: RuleNodeConfiguration) {
this.configurationValue = value; this.configurationValue = value;
if (!this.configurationSet) { if (!this.configurationSet) {