hashgraph
diff --git a/‎frontend/package-lock.json‎
Lines changed: 3 additions & 3 deletions b/‎frontend/package-lock.json‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎frontend/src/app/injectors/block-type-tips.injector.ts‎
Lines changed: 2 additions & 0 deletions b/‎frontend/src/app/injectors/block-type-tips.injector.ts‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎frontend/src/app/modules/policy-engine/helpers/select-block/select-block.component.ts‎
Lines changed: 47 additions & 42 deletions b/‎frontend/src/app/modules/policy-engine/helpers/select-block/select-block.component.ts‎
Lines changed: 47 additions & 42 deletions
diff --git a/‎frontend/src/app/modules/policy-engine/policy-configuration/blocks/calculate/data-transformation-config/data-transformation-config.component.html‎
Lines changed: 11 additions & 0 deletions b/‎frontend/src/app/modules/policy-engine/policy-configuration/blocks/calculate/data-transformation-config/data-transformation-config.component.html‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎frontend/src/app/modules/policy-engine/policy-configuration/blocks/calculate/data-transformation-config/data-transformation-config.component.scss‎
Lines changed: 1 addition & 0 deletions b/‎frontend/src/app/modules/policy-engine/policy-configuration/blocks/calculate/data-transformation-config/data-transformation-config.component.scss‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎frontend/src/app/modules/policy-engine/policy-configuration/blocks/calculate/data-transformation-config/data-transformation-config.component.ts‎
Lines changed: 67 additions & 0 deletions b/‎frontend/src/app/modules/policy-engine/policy-configuration/blocks/calculate/data-transformation-config/data-transformation-config.component.ts‎
Lines changed: 67 additions & 0 deletions
diff --git a/‎frontend/src/app/modules/policy-engine/policy-engine.module.ts‎
Lines changed: 3 additions & 1 deletion b/‎frontend/src/app/modules/policy-engine/policy-engine.module.ts‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.html‎
Lines changed: 20 additions & 4 deletions b/‎frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.html‎
Lines changed: 20 additions & 4 deletions
diff --git a/‎frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.scss‎
Lines changed: 39 additions & 9 deletions b/‎frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.scss‎
Lines changed: 39 additions & 9 deletions
@@ -24,6 +24,8 @@ BLOCK_TYPE_TIPS_VALUE[BlockType.DocumentsViewer] =
     'A block type which outputs information from the DB as grid';
 BLOCK_TYPE_TIPS_VALUE[BlockType.PaginationAddon] =
     'A block type which adds pagination to the InterfaceDocumentSourceBlock if added';
+BLOCK_TYPE_TIPS_VALUE[BlockType.DataTransformationAddon] =
+    'A block type that transforms grid data';
 BLOCK_TYPE_TIPS_VALUE[BlockType.DocumentsSourceAddon] =
     'A block for searching VC, for grid';
 BLOCK_TYPE_TIPS_VALUE[BlockType.FiltersAddon] =
 
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Inject, Input, Output, SimpleChanges } from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, EventEmitter, Input, Output, SimpleChanges } from '@angular/core';
 import { RegisteredService } from '../../services/registered.service';
 import { PolicyBlock, PolicyFolder } from '../../structures';
 
@@ -13,7 +13,9 @@ type ValueType = string | PolicyBlock | null | undefined;
     templateUrl: './select-block.component.html',
     styleUrls: ['./select-block.component.scss']
 })
