Skip to content

Commit d87d27f

Browse files
dtaylor113jwforres
dtaylor113
authored and
jwforres
committed
Fix orderBy calls that were passed hashes so we dont get errors with ang 1.5
Also update more dependencies to fix some resolution issues.
1 parent 6052b33 commit d87d27f

File tree

12 files changed

+277
-174
lines changed

12 files changed

+277
-174
lines changed

‎app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ <h1>JavaScript Required</h1>
118118
<script src="bower_components/uri.js/src/jquery.URI.js"></script>
119119
<script src="bower_components/uri.js/src/URI.fragmentURI.js"></script>
120120
<script src="bower_components/js-logger/src/logger.js"></script>
121-
<script src="bower_components/hawtio-core/hawtio-core.js"></script>
121+
<script src="bower_components/hawtio-core/dist/hawtio-core.js"></script>
122122
<script src="bower_components/hawtio-extension-service/dist/hawtio-extension-service.js"></script>
123123
<script src="bower_components/sifter/sifter.js"></script>
124124
<script src="bower_components/microplugin/src/microplugin.js"></script>

‎app/scripts/controllers/imagestream.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ angular.module('openshiftConsole')
1010
.controller('ImageStreamController', function ($scope, $routeParams, DataService, ProjectsService, $filter, ImageStreamsService) {
1111
$scope.projectName = $routeParams.project;
1212
$scope.imageStream = null;
13-
$scope.tagsByName = {};
13+
$scope.tags = [];
1414
$scope.tagShowOlder = {};
1515
$scope.alerts = {};
1616
$scope.renderOptions = $scope.renderOptions || {};
@@ -48,7 +48,7 @@ angular.module('openshiftConsole')
4848
};
4949
}
5050
$scope.imageStream = imageStream;
51-
$scope.tagsByName = ImageStreamsService.tagsByName($scope.imageStream);
51+
$scope.tags = _.toArray(ImageStreamsService.tagsByName($scope.imageStream));
5252
}));
5353
},
5454
// failure

‎app/scripts/controllers/quota.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ angular.module('openshiftConsole')
102102
$scope.project = project;
103103

104104
DataService.list("resourcequotas", context, function(quotas) {
105-
$scope.quotas = quotas.by("metadata.name");
105+
$scope.quotas = _.sortBy(quotas.by("metadata.name"), "metadata.name");
106106
$scope.orderedTypesByQuota = orderTypes($scope.quotas);
107107
Logger.log("quotas", $scope.quotas);
108108
});
109109

