Skip to content

Commit 924c13b

Browse files
jhadvigjhadvig
committed
Remove emptyMessage var if its not changing
1 parent 46c6d8b commit 924c13b

37 files changed

+41
-68
lines changed

‎app/scripts/controllers/buildConfig.js

-3
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ angular.module('openshiftConsole')
4343
title: $routeParams.buildconfig
4444
});
4545

46-
$scope.emptyMessage = "Loading...";
47-
4846
AlertMessageService.getAlerts().forEach(function(alert) {
4947
$scope.alerts[alert.name] = alert.data;
5048
});
@@ -186,7 +184,6 @@ angular.module('openshiftConsole')
186184
);
187185

188186
watches.push(DataService.watch("builds", context, function(builds, action, build) {
189-
$scope.emptyMessage = "No builds to show";
190187
if (!action) {
191188
$scope.unfilteredBuilds = BuildsService.validatedBuildsForBuildConfig($routeParams.buildconfig, builds.by('metadata.name'));
192189
} else {

‎app/scripts/controllers/builds.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ angular.module('openshiftConsole')
1515
$scope.buildConfigs = undefined;
1616
$scope.labelSuggestions = {};
1717
$scope.alerts = $scope.alerts || {};
18-
$scope.emptyMessage = "Loading...";
1918
$scope.latestByConfig = {};
2019

2120
// get and clear any alerts
@@ -38,8 +37,8 @@ angular.module('openshiftConsole')
3837
watches.push(DataService.watch("builds", context, function(builds) {
3938
// Filter out pipeline builds, which have a separate page.
4039
$scope.builds = _.omit(builds.by("metadata.name"), isPipeline);
41-
$scope.emptyMessage = "No builds to show";
4240
associateBuildsToBuildConfig();
41+
$scope.loaded = true;
4342
LabelFilter.addLabelSuggestionsFromResources($scope.builds, $scope.labelSuggestions);
4443

4544
Logger.log("builds (subscribe)", $scope.builds);

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

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ angular.module("openshiftConsole")
7575
}
7676
function initAndValidate(scope){
7777

78-
scope.emptyMessage = "Loading...";
7978
scope.name = $routeParams.name;
8079
scope.imageName = imageName;
8180
scope.imageTag = $routeParams.imageTag;

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

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ angular.module("openshiftConsole")
1313
var displayNameFilter = $filter('displayName');
1414
var watches = [];
1515

16-
$scope.emptyMessage = "Loading...";
1716
$scope.alerts = [];
1817
$scope.loginBaseUrl = DataService.openshiftAPIBaseUrl();
1918
$scope.buildConfigs = {};

‎app/scripts/controllers/deployment.js

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ angular.module('openshiftConsole')
3838
title: $routeParams.deployment
3939
}
4040
];
41-
$scope.emptyMessage = "Loading...";
4241
$scope.healthCheckURL = Navigate.healthCheckURL($routeParams.project,
4342
"Deployment",
4443
$routeParams.deployment,

‎app/scripts/controllers/deploymentConfig.js

-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ angular.module('openshiftConsole')
4242
kind: 'DeploymentConfig',
4343
namespace: $routeParams.project
4444
});
45-
$scope.emptyMessage = "Loading...";
4645
$scope.healthCheckURL = Navigate.healthCheckURL($routeParams.project,
4746
"DeploymentConfig",
4847
$routeParams.deploymentconfig);
@@ -188,7 +187,6 @@ angular.module('openshiftConsole')
188187

189188
watches.push(DataService.watch("replicationcontrollers", context, function(deployments, action, deployment) {
190189
var deploymentConfigName = $routeParams.deploymentconfig;
191-
$scope.emptyMessage = "No deployments to show";
192190
if (!action) {
193191
var deploymentsByDeploymentConfig = DeploymentsService.associateDeploymentsToDeploymentConfig(deployments.by("metadata.name"));
194192
$scope.unfilteredDeployments = deploymentsByDeploymentConfig[$routeParams.deploymentconfig] || {};

‎app/scripts/controllers/deployments.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ angular.module('openshiftConsole')
2525
$scope.replicationControllersByDC = {};
2626
$scope.labelSuggestions = {};
2727
$scope.alerts = $scope.alerts || {};
28-
$scope.emptyMessage = "Loading...";
2928
$scope.expandedDeploymentConfigRow = {};
3029
$scope.unfilteredReplicaSets = {};
3130
$scope.unfilteredReplicationControllers = {};
@@ -125,7 +124,7 @@ angular.module('openshiftConsole')
125124
LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredDeploymentConfigs, $scope.labelSuggestions);
126125
LabelFilter.setLabelSuggestions($scope.labelSuggestions);
127126
$scope.deploymentConfigs = LabelFilter.getLabelSelector().select($scope.unfilteredDeploymentConfigs);
128-
$scope.emptyMessage = "No deployment configurations to show";
127+
$scope.loaded = true;
129128
$scope.replicationControllersByDC = DeploymentsService.associateDeploymentsToDeploymentConfig($scope.replicationControllers, $scope.deploymentConfigs, true);
130129
if ($scope.replicationControllersByDC['']) {
131130
$scope.unfilteredReplicationControllers = $scope.replicationControllersByDC[''];

‎app/scripts/controllers/image.js

-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ angular.module('openshiftConsole')
3737
}
3838
];
3939

40-
$scope.emptyMessage = "Loading...";
41-
4240
var watches = [];
4341

4442
var fetchImageStreamTag = _.debounce(function(tagData, context) {
@@ -84,7 +82,6 @@ angular.module('openshiftConsole')
8482

8583
var imageStreamResolved = function(imageStream, context, action) {
8684
populateWithImageStream(imageStream, context);
87-
$scope.emptyMessage = "";
8885
if (action === "DELETED") {
8986
$scope.alerts["deleted"] = {
9087
type: "warning",

‎app/scripts/controllers/images.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ angular.module('openshiftConsole')
1616
$scope.builds = {};
1717
$scope.labelSuggestions = {};
1818
$scope.alerts = $scope.alerts || {};
19-
$scope.emptyMessage = "Loading...";
2019

2120
// get and clear any alerts
2221
AlertMessageService.getAlerts().forEach(function(alert) {
@@ -35,7 +34,7 @@ angular.module('openshiftConsole')
3534
LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredImageStreams, $scope.labelSuggestions);
3635
LabelFilter.setLabelSuggestions($scope.labelSuggestions);
3736
$scope.imageStreams = LabelFilter.getLabelSelector().select($scope.unfilteredImageStreams);
38-
$scope.emptyMessage = "No image streams to show";
37+
$scope.loaded = true;
3938
updateMissingStatusTags();
4039
updateFilterWarning();
4140
Logger.log("image streams (subscribe)", $scope.imageStreams);

‎app/scripts/controllers/imagestream.js

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ angular.module('openshiftConsole')
2424
title: $routeParams.imagestream
2525
}
2626
];
27-
$scope.emptyMessage = "Loading...";
2827

2928
var watches = [];
3029

@@ -37,7 +36,6 @@ angular.module('openshiftConsole')
3736
function(imageStream) {
3837
$scope.loaded = true;
3938
$scope.imageStream = imageStream;
40-
$scope.emptyMessage = "No tags to show";
4139

4240
// If we found the item successfully, watch for changes on it
4341
watches.push(DataService.watchObject("imagestreams", $routeParams.imagestream, context, function(imageStream, action) {

‎app/scripts/controllers/membership.js

-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ angular
143143
projectName: projectName,
144144
alerts: {},
145145
forms: {},
146-
emptyMessage: 'Loading...',
147146
subjectKinds: subjectKinds,
148147
newBinding: {
149148
role: '',

‎app/scripts/controllers/newfromtemplate.js

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ angular.module('openshiftConsole')
4141
return;
4242
}
4343

44-
$scope.emptyMessage = "Loading...";
4544
$scope.alerts = {};
4645
$scope.quotaAlerts = {};
4746
$scope.projectName = $routeParams.project;

‎app/scripts/controllers/pods.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ angular.module('openshiftConsole')
1818
// $scope.imageStreamImageRefByDockerReference = {}; // lets us determine if a particular container's docker image reference belongs to an imageStream
1919
$scope.labelSuggestions = {};
2020
$scope.alerts = $scope.alerts || {};
21-
$scope.emptyMessage = "Loading...";
2221

2322
// get and clear any alerts
2423
AlertMessageService.getAlerts().forEach(function(alert) {
@@ -35,7 +34,7 @@ angular.module('openshiftConsole')
3534
watches.push(DataService.watch("pods", context, function(pods) {
3635
$scope.unfilteredPods = pods.by("metadata.name");
3736
$scope.pods = LabelFilter.getLabelSelector().select($scope.unfilteredPods);
38-
$scope.emptyMessage = "No pods to show";
37+
$scope.loaded = true;
3938
// TODO should we add links to the image streams the pod is using
4039
//ImageStreamResolver.fetchReferencedImageStreamImages($scope.pods, $scope.imagesByDockerReference, $scope.imageStreamImageRefByDockerReference, $scope);
4140
LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredPods, $scope.labelSuggestions);

‎app/scripts/controllers/quota.js

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ angular.module('openshiftConsole')
2121
$scope.labelSuggestions = {};
2222
$scope.alerts = $scope.alerts || {};
2323
$scope.quotaHelp = "Limits resource usage within this project.";
24-
$scope.emptyMessageLimitRanges = "Loading...";
2524
$scope.limitRangeHelp = "Defines minimum and maximum constraints for runtime resources such as memory and CPU.";
2625
$scope.renderOptions = $scope.renderOptions || {};
2726
$scope.renderOptions.hideFilterWidget = true;
@@ -122,7 +121,6 @@ angular.module('openshiftConsole')
122121

123122
DataService.list("limitranges", context, function(limitRanges) {
124123
$scope.limitRanges = limitRanges.by("metadata.name");
125-
$scope.emptyMessageLimitRanges = "There are no limit ranges set on this project.";
126124
// Convert to a sane format for a view to a build a table with rows per resource type
127125
angular.forEach($scope.limitRanges, function(limitRange, name){
128126
$scope.limitsByType[name] = {};

‎app/scripts/controllers/replicaSet.js

-1
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,6 @@ angular.module('openshiftConsole')
445445

446446
watches.push(DataService.watch($scope.resource, context, function(replicaSets, action, replicaSet) {
447447
$scope.replicaSets = replicaSets.by("metadata.name");
448-
$scope.emptyMessage = "No deployments to show";
449448
if (kind === 'ReplicationController') {
450449
$scope.deploymentsByDeploymentConfig = DeploymentsService.associateDeploymentsToDeploymentConfig($scope.replicaSets);
451450
}

‎app/scripts/controllers/routes.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ angular.module('openshiftConsole')
1414
$scope.routes = {};
1515
$scope.labelSuggestions = {};
1616
$scope.alerts = $scope.alerts || {};
17-
$scope.emptyMessage = "Loading...";
1817

1918
AlertMessageService.getAlerts().forEach(function(alert) {
2019
$scope.alerts[alert.name] = alert.data;
@@ -33,7 +32,7 @@ angular.module('openshiftConsole')
3332
LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredRoutes, $scope.labelSuggestions);
3433
LabelFilter.setLabelSuggestions($scope.labelSuggestions);
3534
$scope.routes = LabelFilter.getLabelSelector().select($scope.unfilteredRoutes);
36-
$scope.emptyMessage = "No routes to show";
35+
$scope.loaded = true;
3736
updateFilterWarning();
3837
}));
3938

‎app/scripts/controllers/secret.js

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ angular.module('openshiftConsole')
1616
};
1717

1818
$scope.alerts = $scope.alerts || {};
19-
$scope.emptyMessage = "Loading...";
2019

2120
$scope.breadcrumbs = [
2221
{

‎app/scripts/controllers/services.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ angular.module('openshiftConsole')
1616
$scope.routes = {};
1717
$scope.labelSuggestions = {};
1818
$scope.alerts = $scope.alerts || {};
19-
$scope.emptyMessage = "Loading...";
20-
$scope.emptyMessageRoutes = "Loading...";
2119

2220
// get and clear any alerts
2321
AlertMessageService.getAlerts().forEach(function(alert) {
@@ -36,15 +34,14 @@ angular.module('openshiftConsole')
3634
LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredServices, $scope.labelSuggestions);
3735
LabelFilter.setLabelSuggestions($scope.labelSuggestions);
3836
$scope.services = LabelFilter.getLabelSelector().select($scope.unfilteredServices);
39-
$scope.emptyMessage = "No services to show";
37+
$scope.loaded = true;
4038
updateFilterWarning();
4139

4240
Logger.log("services (subscribe)", $scope.unfilteredServices);
4341
}));
4442

4543
watches.push(DataService.watch("routes", context, function(routes){
4644
$scope.routes = routes.by("metadata.name");
47-
$scope.emptyMessageRoutes = "No routes to show";
4845
$scope.routesByService = routesByService($scope.routes);
4946
Logger.log("routes (subscribe)", $scope.routesByService);
5047
}));

‎app/scripts/controllers/statefulSet.js

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ angular
2323
namespace: $routeParams.project
2424
});
2525

26-
$scope.emptyMessage = "Loading...";
27-
2826
var updateEnvVars = function(statefulSet) {
2927
// Return a copy so that we don't alter the original object, which is
3028
// cached by DataService. Normalizing would otherwise modify the original.

‎app/scripts/controllers/statefulSets.js

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ angular.module('openshiftConsole')
55
$scope.projectName = $routeParams.project;
66
$scope.alerts = $scope.alerts || {};
77
$scope.labelSuggestions = {};
8-
$scope.emptyMessage = "Loading...";
98

109
// get and clear any alerts
1110
AlertMessageService.getAlerts().forEach(function(alert) {

‎app/scripts/controllers/storage.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ angular.module('openshiftConsole')
1414
$scope.unfilteredPVCs = {};
1515
$scope.labelSuggestions = {};
1616
$scope.alerts = $scope.alerts || {};
17-
$scope.emptyMessage = "Loading...";
1817

1918
// get and clear any alerts
2019
AlertMessageService.getAlerts().forEach(function(alert) {
@@ -33,7 +32,7 @@ angular.module('openshiftConsole')
3332
LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredPVCs, $scope.labelSuggestions);
3433
LabelFilter.setLabelSuggestions($scope.labelSuggestions);
3534
$scope.pvcs = LabelFilter.getLabelSelector().select($scope.unfilteredPVCs);
36-
$scope.emptyMessage = "No persistent volume claims to show";
35+
$scope.loaded = true;
3736
updateFilterWarning();
3837
Logger.log("pvcs (subscribe)", $scope.unfilteredPVCs);
3938
}));

‎app/scripts/directives/resources.js

-4
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@ angular.module('openshiftConsole')
176176
pods: '=',
177177
// Optional active pods map to display whether or not pods have endpoints
178178
activePods: '=?',
179-
// Optional empty message to display when there are no pods.
180-
emptyMessage: '=?',
181179
// Alternative header text to display in the 'Name' column.
182180
customNameHeader: '=?',
183181
// Optional map of explanations or warnings for each phase of a pod
@@ -194,8 +192,6 @@ angular.module('openshiftConsole')
194192
services: '=',
195193
portsByRoute: '=',
196194
showNodePorts: '=?',
197-
// Optional empty message to display when there are no pods.
198-
emptyMessage: '=?',
199195
// Alternative header text to display in the 'Name' column.
200196
customNameHeader: '=?',
201197
},

‎app/views/browse/build-config.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ <h2>No builds.</h2>
185185
</tr>
186186
</thead>
187187
<tbody ng-if="(builds | hashSize) == 0">
188-
<tr><td colspan="3"><em>{{emptyMessage}}</em></td></tr>
188+
<tr><td colspan="3"><em>No builds to show</em></td></tr>
189189
</tbody>
190190
<tbody ng-if="(builds | hashSize) > 0">
191191
<tr ng-repeat="build in orderedBuilds">
@@ -218,7 +218,7 @@ <h2>No builds.</h2>
218218
<div ng-if="buildConfig | isJenkinsPipelineStrategy">
219219
<build-pipeline build="build" ng-repeat="build in orderedBuilds track by (build | uid)"></build-pipeline>
220220
<table ng-if="(builds | hashSize) === 0" class="table table-bordered table-hover table-mobile">
221-
<tbody><tr><td><em>{{emptyMessage}}</em></td></tr></tbody>
221+
<tbody><tr><td><em>No builds to show</em></td></tr></tbody>
222222
</table>
223223
</div>
224224
</div>

‎app/views/browse/deployment-config.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ <h1 class="contains-actions">
140140
</tr>
141141
</thead>
142142
<tbody ng-if="(deployments | hashSize) == 0">
143-
<tr><td colspan="4"><em>{{emptyMessage}}</em></td></tr>
143+
<tr><td colspan="4"><em>No deployments to show</em></td></tr>
144144
</tbody>
145145
<tbody ng-if="(deployments | hashSize) > 0">
146146
<tr ng-repeat="deployment in orderedDeployments">

‎app/views/browse/imagestream.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ <h1 class="contains-actions">
6464
</tr>
6565
</thead>
6666
<tbody ng-if="(tagsByName | hashSize) == 0">
67-
<tr><td colspan="5"><em>{{emptyMessage}}</em></td></tr>
67+
<tr><td colspan="5"><em>No tags to show</em></td></tr>
6868
</tbody>
6969
<tbody ng-if="(tagsByName | hashSize) > 0">
7070
<tr ng-repeat="tag in tagsByName | orderBy : 'name'">

‎app/views/browse/routes.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ <h1>
2929
<div class="middle-content">
3030
<div class="container-fluid">
3131
<alerts alerts="alerts"></alerts>
32-
<div class="row">
32+
<div ng-if="!loaded">Loading...</div>
33+
<div class="row" ng-if="loaded">
3334
<div class="col-md-12">
3435
<table class="table table-bordered table-hover table-mobile table-layout-fixed">
3536
<colgroup>
@@ -49,7 +50,7 @@ <h1>
4950
</tr>
5051
</thead>
5152
<tbody ng-if="(routes | hashSize) == 0">
52-
<tr><td colspan="5"><em>{{emptyMessage || 'No routes to show'}}</em></td></tr>
53+
<tr><td colspan="5"><em>No routes to show</em></td></tr>
5354
</tbody>
5455
<tbody ng-if="(routes | hashSize) > 0">
5556
<tr ng-repeat="route in routes | orderObjectsByDate : true">

‎app/views/builds.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ <h1>
2626
<div class="middle-content">
2727
<div class="container-fluid">
2828
<alerts alerts="alerts"></alerts>
29-
<div class="row">
29+
<div ng-if="!loaded">Loading...</div>
30+
<div class="row" ng-if="loaded">
3031
<div class="col-md-12">
3132
<table class="table table-bordered table-hover table-mobile table-layout-fixed">
3233
<colgroup>
@@ -50,7 +51,7 @@ <h1>
5051
</tr>
5152
</thead>
5253
<tbody ng-if="!(latestByConfig | hashSize)">
53-
<tr><td colspan="7"><em>{{emptyMessage}}</em></td></tr>
54+
<tr><td colspan="7"><em>No builds to show</em></td></tr>
5455
</tbody>
5556
<tbody ng-if="(latestByConfig | hashSize)">
5657
<tr ng-repeat="(buildConfigName, latestBuild) in latestByConfig">

‎app/views/create/fromimage.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
<div class="row">
1313
<div class="col-md-12">
1414
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
15-
<div ng-hide="imageStream">
16-
{{ emptyMessage }}
17-
</div>
15+
<div ng-hide="imageStream">Loading...</div>
1816
<div class="osc-form" ng-show="imageStream">
1917
<alerts alerts="alerts"></alerts>
2018
<div class="row">

0 commit comments

Comments
 (0)