Use taskListProvider for polling for discovery results

Katello · Jan 15, 2014 · 54fd9f4 · 54fd9f4
1 parent 8134292
commit 54fd9f4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/engines/bastion/app/assets/bastion/products/discovery/discovery.controller.js b/engines/bastion/app/assets/bastion/products/discovery/discovery.controller.js
@@ -27,8 +27,8 @@
  *   Provides the functionality for the repo discovery action pane.
  */
 angular.module('Bastion.products').controller('DiscoveryController',
-    ['$scope', '$q', '$timeout', '$http', 'Task', 'Organization', 'CurrentOrganization',
-    function ($scope, $q, $timeout, $http, Task, Organization, CurrentOrganization) {
+    ['$scope', '$q', '$timeout', '$http', 'taskListProvider', 'Organization', 'CurrentOrganization',
+    function ($scope, $q, $timeout, $http, taskListProvider, Organization, CurrentOrganization) {
         var transformRows, setDiscoveryDetails;
 
         $scope.discovery = {url: ''};
@@ -92,24 +92,21 @@ angular.module('Bastion.products').controller('DiscoveryController',
             }
         });
 
+        $scope.updateTask = function (task) {
+            setDiscoveryDetails(task);
+            if(!task.pending) {
+                taskListProvider.unregisterScope($scope);
+            }
+        }
+
         $scope.discover = function () {
             $scope.discovery.pending = true;
             $scope.discoveryTable.rows = [];
             $scope.discoveryTable.selectAll(false);
-            Organization.repoDiscover({id: CurrentOrganization, url: $scope.discovery.url}, function (response) {
-                pollTask(response);
+            Organization.repoDiscover({id: CurrentOrganization, url: $scope.discovery.url}, function (task) {
+                taskListProvider.registerScope($scope, { type: 'task', task_id: task.uuid })
             });
         };
 
-        function pollTask(task) {
-            if (task.pending) {
-                Task.poll(task, function (response) {
-                    setDiscoveryDetails(response);
-                });
-            }
-            else {
-                setDiscoveryDetails(task);
-            }
-        }
     }]
 );
diff --git a/engines/bastion/app/assets/bastion/tasks/task-details.controller.js b/engines/bastion/app/assets/bastion/tasks/task-details.controller.js
@@ -43,14 +43,13 @@ angular.module('Bastion.systems').controller('TaskDetailsController',
             $scope.transitionTo(fromState, fromParams);
         };
 
-        $scope.updateTasks = function(tasks) {
-            var task = tasks[0];
+        $scope.updateTask = function(task) {
             $scope.task = task;
             if(!$scope.task.pending) {
                 taskListProvider.unregisterScope($scope);
             }
         }
 
-        taskListProvider.registerScope($scope, { 'type': 'task', 'task_id': taskId })
+        taskListProvider.registerScope($scope, { type: 'task', task_id: taskId })
     }
 ]);
diff --git a/engines/bastion/app/assets/bastion/widgets/task-list.directive.js b/engines/bastion/app/assets/bastion/widgets/task-list.directive.js
@@ -26,7 +26,11 @@ angular.module('Bastion.widgets')
                 angular.forEach(conditionsTasks, function(conditionTasks) {
                     var scopes = condToScopes[JSON.stringify(conditionTasks.condition)];
                     angular.forEach(scopes, function(scope) {
-                        scope.updateTasks(conditionTasks.tasks);
+                        if(conditionTasks.condition.type == 'task') {
+                            scope.updateTask(conditionTasks.tasks[0]);
+                        } else {
+                            scope.updateTasks(conditionTasks.tasks);
+                        }
                     });
                 });
             });