diff options
author | KAPIL SINGAL <ks220y@att.com> | 2020-10-21 13:12:26 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-10-21 13:12:26 +0000 |
commit | 94e008c6ed3a9ff9c3adca069208a638f11988f3 (patch) | |
tree | 747fb9412aa2defc8c01765f87c9d8a720dec71e /cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation | |
parent | 576f81eedeed766f28ffa0f5841dd40507e48b24 (diff) | |
parent | a03d4f6e227d1dbe9f1fa79365f4c6da73f609d9 (diff) |
Merge "fixing forming cba package definition"
Diffstat (limited to 'cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation')
-rw-r--r-- | cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts | 8 |
1 files changed, 5 insertions, 3 deletions
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 61de5078b..d6e15ed09 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 @@ -78,19 +78,21 @@ export class DesignerCreationMode extends PackageCreationModes { if (cbaPackage.definitions.imports && cbaPackage.definitions.imports.size > 0) { cbaPackage.definitions.imports.forEach((valueOfFile, key) => { if (!key.includes(cbaPackage.metaData.name)) { - files.push({file: key}); + if (!key.includes('resources_definition_types')) { + files.push({file: key}); + } } else { insideVlbDefinition = JSON.parse(valueOfFile); } }); } - + vlbDefinition.imports = files; if (cbaPackage.definitions && cbaPackage.definitions.dslDefinition && cbaPackage.definitions.dslDefinition.content) { vlbDefinition.dsl_definitions = JSON.parse(cbaPackage.definitions.dslDefinition.content); } - vlbDefinition.imports = files; + // vlbDefinition.imports = files; if (cbaPackage.templateTopology && cbaPackage.templateTopology.content) { vlbDefinition.topology_template = JSON.parse(cbaPackage.templateTopology.content); } else if (insideVlbDefinition && insideVlbDefinition.topology_template) { |