Merge "add the new style to all guide steps"

2 files changed, 28 insertions, 57 deletions

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 d101d6111..5026980de 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
@@ -1,11 +1,11 @@
 
 
 export const steps = [
-    // {
-    //     anchorId: 'allTab',
-    //     content: 'This Tab contain all packages you created before',
-    //     title: 'All Package',
-    // },
+    {
+        anchorId: 'allTab',
+        content: 'Package list is where you get access to your all and most recent CBA packages.',
+        title: 'Managing your CBA packages',
+    },
     // {
     //     anchorId: 'search',
     //     content: 'Search for Package by name, version, tags and type',
@@ -16,22 +16,16 @@ export const steps = [
     //     content: 'Filter Packages by tags',
     //     title: 'Tag Filter',
     // },
-    // {
-    //     anchorId: 'import',
-    //     content: 'Import a package to CDS',
-    //     title: 'Import',
-    // },
     {
         anchorId: 'create',
-        content: 'Create a new Package',
-        title: 'Create',
+        content: 'Start creating a full CBA packages from built-in forms without programming.',
+        title: 'Create new package',
     },
     {
         anchorId: 'metadataTab',
         content: 'Set your package basic information',
         title: 'Metadata Tab',
-        route: 'packages/createPackage',
-        stepId: 'metadataTab'
+        route: 'packages/createPackage'
     },
     {
         anchorId: 'mt-packageName',
@@ -53,7 +47,6 @@ export const steps = [
         content: 'Set your package Tags (Optional)',
         title: 'Package tag',
     },
-    // -------
     // {
     //     anchorId: 'mt-packageKeys',
     //     content: 'Set your package custom keys (Optional)',
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 f863341e0..c6b9c41f6 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
@@ -40,34 +40,7 @@ export class PackagesDashboardComponent implements OnInit, OnDestroy {
 
         console.log('PackagesDashboardComponent');
 
-        this.tourService.initialize([
-            {
-                anchorId: 'allTab',
-                content: 'Package list is where you get access to your all and most recent CBA packages.',
-                title: 'Managing your CBA packages',
-            },
-            {
-                anchorId: 'search',
-                content: 'Search for Package by name, version, tags and type',
-                title: 'Search',
-            },
-            {
-                anchorId: 'tagFilter',
-                content: 'Filter Packages by tags',
-                title: 'Tag Filter',
-            },
-            {
-                anchorId: 'create',
-                content: 'Start creating a full CBA packages from built-in forms without programming.',
-                title: 'Create new package',
-            },
-            {
-                anchorId: 'metadataTab',
-                content: 'Set your package basic information',
-                title: 'Metadata Tab',
-                route: 'packages/createPackage'
-            },
-        ]);
+        this.tourService.initialize([...steps]);
         this.checkTour();
     }
 
@@ -84,20 +57,25 @@ 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');
-            }
-            if (res.value && res.value.anchorId && res.value.anchorId === 'tm-mappingContent') {
-                $('#mappingTab').trigger('click');
-            }
-            if (res.value && res.value.anchorId && res.value.anchorId === 'dslTab') {
-                $('#nav-authentication-tab').trigger('click');
-            }
-            if (res.value && res.value.anchorId && res.value.anchorId.includes('st-')) {
-                $('#nav-scripts-tab').trigger('click');
+            if (res.value && res.value.anchorId) {
+                if (res.value.anchorId.includes('mt-')) {
+                    $('#nav-metadata-tab').trigger('click');
+                }
+                if (res.value.anchorId.includes('tm-')) {
+                    $('#nav-template-tab').trigger('click');
+                }
+                if (res.value.anchorId === 'tm-mappingContent') {
+                    $('#mappingTab').trigger('click');
+                }
+                if (res.value.anchorId === 'tm-templateContent') {
+                    //  $('#templateTab').trigger('click');
+                }
+                if (res.value.anchorId === 'dslTab') {
+                    $('#nav-authentication-tab').trigger('click');
+                }
+                if (res.value.anchorId.includes('st-')) {
+                    $('#nav-scripts-tab').trigger('click');
+                }
             }
         });
     }