Merge pull request #9123 from kalutkaz/fix/ruleNodeDisable

Fix for showing disabled form controls in rule nodes
2023-08-25 18:39:52 +03:00 · 2023-08-25 18:39:52 +03:00 · c3db59e6f8
commit c3db59e6f8
parent 8125f5dfef b493f1a1b7
7 changed files with 64 additions and 57 deletions
--- a/ui-ngx/src/app/modules/home/pages/rulechain/add-rule-node-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/add-rule-node-dialog.component.html
@ -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">
-      </tb-rule-node>
-    </fieldset>
+    <tb-rule-node #tbRuleNode
+                  [ruleNode]="ruleNode"
+                  [ruleChainId]="ruleChainId"
+                  [ruleChainType]="ruleChainType"
+                  isAdd>
+    </tb-rule-node>
  </div>
  <div mat-dialog-actions fxLayoutAlign="end center">
    <button mat-button color="primary"
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.scss
@ -15,7 +15,7 @@
 */
 :host {
  display: block;
-  margin-bottom: 16px;
+
  tb-json-object-edit.tb-rule-node-configuration-json {
    display: block;
    height: 300px;
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.ts
@ -165,6 +165,9 @@ export class RuleNodeConfigComponent implements ControlValueAccessor, OnInit, On
    } else {
      this.ruleNodeConfigFormGroup.enable({emitEvent: false});
    }
+    if (this.definedConfigComponent) {
+      this.definedConfigComponent.disabled = this.disabled;
+    }
  }

  writeValue(value: RuleNodeConfiguration): void {
@ -222,6 +225,7 @@ export class RuleNodeConfigComponent implements ControlValueAccessor, OnInit, On
      this.definedConfigComponent.ruleChainId = this.ruleChainId;
      this.definedConfigComponent.ruleChainType = this.ruleChainType;
      this.definedConfigComponent.configuration = this.configuration;
+      this.definedConfigComponent.disabled = this.disabled;
      this.changeSubscription = this.definedConfigComponent.configurationChanged.subscribe((configuration) => {
        this.updateModel(configuration);
      });
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
@ -22,44 +22,40 @@
  </button>
 </div>
 <form [formGroup]="ruleNodeFormGroup" class="mat-padding">
-  <fieldset [disabled]="(isLoading$ | async) || !isEdit || isReadOnly">
-    <section>
-      <section class="title-row">
-        <mat-form-field fxFlex class="mat-block">
-          <mat-label translate>rulenode.name</mat-label>
-          <input matInput formControlName="name" required>
-          <mat-error *ngIf="ruleNodeFormGroup.get('name').hasError('required')
+  <section class="title-row">
+    <mat-form-field fxFlex class="mat-block">
+      <mat-label translate>rulenode.name</mat-label>
+      <input matInput formControlName="name" required>
+      <mat-error *ngIf="ruleNodeFormGroup.get('name').hasError('required')
                         || ruleNodeFormGroup.get('name').hasError('pattern')">
-            {{ 'rulenode.name-required' | translate }}
-          </mat-error>
-          <mat-error *ngIf="ruleNodeFormGroup.get('name').hasError('maxlength')">
-            {{ 'rulenode.name-max-length' | translate }}
-          </mat-error>
-        </mat-form-field>
-        <section class="node-setting">
-          <mat-slide-toggle formControlName="debugMode">
-            {{ 'rulenode.debug-mode' | translate }}
-          </mat-slide-toggle>
-          <mat-slide-toggle *ngIf="isSingletonEditAllowed()" formControlName="singletonMode">
-            {{ 'rulenode.singleton-mode' | translate }}
-          </mat-slide-toggle >
-        </section>
-      </section>
-      <tb-rule-node-config #ruleNodeConfigComponent
-        formControlName="configuration"
-        [ruleNodeId]="ruleNode.ruleNodeId?.id"
-        [ruleChainId]="ruleChainId"
-        [ruleChainType]="ruleChainType"
-        [nodeDefinition]="ruleNode.component.configurationDescriptor.nodeDefinition"
-        (initRuleNode)="initRuleNode.emit($event)"
-        (changeScript)="changeScript.emit($event)">
-      </tb-rule-node-config>
-      <div formGroupName="additionalInfo" fxLayout="column" class="description-block">
-        <mat-form-field class="mat-block">
-          <mat-label translate>rulenode.rule-node-description</mat-label>
-          <textarea matInput formControlName="description" rows="1"></textarea>
-        </mat-form-field>
-      </div>
+        {{ 'rulenode.name-required' | translate }}
+      </mat-error>
+      <mat-error *ngIf="ruleNodeFormGroup.get('name').hasError('maxlength')">
+        {{ 'rulenode.name-max-length' | translate }}
+      </mat-error>
+    </mat-form-field>
+    <section class="node-setting">
+      <mat-slide-toggle formControlName="debugMode">
+        {{ 'rulenode.debug-mode' | translate }}
+      </mat-slide-toggle>
+      <mat-slide-toggle *ngIf="isSingletonEditAllowed()" formControlName="singletonMode">
+        {{ 'rulenode.singleton-mode' | translate }}
+      </mat-slide-toggle>
    </section>
-  </fieldset>
+  </section>
+  <tb-rule-node-config #ruleNodeConfigComponent
+                       formControlName="configuration"
+                       [ruleNodeId]="ruleNode.ruleNodeId?.id"
+                       [ruleChainId]="ruleChainId"
+                       [ruleChainType]="ruleChainType"
+                       [nodeDefinition]="ruleNode.component.configurationDescriptor.nodeDefinition"
+                       (initRuleNode)="initRuleNode.emit($event)"
+                       (changeScript)="changeScript.emit($event)">
+  </tb-rule-node-config>
+  <div formGroupName="additionalInfo" fxLayout="column" class="description-block">
+    <mat-form-field class="mat-block">
+      <mat-label translate>rulenode.rule-node-description</mat-label>
+      <textarea matInput formControlName="description" rows="1"></textarea>
+    </mat-form-field>
+  </div>
 </form>
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.ts
@ -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 {
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.html
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.html
@ -110,8 +110,6 @@
                              [ruleNode]="editingRuleNode"
                              [ruleChainId]="ruleChain.id?.id"
                              [ruleChainType]="ruleChainType"
-                              [isEdit]="true"
-                              [isReadOnly]="false"
                              (initRuleNode)="onRuleNodeInit()"
                              (changeScript)="switchToFirstTab()">
                </tb-rule-node>
--- a/ui-ngx/src/app/shared/models/rule-node.models.ts
+++ b/ui-ngx/src/app/shared/models/rule-node.models.ts
@ -74,6 +74,7 @@ export interface IRuleNodeConfigurationComponent {
  ruleNodeId: string;
  ruleChainId: string;
  hasScript: boolean;
+  disabled: boolean;
  testScriptLabel?: string;
  changeScript?: EventEmitter<void>;
  ruleChainType: RuleChainType;
@ -101,6 +102,14 @@ export abstract class RuleNodeConfigurationComponent extends PageComponent imple

  private configurationSet = false;

+  set disabled(value: boolean) {
+    if (value) {
+      this.configForm().disable({emitEvent: false});
+    } else {
+      this.configForm().enable({emitEvent: false});
+    }
+  };
+
  set configuration(value: RuleNodeConfiguration) {
    this.configurationValue = value;
    if (!this.configurationSet) {