Merge pull request #1092 from jwforres/duplicate-triggers

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/directives/overview/serviceGroup.js

@@ -179,9 +179,17 @@ angular.module('openshiftConsole')
           $scope.childServices = _.get($scope, ['childServicesByParent', $scope.service.metadata.name], []);
         });
 
-        $scope.$watchGroup(['service', 'childServices', 'alternateServices'], function() {
+        $scope.$watchGroup(['service', 'childServices', 'alternateServices', 'deploymentConfigsByService'], function() {
+          if (!$scope.deploymentConfigsByService) {
+            return;
+          }
           var allSvcs = [$scope.service].concat($scope.alternateServices).concat($scope.childServices);
-          $scope.allServicesInGroup = _.uniq(allSvcs, "metadata.uid");
+          allSvcs = _.map(allSvcs, "metadata.name");
+          var allDCs = {};
+          _.each(allSvcs, function(svc) {
+            _.extend(allDCs, $scope.deploymentConfigsByService[svc]);
+          });
+          $scope.allDeploymentConfigsInGroup = allDCs;
         });
       }
     };

app/views/overview/_service-group.html

@@ -36,15 +36,13 @@ <h3 class="route-title truncate">
   </div>
   <div>
     <div class="service-group-triggers">
-      <div ng-repeat="svc in allServicesInGroup track by (svc | uid)">
-        <div ng-repeat="dc in deploymentConfigsByService[svc.metadata.name || '']">
-          <div row ng-repeat="pipeline in recentPipelinesByDC[dc.metadata.name] | orderObjectsByDate : true track by (pipeline | uid)"
-              class="build-pipeline-wrapper animate-repeat animate-slide">
-            <build-pipeline flex build="pipeline" collapse-stages-on-completion="true" build-config-name-on-expanded="true"></build-pipeline>
-          </div>
-          <div>
-            <triggers triggers="dc.spec.triggers" builds-by-output-image="recentBuildsByOutputImage" namespace="dc.metadata.namespace"></triggers>
-          </div>
+      <div ng-repeat="dc in allDeploymentConfigsInGroup">
+        <div row ng-repeat="pipeline in recentPipelinesByDC[dc.metadata.name] | orderObjectsByDate : true track by (pipeline | uid)"
+            class="build-pipeline-wrapper animate-repeat animate-slide">
+          <build-pipeline flex build="pipeline" collapse-stages-on-completion="true" build-config-name-on-expanded="true"></build-pipeline>
+        </div>
+        <div>
+          <triggers triggers="dc.spec.triggers" builds-by-output-image="recentBuildsByOutputImage" namespace="dc.metadata.namespace"></triggers>
         </div>
       </div>
     </div>

dist/scripts/scripts.js

@@ -12843,9 +12843,15 @@ return _.get(e, [ "routesByService", a ]);
 e.displayRoute = i(a), e.primaryServiceRoutes = a, j();
 }), e.$watchGroup([ "service", "childServicesByParent" ], function() {
 e.service && (e.primaryService = e.service, e.childServices = _.get(e, [ "childServicesByParent", e.service.metadata.name ], []));
-}), e.$watchGroup([ "service", "childServices", "alternateServices" ], function() {
+}), e.$watchGroup([ "service", "childServices", "alternateServices", "deploymentConfigsByService" ], function() {
+if (e.deploymentConfigsByService) {
 var a = [ e.service ].concat(e.alternateServices).concat(e.childServices);
-e.allServicesInGroup = _.uniq(a, "metadata.uid");
+a = _.map(a, "metadata.name");
+var b = {};
+_.each(a, function(a) {
+_.extend(b, e.deploymentConfigsByService[a]);
+}), e.allDeploymentConfigsInGroup = b;
+}
 });
 }
 };

dist/scripts/templates.js

@@ -10949,8 +10949,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div>\n" +
     "<div class=\"service-group-triggers\">\n" +
-    "<div ng-repeat=\"svc in allServicesInGroup track by (svc | uid)\">\n" +
-    "<div ng-repeat=\"dc in deploymentConfigsByService[svc.metadata.name || '']\">\n" +
+    "<div ng-repeat=\"dc in allDeploymentConfigsInGroup\">\n" +
     "<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" +
     "<build-pipeline flex build=\"pipeline\" collapse-stages-on-completion=\"true\" build-config-name-on-expanded=\"true\"></build-pipeline>\n" +
     "</div>\n" +
@@ -10959,7 +10958,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +
-    "</div>\n" +
     "\n" +
     "<service-group-notifications ng-if=\"service\"></service-group-notifications>\n" +
     "<div uib-collapse=\"collapse\" class=\"service-group-body\">\n" +