From 25504c9191f6d94687831ac1bf880cbbc3a0443b Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Tue, 19 Apr 2016 21:51:08 -0700
Subject: [PATCH 1/2] adding notifications to management jobs

---
 .../management-jobs/card/card.controller.js   |   7 ++
 .../management-jobs/card/card.partial.html    |   5 +
 awx/ui/client/src/management-jobs/main.js     |   4 +-
 .../src/management-jobs/notifications/main.js |  15 +++
 .../notifications/notification.controller.js  | 105 ++++++++++++++++++
 .../notifications/notification.route.js       |  52 +++++++++
 .../notifications/notifications.partial.html  |   4 +
 .../notificationTemplates.list.js             |   2 +-
 .../shared/notification-list-init.factory.js  |   4 +-
 .../list-generator/list-generator.factory.js  |   6 +
 10 files changed, 200 insertions(+), 4 deletions(-)
 create mode 100644 awx/ui/client/src/management-jobs/notifications/main.js
 create mode 100644 awx/ui/client/src/management-jobs/notifications/notification.controller.js
 create mode 100644 awx/ui/client/src/management-jobs/notifications/notification.route.js
 create mode 100644 awx/ui/client/src/management-jobs/notifications/notifications.partial.html

diff --git a/awx/ui/client/src/management-jobs/card/card.controller.js b/awx/ui/client/src/management-jobs/card/card.controller.js
index 85c4d825ab..04e1261151 100644
--- a/awx/ui/client/src/management-jobs/card/card.controller.js
+++ b/awx/ui/client/src/management-jobs/card/card.controller.js
@@ -159,6 +159,13 @@ export default
                     });
                 };
 
