From: Eltanany Shaaban <shaaban.eltanany.ext@orange.com>
Date: Sun, 10 Jan 2021 15:32:41 +0000 (+0200)
Subject: changing json handling with function inputs
X-Git-Tag: 1.1.0~34
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F14%2F116714%2F1;p=ccsdk%2Fcds.git

changing json handling with function inputs

Issue-ID: CCSDK-3051

Signed-off-by: Eltanany Shaaban <shaaban.eltanany.ext@orange.com>
Change-Id: I325d31d18eeb639013b518c007a69799cdb29701
---

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html
index f00878a74..e619f3a88 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html
@@ -81,7 +81,7 @@
                                     <div class="attribute-wrap"
                                         *ngFor="let requiredInput of getKeys(requiredInputs); let i=index">
                                         <!--string-->
-                                        <div *ngIf="getValue(requiredInput,requiredInputs).type=='string'"
+                                        <div *ngIf="getValue(requiredInput,requiredInputs).type=='string' || getValue(requiredInput,requiredInputs).type=='json'"
                                             class="form-group">
                                             <label for="exampleInputEmail1">{{ requiredInput }}<i
                                                     class="icon-required-star" type="button"
@@ -90,7 +90,7 @@
                                             <input [(ngModel)]="currentFuncion['inputs'][requiredInput]" type="text"
                                                 class="form-control">
                                         </div>
-                                        <!--JSON-->
+                                        <!--JSON
                                         <div *ngIf="getValue(requiredInput,requiredInputs).type=='json'"
                                             class="form-group">
                                             <label for="exampleInputEmail1">{{ requiredInput }}<i
@@ -100,7 +100,7 @@
                                             <textarea style="height: 120px;" (change)="bind(requiredInput,$event)"
                                                 [value]="currentFuncion['inputs'][requiredInput]"
                                                 class="form-control"></textarea>
-                                        </div>
+                                        </div>-->
                                         <!-- Integer -->
                                         <div class="form-group"
                                             *ngIf="getValue(requiredInput,requiredInputs).type=='integer'">
@@ -277,4 +277,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.ts
index a86ade0fa..70ccb7305 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.ts
@@ -139,11 +139,11 @@ export class FunctionsAttributeComponent implements OnInit, OnDestroy {
             if (inputs) {
                 for (const [key, value] of Object.entries(inputs)) {
                     console.log(key + ' - ' + value);
-                    if (typeof value === 'object' || this.isValidJson(value)) {
+                   /* if (typeof value === 'object' || this.isValidJson(value)) {
                         this.currentFuncion.inputs[key] = JSON.stringify(value);
-                    } else {
-                        this.currentFuncion.inputs[key] = value;
-                    }
+                    } else {*/
+                    this.currentFuncion.inputs[key] = value;
+                   // }
                 }
             }
             if (outputs) {