Skip to content
This repository has been archived by the owner on Jul 23, 2019. It is now read-only.

Commit

Permalink
fix(improvement): Get rid of a api call to get booster (#314)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jyasveer Gotta authored and edewit committed Jul 3, 2018
1 parent e5bb5c5 commit 45231c1
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 50 deletions.
1 change: 0 additions & 1 deletion index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export { TargetEnvironment } from './src/app/launcher/model/target-environment.m
// Launcher services
export { ClusterService } from './src/app/launcher/service/cluster.service';
export { DependencyCheckService } from './src/app/launcher/service/dependency-check.service';
export { DependencyEditorService } from './src/app/launcher/service/dependency-editor.service';
export { GitProviderService } from './src/app/launcher/service/git-provider.service';
export { MissionRuntimeService } from './src/app/launcher/service/mission-runtime.service';
export { PipelineService } from './src/app/launcher/service/pipeline.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ import { DependencyEditorModule, URLProvider, DependencyEditorTokenProvider }

import { DependencyCheck } from '../../launcher.module';
import { DependencyCheckService } from '../../service/dependency-check.service';
import { DependencyEditorService } from '../../service/dependency-editor.service';
import { DependencyEditorCreateappStepComponent } from './dependency-editor-step.component';
import { LauncherComponent } from '../../launcher.component';
import { LauncherStep } from '../../launcher-step';
import { DemoDependencyEditorService } from '../../../../demo/service/demo-dependency-editor.service';
import { HelperService } from '../../service/helper.service';
import { TokenProvider } from '../../../../app/service/token-provider';

Expand Down Expand Up @@ -93,9 +91,6 @@ describe('DependencyEditorCreateappStepComponent', () => {
{
provide: DependencyCheckService, useValue: mockDependencyCheckService
},
{
provide: DependencyEditorService, useClass: DemoDependencyEditorService
},
{ provide: HelperService, useValue: mockHelperService },
{
provide: LauncherComponent, useValue: mockWizardComponent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import { FormsModule } from '@angular/forms';
import { Subscription } from 'rxjs/Subscription';

import { DependencyEditorService } from '../../service/dependency-editor.service';
import { DependencyCheckService } from '../../service/dependency-check.service';
import { Selection } from '../../model/selection.model';
import { LauncherComponent } from '../../launcher.component';
Expand Down Expand Up @@ -40,7 +39,6 @@ export class DependencyEditorCreateappStepComponent extends LauncherStep impleme
private subscriptions: Subscription[] = [];
constructor(
@Host() public launcherComponent: LauncherComponent,
@Optional() private depEditorService: DependencyEditorService,
private dependencyCheckService: DependencyCheckService,
private keyValueDiffers: KeyValueDiffers
) {
Expand Down Expand Up @@ -192,16 +190,14 @@ export class DependencyEditorCreateappStepComponent extends LauncherStep impleme
let runtime: string = this.cacheInfo['runtime'].id;
let runtimeVersion: string = this.cacheInfo['runtime'].version;
this.boosterInfo = this.cacheInfo;
if ( this.depEditorService) {
let service = this.depEditorService.getBoosterInfo(mission, runtime, runtimeVersion);
if (service) {
service.subscribe((response: any) => {
if (response && response.gitRepo && response.gitRef) {
this.github = response.gitRepo;
this.gitref = response.gitRef;
}
});
}
const missionObj = <any>this.launcherComponent.summary.mission;
if (missionObj && missionObj['boosters'] && missionObj['boosters'].length) {
missionObj['boosters'].forEach((booster: any) => {
if (mission === booster.mission.id && runtime === booster.runtime.id) {
this.github = booster.source.git.url;
this.gitref = booster.source.git.ref;
}
});
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/app/launcher/launcher.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ export { TargetEnvironment } from './model/target-environment.model';

// Services
export { ClusterService } from './service/cluster.service';
export { DependencyEditorService } from './service/dependency-editor.service';
export { DependencyCheckService } from './service/dependency-check.service';
export { GitProviderService } from './service/git-provider.service';
export { MissionRuntimeService } from './service/mission-runtime.service';
Expand Down
1 change: 1 addition & 0 deletions src/app/launcher/model/catalog.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export class CatalogBooster {
name: string;
description?: string;
metadata?: any;
source?: any;
}

export class Catalog {
Expand Down
16 changes: 0 additions & 16 deletions src/app/launcher/service/dependency-editor.service.ts

This file was deleted.

1 change: 1 addition & 0 deletions src/app/launcher/service/mission-runtime.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export abstract class MissionRuntimeService {
metadata: b.metadata,
mission: mission,
runtime: runtime,
source: b.source,
version: runtime.versions.find(v => v.id === b.version)
};
});
Expand Down
3 changes: 0 additions & 3 deletions src/demo/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { ImportAppComponent } from './import-app/import-app.component';
import { WelcomeComponent } from './welcome/welcome.component';

import { DemoDependencyCheckService } from './service/demo-dependency-check.service';
import { DemoDependencyEditorService } from './service/demo-dependency-editor.service';
import { DemoGitProviderService } from './service/demo-git-provider.service';
import { DemoMissionRuntimeService } from './service/demo-mission-runtime.service';
import { DemoPipelineService } from './service/demo-pipeline.service';
Expand All @@ -41,7 +40,6 @@ import { HelperService } from '../app/launcher/service/helper.service';

import {
DependencyCheckService,
DependencyEditorService,
GitProviderService,
LauncherModule,
MissionRuntimeService,
Expand Down Expand Up @@ -74,7 +72,6 @@ import {
Broadcaster,
HelperService,
{ provide: DependencyCheckService, useClass: DemoDependencyCheckService},
{ provide: DependencyEditorService, useClass: DemoDependencyEditorService},
{ provide: GitProviderService, useClass: DemoGitProviderService},
{ provide: MissionRuntimeService, useClass: DemoMissionRuntimeService },
{ provide: PipelineService, useClass: DemoPipelineService },
Expand Down
12 changes: 0 additions & 12 deletions src/demo/service/demo-dependency-editor.service.ts

This file was deleted.

0 comments on commit 45231c1

Please sign in to comment.