diff --git a/awx/ui/client/assets/default.strings.json b/awx/ui/client/assets/default.strings.json index a5ef8a6cfa..f5f3d5d399 100644 --- a/awx/ui/client/assets/default.strings.json +++ b/awx/ui/client/assets/default.strings.json @@ -1,3 +1,4 @@ { - "BRAND_NAME": "AWX" + "BRAND_NAME": "AWX", + "PENDO_API_KEY": "" } diff --git a/awx/ui/client/lib/services/base-string.service.js b/awx/ui/client/lib/services/base-string.service.js index 91fba70699..b514e653fd 100644 --- a/awx/ui/client/lib/services/base-string.service.js +++ b/awx/ui/client/lib/services/base-string.service.js @@ -20,6 +20,7 @@ function BaseStringService (namespace) { * default.strings.json and fall back to defaults defined inline. */ this.BRAND_NAME = defaults.BRAND_NAME || 'AWX'; + this.PENDO_API_KEY = defaults.PENDO_API_KEY || ''; /* * Globally relevant strings should be defined here to avoid duplication of content across the diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index dcc9500834..90c335e996 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -67,7 +67,6 @@ import users from './users/main'; import projects from './projects/main'; import RestServices from './rest/main'; import access from './access/main'; -import './login/authenticationServices/pendo/ng-pendo'; import footer from './footer/main'; import scheduler from './scheduler/main'; import instanceGroups from './instance-groups/main'; @@ -94,7 +93,6 @@ var tower = angular.module('Tower', [ 'I18N', uiRouter, 'ui.router.state.events', - 'pendolytics', 'lrInfiniteScroll', about.name, @@ -150,9 +148,6 @@ var tower = angular.module('Tower', [ .config(['$logProvider', function($logProvider) { $logProvider.debugEnabled($ENV['ng-debug'] || false); }]) - .config(['$pendolyticsProvider', function($pendolyticsProvider) { - $pendolyticsProvider.doNotAutoStart(); - }]) .config(['ngToastProvider', function(ngToastProvider) { ngToastProvider.configure({ animation: 'slide', diff --git a/awx/ui/client/src/login/authenticationServices/pendo.service.js b/awx/ui/client/src/login/authenticationServices/pendo.service.js index 5d5b12d9e2..868b37170b 100644 --- a/awx/ui/client/src/login/authenticationServices/pendo.service.js +++ b/awx/ui/client/src/login/authenticationServices/pendo.service.js @@ -6,15 +6,16 @@ export default - [ '$rootScope', '$pendolytics', 'Rest', 'GetBasePath', 'ProcessErrors', '$q', - 'ConfigService', '$log', - function ($rootScope, $pendolytics, Rest, GetBasePath, ProcessErrors, $q, - ConfigService, $log) { + [ '$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors', '$q', + 'ConfigService', '$log', 'AppStrings', + function ($rootScope, Rest, GetBasePath, ProcessErrors, $q, + ConfigService, $log, AppStrings) { return { setPendoOptions: function (config) { var tower_version = config.version.split('-')[0], trial = (config.trial) ? config.trial : false, options = { + apiKey: AppStrings.get('PENDO_API_KEY'), visitor: { id: null, role: null, @@ -93,6 +94,16 @@ export default return deferred.promise; }, + bootstrap: function(){ + /* jshint ignore:start */ + (function(p,e,n,d,o){var v,w,x,y,z;o=p[d]=p[d]||{};o._q=[]; + v=['initialize','identify','updateOptions','pageLoad'];for(w=0,x=v.length;w -