diff --git a/app/scripts/controllers/overview.js b/app/scripts/controllers/overview.js
index 8252432abd..fce6dceda4 100644
--- a/app/scripts/controllers/overview.js
+++ b/app/scripts/controllers/overview.js
@@ -401,6 +401,7 @@ angular.module('openshiftConsole')
};
var buildConfigForBuild = $filter('buildConfigForBuild');
+ var isIncompleteBuild = $filter('isIncompleteBuild');
var groupPipelineByDC = function(build) {
if (!buildConfigs) {
return;
@@ -417,6 +418,10 @@ angular.module('openshiftConsole')
_.each(dcNames, function(dcName) {
$scope.recentPipelinesByDC[dcName] = $scope.recentPipelinesByDC[dcName] || [];
$scope.recentPipelinesByDC[dcName].push(build);
+ if (isIncompleteBuild(build)) {
+ $scope.incompletePipelinesByDC[dcName] = $scope.incompletePipelinesByDC[dcName] || [];
+ $scope.incompletePipelinesByDC[dcName].push(build);
+ }
});
};
@@ -426,6 +431,7 @@ angular.module('openshiftConsole')
}
// reset these maps
$scope.recentPipelinesByDC = {};
+ $scope.incompletePipelinesByDC = {};
$scope.recentBuildsByOutputImage = {};
_.each(
BuildsService.interestingBuilds(builds),
@@ -436,6 +442,14 @@ angular.module('openshiftConsole')
}
groupPipelineByDC(build);
});
+
+ $scope.pipelinesForDC = {};
+ _.each(buildConfigs, function(buildConfig) {
+ _.each(BuildsService.usesDeploymentConfigs(buildConfig), function(dcName) {
+ $scope.pipelinesForDC[dcName] = $scope.pipelinesForDC[dcName] || [];
+ $scope.pipelinesForDC[dcName].push(buildConfig);
+ });
+ });
};
diff --git a/app/scripts/directives/overview/dc.js b/app/scripts/directives/overview/dc.js
index 5205211d63..c8f3defc65 100644
--- a/app/scripts/directives/overview/dc.js
+++ b/app/scripts/directives/overview/dc.js
@@ -1,7 +1,12 @@
'use strict';
angular.module('openshiftConsole')
- .directive('overviewDeploymentConfig', function($filter, $uibModal, DeploymentsService, Navigate) {
+ .directive('overviewDeploymentConfig',
+ function($filter,
+ $uibModal,
+ BuildsService,
+ DeploymentsService,
+ Navigate) {
return {
restrict: 'E',
// Inherit scope from OverviewController. This directive is only used for the overview.
@@ -37,6 +42,18 @@ angular.module('openshiftConsole')
return Navigate.resourceURL(name, 'ImageStream', namespace);
};
+ $scope.startPipeline = function(pipeline) {
+ BuildsService
+ .startBuild(pipeline.metadata.name, { namespace: pipeline.metadata.namespace })
+ .then(_.noop, function(result) {
+ $scope.alerts["start-pipeline"] = {
+ type: "error",
+ message: "An error occurred while starting the pipeline.",
+ details: $filter('getErrorDetails')(result)
+ };
+ });
+ };
+
$scope.startDeployment = function() {
DeploymentsService.startLatestDeployment($scope.deploymentConfig, {
namespace: $scope.deploymentConfig.metadata.namespace
diff --git a/app/views/overview/_dc.html b/app/views/overview/_dc.html
index fe550a6211..e646743d32 100644
--- a/app/views/overview/_dc.html
+++ b/app/views/overview/_dc.html
@@ -51,12 +51,28 @@
No deployments.
-
- No deployments have started for
- {{deploymentConfig.metadata.name}}.
-
-
-
\n" +
"
\n" +
+ "
\n" +
+ "
\n" +
+ "This deployment config is part of pipeline\n" +
+ "{{pipeline.metadata.name}}.\n" +
+ "
\n" +
+ "
\n" +
+ "\n" +
+ "\n" +
+ "
\n" +
+ "
\n" +
+ "