110110
DataService.list("appliedclusterresourcequotas", context, function(quotas) {
111-
$scope.clusterQuotas = quotas.by("metadata.name");
111+
$scope.clusterQuotas = _.sortBy(quotas.by("metadata.name"), "metadata.name");
112112
$scope.orderedTypesByClusterQuota = orderTypes($scope.clusterQuotas);
113113
$scope.namespaceUsageByClusterQuota = {};
114114
_.each($scope.clusterQuotas, function(quota, quotaName) {
@@ -121,10 +121,11 @@ angular.module('openshiftConsole')
121121
});
122122

123123
DataService.list("limitranges", context, function(limitRanges) {
124-
$scope.limitRanges = limitRanges.by("metadata.name");
124+
$scope.limitRanges = _.sortBy(limitRanges.by("metadata.name"), "metadata.name");
125125
$scope.emptyMessageLimitRanges = "There are no limit ranges set on this project.";
126126
// Convert to a sane format for a view to a build a table with rows per resource type
127-
angular.forEach($scope.limitRanges, function(limitRange, name){
127+
angular.forEach($scope.limitRanges, function(limitRange){
128+
var name = limitRange.metadata.name;
128129
$scope.limitsByType[name] = {};
129130

130131
angular.forEach(limitRange.spec.limits, function(limit) {

‎app/views/browse/imagestream.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ <h1 class="contains-actions">
6363
<th>Pull Spec</th>
6464
</tr>
6565
</thead>
66-
<tbody ng-if="(tagsByName | hashSize) == 0">
66+
<tbody ng-if="!tags.length">
6767
<tr><td colspan="5"><em>{{emptyMessage}}</em></td></tr>
6868
</tbody>
69-
<tbody ng-repeat="tag in tagsByName | orderBy : 'name'">
69+
<tbody ng-repeat="tag in tags">
7070
<tr>
7171
<td data-title="Tag">
7272
<a ng-if="tag.status" ng-href="{{imageStream | navigateResourceURL}}/{{tag.name}}">{{tag.name}}</a>

‎app/views/overview.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,29 @@ <h2>Welcome to project {{projectName}}.</h2>
6666
<!-- /unserviced deployment -->
6767

6868
<!-- unserviced RC -->
69-
<div ng-repeat="set in replicationControllersByService[''] | orderBy : 'metadata.name' track by (set | uid)"
69+
<div ng-repeat="set in replicationControllersByService[''] | toArray | orderBy : 'metadata.name' track by (set | uid)"
7070
ng-if="!(set | annotation : 'deploymentConfig') || !deploymentConfigs[(set | annotation : 'deploymentConfig')]"
7171
class="no-service">
7272
<overview-set class="overview-tile-wrapper"></overview-set>
7373
</div>
7474
<!-- /unserviced RC-->
7575

7676
<!-- unserviced RS -->
77-
<div ng-repeat="set in replicaSetsByService[''] | orderBy : 'metadata.name' track by (set | uid)"
77+
<div ng-repeat="set in replicaSetsByService[''] | toArray | orderBy : 'metadata.name' track by (set | uid)"
7878
ng-if="!(set | annotation : 'deployment.kubernetes.io/revision')"
7979
class="no-service">
8080
<overview-set class="overview-tile-wrapper"></overview-set>
8181
</div>
8282
<!-- /unserviced RS-->
8383

8484
<!-- unserviced RS -->
85-
<div ng-repeat="set in statefulSetsByService[''] | orderBy : 'metadata.name' track by (set | uid)" class="no-service">
85+
<div ng-repeat="set in statefulSetsByService[''] | toArray | orderBy : 'metadata.name' track by (set | uid)" class="no-service">
8686
<overview-set class="overview-tile-wrapper"></overview-set>
8787
</div>
8888
<!-- /unserviced RS-->
8989

9090
<!-- unservice monopods -->
91-
<div ng-repeat="pod in monopodsByService[''] | orderBy : 'metadata.name' track by (pod | uid)"
91+
<div ng-repeat="pod in monopodsByService[''] | toArray | orderBy : 'metadata.name' track by (pod | uid)"
9292
class="no-service">
9393
<overview-pod class="overview-tile-wrapper"></overview-pod>
9494
</div>

‎app/views/quota.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
<div class="row">
1111
<div class="col-md-12">
1212
<h1>
13-
<span ng-if="clusterQuotas | hashSize">Cluster </span>Quota
13+
<span ng-if="clusterQuotas.length">Cluster </span>Quota
1414
<span class="page-header-link">
1515
<a ng-href="{{'quota' | helpLink}}" target="_blank">
1616
Learn More <i class="fa fa-external-link" aria-hidden="true"></i>
1717
</a>
1818
</span>
1919
</h1>
20-
<div ng-if="!(quotas | hashSize) && !(clusterQuotas | hashSize)" class="mar-top-xl">
20+
<div ng-if="!quotas.length && !clusterQuotas.length" class="mar-top-xl">
2121
<div class="help-block">{{quotaHelp}}</div>
2222
<p><em ng-if="!quotas && !clusterQuotas">Loading...</em><em ng-if="quotas || clusterQuotas">There are no resource quotas set on this project.</em></p>
2323
</div>
2424

2525
<div ng-repeat="quota in clusterQuotas | orderBy: 'metadata.name'" class="gutter-bottom">
26-
<h2 ng-if="(clusterQuotas | hashSize) > 1">{{quota.metadata.name}}</h2>
26+
<h2 ng-if="clusterQuotas.length">{{quota.metadata.name}}</h2>
2727
<div ng-if="$first" class="help-block">Limits resource usage across a set of projects.</div>
2828
<dl ng-if="quota.spec.quota.scopes.length">
2929
<dt>Scopes:</dt>
@@ -113,9 +113,9 @@ <h3 class="text-center">Memory <small>Limit</small></h3>
113113
</div>
114114
</div>
115115

116-
<h1 ng-if="(clusterQuotas | hashSize) && (quotas | hashSize)">Project Quota</h1>
116+
<h1 ng-if="clusterQuotas.length && quotas.length">Project Quota</h1>
117117
<div ng-repeat="quota in quotas | orderBy: 'metadata.name'" class="gutter-bottom">
118-
<h2 ng-if="(quotas | hashSize) > 1">{{quota.metadata.name}}</h2>
118+
<h2 ng-if="quotas.length">{{quota.metadata.name}}</h2>
119119
<div ng-if="$first" class="help-block mar-bottom-md">{{quotaHelp}}</div>
120120
<dl ng-if="quota.spec.scopes.length">
121121
<dt>Scopes:</dt>
@@ -202,13 +202,13 @@ <h3 class="text-center">Memory <small>Limit</small></h3>
202202

203203
<div class="limit-ranges-section">
204204
<h1>Limit Range</h1>
205-
<div ng-if="!(limitRanges | hashSize)">
205+
<div ng-if="!limitRanges.length">
206206
<div class="help-block">{{limitRangeHelp}}</div>
207207
<p><em>{{emptyMessageLimitRanges}}</em></p>
208208
</div>
209209

210-
<div ng-repeat="(limitRangeName, limitRange) in limitRanges">
211-
<h2 ng-if="(limitRanges | hashSize) > 1">{{limitRangeName}}</h2>
210+
<div ng-repeat="limitRange in limitRanges">
211+
<h2 ng-if="limitRanges.length">{{limitRange.metadata.name}}</h2>
212212
<div ng-if="$first" class="help-block mar-bottom-md">{{limitRangeHelp}}</div>
213213
<div class="table-responsive">
214214
<table class="table">
@@ -250,7 +250,7 @@ <h2 ng-if="(limitRanges | hashSize) > 1">{{limitRangeName}}</h2>
250250
</thead>
251251
<tbody>
252252
<tr ng-repeat-start="limit in limitRange.spec.limits"></tr>
253-
<tr ng-repeat="(type, typeLimits) in limitsByType[limitRangeName][limit.type]">
253+
<tr ng-repeat="(type, typeLimits) in limitsByType[limitRange.metadata.name][limit.type]">
254254
<td>{{limit.type}} {{type | computeResourceLabel : true}}</td>
255255
<td>{{(typeLimits.min | usageWithUnits : type) || "&mdash;"}}</td>
256256
<td>{{(typeLimits.max | usageWithUnits : type) || "&mdash;"}}</td>

‎bower.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"angular": "1.5.11",
66
"json3": "3.3.2",
77
"es5-shim": "3.1.1",
8+
"es5-dom-shim": "*",
89
"angular-resource": "1.5.11",
910
"angular-cookies": "1.5.11",
1011
"angular-sanitize": "1.5.11",
@@ -17,19 +18,19 @@
1718
"moment": "2.14.2",
1819
"moment-timezone": "0.5.3",
1920
"patternfly": "3.18.1",
20-
"hawtio-core": "2.0.11",
21+
"hawtio-core": "2.0.37",
2122
"hawtio-extension-service": "2.0.2",
2223
"jquery": "2.1.4",
2324
"lodash": "3.10.1",
2425
"sifter": "0.4.1",
2526
"microplugin": "0.0.3",
2627
"selectize": "0.12.1",
2728
"messenger": "1.4.1",
28-
"kubernetes-label-selector": "1.4.1",
29+
"kubernetes-label-selector": "1.4.2",
2930
"kubernetes-topology-graph": "0.0.23",
30-
"kubernetes-container-terminal": "1.0.2",
31+
"kubernetes-container-terminal": "1.0.3",
3132
"registry-image-widgets": "0.0.2",
32-
"openshift-object-describer": "1.1.2",
33+
"openshift-object-describer": "1.1.4",
3334
"layout.attrs": "2.1.1",
3435
"bootstrap-hover-dropdown": "2.1.3",
3536
"angular-ui-ace": "0.2.3",
@@ -40,7 +41,7 @@
4041
"ng-sortable": "1.3.4",
4142
"ui-select": "angular-ui-select#0.19.4",
4243
"matchHeight": "0.7.0",
43-
"angular-key-value-editor": "2.9.2",
44+
"angular-key-value-editor": "3.0.0",
4445
"angular-inview": "1.5.7",
4546
"js-yaml": "3.6.1",
4647
"angular-moment": "1.0.0",

‎dist/scripts/scripts.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -5109,9 +5109,9 @@ b[a.metadata.name] = d;
51095109
};
51105110
e.get(b.project).then(_.spread(function(a, e) {
51115111
c.project = a, d.list("resourcequotas", e, function(a) {
5112-
c.quotas = a.by("metadata.name"), c.orderedTypesByQuota = k(c.quotas), f.log("quotas", c.quotas);
5112+
c.quotas = _.sortBy(a.by("metadata.name"), "metadata.name"), c.orderedTypesByQuota = k(c.quotas), f.log("quotas", c.quotas);
51135113
}), d.list("appliedclusterresourcequotas", e, function(a) {
5114-
c.clusterQuotas = a.by("metadata.name"), c.orderedTypesByClusterQuota = k(c.clusterQuotas), c.namespaceUsageByClusterQuota = {}, _.each(c.clusterQuotas, function(a, d) {
5114+
c.clusterQuotas = _.sortBy(a.by("metadata.name"), "metadata.name"), c.orderedTypesByClusterQuota = k(c.clusterQuotas), c.namespaceUsageByClusterQuota = {}, _.each(c.clusterQuotas, function(a, d) {
51155115
if (a.status) {
51165116
var e = _.find(a.status.namespaces, {
51175117
namespace:b.project
@@ -5120,7 +5120,8 @@ c.namespaceUsageByClusterQuota[d] = e.status;
51205120
}
51215121
}), f.log("cluster quotas", c.clusterQuotas);
51225122
}), d.list("limitranges", e, function(a) {
5123-
c.limitRanges = a.by("metadata.name"), c.emptyMessageLimitRanges = "There are no limit ranges set on this project.", angular.forEach(c.limitRanges, function(a, b) {
5123+
c.limitRanges = _.sortBy(a.by("metadata.name"), "metadata.name"), c.emptyMessageLimitRanges = "There are no limit ranges set on this project.", angular.forEach(c.limitRanges, function(a) {
5124+
var b = a.metadata.name;
51245125
c.limitsByType[b] = {}, angular.forEach(a.spec.limits, function(a) {
51255126
var d = c.limitsByType[b][a.type] = {};
51265127
angular.forEach(a.max, function(a, b) {
@@ -5949,7 +5950,7 @@ d.unwatchAll(i);
59495950
});
59505951
}));
59515952
} ]), angular.module("openshiftConsole").controller("ImageStreamController", [ "$scope", "$routeParams", "DataService", "ProjectsService", "$filter", "ImageStreamsService", function(a, b, c, d, e, f) {
5952-
a.projectName = b.project, a.imageStream = null, a.tagsByName = {}, a.tagShowOlder = {}, a.alerts = {}, a.renderOptions = a.renderOptions || {}, a.renderOptions.hideFilterWidget = !0, a.breadcrumbs = [ {
5953+
a.projectName = b.project, a.imageStream = null, a.tags = [], a.tagShowOlder = {}, a.alerts = {}, a.renderOptions = a.renderOptions || {}, a.renderOptions.hideFilterWidget = !0, a.breadcrumbs = [ {
59535954
title:"Image Streams",
59545955
link:"project/" + b.project + "/browse/images"
59555956
}, {
@@ -5962,7 +5963,7 @@ a.loaded = !0, a.imageStream = d, a.emptyMessage = "No tags to show", g.push(c.w
59625963
"DELETED" === c && (a.alerts.deleted = {
59635964
type:"warning",
59645965
message:"This image stream has been deleted."
5965-
}), a.imageStream = b, a.tagsByName = f.tagsByName(a.imageStream);
5966+
}), a.imageStream = b, a.tags = _.toArray(f.tagsByName(a.imageStream));
59665967
}));
59675968
}, function(b) {
59685969
a.loaded = !0, a.alerts.load = {

0 commit comments

Comments
 (0)