From c97bae74316ddae5121dc361a7631a8cdaa335b0 Mon Sep 17 00:00:00 2001 From: Arielk Date: Sun, 2 Dec 2018 17:05:09 +0200 Subject: complex types selectable in Operation params Change-Id: I4ea366e1a9aff6bd0e3b707a292776bfb48b809f Issue-ID: SDC-1968 Signed-off-by: Arielk --- .../operation-creator/operation-creator.component.ts | 8 ++++++-- .../operation-creator/param-row/param-row.component.ts | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'catalog-ui') diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts index e27c783620..a304f1a30d 100644 --- a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts +++ b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts @@ -251,11 +251,15 @@ export class OperationCreatorComponent { let valid = true; if (this.currentTab === this.TYPE_INPUT) { _.forEach(this.inputParameters, param => { - if (!param.name || !param.property) valid = false; + if (!param.name || !param.property) { + valid = false; + } }); } else { _.forEach(this.outputParameters, param => { - if (!param.name || !param.type) valid = false; + if (!param.name || !param.type) { + valid = false; + } }); } return valid; 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 9bedfa7031..a12425d6e9 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 @@ -50,9 +50,8 @@ export class ParamRowComponent { _.toArray(dataTypes), (type: any) => type.name === prop.type ); - if (!type.properties) { - flattenedProps.push(prop); - } else { + flattenedProps.push(prop); + if (type.properties) { _.forEach(type.properties, subType => { if (this.isTypePrimitive(subType.type)) { flattenedProps.push({ -- cgit 1.2.3-korg