From 3cc392fde533b4d258b1930b17df0573372914c8 Mon Sep 17 00:00:00 2001 From: ia3andy Date: Thu, 5 Jul 2018 15:14:36 +0200 Subject: [PATCH] fix: use hard coded current step id to compute next step --- .../cancel-overlay.component.ts | 7 +----- .../dependency-editor-step.component.ts | 22 +++++++++---------- .../gitprovider-createapp-step.component.ts | 2 +- .../link-accounts-createapp-step.component.ts | 3 +-- ...ission-runtime-createapp-step.component.ts | 3 +-- ...roject-summary-createapp-step.component.ts | 2 +- ...lease-strategy-createapp-step.component.ts | 2 +- ...et-environment-createapp-step.component.ts | 2 +- .../gitprovider-importapp-step.component.ts | 2 +- ...t-progress-importapp-nextstep.component.ts | 12 +--------- ...roject-summary-importapp-step.component.ts | 2 +- ...lease-strategy-importapp-step.component.ts | 2 +- src/app/launcher/launcher.component.ts | 4 ++-- .../step-indicator.component.ts | 4 ++-- 14 files changed, 25 insertions(+), 44 deletions(-) diff --git a/src/app/launcher/cancel-overlay/cancel-overlay.component.ts b/src/app/launcher/cancel-overlay/cancel-overlay.component.ts index da3032a1..8219d954 100644 --- a/src/app/launcher/cancel-overlay/cancel-overlay.component.ts +++ b/src/app/launcher/cancel-overlay/cancel-overlay.component.ts @@ -1,9 +1,4 @@ -import { - Component, - Host, - Input, - OnInit -} from '@angular/core'; +import { Component, Host, OnInit } from '@angular/core'; import { LauncherComponent } from '../launcher.component'; diff --git a/src/app/launcher/create-app/dependency-editor-step/dependency-editor-step.component.ts b/src/app/launcher/create-app/dependency-editor-step/dependency-editor-step.component.ts index e9bc5206..c9575239 100644 --- a/src/app/launcher/create-app/dependency-editor-step/dependency-editor-step.component.ts +++ b/src/app/launcher/create-app/dependency-editor-step/dependency-editor-step.component.ts @@ -1,15 +1,14 @@ import { - Component, - DoCheck, - Host, - Input, - KeyValueDiffers, - OnInit, - OnDestroy, - ViewEncapsulation, - Optional + Component, + DoCheck, + Host, + Input, + KeyValueDiffers, + OnDestroy, + OnInit, + Optional, + ViewEncapsulation } from '@angular/core'; -import { FormsModule } from '@angular/forms'; import { Subscription } from 'rxjs/Subscription'; import { DependencyCheckService } from '../../service/dependency-check.service'; @@ -18,7 +17,6 @@ import { Selection } from '../../model/selection.model'; import { LauncherComponent } from '../../launcher.component'; import { LauncherStep } from '../../launcher-step'; import { DependencyEditor } from '../../model/dependency-editor/dependency-editor.model'; -import { Summary } from '../../model/summary.model'; import { broadcast } from '../../shared/telemetry.decorator'; @Component({ @@ -106,7 +104,7 @@ export class DependencyEditorCreateappStepComponent extends LauncherStep impleme } }) navToNextStep(): void { - this.launcherComponent.navToNextStep(); + this.launcherComponent.navToNextStep('SelectDependencies'); } /** diff --git a/src/app/launcher/create-app/gitprovider-createapp-step/gitprovider-createapp-step.component.ts b/src/app/launcher/create-app/gitprovider-createapp-step/gitprovider-createapp-step.component.ts index a6a15bd4..4ebfdb95 100644 --- a/src/app/launcher/create-app/gitprovider-createapp-step/gitprovider-createapp-step.component.ts +++ b/src/app/launcher/create-app/gitprovider-createapp-step/gitprovider-createapp-step.component.ts @@ -87,7 +87,7 @@ export class GitproviderCreateappStepComponent extends LauncherStep implements A } }) navToNextStep(): void { - this.launcherComponent.navToNextStep(); + this.launcherComponent.navToNextStep('GitProvider'); const summary = this.launcherComponent.summary; } diff --git a/src/app/launcher/create-app/link-accounts-createapp-step/link-accounts-createapp-step.component.ts b/src/app/launcher/create-app/link-accounts-createapp-step/link-accounts-createapp-step.component.ts index c47892a1..03831d69 100644 --- a/src/app/launcher/create-app/link-accounts-createapp-step/link-accounts-createapp-step.component.ts +++ b/src/app/launcher/create-app/link-accounts-createapp-step/link-accounts-createapp-step.component.ts @@ -1,8 +1,7 @@ -import { Component, Optional, Output, EventEmitter, ChangeDetectorRef, Input } from '@angular/core'; +import { ChangeDetectorRef, Component, EventEmitter, Input, Optional, Output } from '@angular/core'; import { Cluster } from '../../model/cluster.model'; import { TokenService } from '../../service/token.service'; -import { Observable } from 'rxjs'; @Component({ selector: 'f8launcher-link-accounts-createapp-step', diff --git a/src/app/launcher/create-app/mission-runtime-createapp-step/mission-runtime-createapp-step.component.ts b/src/app/launcher/create-app/mission-runtime-createapp-step/mission-runtime-createapp-step.component.ts index 93996730..4c01d15b 100644 --- a/src/app/launcher/create-app/mission-runtime-createapp-step/mission-runtime-createapp-step.component.ts +++ b/src/app/launcher/create-app/mission-runtime-createapp-step/mission-runtime-createapp-step.component.ts @@ -126,8 +126,7 @@ export class MissionRuntimeCreateappStepComponent extends LauncherStep implement } }) navToNextStep(): void { - this.launcherComponent.navToNextStep(); - const summary = this.launcherComponent.summary; + this.launcherComponent.navToNextStep('MissionRuntime'); } /** diff --git a/src/app/launcher/create-app/project-summary-createapp-step/project-summary-createapp-step.component.ts b/src/app/launcher/create-app/project-summary-createapp-step/project-summary-createapp-step.component.ts index 3637ec58..b3e0e360 100644 --- a/src/app/launcher/create-app/project-summary-createapp-step/project-summary-createapp-step.component.ts +++ b/src/app/launcher/create-app/project-summary-createapp-step/project-summary-createapp-step.component.ts @@ -88,7 +88,7 @@ export class ProjectSummaryCreateappStepComponent extends LauncherStep implement * Navigate to next step */ navToNextStep(): void { - this.launcherComponent.navToNextStep(); + this.launcherComponent.navToNextStep('ProjectSummary'); } /** diff --git a/src/app/launcher/create-app/release-strategy-createapp-step/release-strategy-createapp-step.component.ts b/src/app/launcher/create-app/release-strategy-createapp-step/release-strategy-createapp-step.component.ts index 7ad22467..e0d45e50 100644 --- a/src/app/launcher/create-app/release-strategy-createapp-step/release-strategy-createapp-step.component.ts +++ b/src/app/launcher/create-app/release-strategy-createapp-step/release-strategy-createapp-step.component.ts @@ -96,7 +96,7 @@ export class ReleaseStrategyCreateappStepComponent extends LauncherStep implemen } }) navToNextStep(): void { - this.launcherComponent.navToNextStep(); + this.launcherComponent.navToNextStep('ReleaseStrategy'); } updatePipelineSelection(pipeline: Pipeline): void { diff --git a/src/app/launcher/create-app/targetenvironment-createapp-step/target-environment-createapp-step.component.ts b/src/app/launcher/create-app/targetenvironment-createapp-step/target-environment-createapp-step.component.ts index 0fe9007b..1da64959 100644 --- a/src/app/launcher/create-app/targetenvironment-createapp-step/target-environment-createapp-step.component.ts +++ b/src/app/launcher/create-app/targetenvironment-createapp-step/target-environment-createapp-step.component.ts @@ -99,7 +99,7 @@ export class TargetEnvironmentCreateappStepComponent extends LauncherStep implem // Steps navToNextStep(): void { - this.launcherComponent.navToNextStep(); + this.launcherComponent.navToNextStep('TargetEnvironment'); } selectCluster(cluster?: Cluster): void { diff --git a/src/app/launcher/import-app/gitprovider-importapp-step/gitprovider-importapp-step.component.ts b/src/app/launcher/import-app/gitprovider-importapp-step/gitprovider-importapp-step.component.ts index 827b6cbe..2f12b2a9 100644 --- a/src/app/launcher/import-app/gitprovider-importapp-step/gitprovider-importapp-step.component.ts +++ b/src/app/launcher/import-app/gitprovider-importapp-step/gitprovider-importapp-step.component.ts @@ -89,7 +89,7 @@ export class GitproviderImportappStepComponent extends LauncherStep implements A } }) navToNextStep(): void { - this.launcherComponent.navToNextStep(); + this.launcherComponent.navToNextStep('GitProvider'); } /** diff --git a/src/app/launcher/import-app/project-progress-importapp-nextstep/project-progress-importapp-nextstep.component.ts b/src/app/launcher/import-app/project-progress-importapp-nextstep/project-progress-importapp-nextstep.component.ts index 5da219e9..c526305b 100644 --- a/src/app/launcher/import-app/project-progress-importapp-nextstep/project-progress-importapp-nextstep.component.ts +++ b/src/app/launcher/import-app/project-progress-importapp-nextstep/project-progress-importapp-nextstep.component.ts @@ -1,14 +1,4 @@ -import { - Component, - Host, - Input, - OnChanges, - OnDestroy, - OnInit, - SimpleChanges, - ViewEncapsulation -} from '@angular/core'; -import { Subscription } from 'rxjs/Subscription'; +import { Component, Host, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { Progress } from '../../model/progress.model'; import { ProjectProgressService } from '../../service/project-progress.service'; diff --git a/src/app/launcher/import-app/project-summary-importapp-step/project-summary-importapp-step.component.ts b/src/app/launcher/import-app/project-summary-importapp-step/project-summary-importapp-step.component.ts index 2153fff6..653816ec 100644 --- a/src/app/launcher/import-app/project-summary-importapp-step/project-summary-importapp-step.component.ts +++ b/src/app/launcher/import-app/project-summary-importapp-step/project-summary-importapp-step.component.ts @@ -89,7 +89,7 @@ export class ProjectSummaryImportappStepComponent extends LauncherStep implement * Navigate to next step */ navToNextStep(): void { - this.launcherComponent.navToNextStep(); + this.launcherComponent.navToNextStep('ProjectSummary'); } /** diff --git a/src/app/launcher/import-app/release-strategy-importapp-step/release-strategy-importapp-step.component.ts b/src/app/launcher/import-app/release-strategy-importapp-step/release-strategy-importapp-step.component.ts index 6ae5e066..df5c48d4 100644 --- a/src/app/launcher/import-app/release-strategy-importapp-step/release-strategy-importapp-step.component.ts +++ b/src/app/launcher/import-app/release-strategy-importapp-step/release-strategy-importapp-step.component.ts @@ -200,7 +200,7 @@ export class ReleaseStrategyImportappStepComponent extends LauncherStep implemen } }) navToNextStep(): void { - this.launcherComponent.navToNextStep(); + this.launcherComponent.navToNextStep('ReleaseStrategy'); } updatePipelineSelection(pipeline: Pipeline): void { diff --git a/src/app/launcher/launcher.component.ts b/src/app/launcher/launcher.component.ts index aef144f4..21858a78 100644 --- a/src/app/launcher/launcher.component.ts +++ b/src/app/launcher/launcher.component.ts @@ -250,14 +250,14 @@ export class LauncherComponent implements AfterViewInit, OnInit { /** * Navigate to next step */ - navToNextStep(): void { + navToNextStep(fromStepId: string = this.selectedSection): void { let summaryStep = this.getStep('ProjectSummary'); if (summaryStep !== undefined && summaryStep.completed === true) { this.summaryCompleted = true; return; } setTimeout(() => { - this.stepIndicator.navToNextStep(); + this.stepIndicator.navToNextStep(fromStepId); }, 10); } diff --git a/src/app/launcher/step-indicator/step-indicator.component.ts b/src/app/launcher/step-indicator/step-indicator.component.ts index 651c98be..ffe5ef3c 100644 --- a/src/app/launcher/step-indicator/step-indicator.component.ts +++ b/src/app/launcher/step-indicator/step-indicator.component.ts @@ -39,9 +39,9 @@ export class StepIndicatorComponent implements OnInit { /** * Navigate to next step */ - navToNextStep(): void { + navToNextStep(fromStepId?: string): void { let steps = this.launcherComponent.steps.filter(step => !step.hidden); - const index = steps.findIndex(step => step.id === this.launcherComponent.selectedSection); + const index = steps.findIndex(step => step.id === fromStepId); this.navToStep(steps[index + 1].id); }