UI: Improved disabled rulenode config

This commit is contained in:
Vladyslav_Prykhodko 2023-08-25 16:29:51 +03:00
parent 186614a18d
commit b493f1a1b7
5 changed files with 52 additions and 69 deletions

View File

@ -29,16 +29,12 @@
<mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
</mat-progress-bar>
<div mat-dialog-content>
<fieldset [disabled]="isLoading$ | async">
<tb-rule-node #tbRuleNode
[ruleNode]="ruleNode"
[ruleChainId]="ruleChainId"
[ruleChainType]="ruleChainType"
[isEdit]="true"
[isAdd]="true"
[isReadOnly]="false">
isAdd>
</tb-rule-node>
</fieldset>
</div>
<div mat-dialog-actions fxLayoutAlign="end center">
<button mat-button color="primary"

View File

@ -15,7 +15,7 @@
*/
:host {
display: block;
margin-bottom: 16px;
tb-json-object-edit.tb-rule-node-configuration-json {
display: block;
height: 300px;

View File

@ -22,8 +22,6 @@
</button>
</div>
<form [formGroup]="ruleNodeFormGroup" class="mat-padding">
<fieldset [disabled]="(isLoading$ | async)">
<section>
<section class="title-row">
<mat-form-field fxFlex class="mat-block">
<mat-label translate>rulenode.name</mat-label>
@ -60,6 +58,4 @@
<textarea matInput formControlName="description" rows="1"></textarea>
</mat-form-field>
</div>
</section>
</fieldset>
</form>

View File

@ -14,7 +14,7 @@
/// limitations under the License.
///
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChange, SimpleChanges, ViewChild } from '@angular/core';
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
import { PageComponent } from '@shared/components/page.component';
import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
@ -22,11 +22,11 @@ import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms
import { FcRuleNode, RuleNodeType } from '@shared/models/rule-node.models';
import { EntityType } from '@shared/models/entity-type.models';
import { Subscription } from 'rxjs';
import { RuleChainService } from '@core/http/rule-chain.service';
import { RuleNodeConfigComponent } from './rule-node-config.component';
import { Router } from '@angular/router';
import { RuleChainType } from '@app/shared/models/rule-chain.models';
import { ComponentClusteringMode } from '@shared/models/component-descriptor.models';
import { coerceBoolean } from '@shared/decorators/coercion';
@Component({
selector: 'tb-rule-node',
@ -47,12 +47,11 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
ruleChainType: RuleChainType;
@Input()
isEdit: boolean;
@Input()
isReadOnly: boolean;
@coerceBoolean()
disabled = false;
@Input()
@coerceBoolean()
isAdd = false;
@Output()
@ -70,7 +69,6 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
constructor(protected store: Store<AppState>,
private fb: UntypedFormBuilder,
private ruleChainService: RuleChainService,
private router: Router) {
super(store);
this.ruleNodeFormGroup = this.fb.group({});
@ -99,6 +97,9 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
} else {
this.ruleNodeFormGroup = this.fb.group({});
}
if (this.disabled) {
this.ruleNodeFormGroup.disable({emitEvent: false});
}
}
private updateRuleNode() {
@ -108,6 +109,9 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
}
ngOnInit(): void {
if (this.disabled) {
this.ruleNodeFormGroup.disable({emitEvent: false});
}
}
ngOnChanges(changes: SimpleChanges): void {
@ -119,17 +123,6 @@ 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() {

View File

@ -110,8 +110,6 @@
[ruleNode]="editingRuleNode"
[ruleChainId]="ruleChain.id?.id"
[ruleChainType]="ruleChainType"
[isEdit]="true"
[isReadOnly]="false"
(initRuleNode)="onRuleNodeInit()"
(changeScript)="switchToFirstTab()">
</tb-rule-node>