@@ -14070,9 +14070,15 @@ return _.get(e, [ "routesByService", a ]);
14070
14070
e.displayRoute = i(a), e.primaryServiceRoutes = a, j();
14071
14071
}), e.$watchGroup([ "service", "childServicesByParent" ], function() {
14072
14072
e.service && (e.primaryService = e.service, e.childServices = _.get(e, [ "childServicesByParent", e.service.metadata.name ], []));
14073
- }), e.$watchGroup([ "service", "childServices", "alternateServices" ], function() {
14073
+ }), e.$watchGroup([ "service", "childServices", "alternateServices", "deploymentConfigsByService" ], function() {
14074
+ if (e.deploymentConfigsByService) {
14074
14075
var a = [ e.service ].concat(e.alternateServices).concat(e.childServices);
14075
- e.allServicesInGroup = _.uniq(a, "metadata.uid");
14076
+ a = _.map(a, "metadata.name");
14077
+ var b = {};
14078
+ _.each(a, function(a) {
14079
+ _.extend(b, e.deploymentConfigsByService[a]);
14080
+ }), e.allDeploymentConfigsInGroup = b;
14081
+ }
14076
14082
});
14077
14083
}
14078
14084
};
@@ -26884,8 +26890,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
26884
26890
"</div>\n" +
26885
26891
"<div>\n" +
26886
26892
"<div class=\"service-group-triggers\">\n" +
26887
- "<div ng-repeat=\"svc in allServicesInGroup track by (svc | uid)\">\n" +
26888
- "<div ng-repeat=\"dc in deploymentConfigsByService[svc.metadata.name || '']\">\n" +
26893
+ "<div ng-repeat=\"dc in allDeploymentConfigsInGroup\">\n" +
26889
26894
"<div row ng-repeat=\"pipeline in recentPipelinesByDC[dc.metadata.name] | orderObjectsByDate : true track by (pipeline | uid)\" class=\"build-pipeline-wrapper animate-repeat animate-slide\">\n" +
26890
26895
"<build-pipeline flex build=\"pipeline\" collapse-stages-on-completion=\"true\" build-config-name-on-expanded=\"true\"></build-pipeline>\n" +
26891
26896
"</div>\n" +
@@ -26894,7 +26899,6 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
26894
26899
"</div>\n" +
26895
26900
"</div>\n" +
26896
26901
"</div>\n" +
26897
- "</div>\n" +
26898
26902
"\n" +
26899
26903
"<service-group-notifications ng-if=\"service\"></service-group-notifications>\n" +
26900
26904
"<div uib-collapse=\"collapse\" class=\"service-group-body\">\n" +
0 commit comments