From 3a65c945cb5019222eb0c40de83cc16beffb1bdd Mon Sep 17 00:00:00 2001 From: David Newswanger Date: Thu, 2 Aug 2018 11:41:10 -0400 Subject: [PATCH] Add basic link and button tracking to the most common links. --- galaxyui/src/app/app.component.html | 5 +++-- galaxyui/src/app/app.component.ts | 12 ++++-------- galaxyui/src/app/authors/authors.component.html | 2 +- .../app/authors/detail/author-detail.component.html | 10 +++++----- .../detail-actions/detail-actions.component.ts | 12 +++++++++--- .../src/app/home/carousel/carousel.component.html | 2 +- .../src/app/home/carousel/carousel.component.ts | 7 +++++-- galaxyui/src/app/home/popular/popular.component.ts | 8 +++++++- galaxyui/src/app/login/login.component.html | 2 +- galaxyui/src/app/login/login.module.ts | 5 ++++- .../namespace-list/action/action.component.ts | 10 +++++++--- .../repositories-content/action/action.component.ts | 6 +++++- .../repositories-content.component.html | 8 ++++---- .../namespace-list/namespace-list.component.html | 2 +- .../import-detail/import-detail.component.html | 2 +- .../src/app/search/popular/popular.component.ts | 13 +++++++------ galaxyui/src/app/search/search.component.html | 4 ++-- .../components/clipboard/clipboard.component.html | 2 +- .../page-header/page-header.component.html | 2 +- .../app/shared/directives/log-event.directive.ts | 3 ++- .../src/app/vendors/card/vendor-card.component.ts | 7 +++++-- 21 files changed, 76 insertions(+), 48 deletions(-) diff --git a/galaxyui/src/app/app.component.html b/galaxyui/src/app/app.component.html index 559ff5c78..5b588a631 100644 --- a/galaxyui/src/app/app.component.html +++ b/galaxyui/src/app/app.component.html @@ -8,7 +8,8 @@ [pinnableMenus]="true" [showBadges]="true" [showIcons]="true" - [updateActiveItemsOnClick]="false"> + [updateActiveItemsOnClick]="false" + (onItemClickEvent)='onItemClickEvent($event)'>
  • -  Login +  Login
  • { if (event instanceof NavigationEnd || event instanceof NavigationStart) { @@ -213,13 +215,7 @@ export class AppComponent implements OnInit { this.removeNavButtons(); } - onItemClicked($event: NavigationItemConfig): void { - console.log('item clicked'); - console.log($event); - } - - onNavigation($event: NavigationItemConfig): void { - console.log('navigation started'); - console.log($event); + onItemClickEvent($event: any): void { + this.eventLoggerService.logLink($event.title, $event.url); } } diff --git a/galaxyui/src/app/authors/authors.component.html b/galaxyui/src/app/authors/authors.component.html index 72cfbd072..0a23557ef 100644 --- a/galaxyui/src/app/authors/authors.component.html +++ b/galaxyui/src/app/authors/authors.component.html @@ -34,7 +34,7 @@
    - {{item.name}}
    {{item.description }}
    diff --git a/galaxyui/src/app/authors/detail/author-detail.component.html b/galaxyui/src/app/authors/detail/author-detail.component.html index a016c1e7e..41c5b0373 100644 --- a/galaxyui/src/app/authors/detail/author-detail.component.html +++ b/galaxyui/src/app/authors/detail/author-detail.component.html @@ -19,12 +19,12 @@

    {{ namespace.company }}

    {{ namespace.location }}

    - + {{ namespace.email }}

    - {{ namespace.html_url }} @@ -47,7 +47,7 @@

    - View on GitHub + View on GitHub
    @@ -79,7 +79,7 @@
    - {{ item.name }}
    {{ item.description }}
    @@ -111,7 +111,7 @@
    - +   diff --git a/galaxyui/src/app/authors/detail/detail-actions/detail-actions.component.ts b/galaxyui/src/app/authors/detail/detail-actions/detail-actions.component.ts index f34e89652..accea993d 100644 --- a/galaxyui/src/app/authors/detail/detail-actions/detail-actions.component.ts +++ b/galaxyui/src/app/authors/detail/detail-actions/detail-actions.component.ts @@ -8,7 +8,8 @@ import { Router } from '@angular/router'; import { ActionConfig } from 'patternfly-ng/action/action-config'; -import { Repository } from '../../../resources/repositories/repository'; +import { EventLoggerService } from '../../../resources/logger/event-logger.service'; +import { Repository } from '../../../resources/repositories/repository'; @Component({ selector: 'author-detail-actions', @@ -18,7 +19,8 @@ import { Repository } from '../../../resources/repositories/repository'; export class DetailActionsComponent implements OnInit { constructor( - private router: Router + private router: Router, + private eventLoggerService: EventLoggerService, ) {} _repository: Repository; @@ -45,7 +47,7 @@ export class DetailActionsComponent implements OnInit { title: 'View SCM Repository', tooltip: 'Opens the SCM repository in new browser window or tab' }, { - disabled: (this._repository.issue_tracker_url) ? true : false, + disabled: (!this.repository.issue_tracker_url) ? true : false, id: 'issueLog', title: 'Visit the Issue Log', tooltip: 'Opens the Issue Log in new browser window or tab' @@ -56,13 +58,17 @@ export class DetailActionsComponent implements OnInit { handleAction($event) { switch ($event.id) { case 'more': + const url = `/${ this.repository.summary_fields['namespace']['name'] }/${ this.repository.name }`; + this.eventLoggerService.logLink('View Content', url); this.router.navigate(['/', this.repository.summary_fields['namespace']['name'], this.repository.name]); break; case 'scmView': + this.eventLoggerService.logLink('View SCM Repository', this.repository.external_url); window.open(this.repository.external_url, '_blank'); break; case 'issueLog': + this.eventLoggerService.logLink('Visit the Issue Log', this.repository.issue_tracker_url); window.open(this.repository.issue_tracker_url, '_blank'); break; } diff --git a/galaxyui/src/app/home/carousel/carousel.component.html b/galaxyui/src/app/home/carousel/carousel.component.html index 2d33ee6b4..e241fae4c 100644 --- a/galaxyui/src/app/home/carousel/carousel.component.html +++ b/galaxyui/src/app/home/carousel/carousel.component.html @@ -7,7 +7,7 @@ Featured Partners - View All Partners + View All Partners
    diff --git a/galaxyui/src/app/home/carousel/carousel.component.ts b/galaxyui/src/app/home/carousel/carousel.component.ts index 374c2cbf1..61d604345 100644 --- a/galaxyui/src/app/home/carousel/carousel.component.ts +++ b/galaxyui/src/app/home/carousel/carousel.component.ts @@ -8,7 +8,8 @@ import { Router } from '@angular/router'; -import { Namespace } from '../../resources/namespaces/namespace'; +import { EventLoggerService } from '../../resources/logger/event-logger.service'; +import { Namespace } from '../../resources/namespaces/namespace'; @Component({ selector: 'carousel-component', @@ -39,7 +40,8 @@ export class CarouselComponent implements OnInit { _vendors: Namespace[] = []; constructor( - private router: Router + private router: Router, + private eventLoggerService: EventLoggerService, ) { } ngOnInit() { } @@ -57,6 +59,7 @@ export class CarouselComponent implements OnInit { 'vendor': 'true', 'namespaces': vendor.name }; + this.eventLoggerService.logLink(vendor.name, '/search'); this.router.navigate(['/', 'search'], { queryParams: params }); } } diff --git a/galaxyui/src/app/home/popular/popular.component.ts b/galaxyui/src/app/home/popular/popular.component.ts index 0717a82eb..e30e65eea 100644 --- a/galaxyui/src/app/home/popular/popular.component.ts +++ b/galaxyui/src/app/home/popular/popular.component.ts @@ -16,6 +16,8 @@ class Category { iconClass: string; } +import { EventLoggerService } from '../../resources/logger/event-logger.service'; + @Component({ selector: 'popular-component', templateUrl: './popular.component.html', @@ -26,7 +28,8 @@ export class PopularComponent implements OnInit { categories: Category[] = []; constructor( - private router: Router + private router: Router, + private eventLoggerService: EventLoggerService, ) {} ngOnInit() { @@ -81,6 +84,9 @@ export class PopularComponent implements OnInit { } else { params['tags'] = category.name.toLowerCase(); } + + this.eventLoggerService.logLink(category.name, '/search'); + this.router.navigate(['/', 'search'], {queryParams: params}); } diff --git a/galaxyui/src/app/login/login.component.html b/galaxyui/src/app/login/login.component.html index f32a65ccd..70d905a37 100644 --- a/galaxyui/src/app/login/login.component.html +++ b/galaxyui/src/app/login/login.component.html @@ -6,7 +6,7 @@ [config]="config">
    - +

    {{ connectingMsg || msgText }}

    diff --git a/galaxyui/src/app/login/login.module.ts b/galaxyui/src/app/login/login.module.ts index 17de59532..c825e3ffc 100644 --- a/galaxyui/src/app/login/login.module.ts +++ b/galaxyui/src/app/login/login.module.ts @@ -14,13 +14,16 @@ import { CardModule } from 'patternfly-ng/card/basic-card/card.module'; +import { SharedModule } from '../shared/shared.module'; + @NgModule({ declarations: [ LoginComponent ], imports: [ CardModule, - LoginRoutingModule + LoginRoutingModule, + SharedModule ], providers: [] }) diff --git a/galaxyui/src/app/my-content/namespace-list/action/action.component.ts b/galaxyui/src/app/my-content/namespace-list/action/action.component.ts index 100083ebd..3c3b2a232 100644 --- a/galaxyui/src/app/my-content/namespace-list/action/action.component.ts +++ b/galaxyui/src/app/my-content/namespace-list/action/action.component.ts @@ -12,8 +12,9 @@ import { import { Action } from 'patternfly-ng/action/action'; import { ActionConfig } from 'patternfly-ng/action/action-config'; -import { AuthService } from '../../../auth/auth.service'; -import { Namespace } from '../../../resources/namespaces/namespace'; +import { AuthService } from '../../../auth/auth.service'; +import { EventLoggerService } from '../../../resources/logger/event-logger.service'; +import { Namespace } from '../../../resources/namespaces/namespace'; @Component({ encapsulation: ViewEncapsulation.None, @@ -40,7 +41,8 @@ export class NamespaceActionComponent implements OnInit { actionConfig: ActionConfig; constructor( - private authService: AuthService + private authService: AuthService, + private eventLoggerService: EventLoggerService, ) {} ngOnInit(): void { @@ -97,6 +99,8 @@ export class NamespaceActionComponent implements OnInit { id: $event.id, item: this.namespace }; + + this.eventLoggerService.logButton($event.title); this.handleAction.emit(event); } } diff --git a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/action/action.component.ts b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/action/action.component.ts index 9487f939b..2313fdcfd 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/action/action.component.ts +++ b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/action/action.component.ts @@ -12,7 +12,8 @@ import { import { Action } from 'patternfly-ng/action/action'; import { ActionConfig } from 'patternfly-ng/action/action-config'; -import { Repository } from '../../../../../resources/repositories/repository'; +import { EventLoggerService } from '../../../../../resources/logger/event-logger.service'; +import { Repository } from '../../../../../resources/repositories/repository'; @Component({ encapsulation: ViewEncapsulation.None, @@ -39,6 +40,7 @@ export class NamespaceRepositoryActionComponent implements OnInit { actionConfig: ActionConfig; constructor( + private eventLoggerService: EventLoggerService, ) {} ngOnInit(): void { @@ -71,6 +73,8 @@ export class NamespaceRepositoryActionComponent implements OnInit { id: $event.id, item: this.repository }; + + this.eventLoggerService.logButton($event.title); this.handleAction.emit(event); } } diff --git a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.html b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.html index fd7a4f5bd..452cd82a2 100644 --- a/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.html +++ b/galaxyui/src/app/my-content/namespace-list/content/repositories-content/repositories-content.component.html @@ -22,12 +22,12 @@
    - {{ item.name }}
    + {{ item.name }}
    {{ item.description | slice:0:60 }}
    - Failed {{ item['latest_import']['as_of_dt'] }} diff --git a/galaxyui/src/app/my-content/namespace-list/namespace-list.component.html b/galaxyui/src/app/my-content/namespace-list/namespace-list.component.html index 0c8d14b39..f11fc02dc 100644 --- a/galaxyui/src/app/my-content/namespace-list/namespace-list.component.html +++ b/galaxyui/src/app/my-content/namespace-list/namespace-list.component.html @@ -12,7 +12,7 @@ (onSortChange)="sortChanged($event)" (onViewSelect)="viewSelected($event)"> - Add diff --git a/galaxyui/src/app/my-imports/import-detail/import-detail.component.html b/galaxyui/src/app/my-imports/import-detail/import-detail.component.html index b122a4a03..e5412c2f4 100644 --- a/galaxyui/src/app/my-imports/import-detail/import-detail.component.html +++ b/galaxyui/src/app/my-imports/import-detail/import-detail.component.html @@ -6,7 +6,7 @@
    -
    diff --git a/galaxyui/src/app/shared/components/page-header/page-header.component.html b/galaxyui/src/app/shared/components/page-header/page-header.component.html index f21ede043..7217b71c2 100644 --- a/galaxyui/src/app/shared/components/page-header/page-header.component.html +++ b/galaxyui/src/app/shared/components/page-header/page-header.component.html @@ -3,7 +3,7 @@
  • - +
    • diff --git a/galaxyui/src/app/shared/directives/log-event.directive.ts b/galaxyui/src/app/shared/directives/log-event.directive.ts index b5f7c356e..c837fbe94 100644 --- a/galaxyui/src/app/shared/directives/log-event.directive.ts +++ b/galaxyui/src/app/shared/directives/log-event.directive.ts @@ -23,7 +23,8 @@ export class LogEventDirective { const name = this.appLogEvent || this.el.nativeElement.text || this.el.nativeElement.innerText; if (this.el.nativeElement.nodeName === 'A') { - this.eventLoggerService.logLink(name, this.el.nativeElement.href); + // TODO Add logic to use href when link not on our site + this.eventLoggerService.logLink(name, this.el.nativeElement.pathname); } else if (this.el.nativeElement.nodeName === 'BUTTON') { this.eventLoggerService.logButton(name); } diff --git a/galaxyui/src/app/vendors/card/vendor-card.component.ts b/galaxyui/src/app/vendors/card/vendor-card.component.ts index b4d2e7167..b33a669ec 100644 --- a/galaxyui/src/app/vendors/card/vendor-card.component.ts +++ b/galaxyui/src/app/vendors/card/vendor-card.component.ts @@ -8,7 +8,8 @@ import { Router } from '@angular/router'; -import { Namespace } from '../../resources/namespaces/namespace'; +import { EventLoggerService} from '../../resources/logger/event-logger.service'; +import { Namespace } from '../../resources/namespaces/namespace'; @Component({ selector: 'vendor-card', @@ -18,7 +19,8 @@ import { Namespace } from '../../resources/namespaces/namespace'; export class VendorCardComponent implements OnInit { constructor( - private router: Router + private router: Router, + private eventLoggerService: EventLoggerService, ) {} _vendor: Namespace; @@ -52,6 +54,7 @@ export class VendorCardComponent implements OnInit { } handleCardClick() { + this.eventLoggerService.logLink(this.vendor.name, '/' + this.vendor.name); this.router.navigate(['/', this.vendor.name]); } }