Fix orderBy calls that were passed hashes so we dont get errors with ang 1.5

dtaylor113 · jwforres · commit 7689654439d9 · 2017-02-10T15:27:53.000-05:00
Also update more dependencies to fix some resolution issues.
diff --git a/app/index.html b/app/index.html
@@ -118,7 +118,7 @@ <h1>JavaScript Required</h1>
     <script src="bower_components/uri.js/src/jquery.URI.js"></script>
     <script src="bower_components/uri.js/src/URI.fragmentURI.js"></script>
     <script src="bower_components/js-logger/src/logger.js"></script>
-    <script src="bower_components/hawtio-core/hawtio-core.js"></script>
+    <script src="bower_components/hawtio-core/dist/hawtio-core.js"></script>
     <script src="bower_components/hawtio-extension-service/dist/hawtio-extension-service.js"></script>
     <script src="bower_components/sifter/sifter.js"></script>
     <script src="bower_components/microplugin/src/microplugin.js"></script>
diff --git a/app/scripts/controllers/imagestream.js b/app/scripts/controllers/imagestream.js
@@ -10,7 +10,7 @@ angular.module('openshiftConsole')
   .controller('ImageStreamController', function ($scope, $routeParams, DataService, ProjectsService, $filter, ImageStreamsService) {
     $scope.projectName = $routeParams.project;
     $scope.imageStream = null;
-    $scope.tagsByName = {};
+    $scope.tags = [];
     $scope.tagShowOlder = {};
     $scope.alerts = {};
     $scope.renderOptions = $scope.renderOptions || {};
@@ -48,7 +48,7 @@ angular.module('openshiftConsole')
                 };
               }
               $scope.imageStream = imageStream;
-              $scope.tagsByName = ImageStreamsService.tagsByName($scope.imageStream);
+              $scope.tags = _.sortBy(ImageStreamsService.tagsByName($scope.imageStream), 'name');
             }));
           },
           // failure
