improve getting definition from entry definition.

Issue-ID: CCSDK-2298
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I2a0f91e3c42c50d537570042a0a6146040277f3e

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation-extraction.service.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation-extraction.service.ts
index cdf89ef..232590c 100644 (file)
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation-extraction.service.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation-extraction.service.ts
@@ -80,7 +80,7 @@ export class PackageCreationExtractionService {
 
     public setImports(filename: string, fileData: any, packageName: string) {
         console.log(filename);
-        if (filename.includes(packageName)) {
+        if (filename.includes('Definitions/' + packageName.trim() + '.json')) {
             let definition = new VlbDefinition();
             definition = fileData as VlbDefinition;
             definition = JSON.parse(fileData);
@@ -92,6 +92,7 @@ export class PackageCreationExtractionService {
                     mapOfCustomKeys.set(metadataKey + '', definition.metadata[metadataKey + '']);
                 }
             }
+
             this.packageCreationStore.changeDslDefinition(dslDefinition);
             this.packageCreationStore.setCustomKeys(mapOfCustomKeys);
             this.setPackageDescription(definition.metadata.template_description);