fix(decorator): added decorator as a aop feauture to broadcast events

fabric8-launcher · Jun 19, 2018 · 6146baf · 6146baf
1 parent 1cdee2f
commit 6146baf
Show file tree

Hide file tree

Showing 23 changed files with 133 additions and 121 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,6 +71,7 @@
     "angular-2-dropdown-multiselect": "^1.6.0",
     "fabric8-analytics-dependency-editor": "^0.0.25",
     "lodash": "^4.17.10",
+    "ngx-base": "^2.3.2",
     "ngx-bootstrap": "^2.0.5",
     "ngx-modal": "^0.0.29",
     "patternfly": "^3.30.1",

diff --git a/src/app/launcher/create-app/dependency-editor-step/dependency-editor-step.component.spec.ts b/src/app/launcher/create-app/dependency-editor-step/dependency-editor-step.component.spec.ts
@@ -8,7 +8,6 @@ import { Observable } from 'rxjs';
 import { InViewportModule, WindowRef } from '@thisissoon/angular-inviewport';
 import { DependencyEditorModule,  URLProvider, DependencyEditorTokenProvider }
   from 'fabric8-analytics-dependency-editor';
-import { Broadcaster } from 'ngx-base';
 
 import { DependencyCheck } from '../../launcher.module';
 import { DependencyCheckService } from '../../service/dependency-check.service';
@@ -20,6 +19,7 @@ import { Summary } from '../../launcher.module';
 import { DemoDependencyEditorService } from '../../../../demo/service/demo-dependency-editor.service';
 import { HelperService } from '../../service/helper.service';
 import { TokenProvider } from '../../../../app/service/token-provider';
+import { broadcast } from '../../shared/telemetry.decorator';
 
 let mockHelperService = {
   getBackendUrl(): string {
@@ -106,8 +106,7 @@ describe('DependencyEditorCreateappStepComponent', () => {
         },
         {
           provide: WindowRef, useValue: window
-        },
-        Broadcaster
+        }
       ]
     }).compileComponents();
   }));
