Skip to content

Commit 9c8561b

Browse files
spadgettspadgett
committed
Remove calls to AlertMessageService.getAlerts() / clearAlerts()
These methods are no longer needed since we are now showing toast notifications for alerts that cross page transitions.
1 parent cdf2198 commit 9c8561b

30 files changed

+551
-777
lines changed

‎app/scripts/controllers/buildConfig.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ angular.module('openshiftConsole')
1010
.controller('BuildConfigController', function ($scope,
1111
$filter,
1212
$routeParams,
13-
AlertMessageService,
1413
APIService,
1514
BuildsService,
1615
ImagesService,
@@ -45,11 +44,6 @@ angular.module('openshiftConsole')
4544

4645
$scope.emptyMessage = "Loading...";
4746

48-
AlertMessageService.getAlerts().forEach(function(alert) {
49-
$scope.alerts[alert.name] = alert.data;
50-
});
51-
AlertMessageService.clearAlerts();
52-
5347
$scope.aceLoaded = function(editor) {
5448
var session = editor.getSession();
5549
session.setOption('tabSize', 2);

‎app/scripts/controllers/builds.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Controller of the openshiftConsole
99
*/
1010
angular.module('openshiftConsole')
11-
.controller('BuildsController', function ($routeParams, $scope, AlertMessageService, DataService, $filter, LabelFilter, Logger, $location, BuildsService, ProjectsService) {
11+
.controller('BuildsController', function ($routeParams, $scope, DataService, $filter, LabelFilter, Logger, $location, BuildsService, ProjectsService) {
1212
$scope.projectName = $routeParams.project;
1313
$scope.builds = {};
1414
$scope.unfilteredBuildConfigs = {};
@@ -18,12 +18,6 @@ angular.module('openshiftConsole')
1818
$scope.emptyMessage = "Loading...";
1919
$scope.latestByConfig = {};
2020

21-
// get and clear any alerts
22-
AlertMessageService.getAlerts().forEach(function(alert) {
23-
$scope.alerts[alert.name] = alert.data;
24-
});
25-
AlertMessageService.clearAlerts();
26-
2721
var buildConfigForBuild = $filter('buildConfigForBuild');
2822

2923
var watches = [];

‎app/scripts/controllers/configMap.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ angular.module('openshiftConsole')
1111
.controller('ConfigMapController',
1212
function ($scope,
1313
$routeParams,
14-
AlertMessageService,
1514
BreadcrumbsService,
1615
DataService,
1716
ProjectsService) {
@@ -25,12 +24,6 @@ angular.module('openshiftConsole')
2524
namespace: $routeParams.project
2625
});
2726

28-
AlertMessageService.getAlerts().forEach(function(alert) {
29-
$scope.alerts[alert.name] = alert.data;
30-
});
31-
32-
AlertMessageService.clearAlerts();
33-
3427
var watches = [];
3528

3629
var configMapResolved = function(configMap, action) {

‎app/scripts/controllers/configMaps.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ angular.module('openshiftConsole')
1111
.controller('ConfigMapsController',
1212
function ($scope,
1313
$routeParams,
14-
AlertMessageService,
1514
DataService,
1615
LabelFilter,
1716
ProjectsService) {
@@ -20,12 +19,6 @@ angular.module('openshiftConsole')
2019
$scope.loaded = false;
2120
$scope.labelSuggestions = {};
2221

23-
AlertMessageService.getAlerts().forEach(function(alert) {
24-
$scope.alerts[alert.name] = alert.data;
25-
});
26-
27-
AlertMessageService.clearAlerts();
28-
2922
var watches = [];
3023
var configMaps;
3124

‎app/scripts/controllers/create.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ angular.module('openshiftConsole')
1414
$q,
1515
$routeParams,
1616
$uibModal,
17-
AlertMessageService,
1817
CatalogService,
1918
Constants,
2019
DataService,
@@ -27,11 +26,6 @@ angular.module('openshiftConsole')
2726

2827
$scope.alerts = $scope.alerts || {};
2928

30-
AlertMessageService.getAlerts().forEach(function(alert) {
31-
$scope.alerts[alert.name] = alert.data;
32-
});
33-
AlertMessageService.clearAlerts();
34-
3529
$scope.breadcrumbs = [
3630
{
3731
title: $scope.projectName,

‎app/scripts/controllers/create/browseCategory.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ angular.module('openshiftConsole')
1414
$q,
1515
$routeParams,
1616
$uibModal,
17-
AlertMessageService,
1817
Constants,
1918
DataService,
2019
LabelFilter,
@@ -60,11 +59,6 @@ angular.module('openshiftConsole')
6059

6160
$scope.alerts = $scope.alerts || {};
6261

63-
AlertMessageService.getAlerts().forEach(function(alert) {
64-
$scope.alerts[alert.name] = alert.data;
65-
});
66-
AlertMessageService.clearAlerts();
67-
6862
$scope.breadcrumbs = [
6963
{
7064
title: $scope.projectName,

‎app/scripts/controllers/createFromURL.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,9 @@
77
* Controller of the openshiftConsole
88
*/
99
angular.module('openshiftConsole')
10-
.controller('CreateFromURLController', function ($scope, $routeParams, $location, $filter, AuthService, DataService, AlertMessageService, Navigate, ProjectsService ) {
10+
.controller('CreateFromURLController', function ($scope, $routeParams, $location, $filter, AuthService, DataService, Navigate, ProjectsService ) {
1111
AuthService.withUser();
1212

13-
AlertMessageService.getAlerts().forEach(function(alert) {
14-
$scope.alerts[alert.name] = alert.data;
15-
});
16-
AlertMessageService.clearAlerts();
17-
1813
$scope.alerts = {};
1914
$scope.selected = {};
2015

‎app/scripts/controllers/createProject.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,8 @@
88
* Controller of the openshiftConsole
99
*/
1010
angular.module('openshiftConsole')
11-
.controller('CreateProjectController', function ($scope, $location, AuthService, DataService, AlertMessageService) {
11+
.controller('CreateProjectController',
12+
function($scope, AuthService) {
1213
$scope.alerts = {};
13-
1414
AuthService.withUser();
15-
16-
AlertMessageService.getAlerts().forEach(function(alert) {
17-
$scope.alerts[alert.name] = alert.data;
18-
});
19-
AlertMessageService.clearAlerts();
20-
2115
});

‎app/scripts/controllers/createSecret.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ angular.module('openshiftConsole')
1414
$routeParams,
1515
$scope,
1616
$window,
17-
AlertMessageService,
1817
ApplicationGenerator,
1918
AuthorizationService,
2019
DataService,

‎app/scripts/controllers/deployment.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ angular.module('openshiftConsole')
1111
function ($scope,
1212
$filter,
1313
$routeParams,
14-
AlertMessageService,
1514
DataService,
1615
DeploymentsService,
1716
EnvironmentService,
@@ -44,12 +43,6 @@ angular.module('openshiftConsole')
4443
$routeParams.deployment,
4544
"extensions");
4645

47-
// get and clear any alerts
48-
AlertMessageService.getAlerts().forEach(function(alert) {
49-
$scope.alerts[alert.name] = alert.data;
50-
});
51-
AlertMessageService.clearAlerts();
52-
5346
var previousEnvConflict = false;
5447
var updateEnvironment = function(current, previous) {
5548
if (previousEnvConflict) {

‎app/scripts/controllers/deploymentConfig.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ angular.module('openshiftConsole')
1111
function ($scope,
1212
$filter,
1313
$routeParams,
14-
AlertMessageService,
1514
BreadcrumbsService,
1615
DataService,
1716
DeploymentsService,
@@ -48,12 +47,6 @@ angular.module('openshiftConsole')
4847
"DeploymentConfig",
4948
$routeParams.deploymentconfig);
5049

51-
// get and clear any alerts
52-
AlertMessageService.getAlerts().forEach(function(alert) {
53-
$scope.alerts[alert.name] = alert.data;
54-
});
55-
AlertMessageService.clearAlerts();
56-
5750
var orderByDate = $filter('orderObjectsByDate');
5851
var mostRecent = $filter('mostRecent');
5952

‎app/scripts/controllers/deployments.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ angular.module('openshiftConsole')
1111
.controller('DeploymentsController', function ($scope,
1212
$filter,
1313
$routeParams,
14-
AlertMessageService,
1514
DataService,
1615
DeploymentsService,
1716
LabelFilter,
@@ -30,12 +29,6 @@ angular.module('openshiftConsole')
3029
$scope.unfilteredReplicaSets = {};
3130
$scope.unfilteredReplicationControllers = {};
3231

33-
// get and clear any alerts
34-
AlertMessageService.getAlerts().forEach(function(alert) {
35-
$scope.alerts[alert.name] = alert.data;
36-
});
37-
AlertMessageService.clearAlerts();
38-
3932
var replicaSets, deploymentsByUID;
4033
var annotation = $filter('annotation');
4134

‎app/scripts/controllers/edit/project.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,10 @@ angular.module('openshiftConsole')
1313
$filter,
1414
$location,
1515
DataService,
16-
AlertMessageService,
1716
ProjectsService,
1817
Navigate) {
1918
$scope.alerts = {};
2019

21-
AlertMessageService.getAlerts().forEach(function(alert) {
22-
$scope.alerts[alert.name] = alert.data;
23-
});
24-
AlertMessageService.clearAlerts();
25-
2620
var annotation = $filter('annotation');
2721
var annotationName = $filter('annotationName');
2822

‎app/scripts/controllers/edit/route.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ angular.module('openshiftConsole')
1313
$location,
1414
$routeParams,
1515
$scope,
16-
AlertMessageService,
1716
AuthorizationService,
1817
DataService,
1918
Navigate,

‎app/scripts/controllers/images.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Controller of the openshiftConsole
99
*/
1010
angular.module('openshiftConsole')
11-
.controller('ImagesController', function ($routeParams, $scope, AlertMessageService, DataService, ProjectsService, $filter, LabelFilter, Logger) {
11+
.controller('ImagesController', function ($routeParams, $scope, DataService, ProjectsService, $filter, LabelFilter, Logger) {
1212
$scope.projectName = $routeParams.project;
1313
$scope.imageStreams = {};
1414
$scope.unfilteredImageStreams = {};
@@ -18,12 +18,6 @@ angular.module('openshiftConsole')
1818
$scope.alerts = $scope.alerts || {};
1919
$scope.emptyMessage = "Loading...";
2020

21-
// get and clear any alerts
22-
AlertMessageService.getAlerts().forEach(function(alert) {
23-
$scope.alerts[alert.name] = alert.data;
24-
});
25-
AlertMessageService.clearAlerts();
26-
2721
var watches = [];
2822

2923
ProjectsService

‎app/scripts/controllers/otherResources.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ angular.module('openshiftConsole')
55
$routeParams,
66
$location,
77
$scope,
8-
AlertMessageService,
98
AuthorizationService,
109
DataService,
1110
ProjectsService,
@@ -82,12 +81,6 @@ angular.module('openshiftConsole')
8281
return counts[kind] > 1;
8382
};
8483

85-
// get and clear any alerts
86-
AlertMessageService.getAlerts().forEach(function(alert) {
87-
$scope.alerts[alert.name] = alert.data;
88-
});
89-
AlertMessageService.clearAlerts();
90-
9184
var kindExists = function(kind, group) {
9285
return _.some($scope.kinds, function(next) {
9386
if (next.kind !== kind) {

‎app/scripts/controllers/overview.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,6 @@ function OverviewController($scope,
115115
showMetrics: false
116116
};
117117

118-
AlertMessageService.getAlerts().forEach(function(alert) {
119-
state.alerts[alert.name] = alert.data;
120-
});
121-
AlertMessageService.clearAlerts();
122-
123118
// Track the breakpoint ourselves so we can remove elements from the page,
124119
// rather than hiding them using CSS. This avoids rendering charts more than
125120
// once for the responsive layout, which switches to tabs at smaller screen

‎app/scripts/controllers/pipelines.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ angular.module('openshiftConsole')
1313
$scope,
1414
Constants,
1515
Navigate,
16-
AlertMessageService,
1716
BuildsService,
1817
DataService,
1918
Logger,
@@ -22,12 +21,6 @@ angular.module('openshiftConsole')
2221
$scope.alerts = $scope.alerts || {};
2322
$scope.buildConfigs = {};
2423

25-
// get and clear any alerts
26-
AlertMessageService.getAlerts().forEach(function(alert) {
27-
$scope.alerts[alert.name] = alert.data;
28-
});
29-
AlertMessageService.clearAlerts();
30-
3124
var watches = [];
3225

3326
ProjectsService

‎app/scripts/controllers/pods.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Controller of the openshiftConsole
99
*/
1010
angular.module('openshiftConsole')
11-
.controller('PodsController', function ($routeParams, $scope, DataService, ProjectsService, AlertMessageService, $filter, LabelFilter, Logger) {
11+
.controller('PodsController', function ($routeParams, $scope, DataService, ProjectsService, $filter, LabelFilter, Logger) {
1212
$scope.projectName = $routeParams.project;
1313
$scope.pods = {};
1414
$scope.unfilteredPods = {};
@@ -20,12 +20,6 @@ angular.module('openshiftConsole')
2020
$scope.alerts = $scope.alerts || {};
2121
$scope.emptyMessage = "Loading...";
2222

23-
// get and clear any alerts
24-
AlertMessageService.getAlerts().forEach(function(alert) {
25-
$scope.alerts[alert.name] = alert.data;
26-
});
27-
AlertMessageService.clearAlerts();
28-
2923
var watches = [];
3024

3125
ProjectsService

‎app/scripts/controllers/projects.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ angular.module('openshiftConsole')
1313
$location,
1414
$route,
1515
$timeout,
16-
AlertMessageService,
1716
AuthService,
1817
DataService,
1918
KeywordService,
@@ -110,11 +109,6 @@ angular.module('openshiftConsole')
110109
onSortChange: update
111110
};
112111

113-
AlertMessageService.getAlerts().forEach(function(alert) {
114-
$scope.alerts[alert.name] = alert.data;
115-
});
116-
AlertMessageService.clearAlerts();
117-
118112
$scope.$watch('search.text', _.debounce(function(searchText) {
119113
$scope.keywords = filterKeywords = KeywordService.generateKeywords(searchText);
120114
$scope.$apply(filterProjects);

‎app/scripts/controllers/replicaSet.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ angular.module('openshiftConsole')
1111
function ($scope,
1212
$filter,
1313
$routeParams,
14-
AlertMessageService,
1514
AuthorizationService,
1615
BreadcrumbsService,
1716
DataService,
@@ -68,12 +67,6 @@ angular.module('openshiftConsole')
6867

6968
$scope.logOptions = {};
7069

71-
// get and clear any alerts
72-
AlertMessageService.getAlerts().forEach(function(alert) {
73-
$scope.alerts[alert.name] = alert.data;
74-
});
75-
AlertMessageService.clearAlerts();
76-
7770
var watches = [];
7871

7972
// Check if the metrics service is available so we know when to show the tab.

0 commit comments

Comments
 (0)