From 71f6d98f1003dc9acc212e4132f03bb21c0b73c8 Mon Sep 17 00:00:00 2001
From: Ahmed <ahmed.eldeeb.ext@orange.com>
Date: Wed, 26 Feb 2020 17:47:04 +0200
Subject: adding view package tabs

Issue-ID: CCSDK-2120

Signed-off-by: ahmedeldeeb50  <ahmed.eldeeb.ext@orange.com>
Change-Id: I21af8c2b193b3fec4e5bc59e44b7a3b852f3b784
---
 .../package-creation/creationModes/DesignerCreationMode.ts   |  3 +--
 .../package-creation/creationModes/PackageCreationModes.ts   | 12 +++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes')

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 162efff9e..1606d6574 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
@@ -47,7 +47,6 @@ export class DesignerCreationMode extends PackageCreationModes {
 
         metadata.template_author = 'Shaaban Ebrahim';
         metadata.template_name = cbaPackage.metaData.name;
-        metadata.template_tags = cbaPackage.metaData.tags;
         metadata.template_version = cbaPackage.metaData.version;
         metadata['author-email'] = 'shaaban.eltanany.ext@orange.com';
         metadata['user-groups'] = 'test';
@@ -58,12 +57,12 @@ export class DesignerCreationMode extends PackageCreationModes {
         let fullTags = '';
         let setCount = 0;
         cbaPackage.metaData.templateTags.forEach(val => {
+            setCount++;
             if (setCount === cbaPackage.metaData.templateTags.size) {
                 fullTags += val;
             } else {
                 fullTags += val + ', ';
             }
-            setCount++;
         });
         metadata.template_tags = fullTags;
         vlbDefinition.metadata = metadata;
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 2d234958c..b2a9d14b3 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
@@ -31,6 +31,16 @@ export abstract class PackageCreationModes {
     }
 
     getValueOfMetaData(metaDataTab: MetaDataTabModel): string {
+        let tags = '';
+        let count = 0;
+        for (const tag of metaDataTab.templateTags) {
+            count++;
+            if (count === metaDataTab.templateTags.size) {
+                tags += tag;
+            } else {
+                tags += tag + ', ';
+            }
+        }
         return 'TOSCA-Meta-File-Version: 1.0.0\n' +
             'CSAR-Version: 1.0\n' +
             'Created-By: Shaaban Ebrahim <shaaban.eltanany.ext@orange.con>\n' +
@@ -38,7 +48,7 @@ export abstract class PackageCreationModes {
             'Template-Name:' + metaDataTab.name + '\n' +
             'Template-Version:' + metaDataTab.version + '\n' +
             'Template-Type: ' + metaDataTab.mode + '\n' +
-            'Template-Tags:' + metaDataTab.tags;
+            'Template-Tags:' + tags;
 
     }
 
-- 
cgit 1.2.3-korg