From 8bee90f8177f0a167ff2af58ee156c3189a1d7ba Mon Sep 17 00:00:00 2001 From: ShaabanEltanany Date: Thu, 1 Oct 2020 00:42:18 +0200 Subject: improve dealing with topologyTemplate Issue-ID: CCSDK-2298 Signed-off-by: ShaabanEltanany Change-Id: If2e6bfbfea4c294a1e45dbefeb90fc988b766596 --- .../package-creation/creationModes/DesignerCreationMode.ts | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts') diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts index e2790d552..adae66244 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts @@ -84,27 +84,21 @@ export class DesignerCreationMode extends PackageCreationModes { } }); } - console.log(vlbDefinition); - console.log(cbaPackage.definitions.dslDefinition.content); + if (cbaPackage.definitions && cbaPackage.definitions.dslDefinition && cbaPackage.definitions.dslDefinition.content) { vlbDefinition.dsl_definitions = JSON.parse(cbaPackage.definitions.dslDefinition.content); } vlbDefinition.imports = files; - if (insideVlbDefinition && insideVlbDefinition.topology_template) { - vlbDefinition.topology_template = insideVlbDefinition.topology_template; - } else if (cbaPackage.templateTopology && cbaPackage.templateTopology.content) { + if (cbaPackage.templateTopology && cbaPackage.templateTopology.content) { vlbDefinition.topology_template = JSON.parse(cbaPackage.templateTopology.content); + } else if (insideVlbDefinition && insideVlbDefinition.topology_template) { + vlbDefinition.topology_template = insideVlbDefinition.topology_template; } - - console.log(vlbDefinition); - const value = packageCreationUtils.transformToJson(vlbDefinition); FilesContent.putData(filenameEntry, value); - console.log('hello there'); console.log(FilesContent.getMapOfFilesNamesAndContent()); - } } -- cgit 1.2.3-korg