@@ -118,7 +117,7 @@ describe('DependencyEditorCreateappStepComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create', () => {
+  fit('should create', () => {
     expect(component).toBeTruthy();
   });
 });
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
@@ -11,16 +11,15 @@ import {
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { Subscription } from 'rxjs/Subscription';
-import { get } from 'lodash';
 
-import { Broadcaster } from 'ngx-base';
 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';
 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({
     encapsulation: ViewEncapsulation.None,
@@ -43,8 +42,7 @@ export class DependencyEditorCreateappStepComponent extends LauncherStep impleme
         @Host() public launcherComponent: LauncherComponent,
         @Optional() private depEditorService: DependencyEditorService,
         private dependencyCheckService: DependencyCheckService,
-        private keyValueDiffers: KeyValueDiffers,
-        private broadcaster: Broadcaster
+        private keyValueDiffers: KeyValueDiffers
     ) {
         super();
         if (this.launcherComponent.summary) {
@@ -99,11 +97,13 @@ export class DependencyEditorCreateappStepComponent extends LauncherStep impleme
      * @returns {TargetEnvironment[]} The target environments to display
      */
     // Steps
+    @broadcast('completeDependencyEditorStep', {
+        'launcherComponent.summary.dependencyEditor': {
+            dependencySnapshot: 'dependencySnapshot'
+        }
+    })
     navToNextStep(): void {
         this.launcherComponent.navToNextStep();
-        this.broadcaster.broadcast('completeDependencyEditorStep', {
-            dependencySnapshot: get(this.launcherComponent.summary, 'dependencyEditor.dependencySnapshot', [])
-        });
     }
 
     /**
@@ -176,8 +176,11 @@ export class DependencyEditorCreateappStepComponent extends LauncherStep impleme
             // If runtime is selected first, version of runtime will be null. This updates that.
             let missionsArrFromRuntime: Array<any> = this.cacheInfo['runtime'] && this.cacheInfo['runtime']['missions'];
             if (missionsArrFromRuntime && missionsArrFromRuntime.length) {
-                let filteredMission = missionsArrFromRuntime.filter((mission) => mission.id === this.cacheInfo['mission']['id'])[0];
-                this.cacheInfo['runtime']['version'] = filteredMission && filteredMission.versions && filteredMission.versions[0] && filteredMission.versions[0].id || null;
+                let filteredMission =
+                    missionsArrFromRuntime.filter((mission) => mission.id === this.cacheInfo['mission']['id'])[0];
+                this.cacheInfo['runtime']['version'] =
+                    filteredMission && filteredMission.versions && filteredMission.versions[0]
+                        && filteredMission.versions[0].id || null;
             }
             flag = true;
         }

diff --git a/...pp/launcher/create-app/gitprovider-createapp-step/gitprovider-createapp-step.component.ts b/...pp/launcher/create-app/gitprovider-createapp-step/gitprovider-createapp-step.component.ts
@@ -9,14 +9,13 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
-import { Broadcaster } from 'ngx-base';
-import { get } from 'lodash';
 
 import { DependencyCheckService } from '../../service/dependency-check.service';
 import { GitProviderService } from '../../service/git-provider.service';
 import { Selection } from '../../model/selection.model';
 import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
+import { broadcast } from '../../shared/telemetry.decorator';
 
 @Component({
   encapsulation: ViewEncapsulation.None,
@@ -33,8 +32,7 @@ export class GitproviderCreateappStepComponent extends LauncherStep implements A
 
   constructor(@Host() public launcherComponent: LauncherComponent,
               private dependencyCheckService: DependencyCheckService,
-              private gitProviderService: GitProviderService,
-              private broadcaster: Broadcaster) {
+              private gitProviderService: GitProviderService) {
     super();
   }
 
@@ -112,14 +110,16 @@ export class GitproviderCreateappStepComponent extends LauncherStep implements A
   /**
    * Navigate to next step
    */
+  @broadcast('completeGitProviderStep_Create', {
+    'launcherComponent.summary.gitHubDetails': {
+      location: 'organization',
+      username: 'login',
+      repository: 'repository'
+    }
+  })
   navToNextStep(): void {
     this.launcherComponent.navToNextStep();
     const summary = this.launcherComponent.summary;
-    this.broadcaster.broadcast('completeGitProviderStep_Create', {
-      location: get(summary, 'gitHubDetails.organization', null),
-      username: get(summary, 'gitHubDetails.login', null),
-      repository: get(summary, 'gitHubDetails.repository', null)
-    });
   }
 
   /**

diff --git a/...her/create-app/mission-runtime-createapp-step/mission-runtime-createapp-step.component.ts b/...her/create-app/mission-runtime-createapp-step/mission-runtime-createapp-step.component.ts
@@ -17,6 +17,7 @@ import {
   ViewMission,
   ViewRuntime
 } from './mission-runtime-createapp-step.model';
+import { broadcast } from '../../shared/telemetry.decorator';
 
 
 @Component({
@@ -118,13 +119,15 @@ export class MissionRuntimeCreateappStepComponent extends LauncherStep implement
   /**
    * Navigate to next step
    */
+  @broadcast('completeMissionRuntimeStep', {
+    'launcherComponent.summary': {
+      mission: 'misson.name',
+      runtime: 'runtime.name'
+    }
+  })
   navToNextStep(): void {
     this.launcherComponent.navToNextStep();
     const summary = this.launcherComponent.summary;
-    this.broadcaster.broadcast('completeMissionRuntimeStep', {
-      mission: _.get(summary, 'mission.name', null),
-      runtime: _.get(summary, 'runtime.name', null)
-    });
   }
 
   /**

diff --git a/...reate-app/project-summary-createapp-step/project-summary-createapp-step.component.spec.ts b/...reate-app/project-summary-createapp-step/project-summary-createapp-step.component.spec.ts
@@ -15,7 +15,6 @@ import { DomSanitizer } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Observable } from 'rxjs';
 import { InViewportModule, WindowRef } from '@thisissoon/angular-inviewport';
-import { Broadcaster } from 'ngx-base';
 
 import { DependencyCheck } from '../../launcher.module';
 import { DependencyCheckService } from '../../service/dependency-check.service';
@@ -108,7 +107,6 @@ describe('ProjectSummaryStepComponent', () => {
         FakeToastNotificationComponent
       ],
       providers : [
-        Broadcaster,
         {
           provide: ProjectSummaryService, useValue: mockProjectSummaryService
         },

diff --git a/...her/create-app/project-summary-createapp-step/project-summary-createapp-step.component.ts b/...her/create-app/project-summary-createapp-step/project-summary-createapp-step.component.ts
@@ -8,9 +8,7 @@ import {
 } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
 import { DomSanitizer } from '@angular/platform-browser';
-
-import { defaults, get } from 'lodash';
-import { Broadcaster } from 'ngx-base';
+import { defaults } from 'lodash';
 
 import { Pipeline } from '../../model/pipeline.model';
 import { DependencyCheckService } from '../../service/dependency-check.service';
@@ -20,6 +18,7 @@ import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
 import { DependencyCheck } from '../../model/dependency-check.model';
 import { Summary } from '../../model/summary.model';
+import { broadcast } from '../../shared/telemetry.decorator';
 
 @Component({
   encapsulation: ViewEncapsulation.None,
@@ -37,8 +36,7 @@ export class ProjectSummaryCreateappStepComponent extends LauncherStep implement
   constructor(@Host() public launcherComponent: LauncherComponent,
               private dependencyCheckService: DependencyCheckService,
               private projectSummaryService: ProjectSummaryService,
-              public _DomSanitizer: DomSanitizer,
-              private broadcaster: Broadcaster) {
+              public _DomSanitizer: DomSanitizer) {
     super();
   }
 
@@ -109,6 +107,18 @@ export class ProjectSummaryCreateappStepComponent extends LauncherStep implement
   /**
    * Set up this application
    */
+  @broadcast('completeSummaryStep_Create', {
+    'launcherComponent.summary': {
+      mission: 'misson.name',
+      runtime: 'runtime.name',
+      dependencySnapshot: 'dependencyEditor.dependencySnapshot',
+      pipeline: 'pipeline.name',
+      application: 'dependencyCheck',
+      location: 'gitHubDetails.organization',
+      username: 'gitHubDetails.login',
+      repository: 'gitHubDetails.repository'
+    }
+  })
   setup(): void {
     this.subscriptions.push(
       this.projectSummaryService
@@ -125,19 +135,6 @@ export class ProjectSummaryCreateappStepComponent extends LauncherStep implement
         console.log('error in setup: Create', error);
       })
     );
-    const summary = this.launcherComponent.summary;
-    this.broadcaster.broadcast('completeSummaryStep_Create', {
-      mission: get(summary, 'mission.name', null),
-      runtime: get(summary, 'runtime.name', null),
-      dependencySnapshot: get(summary, 'dependencyEditor.dependencySnapshot', null),
-      pipeline: get(summary, 'pipeline.name', null),
-      application: get(summary, 'dependencyCheck', null),
-      gitHubDetails: {
-        location: get(summary, 'gitHubDetails.organization', null),
-        username: get(summary, 'gitHubDetails.login', null),
-        repository: get(summary, 'gitHubDetails.repository', null)
-      }
-    });
   }
 
   /**

diff --git a/...ate-app/release-strategy-createapp-step/release-strategy-createapp-step.component.spec.ts b/...ate-app/release-strategy-createapp-step/release-strategy-createapp-step.component.spec.ts
@@ -16,7 +16,6 @@ import { InViewportModule, WindowRef } from '@thisissoon/angular-inviewport';
 import { FilterEvent } from 'patternfly-ng/filter';
 import { SortArrayPipeModule } from 'patternfly-ng/pipe';
 import { SortEvent } from 'patternfly-ng/sort';
-import { Broadcaster } from 'ngx-base';
 
 import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
@@ -132,7 +131,6 @@ describe('ReleaseStrategyStepComponent', () => {
         FakePfngToolbarComponent
       ],
       providers : [
-        Broadcaster,
         {
           provide: PipelineService, useValue: mockPipelineService
         },

diff --git a/...r/create-app/release-strategy-createapp-step/release-strategy-createapp-step.component.ts b/...r/create-app/release-strategy-createapp-step/release-strategy-createapp-step.component.ts
@@ -6,14 +6,13 @@ import {
   OnInit,
   ViewEncapsulation } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
-import { get } from 'lodash';
-import { Broadcaster } from 'ngx-base';
 
 import { PipelineService } from '../../service/pipeline.service';
 import { Pipeline } from '../../model/pipeline.model';
 import { Selection } from '../../model/selection.model';
 import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
+import { broadcast } from '../../shared/telemetry.decorator';
 
 @Component({
   encapsulation: ViewEncapsulation.None,
@@ -30,8 +29,7 @@ export class ReleaseStrategyCreateappStepComponent extends LauncherStep implemen
   private subscriptions: Subscription[] = [];
 
   constructor(@Host() public launcherComponent: LauncherComponent,
-              private pipelineService: PipelineService,
-              private broadcaster: Broadcaster) {
+              private pipelineService: PipelineService) {
     super();
   }
 
@@ -92,12 +90,13 @@ export class ReleaseStrategyCreateappStepComponent extends LauncherStep implemen
   }
 
   // Steps
-
+  @broadcast('completePipelineStep_Create', {
+    'launcherComponent.summary.pipeline': {
+      pipeline: 'name'
+    }
+  })
   navToNextStep(): void {
     this.launcherComponent.navToNextStep();
-    this.broadcaster.broadcast('completePipelineStep_Create', {
-      pipeline: get(this.launcherComponent.summary, 'pipeline.name', null)
-    });
   }
 
   updatePipelineSelection(pipeline: Pipeline): void {

diff --git a/...uncher/import-app/gitprovider-importapp-step/gitprovider-importapp-step.component.spec.ts b/...uncher/import-app/gitprovider-importapp-step/gitprovider-importapp-step.component.spec.ts
@@ -7,7 +7,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { Observable } from 'rxjs';
 import { InViewportModule, WindowRef } from '@thisissoon/angular-inviewport';
 import { TypeaheadModule } from 'ngx-bootstrap/typeahead';
-import { Broadcaster } from 'ngx-base';
 
 import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
@@ -109,7 +108,6 @@ describe('Import GitProviderStepComponent', () => {
         GitproviderImportappStepComponent
       ],
       providers: [
-        Broadcaster,
         {
           provide: DependencyCheckService, useValue: mockDependencyCheckService
         },