Merge "change the entry file name to be equal of package name"

2 files changed, 8 insertions, 8 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 e1efc3c22..00dcc5dab 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 {
@@ -41,7 +41,7 @@ export class DesignerCreationMode extends PackageCreationModes {
             FilesContent.putData(key, valueOfFile);
         });
 
-        const filenameEntry = 'Definitions/blueprint.json';
+        const filenameEntry = 'Definitions/' + cbaPackage.metaData.name + '.json';
         const vlbDefinition: VlbDefinition = new VlbDefinition();
         const metadata: Metadata = new Metadata();
 
@@ -68,7 +68,7 @@ export class DesignerCreationMode extends PackageCreationModes {
         vlbDefinition.metadata = metadata;
         const files: Import[] = [];
         cbaPackage.definitions.imports.forEach((valueOfFile, key) => {
-            files.push({ file: key });
+            files.push({file: key});
         });
         console.log(vlbDefinition);
         vlbDefinition.imports = files;
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/PackageCreationModes.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/PackageCreationModes.ts
index 8ccf0c39e..5b8db6b6d 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/PackageCreationModes.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/PackageCreationModes.ts
@@ -11,7 +11,7 @@ export abstract class PackageCreationModes {
 
     public static setEntryPoint(metaDataTab: MetaDataTabModel) {
         if (metaDataTab.mode.startsWith(ModeType.Designer)) {
-            metaDataTab.entryFileName = 'Definitions/blueprint.json';
+            metaDataTab.entryFileName = 'Definitions/' + metaDataTab.name + '.json';
         } else {
             // TODO Not implemented
             metaDataTab.entryFileName = '';