diff --git a/app/scripts/controllers/quota.js b/app/scripts/controllers/quota.js
@@ -102,13 +102,13 @@ angular.module('openshiftConsole')
         $scope.project = project;
 
         DataService.list("resourcequotas", context, function(quotas) {
-          $scope.quotas = quotas.by("metadata.name");
+          $scope.quotas = _.sortBy(quotas.by("metadata.name"), 'name');
           $scope.orderedTypesByQuota = orderTypes($scope.quotas);
           Logger.log("quotas", $scope.quotas);
         });
 
         DataService.list("appliedclusterresourcequotas", context, function(quotas) {
-          $scope.clusterQuotas = quotas.by("metadata.name");
+          $scope.clusterQuotas = _.sortBy(quotas.by("metadata.name"), 'name');
           $scope.orderedTypesByClusterQuota = orderTypes($scope.clusterQuotas);
           $scope.namespaceUsageByClusterQuota = {};
           _.each($scope.clusterQuotas, function(quota, quotaName) {
@@ -121,10 +121,11 @@ angular.module('openshiftConsole')
         });
 
         DataService.list("limitranges", context, function(limitRanges) {
-          $scope.limitRanges = limitRanges.by("metadata.name");
+          $scope.limitRanges = _.sortBy(limitRanges.by("metadata.name"), 'name');
           $scope.emptyMessageLimitRanges = "There are no limit ranges set on this project.";
           // Convert to a sane format for a view to a build a table with rows per resource type
-          angular.forEach($scope.limitRanges, function(limitRange, name){
+          angular.forEach($scope.limitRanges, function(limitRange){
+            var name = limitRange.metadata.name;
             $scope.limitsByType[name] = {};
 
             angular.forEach(limitRange.spec.limits, function(limit) {
diff --git a/app/views/browse/imagestream.html b/app/views/browse/imagestream.html
@@ -63,10 +63,10 @@ <h1 class="contains-actions">
                     <th>Pull Spec</th>
                   </tr>
                 </thead>
-                <tbody ng-if="(tagsByName | hashSize) == 0">
+                <tbody ng-if="!tags.length">
                   <tr><td colspan="5"><em>{{emptyMessage}}</em></td></tr>
                 </tbody>
-                <tbody ng-repeat="tag in tagsByName | orderBy : 'name'">
+                <tbody ng-repeat="tag in tags | orderBy : 'name'">
                   <tr>
                     <td data-title="Tag">
                       <a ng-if="tag.status" ng-href="{{imageStream | navigateResourceURL}}/{{tag.name}}">{{tag.name}}</a>
diff --git a/app/views/overview.html b/app/views/overview.html
@@ -66,29 +66,29 @@ <h2>Welcome to project {{projectName}}.</h2>
                 <!-- /unserviced deployment -->
 
                 <!-- unserviced RC -->
-                <div ng-repeat="set in replicationControllersByService[''] | orderBy : 'metadata.name' track by (set | uid)"
+                <div ng-repeat="set in replicationControllersByService[''] | toArray | orderBy : 'metadata.name' track by (set | uid)"
                     ng-if="!(set | annotation : 'deploymentConfig') || !deploymentConfigs[(set | annotation : 'deploymentConfig')]"
                     class="no-service">
                   <overview-set class="overview-tile-wrapper"></overview-set>
                 </div>
                 <!-- /unserviced RC-->
 
                 <!-- unserviced RS -->
-                <div ng-repeat="set in replicaSetsByService[''] | orderBy : 'metadata.name' track by (set | uid)"
+                <div ng-repeat="set in replicaSetsByService[''] | toArray | orderBy : 'metadata.name' track by (set | uid)"
                      ng-if="!(set | annotation : 'deployment.kubernetes.io/revision')"
                      class="no-service">
                   <overview-set class="overview-tile-wrapper"></overview-set>
                 </div>
                 <!-- /unserviced RS-->
 
                 <!-- unserviced RS -->
-                <div ng-repeat="set in statefulSetsByService[''] | orderBy : 'metadata.name' track by (set | uid)" class="no-service">
+                <div ng-repeat="set in statefulSetsByService[''] | toArray | orderBy : 'metadata.name' track by (set | uid)" class="no-service">
                   <overview-set class="overview-tile-wrapper"></overview-set>
                 </div>
                 <!-- /unserviced RS-->
 
                 <!-- unservice monopods -->
-                <div ng-repeat="pod in monopodsByService[''] | orderBy : 'metadata.name' track by (pod | uid)"
+                <div ng-repeat="pod in monopodsByService[''] | toArray | orderBy : 'metadata.name' track by (pod | uid)"
                     class="no-service">
                   <overview-pod class="overview-tile-wrapper"></overview-pod>
                 </div>
diff --git a/app/views/quota.html b/app/views/quota.html
@@ -10,20 +10,20 @@
             <div class="row">
               <div class="col-md-12">
                 <h1>
-                  <span ng-if="clusterQuotas | hashSize">Cluster </span>Quota
+                  <span ng-if="clusterQuotas.length">Cluster </span>Quota
                   <span class="page-header-link">
                     <a ng-href="{{'quota' | helpLink}}" target="_blank">
                       Learn More <i class="fa fa-external-link" aria-hidden="true"></i>
                     </a>
                   </span>
                 </h1>
-                <div ng-if="!(quotas | hashSize) && !(clusterQuotas | hashSize)" class="mar-top-xl">
+                <div ng-if="!quotas.length && !clusterQuotas.length" class="mar-top-xl">
                   <div class="help-block">{{quotaHelp}}</div>
                   <p><em ng-if="!quotas && !clusterQuotas">Loading...</em><em ng-if="quotas || clusterQuotas">There are no resource quotas set on this project.</em></p>
                 </div>
 
                 <div ng-repeat="quota in clusterQuotas | orderBy: 'metadata.name'" class="gutter-bottom">
-                  <h2 ng-if="(clusterQuotas | hashSize) > 1">{{quota.metadata.name}}</h2>
+                  <h2 ng-if="clusterQuotas.length">{{quota.metadata.name}}</h2>
                   <div ng-if="$first" class="help-block">Limits resource usage across a set of projects.</div>
                   <dl ng-if="quota.spec.quota.scopes.length">
                     <dt>Scopes:</dt>
@@ -113,9 +113,9 @@ <h3 class="text-center">Memory <small>Limit</small></h3>
                   </div>
                 </div>
 
-                <h1 ng-if="(clusterQuotas | hashSize) && (quotas | hashSize)">Project Quota</h1>
+                <h1 ng-if="clusterQuotas.length && quotas.length">Project Quota</h1>
                 <div ng-repeat="quota in quotas | orderBy: 'metadata.name'" class="gutter-bottom">
-                  <h2 ng-if="(quotas | hashSize) > 1">{{quota.metadata.name}}</h2>
+                  <h2 ng-if="quotas.length">{{quota.metadata.name}}</h2>
                   <div ng-if="$first" class="help-block mar-bottom-md">{{quotaHelp}}</div>
                   <dl ng-if="quota.spec.scopes.length">
                     <dt>Scopes:</dt>
@@ -202,13 +202,13 @@ <h3 class="text-center">Memory <small>Limit</small></h3>
 
                 <div class="limit-ranges-section">
                   <h1>Limit Range</h1>
-                  <div ng-if="!(limitRanges | hashSize)">
+                  <div ng-if="!limitRanges.length">
                     <div class="help-block">{{limitRangeHelp}}</div>
                     <p><em>{{emptyMessageLimitRanges}}</em></p>
                   </div>
 
-                  <div ng-repeat="(limitRangeName, limitRange) in limitRanges">
-                    <h2 ng-if="(limitRanges | hashSize) > 1">{{limitRangeName}}</h2>
+                  <div ng-repeat="limitRange in limitRanges">
+                    <h2 ng-if="limitRanges.length">{{limitRange.metadata.name}}</h2>
                     <div ng-if="$first" class="help-block mar-bottom-md">{{limitRangeHelp}}</div>
                     <div class="table-responsive">
                       <table class="table">
@@ -250,7 +250,7 @@ <h2 ng-if="(limitRanges | hashSize) > 1">{{limitRangeName}}</h2>
                         </thead>
                         <tbody>
                           <tr ng-repeat-start="limit in limitRange.spec.limits"></tr>
-                          <tr ng-repeat="(type, typeLimits) in limitsByType[limitRangeName][limit.type]">
+                          <tr ng-repeat="(type, typeLimits) in limitsByType[limitRange.metadata.name][limit.type]">
                             <td>{{limit.type}} {{type | computeResourceLabel : true}}</td>
                             <td>{{(typeLimits.min | usageWithUnits : type) || "&mdash;"}}</td>
                             <td>{{(typeLimits.max | usageWithUnits : type) || "&mdash;"}}</td>
diff --git a/bower.json b/bower.json
@@ -5,6 +5,7 @@
     "angular": "1.5.11",
     "json3": "3.3.2",
     "es5-shim": "3.1.1",
+    "es5-dom-shim": "*",
     "angular-resource": "1.5.11",
     "angular-cookies": "1.5.11",
     "angular-sanitize": "1.5.11",
@@ -17,19 +18,19 @@
     "moment": "2.14.2",
     "moment-timezone": "0.5.3",
     "patternfly": "3.18.1",
-    "hawtio-core": "2.0.11",
+    "hawtio-core": "2.0.37",
     "hawtio-extension-service": "2.0.2",
     "jquery": "2.1.4",
     "lodash": "3.10.1",
     "sifter": "0.4.1",
     "microplugin": "0.0.3",
     "selectize": "0.12.1",
     "messenger": "1.4.1",
-    "kubernetes-label-selector": "1.4.1",
+    "kubernetes-label-selector": "1.4.2",
     "kubernetes-topology-graph": "0.0.23",
-    "kubernetes-container-terminal": "1.0.2",
+    "kubernetes-container-terminal": "1.0.3",
     "registry-image-widgets": "0.0.2",
-    "openshift-object-describer": "1.1.2",
+    "openshift-object-describer": "1.1.4",
     "layout.attrs": "2.1.1",
     "bootstrap-hover-dropdown": "2.1.3",
     "angular-ui-ace": "0.2.3",
@@ -40,7 +41,7 @@
     "ng-sortable": "1.3.4",
     "ui-select": "angular-ui-select#0.19.4",
     "matchHeight": "0.7.0",
-    "angular-key-value-editor": "2.9.2",
+    "angular-key-value-editor": "3.0.0",
     "angular-inview": "1.5.7",
     "js-yaml": "3.6.1",
     "angular-moment": "1.0.0",
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -5109,9 +5109,9 @@ b[a.metadata.name] = d;
 };
 e.get(b.project).then(_.spread(function(a, e) {
 c.project = a, d.list("resourcequotas", e, function(a) {
-c.quotas = a.by("metadata.name"), c.orderedTypesByQuota = k(c.quotas), f.log("quotas", c.quotas);
+c.quotas = _.sortBy(a.by("metadata.name"), "name"), c.orderedTypesByQuota = k(c.quotas), f.log("quotas", c.quotas);
 }), d.list("appliedclusterresourcequotas", e, function(a) {
-c.clusterQuotas = a.by("metadata.name"), c.orderedTypesByClusterQuota = k(c.clusterQuotas), c.namespaceUsageByClusterQuota = {}, _.each(c.clusterQuotas, function(a, d) {
+c.clusterQuotas = _.sortBy(a.by("metadata.name"), "name"), c.orderedTypesByClusterQuota = k(c.clusterQuotas), c.namespaceUsageByClusterQuota = {}, _.each(c.clusterQuotas, function(a, d) {
 if (a.status) {
 var e = _.find(a.status.namespaces, {
 namespace:b.project
@@ -5120,7 +5120,8 @@ c.namespaceUsageByClusterQuota[d] = e.status;
 }
 }), f.log("cluster quotas", c.clusterQuotas);
 }), d.list("limitranges", e, function(a) {
-c.limitRanges = a.by("metadata.name"), c.emptyMessageLimitRanges = "There are no limit ranges set on this project.", angular.forEach(c.limitRanges, function(a, b) {
+c.limitRanges = _.sortBy(a.by("metadata.name"), "name"), c.emptyMessageLimitRanges = "There are no limit ranges set on this project.", angular.forEach(c.limitRanges, function(a) {
+var b = a.metadata.name;
 c.limitsByType[b] = {}, angular.forEach(a.spec.limits, function(a) {
 var d = c.limitsByType[b][a.type] = {};
 angular.forEach(a.max, function(a, b) {
@@ -5949,7 +5950,7 @@ d.unwatchAll(i);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("ImageStreamController", [ "$scope", "$routeParams", "DataService", "ProjectsService", "$filter", "ImageStreamsService", function(a, b, c, d, e, f) {
-a.projectName = b.project, a.imageStream = null, a.tagsByName = {}, a.tagShowOlder = {}, a.alerts = {}, a.renderOptions = a.renderOptions || {}, a.renderOptions.hideFilterWidget = !0, a.breadcrumbs = [ {
+a.projectName = b.project, a.imageStream = null, a.tags = [], a.tagShowOlder = {}, a.alerts = {}, a.renderOptions = a.renderOptions || {}, a.renderOptions.hideFilterWidget = !0, a.breadcrumbs = [ {
 title:"Image Streams",
 link:"project/" + b.project + "/browse/images"
 }, {
@@ -5962,7 +5963,7 @@ a.loaded = !0, a.imageStream = d, a.emptyMessage = "No tags to show", g.push(c.w
 "DELETED" === c && (a.alerts.deleted = {
 type:"warning",
 message:"This image stream has been deleted."
-}), a.imageStream = b, a.tagsByName = f.tagsByName(a.imageStream);
+}), a.imageStream = b, a.tags = _.sortBy(f.tagsByName(a.imageStream), "name");
 }));
 }, function(b) {
 a.loaded = !0, a.alerts.load = {
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
diff --git a/dist/scripts/vendor.js b/dist/scripts/vendor.js
diff --git a/dist/styles/main.css b/dist/styles/main.css
diff --git a/test/karma.conf.js b/test/karma.conf.js
