From 5801d3cec8e575fb824556f16a8671c60f162c37 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 14 Sep 2016 15:18:39 -0700 Subject: [PATCH] changing naming scheme for event listeners to "ws-" instead of ws-- --- awx/ui/client/src/controllers/Home.js | 2 +- awx/ui/client/src/controllers/Jobs.js | 4 ++-- awx/ui/client/src/controllers/Projects.js | 2 +- .../graphs/job-status/job-status-graph.service.js | 2 +- .../manage/groups/groups-list.controller.js | 2 +- .../host-summary/host-summary.controller.js | 12 ++++++------ .../src/job-detail/job-detail.controller.js | 6 +++--- .../list/job-templates-list.controller.js | 2 +- .../organizations-job-templates.controller.js | 2 +- .../organizations-projects.controller.js | 2 +- .../portal-mode/portal-mode-jobs.controller.js | 2 +- awx/ui/client/src/shared/socket/socket.service.js | 15 +++++++-------- .../log/standard-out-log.controller.js | 6 +++--- .../src/standard-out/standard-out.controller.js | 2 +- 14 files changed, 30 insertions(+), 31 deletions(-) diff --git a/awx/ui/client/src/controllers/Home.js b/awx/ui/client/src/controllers/Home.js index 281a5cee84..ff443923fc 100644 --- a/awx/ui/client/src/controllers/Home.js +++ b/awx/ui/client/src/controllers/Home.js @@ -28,7 +28,7 @@ export function Home($scope, $compile, $stateParams, $rootScope, $location, $log var dataCount = 0; - $rootScope.$on('ws-dashboard-jobs', function () { + $rootScope.$on('ws-jobs', function () { Rest.setUrl(GetBasePath('dashboard')); Rest.get() .success(function (data) { diff --git a/awx/ui/client/src/controllers/Jobs.js b/awx/ui/client/src/controllers/Jobs.js index e3cfd2ab99..8ed4ca9da0 100644 --- a/awx/ui/client/src/controllers/Jobs.js +++ b/awx/ui/client/src/controllers/Jobs.js @@ -113,14 +113,14 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa if ($rootScope.removeJobStatusChange) { $rootScope.removeJobStatusChange(); } - $rootScope.removeJobStatusChange = $rootScope.$on('ws-jobs-jobs', function() { + $rootScope.removeJobStatusChange = $rootScope.$on('ws-jobs', function() { $scope.refreshJobs(); }); if ($rootScope.removeScheduleStatusChange) { $rootScope.removeScheduleStatusChange(); } - $rootScope.removeScheduleStatusChange = $rootScope.$on('ws-jobs-schedules', function() { + $rootScope.removeScheduleStatusChange = $rootScope.$on('ws-schedules', function() { if (api_complete) { scheduled_scope.search('schedule'); } diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js index 56aca39209..3ec77ecb69 100644 --- a/awx/ui/client/src/controllers/Projects.js +++ b/awx/ui/client/src/controllers/Projects.js @@ -90,7 +90,7 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams, if ($rootScope.removeJobStatusChange) { $rootScope.removeJobStatusChange(); } - $rootScope.removeJobStatusChange = $rootScope.$on(`ws-${$state.current.name}-jobs`, function(e, data) { + $rootScope.removeJobStatusChange = $rootScope.$on(`ws-jobs`, function(e, data) { var project; $log.debug(data); if ($scope.projects) { diff --git a/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.service.js b/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.service.js index cf68287c44..0e6a3b4dda 100644 --- a/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.service.js +++ b/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.service.js @@ -58,7 +58,7 @@ function JobStatusGraphData(Rest, getBasePath, processErrors, $rootScope, $q) { destroyWatcher: angular.noop, setupWatcher: function(period, jobType) { this.destroyWatcher = - $rootScope.$on('ws-dashboard-jobs', function() { + $rootScope.$on('ws-jobs', function() { getData(period, jobType).then(function(result) { $rootScope. $broadcast('DataReceived:JobStatusGraph', diff --git a/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js b/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js index 5cd2297129..fc7326f6d0 100644 --- a/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js +++ b/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js @@ -104,7 +104,7 @@ if ($rootScope.inventoryManageStatus) { $rootScope.inventoryManageStatus(); } - $rootScope.inventoryManageStatus = $rootScope.$on(`ws-${$state.current.name}-jobs`, function(e, data){ + $rootScope.inventoryManageStatus = $rootScope.$on(`ws-jobs`, function(e, data){ var group = Find({ list: $scope.groups, key: 'id', val: data.group_id }); if(data.status === 'failed' || data.status === 'successful'){ $state.reload(); diff --git a/awx/ui/client/src/job-detail/host-summary/host-summary.controller.js b/awx/ui/client/src/job-detail/host-summary/host-summary.controller.js index ab2b91e993..c49eeb3d86 100644 --- a/awx/ui/client/src/job-detail/host-summary/host-summary.controller.js +++ b/awx/ui/client/src/job-detail/host-summary/host-summary.controller.js @@ -48,22 +48,22 @@ $scope.status = res.results[0].status; }); }; - if ($rootScope.removeJobStatusChange) { - $rootScope.removeJobStatusChange(); + if ($rootScope.removeJobSummaryComplete) { + $rootScope.removeJobSummaryComplete(); } // emitted by the API in the same function used to persist host summary data // JobEvent.update_host_summary_from_stats() from /awx/main.models.jobs.py - $rootScope.removeJobStatusChange = $rootScope.$on('ws-JobSummaryComplete', function(e, data) { + $rootScope.removeJobSummaryComplete = $rootScope.$on('ws-jobs-summary', function(e, data) { // discard socket msgs we don't care about in this context if (parseInt($stateParams.id) === data.unified_job_id){ init(); } }); - if ($rootScope.removeJobSummaryComplete) { - $rootScope.removeJobSummaryComplete(); + if ($rootScope.removeJobStatusChange) { + $rootScope.removeJobStatusChange(); } - $rootScope.removeJobSummaryComplete = $rootScope.$on('ws-jobDetail-jobs', function(e, data) { + $rootScope.removeJobStatusChange = $rootScope.$on('ws-jobs', function(e, data) { if (parseInt($stateParams.id) === data.unified_job_id){ $scope.status = data.status; } diff --git a/awx/ui/client/src/job-detail/job-detail.controller.js b/awx/ui/client/src/job-detail/job-detail.controller.js index d37ee0624d..b9f7edfca7 100644 --- a/awx/ui/client/src/job-detail/job-detail.controller.js +++ b/awx/ui/client/src/job-detail/job-detail.controller.js @@ -201,7 +201,7 @@ export default if ($rootScope.removeJobEventChange) { $rootScope.removeJobEventChange(); } - $rootScope.removeJobEventChange = $rootScope.$on(`ws-${$state.current.name}-job_events-${job_id}`, function(e, data) { + $rootScope.removeJobEventChange = $rootScope.$on(`ws-job_events-${job_id}`, function(e, data) { // update elapsed time on each event received scope.job_status.elapsed = GetElapsed({ start: scope.job.created, @@ -225,7 +225,7 @@ export default if ($rootScope.removeJobStatusChange) { $rootScope.removeJobStatusChange(); } - $rootScope.removeJobStatusChange = $rootScope.$on(`ws-${$state.current.name}-jobs`, function(e, data) { + $rootScope.removeJobStatusChange = $rootScope.$on(`ws-jobs`, function(e, data) { // if we receive a status change event for the current job indicating the job // is finished, stop event queue processing and reload if (parseInt(data.unified_job_id, 10) === parseInt(job_id,10)) { @@ -242,7 +242,7 @@ export default if ($rootScope.removeJobSummaryComplete) { $rootScope.removeJobSummaryComplete(); } - $rootScope.removeJobSummaryComplete = $rootScope.$on('ws-JobSummaryComplete', function() { + $rootScope.removeJobSummaryComplete = $rootScope.$on('ws-jobs-summary', function() { // the job host summary should now be available from the API $log.debug('Trigging reload of job_host_summaries'); scope.$emit('InitialLoadComplete'); diff --git a/awx/ui/client/src/job-templates/list/job-templates-list.controller.js b/awx/ui/client/src/job-templates/list/job-templates-list.controller.js index 6ad5fa053f..86890c7a5f 100644 --- a/awx/ui/client/src/job-templates/list/job-templates-list.controller.js +++ b/awx/ui/client/src/job-templates/list/job-templates-list.controller.js @@ -41,7 +41,7 @@ export default if ($rootScope.JobStatusChange) { $rootScope.JobStatusChange(); } - $rootScope.JobStatusChange = $rootScope.$on(`ws-${$state.current.name}-jobs`, function (e, data) { + $rootScope.JobStatusChange = $rootScope.$on(`ws-jobs`, function (e, data) { $scope.search(list.iterator); }); diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js index 4ec28f7643..53e4317336 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js @@ -24,7 +24,7 @@ export default ['$scope', '$rootScope', '$location', '$log', if ($rootScope.JobStatusChange) { $rootScope.JobStatusChange(); } - $rootScope.JobStatusChange = $rootScope.$on(`ws-${$state.current.name}-jobs`, function (e, data) { + $rootScope.JobStatusChange = $rootScope.$on(`ws-jobs`, function (e, data) { $scope.search(list.iterator); }); diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js index f03b1ebb35..73d6156862 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js @@ -90,7 +90,7 @@ export default ['$scope', '$rootScope', '$location', '$log', if ($rootScope.removeJobStatusChange) { $rootScope.removeJobStatusChange(); } - $rootScope.removeJobStatusChange = $rootScope.$on(`ws-${$state.current.name}-jobs`, function(e, data) { + $rootScope.removeJobStatusChange = $rootScope.$on(`ws-jobs`, function(e, data) { var project; $log.debug(data); if ($scope.projects) { diff --git a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js index 10de01444b..06c2339633 100644 --- a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js +++ b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js @@ -16,7 +16,7 @@ export function PortalModeJobsController($scope, $rootScope, GetBasePath, Genera if ($rootScope.removeJobStatusChange) { $rootScope.removeJobStatusChange(); } - $rootScope.removeJobStatusChange = $rootScope.$on('ws-portalMode-jobs', function() { + $rootScope.removeJobStatusChange = $rootScope.$on('ws-jobs', function() { $scope.search('job'); }); diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js index 922d56759a..32cacbe7b0 100644 --- a/awx/ui/client/src/shared/socket/socket.service.js +++ b/awx/ui/client/src/shared/socket/socket.service.js @@ -30,7 +30,7 @@ export default $log.debug('Error Logged: ' + error); //log errors }; - self.socket.onclose = function (error) { + self.socket.onclose = function () { $log.debug('Websocket Disconnected.'); }; @@ -41,13 +41,13 @@ export default // we know that this must have been a // summary complete message $log.debug('Job summary_complete ' + data.unified_job_id); - $rootScope.$emit('ws-JobSummaryComplete', data); + $rootScope.$emit('ws-jobs-summary', data); } else if(data.group_name==="job_events"){ - str = `ws-${$state.current.name}-${data.group_name}-${data.job}`; + str = `ws-${data.group_name}-${data.job}`; } else if(data.group_name==="ad_hoc_command_events"){ - str = `ws-${$state.current.name}-${data.group_name}-${data.ad_hoc_command}`; + str = `ws-${data.group_name}-${data.ad_hoc_command}`; } else if(data.group_name==="control"){ $log.debug(data.reason); @@ -55,11 +55,10 @@ export default $state.go('signOut'); } else { - // The naming scheme for emitting socket messages to the - // correct route is the route name followed by a + // The naming scheme is "ws" then a // dash (-) and the group_name. - // ex: 'jobDetail-job_events' - str = `ws-${$state.current.name}-${data.group_name}`; + // ex: 'ws-jobs' + str = `ws-${data.group_name}`; } $rootScope.$emit(str, data); return self.socket; diff --git a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js index 52af6330ff..d997b5eb1f 100644 --- a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js +++ b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js @@ -22,7 +22,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce function openSockets() { if ($state.current.name === 'jobDetail') { $log.debug("socket watching on job_events-" + job_id); - $rootScope.$on(`ws-${$state.current.name}-job_events-${job_id}`, function() { + $rootScope.$on(`ws-job_events-${job_id}`, function() { $log.debug("socket fired on job_events-" + job_id); if (api_complete) { event_queue++; @@ -36,7 +36,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce } if ($state.current.name === 'adHocJobStdout') { $log.debug("socket watching on ad_hoc_command_events-" + job_id); - $rootScope.$on(`ws-${$state.current.name}-ad_hoc_command_events-${job_id}`, function() { + $rootScope.$on(`ws-ad_hoc_command_events-${job_id}`, function() { $log.debug("socket fired on ad_hoc_command_events-" + job_id); if (api_complete) { event_queue++; @@ -192,7 +192,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce if ($scope.removeJobStatusChange) { $scope.removeJobStatusChange(); } - $scope.removeJobStatusChange = $rootScope.$on(`ws-${$state.current.name}-jobs`, function(e, data) { + $scope.removeJobStatusChange = $rootScope.$on(`ws-jobs`, function(e, data) { if (parseInt(data.unified_job_id, 10) === parseInt(job_id,10)) { if (data.status === 'failed' || data.status === 'canceled' || data.status === 'error' || data.status === 'successful') { diff --git a/awx/ui/client/src/standard-out/standard-out.controller.js b/awx/ui/client/src/standard-out/standard-out.controller.js index b53acdb798..689052e277 100644 --- a/awx/ui/client/src/standard-out/standard-out.controller.js +++ b/awx/ui/client/src/standard-out/standard-out.controller.js @@ -28,7 +28,7 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, if ($scope.removeJobStatusChange) { $scope.removeJobStatusChange(); } - $scope.removeJobStatusChange = $rootScope.$on(`ws-${$state.current.name}-jobs`, function(e, data) { + $scope.removeJobStatusChange = $rootScope.$on(`ws-jobs`, function(e, data) { if (parseInt(data.unified_job_id, 10) === parseInt(job_id,10) && $scope.job) { $scope.job.status = data.status; }