From 5f8b54ef2a71ba2df65398c3a53cbb29ee3fcf61 Mon Sep 17 00:00:00 2001
From: Ahmedeldeeb50 <ahmed.eldeeb.ext@orange.com>
Date: Thu, 10 Sep 2020 10:32:48 +0200
Subject: Fix autostart for tour-guide in edit

Issue-ID: CCSDK-2705

Signed-off-by: Ahmedeldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: Ib91a0804ff2fab56a20446eb05cada4385961d52
---
 .../templ-mapp-creation/templ-mapp-creation.component.html     |  2 +-
 .../templ-mapp-creation/templ-mapp-creation.component.ts       |  7 ++++---
 .../templ-mapp-listing/templ-mapp-listing.component.ts         |  4 +++-
 .../packages-dashboard/packages-dashboard.component.ts         | 10 ++++++++--
 4 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'cds-ui/designer-client/src')

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html
index 4b0ef8b49..dda6231d9 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html
@@ -31,7 +31,7 @@
         <div class="card">
             <div class="card-header" id="headingOne">
                 <h5 class="mb-0 d-flex justify-content-between">
-                    <button class="btn btn-link" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true"
+                    <button class="btn btn-link" data-toggle="collapse" data-target="#collapseOne" id="templateTab" aria-expanded="true"
                         aria-controls="collapseOne">
                         1. Template <span class="accordian-title">{{currentTemplate?.fileName?.split('/')[1]}}</span>
                     </button>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.ts
index 4d3471263..346a06d83 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.ts
@@ -12,7 +12,7 @@ import { ToastrService } from 'ngx-toastr';
 import { SharedService } from '../shared-service';
 import { XmlParser } from '../utils/XmlParser';
 import { TourService } from 'ngx-tour-md-menu';
-import {PackageCreationService} from '../../package-creation.service';
+import { PackageCreationService } from '../../package-creation.service';
 declare var $: any;
 
 @Component({
@@ -352,8 +352,9 @@ export class TemplMappCreationComponent implements OnInit, OnDestroy {
                 this.fileName = '';
                 this.toastr.success('File is created', 'success');
                 this.openListView();
-                console.log(this.tourService.getStatus());
-                this.tourService.goto('tm-templateEdit');
+                if (localStorage.getItem('tour-guide') !== 'end' && localStorage.getItem('tour-guide') !== 'false') {
+                    this.tourService.goto('tm-templateEdit');
+                }
             } else {
                 console.log('this file already exist');
                 this.toastr.error('File name already exist', 'Error');
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.ts
index 70e35939b..5750bf430 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.ts
@@ -102,7 +102,9 @@ export class TemplMappListingComponent implements OnInit {
     createNewTemplate() {
         this.openCreationView();
         this.sharedService.disableEdit();
-        this.tourService.goto('tm-templateName');
+        if (localStorage.getItem('tour-guide') !== 'end' && localStorage.getItem('tour-guide') !== 'false') {
+            this.tourService.goto('tm-templateName');
+        }
     }
     openCreationView() {
         this.showCreationView.emit('tell parent to open create views');
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 c6b9c41f6..9862608b4 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
@@ -39,8 +39,6 @@ export class PackagesDashboardComponent implements OnInit, OnDestroy {
     ngOnInit() {
 
         console.log('PackagesDashboardComponent');
-
-        this.tourService.initialize([...steps]);
         this.checkTour();
     }
 
@@ -53,10 +51,17 @@ export class PackagesDashboardComponent implements OnInit, OnDestroy {
     }
 
     start() {
+
+        this.tourService.initialize([...steps]);
         console.log('start .................');
         this.tourService.start();
+        localStorage.setItem('tour-guide', 'start');
         this.tourService.events$.subscribe(res => {
             console.log(res);
+
+            if (res.name === 'end') {
+                localStorage.setItem('tour-guide', 'end');
+            }
             if (res.value && res.value.anchorId) {
                 if (res.value.anchorId.includes('mt-')) {
                     $('#nav-metadata-tab').trigger('click');
@@ -76,6 +81,7 @@ export class PackagesDashboardComponent implements OnInit, OnDestroy {
                 if (res.value.anchorId.includes('st-')) {
                     $('#nav-scripts-tab').trigger('click');
                 }
+
             }
         });
     }
-- 
cgit 1.2.3-korg