fix(telemetry): Added code for telemetry (#273)

fabric8-launcher · Jun 12, 2018 · a116add · a116add
1 parent 6371daf
commit a116add
Show file tree

Hide file tree

Showing 20 changed files with 243 additions and 153 deletions.
diff --git a/index.ts b/index.ts
@@ -30,6 +30,7 @@ export { AuthHelperService } from './src/app/launcher/service/auth-provider.serv
 export { HelperService } from './src/app/launcher/service/helper.service';
 export { TokenProvider } from './src/app/service/token-provider';
 export { Config } from './src/app/service/config.component';
+export { BroadcastService } from './src/app/launcher/service/broadcast.service';
 
 // Imported from Dependency Editor
 export { URLProvider, DependencyEditorTokenProvider } from './src/app/launcher/launcher.module';
diff --git a/package.json b/package.json
@@ -70,11 +70,11 @@
     "@thisissoon/angular-inviewport": "^1.3.2",
     "angular-2-dropdown-multiselect": "^1.6.0",
     "fabric8-analytics-dependency-editor": "^0.0.25",
+    "lodash": "^4.17.10",
     "ngx-bootstrap": "^1.9.3",
     "ngx-modal": "^0.0.29",
     "patternfly": "^3.30.1",
-    "patternfly-ng": "^3.1.3",
-    "lodash": "^4.17.10"
+    "patternfly-ng": "^3.1.3"
   },
   "peerDependencies": {
     "@angular/animations": "^4.4.6",

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
@@ -22,6 +22,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 { BroadcastService } from '../../service/broadcast.service';
 
 let mockHelperService = {
   getBackendUrl(): string {
@@ -108,7 +109,8 @@ describe('DependencyEditorCreateappStepComponent', () => {
         },
         {
           provide: WindowRef, useValue: window
-        }
+        },
+        BroadcastService
       ]
     }).compileComponents();
   }));

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,6 +11,7 @@ import {
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { Subscription } from 'rxjs/Subscription';
+import { BroadcastService } from '../../service/broadcast.service';
 
 import { DependencyEditorService } from '../../service/dependency-editor.service';
 import { DependencyCheckService } from '../../service/dependency-check.service';
@@ -41,7 +42,8 @@ export class DependencyEditorCreateappStepComponent extends LauncherStep impleme
         @Host() public launcherComponent: LauncherComponent,
         @Optional() private depEditorService: DependencyEditorService,
         private dependencyCheckService: DependencyCheckService,
-        private keyValueDiffers: KeyValueDiffers
+        private keyValueDiffers: KeyValueDiffers,
+        private broadcaster: BroadcastService
     ) {
         super();
         if (this.launcherComponent.summary) {
@@ -98,6 +100,9 @@ export class DependencyEditorCreateappStepComponent extends LauncherStep impleme
     // Steps
     navToNextStep(): void {
         this.launcherComponent.navToNextStep();
+        this.broadcaster.broadcast('completeDependencyEditorStep', {
+            dependencySnapshot: this.launcherComponent.summary.dependencyEditor.dependencySnapshot
+        });
     }
 
     /**

diff --git a/...uncher/create-app/gitprovider-createapp-step/gitprovider-createapp-step.component.spec.ts b/...uncher/create-app/gitprovider-createapp-step/gitprovider-createapp-step.component.spec.ts
@@ -20,6 +20,7 @@ import { GitproviderCreateappStepComponent } from './gitprovider-createapp-step.
 import { GitProviderService } from '../../service/git-provider.service';
 
 import { GitHubDetails } from '../../model/github-details.model';
+import { BroadcastService } from '../../service/broadcast.service';
 
 let mockDependencyCheckService = {
   getDependencyCheck(): Observable<DependencyCheck> {
@@ -114,6 +115,7 @@ describe('GitProviderStepComponent', () => {
         GitproviderCreateappStepComponent
       ],
       providers: [
+        BroadcastService,
         {
           provide: DependencyCheckService, useValue: mockDependencyCheckService
         },

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,6 +9,7 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
+import { BroadcastService } from '../../service/broadcast.service';
 
 import { DependencyCheckService } from '../../service/dependency-check.service';
 import { GitProviderService } from '../../service/git-provider.service';
@@ -31,7 +32,8 @@ export class GitproviderCreateappStepComponent extends LauncherStep implements A
 
   constructor(@Host() public launcherComponent: LauncherComponent,
               private dependencyCheckService: DependencyCheckService,
-              private gitProviderService: GitProviderService) {
+              private gitProviderService: GitProviderService,
+              private broadcaster: BroadcastService) {
     super();
   }
 
@@ -111,6 +113,11 @@ export class GitproviderCreateappStepComponent extends LauncherStep implements A
    */
   navToNextStep(): void {
     this.launcherComponent.navToNextStep();
+    this.broadcaster.broadcast('completeGitProviderStep_Create', {
+      location: this.launcherComponent.summary.gitHubDetails.organization,
+      username: this.launcherComponent.summary.gitHubDetails.login,
+      repository: this.launcherComponent.summary.gitHubDetails.repository
+    });
   }
 
   /**

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
@@ -120,6 +120,10 @@ export class MissionRuntimeCreateappStepComponent extends LauncherStep implement
    */
   navToNextStep(): void {
     this.launcherComponent.navToNextStep();
+    this.broadcaster.broadcast('completeMissionRuntimeStep', {
+      mission: this.launcherComponent.summary.mission.name,
+      runtime: this.launcherComponent.summary.runtime.name
+    });
   }
 
   /**

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
@@ -23,6 +23,7 @@ import { ProjectSummaryService } from '../../service/project-summary.service';
 import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
 import { Summary } from '../../launcher.module';
+import { BroadcastService } from '../../service/broadcast.service';
 
 @Component({
   selector: 'fab-toast-notification',
@@ -107,6 +108,7 @@ describe('ProjectSummaryStepComponent', () => {
         FakeToastNotificationComponent
       ],
       providers : [
+        BroadcastService,
         {
           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
@@ -19,6 +19,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 { BroadcastService } from '../../service/broadcast.service';
 
 @Component({
   encapsulation: ViewEncapsulation.None,
@@ -38,7 +39,8 @@ export class ProjectSummaryCreateappStepComponent extends LauncherStep implement
   constructor(@Host() public launcherComponent: LauncherComponent,
               private dependencyCheckService: DependencyCheckService,
               private projectSummaryService: ProjectSummaryService,
-              public _DomSanitizer: DomSanitizer) {
+              public _DomSanitizer: DomSanitizer,
+              private broadcaster: BroadcastService) {
     super();
   }
 
@@ -136,6 +138,18 @@ export class ProjectSummaryCreateappStepComponent extends LauncherStep implement
         console.log('error in setup: Create', error);
       })
     );
+    this.broadcaster.broadcast('completeSummaryStep_Create', {
+      mission: this.launcherComponent.summary.mission.name,
+      runtime: this.launcherComponent.summary.pipeline.name,
+      dependencySnapshot: this.launcherComponent.summary.dependencyEditor.dependencySnapshot,
+      pipeline: this.launcherComponent.summary.pipeline.name,
+      application: this.launcherComponent.summary.dependencyCheck,
+      gitHubDetails: {
+        location: this.launcherComponent.summary.gitHubDetails.organization,
+        username: this.launcherComponent.summary.gitHubDetails.login,
+        repository: this.launcherComponent.summary.gitHubDetails.repository
+      }
+    });
   }
 
   /**

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
@@ -24,6 +24,7 @@ import { Pipeline } from '../../model/pipeline.model';
 import { ReleaseStrategyCreateappStepComponent } from './release-strategy-createapp-step.component';
 import { Selection } from '../../model/selection.model';
 import { Summary } from '../../model/summary.model';
+import { BroadcastService } from '../../service/broadcast.service';
 
 @Component({
   selector: 'pfng-toolbar',
@@ -131,6 +132,7 @@ describe('ReleaseStrategyStepComponent', () => {
         FakePfngToolbarComponent
       ],
       providers : [
+        BroadcastService,
         {
           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,6 +6,7 @@ import {
   OnInit,
   ViewEncapsulation } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
+import { BroadcastService } from '../../service/broadcast.service';
 
 import { PipelineService } from '../../service/pipeline.service';
 import { Pipeline } from '../../model/pipeline.model';
@@ -28,7 +29,8 @@ export class ReleaseStrategyCreateappStepComponent extends LauncherStep implemen
   private subscriptions: Subscription[] = [];
 
   constructor(@Host() public launcherComponent: LauncherComponent,
-              private pipelineService: PipelineService) {
+              private pipelineService: PipelineService,
+              private broadcaster: BroadcastService) {
     super();
   }
 
@@ -92,6 +94,9 @@ export class ReleaseStrategyCreateappStepComponent extends LauncherStep implemen
 
   navToNextStep(): void {
     this.launcherComponent.navToNextStep();
+    this.broadcaster.broadcast('completePipelineStep_Create', {
+      pipeline: this.launcherComponent.summary.pipeline.name
+    });
   }
 
   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
@@ -19,6 +19,7 @@ import { GitproviderImportappStepComponent } from './gitprovider-importapp-step.
 import { GitProviderService } from '../../service/git-provider.service';
 
 import { GitHubDetails } from '../../model/github-details.model';
+import { BroadcastService } from '../../service/broadcast.service';
 
 let mockDependencyCheckService = {
   getDependencyCheck(): Observable<DependencyCheck> {
@@ -112,6 +113,7 @@ describe('Import GitProviderStepComponent', () => {
         GitproviderImportappStepComponent
       ],
       providers: [
+        BroadcastService,
         {
           provide: DependencyCheckService, useValue: mockDependencyCheckService
         },

diff --git a/...pp/launcher/import-app/gitprovider-importapp-step/gitprovider-importapp-step.component.ts b/...pp/launcher/import-app/gitprovider-importapp-step/gitprovider-importapp-step.component.ts
@@ -9,6 +9,7 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 import { Subscription } from 'rxjs/Subscription';
+import { BroadcastService } from '../../service/broadcast.service';
 
 import { DependencyCheckService } from '../../service/dependency-check.service';
 import { GitProviderService } from '../../service/git-provider.service';
@@ -30,7 +31,8 @@ export class GitproviderImportappStepComponent extends LauncherStep implements A
 
   constructor(@Host() public launcherComponent: LauncherComponent,
               private dependencyCheckService: DependencyCheckService,
-              private gitProviderService: GitProviderService) {
+              private gitProviderService: GitProviderService,
+              private broadcaster: BroadcastService) {
     super();
   }
 
@@ -103,6 +105,11 @@ export class GitproviderImportappStepComponent extends LauncherStep implements A
    */
   navToNextStep(): void {
     this.launcherComponent.navToNextStep();
+    this.broadcaster.broadcast('completeGitProviderStep_Import', {
+      location: this.launcherComponent.summary.gitHubDetails.organization,
+      username: this.launcherComponent.summary.gitHubDetails.login,
+      repository: this.launcherComponent.summary.gitHubDetails.repository
+    });
   }
 
   /**

diff --git a/...mport-app/project-summary-importapp-step/project-summary-importapp-step.component.spec.ts b/...mport-app/project-summary-importapp-step/project-summary-importapp-step.component.spec.ts
@@ -21,6 +21,7 @@ import { ProjectSummaryService } from '../../service/project-summary.service';
 import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
 import { Summary } from '../../launcher.module';
+import { BroadcastService } from '../../service/broadcast.service';
 
 @Component({
   selector: 'fab-toast-notification',
@@ -105,6 +106,7 @@ describe('Import ProjectSummaryStepComponent', () => {
         FakeToastNotificationComponent
       ],
       providers : [
+        BroadcastService,
         {
           provide: ProjectSummaryService, useValue: mockProjectSummaryService
         },

diff --git a/...her/import-app/project-summary-importapp-step/project-summary-importapp-step.component.ts b/...her/import-app/project-summary-importapp-step/project-summary-importapp-step.component.ts
@@ -10,6 +10,7 @@ import { Subscription } from 'rxjs/Subscription';
 import { DomSanitizer } from '@angular/platform-browser';
 
 import { defaults } from 'lodash';
+import { BroadcastService } from '../../service/broadcast.service';
 
 import { Pipeline } from '../../model/pipeline.model';
 import { DependencyCheckService } from '../../service/dependency-check.service';
@@ -37,7 +38,8 @@ export class ProjectSummaryImportappStepComponent extends LauncherStep implement
   constructor(@Host() public launcherComponent: LauncherComponent,
               private dependencyCheckService: DependencyCheckService,
               private projectSummaryService: ProjectSummaryService,
-              public _DomSanitizer: DomSanitizer) {
+              public _DomSanitizer: DomSanitizer,
+              private broadcaster: BroadcastService) {
     super();
   }
 
@@ -110,6 +112,15 @@ export class ProjectSummaryImportappStepComponent extends LauncherStep implement
   navToNextStep(): void {
     this.completed = this.stepCompleted;
     this.launcherComponent.navToNextStep();
+    this.broadcaster.broadcast('completeSummaryStep_Import', {
+      pipeline: this.launcherComponent.summary.pipeline.name,
+      application: this.launcherComponent.summary.dependencyCheck,
+      gitHubDetails: {
+        location: this.launcherComponent.summary.gitHubDetails.organization,
+        username: this.launcherComponent.summary.gitHubDetails.login,
+        repository: this.launcherComponent.summary.gitHubDetails.repository
+      }
+    });
   }
 
   /**
@@ -140,6 +151,15 @@ export class ProjectSummaryImportappStepComponent extends LauncherStep implement
           console.log('error in setup: Import', error);
         })
     );
+    this.broadcaster.broadcast('completeSummaryStep_Create', {
+      pipeline: this.launcherComponent.summary.pipeline.name,
+      application: this.launcherComponent.summary.dependencyCheck,
+      gitHubDetails: {
+        location: this.launcherComponent.summary.gitHubDetails.organization,
+        username: this.launcherComponent.summary.gitHubDetails.login,
+        repository: this.launcherComponent.summary.gitHubDetails.repository
+      }
+    });
   }
 
   /**