From d904e41a6c7990ccc4f155c8660426abbbd60cbe Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Fri, 17 Jun 2016 11:23:34 -0400 Subject: [PATCH] Fix runtime error in service group watch when service undefined --- app/scripts/directives/overview/serviceGroup.js | 3 +++ dist/scripts/scripts.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/scripts/directives/overview/serviceGroup.js b/app/scripts/directives/overview/serviceGroup.js index f80c54abe0..c71de50968 100644 --- a/app/scripts/directives/overview/serviceGroup.js +++ b/app/scripts/directives/overview/serviceGroup.js @@ -65,6 +65,9 @@ angular.module('openshiftConsole') }); $scope.$watchGroup(['service', 'childServicesByParent'], function() { + if (!$scope.service) { + return; + } $scope.childServices = _.get($scope, ['childServicesByParent', $scope.service.metadata.name], []); $scope.groupedServices = [$scope.service].concat($scope.childServices); }); diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index 0567b023ff..9e6c90a8f8 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -7946,7 +7946,7 @@ _.each(a, function(a) { return b ? void (b = c.getPreferredDisplayRoute(b, a)) :void (b = a); }), e.displayRoute = b; }), e.$watchGroup([ "service", "childServicesByParent" ], function() { -e.childServices = _.get(e, [ "childServicesByParent", e.service.metadata.name ], []), e.groupedServices = [ e.service ].concat(e.childServices); +e.service && (e.childServices = _.get(e, [ "childServicesByParent", e.service.metadata.name ], []), e.groupedServices = [ e.service ].concat(e.childServices)); }); } };