Service operation UI merge

Change-Id: I9e8f584b61638696272738220d73086ebd168c96
Issue-ID: SDC-1739
Signed-off-by: Arielk <Ariel.Kenan@amdocs.com>

2 files changed, 29 insertions, 10 deletions

diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.html b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.html
index 2a72177621..25ecd2932e 100644
--- a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.html
+++ b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.html
@@ -1,9 +1,10 @@
 <div class="cell field-name">
-    <input
+    <ui-element-input
         *ngIf="!isAssociateWorkflow"
-        type="text"
         data-tests-id="paramName"
-        [(ngModel)]="param.name" />
+        [(value)]="param.name"
+        [readonly]="readonly">
+    </ui-element-input>
     <span *ngIf="isAssociateWorkflow">{{param.name}}</span>
 </div>
 
@@ -13,7 +14,8 @@
         data-tests-id="paramType"
         [values]="propTypeEnum"
         [(value)]="param.type"
-        (valueChange)="onChangeType()">
+        (valueChange)="onChangeType()"
+        [readonly]="readonly">
     </ui-element-dropdown>
     <span *ngIf="isAssociateWorkflow">{{param.type}}</span>
 </div>
@@ -22,7 +24,8 @@
     <ui-element-dropdown
         data-tests-id="paramProperty"
         [values]="filteredInputProps"
-        [(value)]="param.property">
+        [(value)]="param.property"
+        [readonly]="readonly">
     </ui-element-dropdown>
 </div>
 
@@ -30,11 +33,12 @@
     <checkbox
         *ngIf="!isAssociateWorkflow"
         data-tests-id="paramMandatory"
-        [(checked)]="param.mandatory">
+        [(checked)]="param.mandatory"
+        [ngClass]="{'disabled':readonly}">
     </checkbox>
 </div>
 
-<div class="cell remove" *ngIf="!isAssociateWorkflow">
+<div class="cell remove" *ngIf="!isAssociateWorkflow && !readonly">
     <span
         class="sprite-new delete-item-icon"
         data-tests-id="removeInputParam"
diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.ts b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.ts
index 75d4fcf7d2..53dcffddd3 100644
--- a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.ts
+++ b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.ts
@@ -1,6 +1,8 @@
 import {Component, Input} from '@angular/core';
-import {DropdownValue} from "app/ng2/components/ui/form-components/dropdown/ui-element-dropdown.component";
+import {PROPERTY_DATA} from "app/utils";
+import {DataTypeService} from "app/ng2/services/data-type.service";
 import {OperationParameter} from 'app/models';
+import {DropdownValue} from "app/ng2/components/ui/form-components/dropdown/ui-element-dropdown.component";
 
 @Component({
     selector: 'param-row',
@@ -11,14 +13,27 @@ import {OperationParameter} from 'app/models';
 export class ParamRowComponent {
     @Input() param: OperationParameter;
     @Input() inputProps: Array<DropdownValue>;
-    @Input() propTypes: {};
+    @Input() propTypes: { [key: string]: string };
     @Input() onRemoveParam: Function;
     @Input() isAssociateWorkflow: boolean;
+    @Input() readonly: boolean;
 
-    propTypeEnum: Array<string> = ['boolean', 'float', 'integer', 'string'];
+    propTypeEnum: Array<String> = [];
     filteredInputProps: Array<DropdownValue> = [];
 
+    constructor(private dataTypeService:DataTypeService) {}
+
     ngOnInit() {
+        const types = PROPERTY_DATA.TYPES.concat(
+            _.filter(
+                Object.keys(this.dataTypeService.getAllDataTypes()),
+                type => PROPERTY_DATA.TYPES.indexOf(type) === -1
+            )
+        );
+        this.propTypeEnum = _.filter(
+            types,
+            type => _.toArray(this.propTypes).indexOf(type) > -1
+        );
         this.onChangeType();
     }