Fixing some bugs in package creation tabs

Issue-ID: CCSDK-2123

Signed-off-by: Ahmed <ahmed.eldeeb.ext@orange.com>
Change-Id: Id7a457470b14ab3491d4e6b9bdd74ef93990dd2c

2 files changed, 28 insertions, 25 deletions

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html
index 0ae8efb47..89724be79 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html
@@ -2,12 +2,11 @@
     <div class="single-line">
         <label class="label-name">Mode</label>
         <label name="trst" *ngFor="let mode of modes; let i = index">
-            <input class="form-check-input" [(ngModel)]="metaDataTab.mode" type="radio" name="exampleRadios"
-                  id="exampleRadios1" value={{mode.name}}>
+            <input class="form-check-input" [(ngModel)]="modeType" type="radio" name="radioMode" id="radioMode"
+                [value]="mode.name">
 
             <span>
-                <i [className]="mode.style" aria-hidden="true"
-                   [id]="mode.name"></i>
+                <i [className]="mode.style" aria-hidden="true" [id]="mode.name"></i>
                 {{mode.name}}
             </span>
         </label>
@@ -31,7 +30,7 @@
         <label class="label-name">Name <span>*</span></label>
         <div class="label-input">
             <input type="input" [readOnly]="!packageNameAndVersionEnables" [(ngModel)]="metaDataTab.name"
-                   placeholder="Topology name.vLB.CDS">
+                placeholder="Topology name.vLB.CDS">
         </div>
         <!--<div class="model-note-container error-message">
             Package name already exists with this version. Please enter a different name or enter different version
@@ -42,8 +41,8 @@
     <div class="single-line-model">
         <label class="label-name">Version <span>*</span></label>
         <div class="label-input">
-            <input type="input" [readOnly]="!packageNameAndVersionEnables" [(ngModel)]="metaDataTab.version" (input)="validatePackageNameAndVersion()"
-                   placeholder="Example: 1.0.0">
+            <input type="input" [readOnly]="!packageNameAndVersionEnables" [(ngModel)]="metaDataTab.version"
+                (input)="validatePackageNameAndVersion()" placeholder="Example: 1.0.0">
         </div>
         <div class="model-note-container error-message">{{errorMessage}}</div>
     </div>
@@ -58,13 +57,13 @@
         <label class="label-name">tags</label>
         <div class="label-input">
             <input type="input" (keyup.enter)="addTag($event)" [(ngModel)]="metaDataTab.tags"
-                   placeholder="Ex., vDNS-CDS">
+                placeholder="Ex., vDNS-CDS">
 
         </div>
         <div class="model-note-container tag-notes">Seprate tags with comma or space</div>
         <div class="model-note-container tages-container">
             <span *ngFor="let tag of tags" class="single-tage">{{tag}} <i (click)="removeTag(tag)"
-                                                                          class="fa fa-times-circle"></i></span>
+                    class="fa fa-times-circle"></i></span>
         </div>
     </div>
 </div>
@@ -91,8 +90,8 @@
                     </div>
                 </div>
                 <div class="single-line-custom-key-delete">
-                    <button (click)="removeKey($event,map.key)"
-                            class="custom-key-delete"><i aria-hidden="true" class="icon-delete"></i></button>
+                    <button (click)="removeKey($event,map.key)" class="custom-key-delete"><i aria-hidden="true"
+                            class="icon-delete"></i></button>
                 </div>
             </div>
 
@@ -101,14 +100,14 @@
                     <label class="label-name"><span>{{customKeysMap.size + 1}}.</span> Name</label>
                     <div class="label-input">
                         <input (keyup.enter)="addCustomKey()" name="key" type="input" class="mapKey"
-                               placeholder="Enter name">
+                            placeholder="Enter name">
                     </div>
                 </div>
                 <div class="single-line-custom-key">
                     <label class="label-name">Value</label>
                     <div class="label-input">
                         <input (keyup.enter)="addCustomKey()" class="mapValue" name="value" type="input"
-                               placeholder="Enter value">
+                            placeholder="Enter value">
                     </div>
                 </div>
                 <!-- <div class="single-line-custom-key-delete"><button (click)="removeKey($event)"
@@ -117,4 +116,4 @@
 
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.ts
index 63c10ad7b..3a9b7b880 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.ts
@@ -1,8 +1,8 @@
-import {Component, OnInit} from '@angular/core';
-import {PackageCreationService} from '../package-creation.service';
-import {MetaDataTabModel} from '../mapping-models/metadata/MetaDataTab.model';
-import {PackageCreationStore} from '../package-creation.store';
-import {ActivatedRoute} from '@angular/router';
+import { Component, OnInit } from '@angular/core';
+import { PackageCreationService } from '../package-creation.service';
+import { MetaDataTabModel } from '../mapping-models/metadata/MetaDataTab.model';
+import { PackageCreationStore } from '../package-creation.store';
+import { ActivatedRoute } from '@angular/router';
 
 
 @Component({
@@ -15,16 +15,18 @@ export class MetadataTabComponent implements OnInit {
     counter = 0;
     tags = new Set<string>();
     customKeysMap = new Map();
-    modes: object[] = [
-        {name: 'Designer Mode', style: 'mode-icon icon-designer-mode'}];
+    modes: any[] = [
+        { name: 'Designer Mode', style: 'mode-icon icon-designer-mode' }];
     /*  {name: 'Scripting Mode', style: 'mode-icon icon-scripting-mode'},
       {name: 'Generic Script Mode', style: 'mode-icon icon-generic-script-mode'}];*/
+    modeType = this.modes[0].name;
     private metaDataTab: MetaDataTabModel = new MetaDataTabModel();
     private errorMessage: string;
 
-    constructor(private route: ActivatedRoute,
-                private packageCreationService: PackageCreationService,
-                private packageCreationStore: PackageCreationStore
+    constructor(
+        private route: ActivatedRoute,
+        private packageCreationService: PackageCreationService,
+        private packageCreationStore: PackageCreationStore
     ) {
 
     }
@@ -32,6 +34,7 @@ export class MetadataTabComponent implements OnInit {
     ngOnInit() {
         this.metaDataTab.templateTags = this.tags;
         this.metaDataTab.mapOfCustomKey = this.customKeysMap;
+        this.metaDataTab.mode = this.modeType;
 
         const id = this.route.snapshot.paramMap.get('id');
         id ? this.packageNameAndVersionEnables = false :
@@ -46,8 +49,9 @@ export class MetadataTabComponent implements OnInit {
                 this.tags = element.metaData.templateTags;
                 this.metaDataTab.templateTags = this.tags;
                 console.log(element);
-                if (element.metaData.mode && element.metaData.mode.includes(' DEFAULT')) {
+                if (element.metaData.mode && element.metaData.mode.includes('DEFAULT')) {
                     this.metaDataTab.mode = 'Designer Mode';
+                    this.modeType = this.metaDataTab.mode;
                 }
 
                 this.customKeysMap = element.metaData.mapOfCustomKey;