From 8a2c3ce7165758b4e892b18f84c860e82f75377b Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 10 May 2018 14:13:13 -0400
Subject: [PATCH] add tokens to activity stream

---
 .../client/features/users/tokens/users-tokens-add.route.js   | 5 +++++
 .../client/features/users/tokens/users-tokens-list.route.js  | 5 +++++
 .../client/src/activity-stream/get-target-title.factory.js   | 3 +++
 .../streamDropdownNav/stream-dropdown-nav.directive.js       | 1 +
 awx/ui/client/src/bread-crumb/bread-crumb.directive.js       | 4 ++--
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/features/users/tokens/users-tokens-add.route.js b/awx/ui/client/features/users/tokens/users-tokens-add.route.js
index 350e9bd2dd..56effe1991 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-add.route.js
+++ b/awx/ui/client/features/users/tokens/users-tokens-add.route.js
@@ -21,6 +21,11 @@ export default {
     name: 'users.edit.tokens.add',
     params: {
     },
+    data: {
+        activityStream: true,
+        activityStreamTarget: 'o_auth2_access_token',
+        noActivityStreamID: true
+    },
     ncyBreadcrumb: {
         label: N_('CREATE TOKEN')
     },
diff --git a/awx/ui/client/features/users/tokens/users-tokens-list.route.js b/awx/ui/client/features/users/tokens/users-tokens-list.route.js
index c8a780e473..d262bbe944 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-list.route.js
+++ b/awx/ui/client/features/users/tokens/users-tokens-list.route.js
@@ -17,6 +17,11 @@ export default {
             controllerAs: 'vm'
         }
     },
+    data: {
+        activityStream: true,
+        activityStreamTarget: 'o_auth2_access_token',
+        noActivityStreamID: true
+    },
     searchPrefix: 'token',
     params: {
         token_search: {
diff --git a/awx/ui/client/src/activity-stream/get-target-title.factory.js b/awx/ui/client/src/activity-stream/get-target-title.factory.js
index 88d274f58f..d895daa988 100644
--- a/awx/ui/client/src/activity-stream/get-target-title.factory.js
+++ b/awx/ui/client/src/activity-stream/get-target-title.factory.js
@@ -46,6 +46,9 @@ export default function GetTargetTitle(i18n) {
             case 'o_auth2_application':
                 rtnTitle = i18n._('APPLICATIONS');
                 break;
+            case 'o_auth2_access_token':
+                rtnTitle = i18n._('TOKENS');
+                break;
         }
 
         return rtnTitle;
diff --git a/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js b/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js
index e60170c310..e6b0ff87be 100644
--- a/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js
+++ b/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js
@@ -22,6 +22,7 @@ export default ['templateUrl', 'i18n', function(templateUrl, i18n) {
             $scope.options = [
                 {label: i18n._('All Activity'), value: 'dashboard'},
                 {label: i18n._('Applications'), value: 'o_auth2_application'},
+                {label: i18n._('Tokens'), value: 'o_auth2_access_token'},
                 {label: i18n._('Credentials'), value: 'credential'},
                 {label: i18n._('Hosts'), value: 'host'},
                 {label: i18n._('Inventories'), value: 'inventory'},
diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
index 41b7bc26ca..eeecf9e4c0 100644
--- a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
+++ b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
@@ -97,7 +97,7 @@ export default
                                     order_by: '-timestamp',
                                     page_size: '20',
                                 };
-                                if (streamConfig.activityStreamTarget && streamConfig.activityStreamId) {
+                                if (streamConfig.activityStreamTarget && streamConfig.activityStreamId && !streamConfig.noActivityStreamID) {
                                     stateGoParams.activity_search[streamConfig.activityStreamTarget] = $state.params[streamConfig.activityStreamId];
                                 }
                             }
@@ -107,7 +107,7 @@ export default
                                     page_size: '20',
                                 };
                             }
-                            if(streamConfig.activityStreamId) {
+                            if(streamConfig.activityStreamId && !streamConfig.noActivityStreamID) {
                                 stateGoParams.id = $state.params[streamConfig.activityStreamId];
                             }
                             if(stateGoParams.target === "custom_inventory_script"){