From 369ede4108a770ceb9639c6009f732ebce9be836 Mon Sep 17 00:00:00 2001 From: ahmedeldeeb50 Date: Tue, 18 Feb 2020 14:13:29 +0200 Subject: Adding DSL-Definition to vlb.json file. Fixing HashMap key and value conflict Issue-ID: CCSDK-2066 Signed-off-by: ahmedeldeeb50 Change-Id: I781f1ffc47a4ce22eeef9651aaff1dad4bf6fcc3 --- .../creationModes/DesignerCreationMode.ts | 25 +++++++++++++--------- 1 file changed, 15 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 41b81eea3..b44e844be 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 @@ -1,8 +1,8 @@ -import {PackageCreationModes} from './PackageCreationModes'; -import {CBAPackage, Scripts} from '../mapping-models/CBAPacakge.model'; -import {FilesContent} from '../mapping-models/metadata/MetaDataTab.model'; -import {Import, Metadata, VlbDefinition} from '../mapping-models/definitions/VlbDefinition'; -import {PackageCreationUtils} from '../package-creation.utils'; +import { PackageCreationModes } from './PackageCreationModes'; +import { CBAPackage, Scripts } from '../mapping-models/CBAPacakge.model'; +import { FilesContent } from '../mapping-models/metadata/MetaDataTab.model'; +import { Import, Metadata, VlbDefinition } from '../mapping-models/definitions/VlbDefinition'; +import { PackageCreationUtils } from '../package-creation.utils'; export class DesignerCreationMode extends PackageCreationModes { @@ -18,13 +18,13 @@ export class DesignerCreationMode extends PackageCreationModes { } private addScriptsFolder(scripts: Scripts) { - scripts.files.forEach((key, value) => { + scripts.files.forEach((value, key) => { FilesContent.putData(key, value); }); } private createDefinitionsFolder(cbaPackage: CBAPackage, packageCreationUtils: PackageCreationUtils) { - cbaPackage.definitions.imports.forEach((key, valueOfFile) => { + cbaPackage.definitions.imports.forEach((valueOfFile, key) => { FilesContent.putData(key, valueOfFile); }); @@ -38,16 +38,21 @@ export class DesignerCreationMode extends PackageCreationModes { metadata.template_version = cbaPackage.metaData.version; metadata['author-email'] = 'shaaban.eltanany.ext@orange.com'; metadata['user-groups'] = 'test'; - cbaPackage.definitions.metaDataTab.mapOfCustomKey.forEach((key, customKeyValue) => { + cbaPackage.definitions.metaDataTab.mapOfCustomKey.forEach((customKeyValue, key) => { metadata[key] = customKeyValue; }); vlbDefinition.metadata = metadata; const files: Import[] = []; - cbaPackage.definitions.imports.forEach((key, valueOfFile) => { - files.push({file: valueOfFile}); + cbaPackage.definitions.imports.forEach((valueOfFile, key) => { + files.push({ file: valueOfFile }); }); console.log(vlbDefinition); vlbDefinition.imports = files; + console.log(cbaPackage.definitions.dslDefinition.content); + if (cbaPackage.definitions.dslDefinition.content) { + vlbDefinition.dsl_definitions = JSON.parse(cbaPackage.definitions.dslDefinition.content); + } + console.log(vlbDefinition); const value = packageCreationUtils.transformToJson(vlbDefinition); FilesContent.putData(filenameEntry, value); console.log('hello there'); -- cgit 1.2.3-korg