+                $scope.goToNotifications = function(card){
+                    $state.transitionTo('managementJobsList.notifications',{
+                        card: card,
+                        management_id: card.id
+                    });
+                };
+
                 $scope.submitJob = function (id, name, card) {
                     Wait('start');
                         defaultUrl = GetBasePath('system_job_templates')+id+'/launch/';
diff --git a/awx/ui/client/src/management-jobs/card/card.partial.html b/awx/ui/client/src/management-jobs/card/card.partial.html
index f0884e96a7..1570b42b66 100644
--- a/awx/ui/client/src/management-jobs/card/card.partial.html
+++ b/awx/ui/client/src/management-jobs/card/card.partial.html
@@ -1,4 +1,5 @@
 <div class="tab-pane" id="management_jobs">
+	<div ui-view></div>
 	<div class="MgmtCards">
 		<div class="MgmtCards-card"
 			ng-repeat="card in mgmtCards track by card.id">
@@ -6,6 +7,10 @@
 			<div class="MgmtCards-header">
 				<h3 class="MgmtCards-label"> {{ card.name }}</h3>
 				<div class="MgmtCards-actionItems">
+					<button class="MgmtCards-actionItem List-actionButton"
+						ng-click='goToNotifications(card, card.id)'>
+						<i class="MgmtCards-actionItemIcon fa fa-bell-o"></i>
+					</button>
 					<button class="MgmtCards-actionItem List-actionButton"
 						ng-click='chooseRunJob(card.id, card.name)'>
 						<i class="MgmtCards-actionItemIcon fa fa-rocket"></i>
diff --git a/awx/ui/client/src/management-jobs/main.js b/awx/ui/client/src/management-jobs/main.js
index e881baa0fb..12d25fbc6b 100644
--- a/awx/ui/client/src/management-jobs/main.js
+++ b/awx/ui/client/src/management-jobs/main.js
@@ -7,10 +7,12 @@
 import managementJobsCard from './card/main';
 import managementJobsScheduler from './scheduler/main';
 import list from './management-jobs.list';
+import managementJobsNotifications from './notifications/main';
 
 export default
     angular.module('managementJobs', [
         managementJobsCard.name,
-        managementJobsScheduler.name
+        managementJobsScheduler.name,
+        managementJobsNotifications.name
     ])
     .factory('managementJobsListObject', list);
diff --git a/awx/ui/client/src/management-jobs/notifications/main.js b/awx/ui/client/src/management-jobs/notifications/main.js
new file mode 100644
index 0000000000..91b92b5373
--- /dev/null
+++ b/awx/ui/client/src/management-jobs/notifications/main.js
@@ -0,0 +1,15 @@
+/*************************************************
+ * Copyright (c) 2015 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+import route from './notification.route';
+import controller from './notification.controller';
+
+export default
+    angular.module('managementJobsNotifications', [])
+        .controller('managementJobsNotificationsController', controller)
+        .run(['$stateExtender', function($stateExtender) {
+            $stateExtender.addState(route);
+        }]);
diff --git a/awx/ui/client/src/management-jobs/notifications/notification.controller.js b/awx/ui/client/src/management-jobs/notifications/notification.controller.js
new file mode 100644
index 0000000000..7cd1d8ea00
--- /dev/null
+++ b/awx/ui/client/src/management-jobs/notifications/notification.controller.js
@@ -0,0 +1,105 @@
+/*************************************************
+ * Copyright (c) 2015 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+export default
+    [   '$rootScope','Wait', 'generateList', 'NotificationsList',
+        'GetBasePath' , 'SearchInit' , 'PaginateInit', 'Rest' ,
+        'ProcessErrors', 'Prompt', '$state', 'GetChoices', 'Empty', 'Find',
+        'ngToast', '$compile', '$filter','ToggleNotification',
+        'NotificationsListInit', '$stateParams', 'management_job',
+        function(
+            $rootScope,Wait, GenerateList, NotificationsList,
+            GetBasePath, SearchInit, PaginateInit, Rest,
+            ProcessErrors, Prompt, $state, GetChoices, Empty, Find, ngToast,
+            $compile, $filter, ToggleNotification, NotificationsListInit,
+            $stateParams, management_job) {
+            var scope = $rootScope.$new(),
+                url = GetBasePath('notifiers'),
+                defaultUrl = GetBasePath('system_job_templates'),
+                list = NotificationsList,
+                view = GenerateList,
+                id = $stateParams.management_id;
+
+            list.listTitle = `${management_job.name} | Notifications`;
+            view.inject( list, {
+                mode: 'edit',
+                cancelButton: true,
+                scope: scope
+            });
+
+            NotificationsListInit({
+                scope: scope,
+                url: defaultUrl,
+                id: id
+            });
+
+            scope.formCancel = function() {
+                $state.go('managementJobsList');
+            };
+
+            scope.toggleNotification = function(event, notifier_id, column) {
+                var notifier = this.notification;
+                try {
+                    $(event.target).tooltip('hide');
+                }
+                catch(e) {
+                    // ignore
+                }
+                ToggleNotification({
+                    scope: scope,
+                    url: defaultUrl,
+                    id: id,
+                    notifier: notifier,
+                    column: column,
+                    callback: 'NotificationRefresh'
+                });
+            };
+
+            if (scope.removePostRefresh) {
+                scope.removePostRefresh();
+            }
+            scope.removePostRefresh = scope.$on('PostRefresh', function () {
+                scope.$emit('relatednotifications');
+            });
+
+            if (scope.removeChoicesHere) {
+                scope.removeChoicesHere();
+            }
+            scope.removeChoicesHere = scope.$on('choicesReadyNotifierList', function () {
+                list.fields.notification_type.searchOptions = scope.notification_type_options;
+
+                SearchInit({
+                    scope: scope,
+                    set: 'notifications',
+                    list: list,
+                    url: url
+                });
+
+                if ($rootScope.addedItem) {
+                    scope.addedItem = $rootScope.addedItem;
+                    delete $rootScope.addedItem;
+                }
+                PaginateInit({
+                    scope: scope,
+                    list: list,
+                    url: url
+                });
+
+                scope.search(list.iterator);
+
+            });
+
+            GetChoices({
+                scope: scope,
+                url: url,
+                field: 'notification_type',
+                variable: 'notification_type_options',
+                callback: 'choicesReadyNotifierList'
+            });
+
+
+        }
+    ];
diff --git a/awx/ui/client/src/management-jobs/notifications/notification.route.js b/awx/ui/client/src/management-jobs/notifications/notification.route.js
new file mode 100644
index 0000000000..d39e96ee20
--- /dev/null
+++ b/awx/ui/client/src/management-jobs/notifications/notification.route.js
@@ -0,0 +1,52 @@
+/*************************************************
+ * Copyright (c) 2015 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+import {templateUrl} from '../../shared/template-url/template-url.factory';
+
+export default {
+    name: 'managementJobsList.notifications',
+    route: '/:management_id/notifications',
+    templateUrl: templateUrl('management-jobs/notifications/notifications'),
+    controller: 'managementJobsNotificationsController',
+    params: {card: null},
+    resolve: {
+        features: ['FeaturesService', function(FeaturesService) {
+            return FeaturesService.get();
+        }],
+        management_job:
+        [   '$stateParams',
+            '$q',
+            'Rest',
+            'GetBasePath',
+            'ProcessErrors',
+            function($stateParams, $q, rest, getBasePath, ProcessErrors) {
+
+                if ($stateParams.card) {
+                    return $q.when($stateParams.card);
+                }
+
+                var managementJobId = $stateParams.management_id;
+
+                var url = getBasePath('system_job_templates') + managementJobId + '/';
+                rest.setUrl(url);
+                return rest.get()
+                        .then(function(data) {
+                            return data.data;
+                        }).catch(function (response) {
+            ProcessErrors(null, response.data, response.status, null, {
+                hdr: 'Error!',
+                msg: 'Failed to get management job info. GET returned status: ' +
+                response.status
+            });
+        });
+            }
+        ]
+    },
+    ncyBreadcrumb: {
+        parent: 'setup',
+        label: 'MANAGEMENT JOBS'
+    },
+};
diff --git a/awx/ui/client/src/management-jobs/notifications/notifications.partial.html b/awx/ui/client/src/management-jobs/notifications/notifications.partial.html
new file mode 100644
index 0000000000..e5ebf859d7
--- /dev/null
+++ b/awx/ui/client/src/management-jobs/notifications/notifications.partial.html
@@ -0,0 +1,4 @@
+<div class="tab-pane" id="notifications">
+    <div ui-view></div>
+    <div ng-cloak id="htmlTemplate" class="Panel"></div>
+</div>
diff --git a/awx/ui/client/src/notifications/notificationTemplates.list.js b/awx/ui/client/src/notifications/notificationTemplates.list.js
index aadda25863..a7ed5fa751 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.list.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.list.js
@@ -40,7 +40,7 @@ export default function(){
             notification_type: {
                     label: 'Type',
                     searchType: 'select',
-                    searchOptions: [], // will be set by Options call to projects resource
+                    searchOptions: [],
                     excludeModal: true,
                     columnClass: 'col-md-4 hidden-sm hidden-xs'
             }
diff --git a/awx/ui/client/src/notifications/shared/notification-list-init.factory.js b/awx/ui/client/src/notifications/shared/notification-list-init.factory.js
index 55935f6f2e..c3395a653e 100644
--- a/awx/ui/client/src/notifications/shared/notification-list-init.factory.js
+++ b/awx/ui/client/src/notifications/shared/notification-list-init.factory.js
@@ -14,8 +14,8 @@
  *
  */
 
-export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest',
-    function(Wait, GetBasePath, ProcessErrors, Rest) {
+export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest', 'GetChoices',
+    function(Wait, GetBasePath, ProcessErrors, Rest, GetChoices) {
     return function(params) {
         var scope = params.scope,
             url = params.url,
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index 806c1cdf15..68f42dfd9f 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -316,6 +316,12 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
                               }
 
                               html += "</div>";
+                              if(options.cancelButton === true) {
+                                  html += "<div class=\"Form-exitHolder\">";
+                                  html += "<button class=\"Form-exit\" ng-click=\"formCancel()\">";
+                                  html += "<i class=\"fa fa-times-circle\"></i>";
+                                  html += "</button></div>\n";
+                              }
                               html += "<div class=\"List-actionHolder\">";
                               if(list.toolbarAuxAction) {
                                   html += "<div class=\"List-auxAction\">";

From 28c4a9faba8ef35bd09ceb3a66229abaab267bc4 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Thu, 21 Apr 2016 09:15:06 -0700
Subject: [PATCH 2/2] Removing GetChoices from notifications list init

---
 .../notifications/shared/notification-list-init.factory.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/src/notifications/shared/notification-list-init.factory.js b/awx/ui/client/src/notifications/shared/notification-list-init.factory.js
index c3395a653e..55935f6f2e 100644
--- a/awx/ui/client/src/notifications/shared/notification-list-init.factory.js
+++ b/awx/ui/client/src/notifications/shared/notification-list-init.factory.js
@@ -14,8 +14,8 @@
  *
  */
 
-export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest', 'GetChoices',
-    function(Wait, GetBasePath, ProcessErrors, Rest, GetChoices) {
+export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest',
+    function(Wait, GetBasePath, ProcessErrors, Rest) {
     return function(params) {
         var scope = params.scope,
             url = params.url,