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

Commit

Permalink
fix: make Broadcaster provided by container app
Browse files Browse the repository at this point in the history
BREAKING-CHANGE:
- Broadcaster need to be provided by container app (demo, frontend, fabric8-ui)
  • Loading branch information
ia3andy committed Jun 6, 2018
1 parent b04865b commit c7800d8
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 35 deletions.
55 changes: 20 additions & 35 deletions src/app/launcher/launcher.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,42 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { ModalModule } from 'ngx-modal';

import { DependencyEditorModule, URLProvider, DependencyEditorTokenProvider }
from 'fabric8-analytics-dependency-editor';
import {
DependencyEditorModule,
DependencyEditorTokenProvider,
URLProvider
} from 'fabric8-analytics-dependency-editor';
import { BsDropdownConfig, BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { PopoverModule } from 'ngx-bootstrap/popover';
import { TypeaheadModule } from 'ngx-bootstrap/typeahead';

import { PipeModule } from 'patternfly-ng/pipe';
import { ToolbarModule } from 'patternfly-ng/toolbar';

// Note: This has to be imported first
import { StepIndicatorComponent } from './step-indicator/step-indicator.component';
import { CancelOverlayComponent } from './cancel-overlay/cancel-overlay.component';

import { ActivateBoosterCreateappNextstepComponent }
from './create-app/activate-booster-createapp-nextstep/activate-booster-createapp-nextstep.component';
import { DependencyEditorCreateappStepComponent }
from './create-app/dependency-editor-step/dependency-editor-step.component';
import { GitproviderCreateappStepComponent }
from './create-app/gitprovider-createapp-step/gitprovider-createapp-step.component';
import { MissionRuntimeCreateappStepComponent }
from './create-app/mission-runtime-createapp-step/mission-runtime-createapp-step.component';
import { ProjectProgressCreateappNextstepComponent }
from './create-app/project-progress-createapp-nextstep/project-progress-createapp-nextstep.component';
import { ProjectSummaryCreateappStepComponent }
from './create-app/project-summary-createapp-step/project-summary-createapp-step.component';
import { ReleaseStrategyCreateappStepComponent }
from './create-app/release-strategy-createapp-step/release-strategy-createapp-step.component';
import { TargetEnvironmentCreateappStepComponent }
from './create-app/targetenvironment-createapp-step/target-environment-createapp-step.component';
import { LinkAccountsCreateappStepComponent }
from './create-app/link-accounts-createapp-step/link-accounts-createapp-step.component';
import { ActivateBoosterCreateappNextstepComponent } from './create-app/activate-booster-createapp-nextstep/activate-booster-createapp-nextstep.component';
import { DependencyEditorCreateappStepComponent } from './create-app/dependency-editor-step/dependency-editor-step.component';
import { GitproviderCreateappStepComponent } from './create-app/gitprovider-createapp-step/gitprovider-createapp-step.component';
import { MissionRuntimeCreateappStepComponent } from './create-app/mission-runtime-createapp-step/mission-runtime-createapp-step.component';
import { ProjectProgressCreateappNextstepComponent } from './create-app/project-progress-createapp-nextstep/project-progress-createapp-nextstep.component';
import { ProjectSummaryCreateappStepComponent } from './create-app/project-summary-createapp-step/project-summary-createapp-step.component';
import { ReleaseStrategyCreateappStepComponent } from './create-app/release-strategy-createapp-step/release-strategy-createapp-step.component';
import { TargetEnvironmentCreateappStepComponent } from './create-app/targetenvironment-createapp-step/target-environment-createapp-step.component';
import { LinkAccountsCreateappStepComponent } from './create-app/link-accounts-createapp-step/link-accounts-createapp-step.component';

import { GitproviderImportappStepComponent }
from './import-app/gitprovider-importapp-step/gitprovider-importapp-step.component';
import { ProjectProgressImportappNextstepComponent }
from './import-app/project-progress-importapp-nextstep/project-progress-importapp-nextstep.component';
import { ProjectSummaryImportappStepComponent }
from './import-app/project-summary-importapp-step/project-summary-importapp-step.component';
import { ReleaseStrategyImportappStepComponent }
from './import-app/release-strategy-importapp-step/release-strategy-importapp-step.component';
import { ToastNotificationComponent} from './toast-notification/toast-notification.component';
import { GitproviderImportappStepComponent } from './import-app/gitprovider-importapp-step/gitprovider-importapp-step.component';
import { ProjectProgressImportappNextstepComponent } from './import-app/project-progress-importapp-nextstep/project-progress-importapp-nextstep.component';
import { ProjectSummaryImportappStepComponent } from './import-app/project-summary-importapp-step/project-summary-importapp-step.component';
import { ReleaseStrategyImportappStepComponent } from './import-app/release-strategy-importapp-step/release-strategy-importapp-step.component';
import { ToastNotificationComponent } from './toast-notification/toast-notification.component';

import { InViewportModule, WindowRef } from '@thisissoon/angular-inviewport';
import { MissionRuntimeService } from './service/mission-runtime.service';
import { ProjectProgressService } from './service/project-progress.service';

import { LauncherComponent } from './launcher.component';
import { from } from 'rxjs/observable/from';

import { Broadcaster } from 'ngx-base';

// Provide window object so as to not break SSR if using universal
export const providers: Provider[] = [
Expand Down Expand Up @@ -95,8 +81,7 @@ export const providers: Provider[] = [
LauncherComponent
],
providers: [
BsDropdownConfig,
Broadcaster
BsDropdownConfig
]
})
export class LauncherModule {
Expand Down
2 changes: 2 additions & 0 deletions src/demo/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import {
TargetEnvironmentService,
TokenService
} from '../app/launcher/launcher.module';
import { Broadcaster } from 'ngx-base';

@NgModule({
imports: [
Expand All @@ -74,6 +75,7 @@ import {
],
providers: [
HelperService,
Broadcaster,
{ provide: DependencyCheckService, useClass: DemoDependencyCheckService},
{ provide: DependencyEditorService, useClass: DemoDependencyEditorService},
{ provide: GitProviderService, useClass: DemoGitProviderService},
Expand Down

0 comments on commit c7800d8

Please sign in to comment.