3988

frontend/src/app/modules/schema-engine/schema-form-view/schema-form-view.component.html

@@ -1,6 +1,6 @@
 <form>
     <ng-container *ngFor="let item of fields">
-        <div *ngIf="!item.hide" class="form-field-container">
+        <div *ngIf="!item.hide && !item.notCorrespondCondition" class="form-field-container">
             <div *ngIf="!item.isArray && !item.isRef" class="form-field">
                 <div class="label-field">{{item.description}}</div>
 

frontend/src/app/modules/schema-engine/schema-form-view/schema-form-view.component.ts

@@ -32,8 +32,32 @@ export class SchemaFormViewComponent implements OnInit {
 
     constructor(private ipfs: IPFSService, private changeDetector: ChangeDetectorRef) { }
 
-
     ngOnInit(): void {
+        if (this.fields !== undefined) {
+            for (const item of this.fields) {
+                if (item.conditions) {
+                    for (const condition of item.conditions) {
+                        const values = this.values ? this.values[item.name] : {};
+                        const ifField = item.fields.find((f: any) => f.name === condition.ifCondition.field.name);
+                        const currentConditionValue = values && values[ifField.name];
+                        if (!currentConditionValue) {
+                            continue;
+                        }
+                        if (currentConditionValue !== condition.ifCondition.fieldValue) {
+                            for (const field of condition.thenFields) {
+                                const thenField = item.fields.find((f: any) => f.name === field.name);
+                                thenField.notCorrespondCondition = true;
+                            }
+                        } else {
+                            for (const field of condition.thenFields) {
+                                const thenField = item.fields.find((f: any) => f.name === field.name);
+                                thenField.notCorrespondCondition = false;
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
     isBooleanView(item: boolean | any): string {

policy-service/src/policy-engine/blocks/filters-addon-block.ts

@@ -40,6 +40,7 @@ export class FiltersAddonBlock {
     }
 
     private previousState: { [key: string]: any } = {};
+    private previousFilters: { [key: string]: any } = {};
 
     /**
      * Block state
@@ -113,15 +114,20 @@ export class FiltersAddonBlock {
     }
 
     async resetFilters(user: PolicyUser): Promise<void> {
+        const ref = PolicyComponentsUtils.GetBlockRef<IPolicyAddonBlock>(this);
         if (this.previousState[user.id]) {
             this.state[user.id] = this.previousState[user.id];
             delete this.previousState[user.id];
         }
+        if (this.previousFilters[user.id]) {
+            ref.filters[user.id] = this.previousFilters[user.id];
+            delete this.previousFilters[user.id];
+        }
     }
 
     async setFiltersStrict(user: PolicyUser, data: any) {
         const ref = PolicyComponentsUtils.GetBlockRef<IPolicyAddonBlock>(this);
-        this.previousState[user.id] = this.state[user.id];
+        this.previousState[user.id] = {...this.state[user.id]};
         const filter: any = {};
         if (!data) {
             throw new BlockActionError(`filter value is unknown`, ref.blockType, ref.uuid)
@@ -142,7 +148,9 @@ export class FiltersAddonBlock {
             }
             blockState.lastValue = value;
             this.state[user.id] = blockState;
+
         }
+        this.previousFilters[user.id] = {...ref.filters[user.id]};
         ref.setFilters(filter, user);
     }