From 307756f7a1c48a086ff3fc4c1c6d4d7204331a03 Mon Sep 17 00:00:00 2001
From: Ahmedeldeeb50 <ahmed.eldeeb.ext@orange.com>
Date: Mon, 7 Sep 2020 11:45:27 +0200
Subject: Fix custom key bug after tour-guide launch

Issue-ID: CCSDK-2014

Signed-off-by: Ahmedeldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: Ie13c2d88a9e9258728c9b66cc70f8ef24fc1b146
---
 .../metadata-tab/metadata-tab.component.html                 | 12 ++++++------
 .../packages/packages-dashboard/guideSteps.ts                | 10 +++++-----
 .../packages-dashboard/packages-dashboard.component.ts       |  3 +++
 3 files changed, 14 insertions(+), 11 deletions(-)

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

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 52445ede2..f2e5eedf1 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
@@ -62,8 +62,8 @@
     <div class="single-line-model">
         <label class="label-name">Tags</label>
         <div class="label-input">
-            <input tourAnchor="mt-packageTags" type="input" (keyup.enter)="addTag($event)" (keyup.Space)="addTag($event)"
-                placeholder="Ex., vDNS-CDS">
+            <input tourAnchor="mt-packageTags" type="input" (keyup.enter)="addTag($event)"
+                (keyup.Space)="addTag($event)" placeholder="Ex., vDNS-CDS">
         </div>
         <div class="model-note-container tag-notes">Use ENTER/SPACE to add tag</div>
         <div class="model-note-container tages-container">
@@ -76,14 +76,14 @@
 <div id="container">
     <div id="target">
         <div class="card creat-card">
-            <div  class="single-line customKeyTitle">
+            <div class="single-line customKeyTitle">
                 <h5 class="label-name w-100 ">
                     Custom key
                 </h5>
                 <span>To add New Custom Key, fill the first key then <b>Press ENTER</b></span>
 
             </div>
-            <div tourAnchor="mt-packageKeys" *ngFor="let map of  this.metaDataTab.mapOfCustomKey | keyvalue; let i=index" class="single-custom-key">
+            <div *ngFor="let map of  this.metaDataTab.mapOfCustomKey | keyvalue; let i=index" class="single-custom-key">
                 <div class="single-line-custom-key">
                     <label class="label-name"><span>{{i + 1}}.</span> Name</label>
                     <div class="label-input">
@@ -106,8 +106,8 @@
                 <div class="single-line-custom-key">
                     <label class="label-name"><span>{{customKeysMap.size + 1}}.</span> Name</label>
                     <div class="label-input">
-                        <input tourAnchor="mt-packageKeys" (keyup.enter)="addCustomKey()" name="key" type="input" class="mapKey"
-                            placeholder="Enter name">
+                        <input tourAnchor="mt-packageKeys" (keyup.enter)="addCustomKey()" name="key" type="input"
+                            class="mapKey" placeholder="Enter name">
                     </div>
                 </div>
                 <div class="single-line-custom-key">
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/guideSteps.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/guideSteps.ts
index 87e6c1990..d101d6111 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/guideSteps.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/guideSteps.ts
@@ -54,11 +54,11 @@ export const steps = [
         title: 'Package tag',
     },
     // -------
-    {
-        anchorId: 'mt-packageKeys',
-        content: 'Set your package custom keys (Optional)',
-        title: 'Package keys',
-    },
+    // {
+    //     anchorId: 'mt-packageKeys',
+    //     content: 'Set your package custom keys (Optional)',
+    //     title: 'Package keys',
+    // },
     // Temaplate & Mapping
     {
         anchorId: 'tm-templateTab',
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.ts
index c0a48d346..e0e80f29e 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.ts
@@ -57,6 +57,9 @@ export class PackagesDashboardComponent implements OnInit, OnDestroy {
         this.tourService.start();
         this.tourService.events$.subscribe(res => {
             console.log(res);
+            if (res.value && res.value.anchorId && res.value.anchorId.includes('mt-')) {
+                $('#nav-metadata-tab').trigger('click');
+            }
             if (res.value && res.value.anchorId && res.value.anchorId.includes('tm-')) {
                 $('#nav-template-tab').trigger('click');
             }
-- 
cgit 1.2.3-korg