diff options
| author |   Eltanany Shaaban <shaaban.eltanany.ext@orange.com> | 2021-01-10 17:32:41 +0200 |
|---|---|---|
| committer | Eltanany Shaaban <shaaban.eltanany.ext@orange.com> | 2021-01-10 17:32:41 +0200 |
| commit | 0f6d8229cff178d1eca82f8cff0c678fafbb1e9c (patch) | |
| tree | 920b75b0e3865cafc59ef61331a840723ae67574 | |
| parent | 325ebe9b3778fdf8db7637042391f609f692d188 (diff) | |
changing json handling with function inputs
Issue-ID: CCSDK-3051
Signed-off-by: Eltanany Shaaban <shaaban.eltanany.ext@orange.com>
Change-Id: I325d31d18eeb639013b518c007a69799cdb29701
2 files changed, 8 insertions, 8 deletions
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) { |