From db8a1f184837d1506b6f3ee0d605f84912e0dfd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Mon, 30 Oct 2017 16:43:24 +0100 Subject: [PATCH] Fixed broken refresh functionality on all topology screens https://bugzilla.redhat.com/show_bug.cgi?id=1501048 --- .../controllers/topology/cloud_topology_controller.js | 2 +- .../controllers/topology/container_topology_controller.js | 6 ++++++ .../controllers/topology/infra_topology_controller.js | 6 ++++++ .../controllers/topology/middleware_topology_controller.js | 6 ++++++ .../controllers/topology/network_topology_controller.js | 6 ++++++ .../topology/physical_infra_topology_controller.js | 6 ++++++ app/views/shared/_topology_header_toolbar.html.haml | 3 +-- 7 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/controllers/topology/cloud_topology_controller.js b/app/assets/javascripts/controllers/topology/cloud_topology_controller.js index a6b57793615..75f2950b8f8 100644 --- a/app/assets/javascripts/controllers/topology/cloud_topology_controller.js +++ b/app/assets/javascripts/controllers/topology/cloud_topology_controller.js @@ -15,7 +15,7 @@ function CloudTopologyCtrl($scope, $http, $interval, $location, topologyService, topologyService.mixinContextMenu(vm, vm); ManageIQ.angular.rxSubject.subscribe(function(event) { - if (event.controller === 'cloudTopologyController' && event.name === 'refresh') { + if (event.name === 'refreshTopology') { vm.refresh(); } }); diff --git a/app/assets/javascripts/controllers/topology/container_topology_controller.js b/app/assets/javascripts/controllers/topology/container_topology_controller.js index 8ed84a95786..c342a1c6c4b 100644 --- a/app/assets/javascripts/controllers/topology/container_topology_controller.js +++ b/app/assets/javascripts/controllers/topology/container_topology_controller.js @@ -13,6 +13,12 @@ function ContainerTopologyCtrl($scope, $http, $interval, topologyService, $windo topologyService.mixinContextMenu(vm, vm); + ManageIQ.angular.rxSubject.subscribe(function(event) { + if (event.name === 'refreshTopology') { + vm.refresh(); + } + }); + vm.refresh = function() { var id; var type; diff --git a/app/assets/javascripts/controllers/topology/infra_topology_controller.js b/app/assets/javascripts/controllers/topology/infra_topology_controller.js index 6556cea1148..f689cee196c 100644 --- a/app/assets/javascripts/controllers/topology/infra_topology_controller.js +++ b/app/assets/javascripts/controllers/topology/infra_topology_controller.js @@ -13,6 +13,12 @@ function InfraTopologyCtrl($scope, $http, $interval, $location, topologyService, topologyService.mixinContextMenu(vm, vm); + ManageIQ.angular.rxSubject.subscribe(function(event) { + if (event.name === 'refreshTopology') { + vm.refresh(); + } + }); + vm.refresh = function() { var id; if ($location.absUrl().match("show/$") || $location.absUrl().match("show$")) { diff --git a/app/assets/javascripts/controllers/topology/middleware_topology_controller.js b/app/assets/javascripts/controllers/topology/middleware_topology_controller.js index fec023edda3..624692b424b 100644 --- a/app/assets/javascripts/controllers/topology/middleware_topology_controller.js +++ b/app/assets/javascripts/controllers/topology/middleware_topology_controller.js @@ -12,6 +12,12 @@ function MiddlewareTopologyCtrl($scope, $http, $interval, $location, topologySer topologyService.mixinContextMenu(vm, vm); + ManageIQ.angular.rxSubject.subscribe(function(event) { + if (event.name === 'refreshTopology') { + vm.refresh(); + } + }); + vm.refresh = function() { var id; if ($location.absUrl().match('show/$') || $location.absUrl().match('show$')) { diff --git a/app/assets/javascripts/controllers/topology/network_topology_controller.js b/app/assets/javascripts/controllers/topology/network_topology_controller.js index 80f4ac7eb24..b3339ccc6a9 100644 --- a/app/assets/javascripts/controllers/topology/network_topology_controller.js +++ b/app/assets/javascripts/controllers/topology/network_topology_controller.js @@ -13,6 +13,12 @@ function NetworkTopologyCtrl($scope, $http, $interval, $location, topologyServic topologyService.mixinContextMenu(this, $scope); + ManageIQ.angular.rxSubject.subscribe(function(event) { + if (event.name === 'refreshTopology') { + $scope.refresh(); + } + }); + $scope.refresh = function() { var id; if ($location.absUrl().match("show/$") || $location.absUrl().match("show$")) { diff --git a/app/assets/javascripts/controllers/topology/physical_infra_topology_controller.js b/app/assets/javascripts/controllers/topology/physical_infra_topology_controller.js index 29f3f508cb2..5fc1bfece01 100644 --- a/app/assets/javascripts/controllers/topology/physical_infra_topology_controller.js +++ b/app/assets/javascripts/controllers/topology/physical_infra_topology_controller.js @@ -13,6 +13,12 @@ function physicalInfraTopologyCtrl($scope, $http, $interval, $location, topology topologyService.mixinContextMenu(vm, vm); + ManageIQ.angular.rxSubject.subscribe(function(event) { + if (event.name === 'refreshTopology') { + vm.refresh(); + } + }); + vm.refresh = function() { var id; if ($location.absUrl().match("show/$") || $location.absUrl().match("show$")) { diff --git a/app/views/shared/_topology_header_toolbar.html.haml b/app/views/shared/_topology_header_toolbar.html.haml index f30aafdf48c..5e6a9207936 100644 --- a/app/views/shared/_topology_header_toolbar.html.haml +++ b/app/views/shared/_topology_header_toolbar.html.haml @@ -5,8 +5,7 @@ .form-group %button.btn.btn-default{'data-function' => 'sendDataWithRx', - 'data-function-data' => {:controller => 'cloudTopologyController', - :name => 'refresh'}.to_json} + 'data-function-data' => {:name => 'refreshTopology'}.to_json} %i.fa.fa-refresh.fa-lg = _("Refresh") %form.search-pf.topology-search{:role => 'form',