-export class SelectBlock {
+export class SelectBlock implements AfterViewInit {
+    private searchTimeout!: any;
+    private data?: any[];
     @Input('root') root!: PolicyFolder;
     @Input('blocks') blocks!: PolicyBlock[];
     @Input('readonly') readonly!: boolean;
@@ -22,16 +24,56 @@ export class SelectBlock {
     @Output('valueChange') valueChange = new EventEmitter<any>();
     @Output('change') change = new EventEmitter<any>();
     @Input() multiple: boolean = false;
-
     public text: string | null | undefined;
     public search: string = '';
     public searchData?: any[];
-    private searchTimeout!: any;
-    private data?: any[];
 
     constructor(private registeredService: RegisteredService) {
     }
 
+    private getText(value: string | PolicyBlock | null | undefined): string {
+        if (value && typeof value === 'object') {
+            if (value === this.root) {
+                if (this.root.isModule) {
+                    return 'Module';
+                } else if (this.root.isTool) {
+                    return 'Tool';
+                } else {
+                    return 'Policy';
+                }
+            } else {
+                return value.localTag;
+            }
+        } if (value) {
+            return value;
+        } else {
+            return '';
+        }
+    }
+
+    private getIcon(value: PolicyBlock) {
+        if (value === this.root) {
+            if (this.root.isModule) {
+                return { icon: 'policy-module', svg: true };
+            } else if (this.root.isTool) {
+                return { icon: 'handyman', svg: false };
+            } else {
+                return { icon: 'article', svg: false };
+            }
+        } else {
+            return {
+                icon: this.registeredService.getIcon(value.blockType),
+                svg: false
+            };
+        }
+    }
+
+    ngAfterViewInit(): void {
+        setTimeout(() => {
+            this.onChange();
+        }, 100)
+    }
+
     onChange() {
         this.text = this.multiple
             ? (this.value as ValueType[])
@@ -78,43 +120,6 @@ export class SelectBlock {
         }, 0);
     }
 
-    private getText(value: string | PolicyBlock | null | undefined): string {
-        if (value && typeof value === 'object') {
-            if (value === this.root) {
-                if (this.root.isModule) {
-                    return 'Module';
-                } else if (this.root.isTool) {
-                    return 'Tool';
-                } else {
-                    return 'Policy';
-                }
-            } else {
-                return value.localTag;
-            }
-        } if (value) {
-            return value;
-        } else {
-            return '';
-        }
-    }
-
-    private getIcon(value: PolicyBlock) {
-        if (value === this.root) {
-            if (this.root.isModule) {
-                return { icon: 'policy-module', svg: true };
-            } else if (this.root.isTool) {
-                return { icon: 'handyman', svg: false };
-            } else {
-                return { icon: 'article', svg: false };
-            }
-        } else {
-            return {
-                icon: this.registeredService.getIcon(value.blockType),
-                svg: false
-            };
-        }
-    }
-
     public onSearch(event: any) {
         clearTimeout(this.searchTimeout);
         this.searchTimeout = setTimeout(() => {
 
@@ -0,0 +1,11 @@
+<!-- UI Prop -->
+<table class="properties" [attr.readonly]="readonly" *ngIf="properties">
+    <tr class="propRow">
+        <td class="propRowCol"></td>
+        <td class="propRowCell cellName">Expression</td>
+        <td class="propRowCell">
+            <input class="prop-input" type="text" [(ngModel)]="properties.expression" [readonly]="true"
+                   (click)="editExpression($event)">
+        </td>
+    </tr>
+</table>
@@ -0,0 +1 @@
+
@@ -0,0 +1,67 @@
+import {Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation} from '@angular/core';
+import {CodeEditorDialogComponent} from '../../../../dialogs/code-editor-dialog/code-editor-dialog.component';
+import {PolicyBlock, SchemaVariables} from '../../../../structures';
+import {DialogService} from 'primeng/dynamicdialog';
+
+@Component({
+    selector: 'app-data-transformation-config',
+    templateUrl: './data-transformation-config.component.html',
+    styleUrls: ['./data-transformation-config.component.scss'],
+    encapsulation: ViewEncapsulation.Emulated
+})
+export class DataTransformationConfigComponent implements OnInit {
+    @Input('block') currentBlock!: PolicyBlock;
+    @Input('readonly') readonly!: boolean;
+    @Output() onInit = new EventEmitter();
+
+    private item!: PolicyBlock;
+
+    properties!: any;
+    propHidden: any = {
+        outputSchemaGroup: false
+    };
+    schemas!: SchemaVariables[];
+
+    constructor(
+        private dialog: DialogService,
+    ) {
+
+    }
+
+    ngOnInit(): void {
+        this.schemas = [];
+        this.onInit.emit(this);
+        this.load(this.currentBlock);
+    }
+
+    load(block: PolicyBlock) {
+        this.item = block;
+        this.properties = block.properties;
+        this.properties.uiMetaData = this.properties.uiMetaData || {}
+        this.properties.expression = this.properties.expression || ''
+        this.properties.documentSigner = this.properties.documentSigner || '';
+        this.properties.idType = this.properties.idType || '';
+    }
+
+    editExpression($event: MouseEvent) {
+        const dialogRef = this.dialog.open(CodeEditorDialogComponent, {
+            width: '80%',
+            data: {
+                expression: this.properties.expression,
+                readonly: this.readonly
+            },
+            styleClass: 'g-dialog',
+            modal: true,
+            closable: false,
+        })
+        dialogRef.onClose.subscribe(result => {
+            if (result) {
+                this.properties.expression = result.expression;
+            }
+        })
+    }
+
+    onSave() {
+        this.item.changed = true;
+    }
+}
@@ -147,6 +147,7 @@ import { JsonEditorDialogComponent } from './dialogs/json-editor-dialog/json-edi
 import { PolicyTestDialog } from './dialogs/policy-test-dialog/policy-test-dialog.component';
 import { NewImportFileDialog } from './dialogs/new-import-file-dialog/new-import-file-dialog.component';
 import { RequestDocumentBlockDialog } from './policy-viewer/blocks/request-document-block/dialog/request-document-block-dialog.component';
+import { DataTransformationConfigComponent } from './policy-configuration/blocks/calculate/data-transformation-config/data-transformation-config.component';
 
 @NgModule({
     declarations: [
@@ -252,7 +253,8 @@ import { RequestDocumentBlockDialog } from './policy-viewer/blocks/request-docum
         DropdownBlockAddonComponent,
         RequestAddonConfigComponent,
         RequestDocumentBlockAddonComponent,
-        RequestDocumentBlockDialog
+        RequestDocumentBlockDialog,
+        DataTransformationConfigComponent
     ],
     imports: [
         CommonModule,
 
@@ -16,7 +16,7 @@
                 [appendTo]="'body'"
                 [style]="{'width':'100%', 'border-radius': '8px 0 0 8px'}"
                 class="w-full"
-                (onChange)="onFilters($event)">
+                (onChange)="onType($event)">
                     <ng-template pTemplate="selectedItem" let-selectedOption>
                         <span class="prefix-dropdown">Type</span>
                         <span *ngIf="selectedOption">{{ selectedOption.name }}</span>
@@ -36,8 +36,9 @@
             <span *ngIf="currentType === 'lte'" class="common-prefix-dropdown">Less Than or Equal</span>
         </div>
 
-        <div *ngIf="type == 'dropdown'" class="content-select">
+        <div *ngIf="type == 'dropdown'" class="content-select" [attr.valid]="valid">
             <p-dropdown
+                *ngIf="!(currentType === 'in' || currentType === 'not_in' || currentType === 'nin')"
                 autoWidth="false"
                 [(ngModel)]="currentValue"
                 [options]="options"
@@ -53,8 +54,23 @@
                     <span *ngIf="!selectedOption">Not selected</span>
                 </ng-template>
             </p-dropdown>
+            <p-multiSelect
+                *ngIf="currentType === 'in' || currentType === 'not_in' || currentType === 'nin'"
+                autoWidth="false"
+                [(ngModel)]="currentValue"
+                [options]="multioptions"
+                [showHeader]="false"
+                optionLabel="name"
+                optionValue="value"
+                [appendTo]="'body'"
+                (onChange)="onFilters($event)"
+                [style]="{'width':'100%', 'height': '100%'}"
+                class="w-full filter-dropdown"
+                panelStyleClass="guardian-multiselect-panel"
+            >
+            </p-multiSelect>
         </div>
-        <div *ngIf="type == 'datepicker'" class="content-select">
+        <div *ngIf="type == 'datepicker'" class="content-select" [attr.valid]="valid">
             <p-calendar
                 [style]="{'border-left': '0', 'border-radius': '0 8px 8px 0'}"
                 [(ngModel)]="currentValue"
@@ -65,7 +81,7 @@
                 dateFormat="yy-mm-dd">
             </p-calendar>
         </div>
-        <div *ngIf="type == 'input'" class="content-select">
+        <div *ngIf="type == 'input'" class="content-select" [attr.valid]="valid">
             <input class="input-filter" [(ngModel)]="currentValue" (change)="onFilters($event)">
         </div>
     </div>
 
@@ -38,6 +38,24 @@
     align-self: flex-end;
     flex: 1;
     height: 38px;
+
+    &[valid="false"] ::ng-deep {
+        .p-multiselect {
+            border-color: #f00;
+        }
+
+        .p-dropdown {
+            border-color: #f00;
+        }
+
+        .p-inputtext {
+            border-color: #f00;
+        }
+
+        .input-filter {
+            border-color: #f00;
+        }
+    }
 }
 
 .grouped-content {
@@ -81,30 +99,42 @@ p-calendar {
     margin-right: 5px;
 }
 
-::ng-deep .p-dropdown-label {
-    font-size: 14px;
-    color: #23252E;
-}
-
-::ng-deep .p-component {
+.content ::ng-deep .p-component {
     border-radius: 8px;
     outline: none;
     box-shadow: none;
 }
 
-::ng-deep .filter-dropdown .p-dropdown {
+.content ::ng-deep .filter-dropdown .p-dropdown {
     border-radius: 0 8px 8px 0;
     border-left: 0;
+
+    .p-dropdown-label {
+        font-size: 14px;
+        color: #23252E;
+        height: 36px;
+    }
+}
+
+.content ::ng-deep .filter-dropdown .p-multiselect {
+    border-radius: 0 8px 8px 0;
+    border-left: 0;
+
+    .p-multiselect-label {
+        font-size: 14px;
+        color: #23252E;
+        height: 36px;
+    }
 }
 
-::ng-deep .calendar-filter .p-inputtext {
+.content ::ng-deep .calendar-filter .p-inputtext {
     padding: 8px 8px 11px 16px;
     border-radius: 0 8px 8px 0;
     border-left: 0;
     height: 37px;
 }
 
-::ng-deep .calendar-filter .p-datepicker-trigger {
+.content ::ng-deep .calendar-filter .p-datepicker-trigger {
     position: absolute;
     top: 50%;
     right: 8px;