Skip to content

Commit

Permalink
fix(core): Render template triggers, notif, params for manual executi…
Browse files Browse the repository at this point in the history 
…on (#7223) (#7224)

spinnaker/spinnaker#4565
  • Loading branch information
@spinnakerbot @louisjimenez
spinnakerbot authored and louisjimenez committed Jul 15, 2019
1 parent 1043977 commit 8553b1e
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 42 deletions.
75 changes: 47 additions & 28 deletions app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ module.exports = angular
'pipeline',
'application',
'trigger',
function($scope, $uibModalInstance, pipeline, application, trigger) {
'$q',
function($scope, $uibModalInstance, pipeline, application, trigger, $q) {
let applicationNotifications = [];
let pipelineNotifications = [];

Expand Down Expand Up @@ -136,21 +137,39 @@ module.exports = angular
}
};

const updatePipelinePlan = pipeline => {
if (pipeline.type === 'templatedPipeline' && (pipeline.stages === undefined || pipeline.stages.length === 0)) {
PipelineTemplateReader.getPipelinePlan(pipeline)
.then(plan => (this.stageComponents = getManualExecutionComponents(plan.stages)))
.catch(() => getManualExecutionComponents(pipeline.stages));
} else {
this.stageComponents = getManualExecutionComponents(pipeline.stages);
}
};
const getPlannedPipeline = pipeline =>
$q(resolve => {
const isV1PipelineMissingStages =
pipeline.type === 'templatedPipeline' && (pipeline.stages === undefined || pipeline.stages.length === 0);
const isV2Pipeline = PipelineTemplateV2Service.isV2PipelineConfig(pipeline);

if (isV1PipelineMissingStages || isV2Pipeline) {
PipelineTemplateReader.getPipelinePlan(pipeline)
.then(plan => {
updateStageComponents(plan.stages);
resolve(isV2Pipeline ? plan : pipeline);
})
.catch(() => {
if (isV2Pipeline) {
this.planError = true;
}
updateStageComponents(pipeline.stages);
resolve(pipeline);
});
} else {
updateStageComponents(pipeline.stages);
resolve(pipeline);
}
});

const getManualExecutionComponents = stages => {
const additionalComponents = stages.map(stage => Registry.pipeline.getManualExecutionComponentForStage(stage));
return _.uniq(_.compact(additionalComponents));
};

const updateStageComponents = pipelineStages =>
(this.stageComponents = getManualExecutionComponents(pipelineStages));

/**
* Controller API
*/
Expand All @@ -172,26 +191,26 @@ module.exports = angular
};

this.pipelineSelected = () => {
const pipeline = this.command.pipeline,
executions = application.executions.data || [];
getPlannedPipeline(this.command.pipeline).then(pipeline => {
this.command.pipeline = pipeline;
const executions = application.executions.data || [];

pipelineNotifications = pipeline.notifications || [];
synchronizeNotifications();
pipelineNotifications = pipeline.notifications || [];
synchronizeNotifications();

this.currentlyRunningExecutions = executions.filter(
execution => execution.pipelineConfigId === pipeline.id && execution.isActive,
);
addTriggers();
this.triggerUpdated();

updatePipelinePlan(pipeline);

if (pipeline.parameterConfig && pipeline.parameterConfig.length) {
this.parameters = {};
this.hasRequiredParameters = pipeline.parameterConfig.some(p => p.required);
pipeline.parameterConfig.forEach(p => this.addParameter(p));
this.updateParameters();
}
this.currentlyRunningExecutions = executions.filter(
execution => execution.pipelineConfigId === pipeline.id && execution.isActive,
);
addTriggers();
this.triggerUpdated();

if (pipeline.parameterConfig && pipeline.parameterConfig.length) {
this.parameters = {};
this.hasRequiredParameters = pipeline.parameterConfig.some(p => p.required);
pipeline.parameterConfig.forEach(p => this.addParameter(p));
this.updateParameters();
}
});
};

this.addParameter = parameterConfig => {
Expand Down
7 changes: 7 additions & 0 deletions ...ipts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.controller.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ describe('Controller: ManualPipelineExecution', function() {
},
};

spyOn(AppNotificationsService, 'getNotificationsForApplication').and.returnValue(this.$q.when({}));
this.initializeController(application, application.pipelineConfigs.data[0]);
this.scope.$digest();
expect(this.ctrl.currentlyRunningExecutions).toEqual([application.executions.data[1]]);
});

Expand All @@ -75,7 +77,9 @@ describe('Controller: ManualPipelineExecution', function() {
executions: { data: [] },
};

spyOn(AppNotificationsService, 'getNotificationsForApplication').and.returnValue(this.$q.when({}));
this.initializeController(application, application.pipelineConfigs.data[0]);
this.scope.$digest();
expect(this.ctrl.parameters).toEqual({ foo: undefined, bar: 'mr. peanutbutter', baz: '', bojack: null });
});
});
Expand Down Expand Up @@ -153,6 +157,7 @@ describe('Controller: ManualPipelineExecution', function() {
expect(this.ctrl.notifications).toEqual([notifications[1], notifications[0]]);
this.ctrl.command.pipeline = application.pipelineConfigs.data[1];
this.ctrl.pipelineSelected();
this.scope.$digest();
expect(this.ctrl.notifications).toEqual([notifications[1], notifications[2]]);
});
});
Expand Down Expand Up @@ -209,7 +214,9 @@ describe('Controller: ManualPipelineExecution', function() {
executions: { data: [] },
};

spyOn(AppNotificationsService, 'getNotificationsForApplication').and.returnValue(this.$q.when({}));
this.initializeController(application, application.pipelineConfigs.data[0], this.modalInstance);
this.scope.$digest();
this.ctrl.execute();
expect(this.command.trigger.parameters).toEqual({ bar: 'mr. peanutbutter' });
});
Expand Down
35 changes: 21 additions & 14 deletions app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ <h3 ng-if="vm.command.pipeline && !vm.triggers.length">Confirm Execution</h3>
<h3 ng-if="!vm.command.pipeline">Select Pipeline</h3>
</div>
<ng-form name="manualExecutionForm">
<div class="modal-body container-fluid form-horizontal">
<div ng-if="vm.planError" class="alert alert-danger">
<p>Could not load pipeline plan. Please try reloading.</p>
</div>
<div class="modal-body container-fluid form-horizontal" ng-if="!vm.planError">
<div class="form-group" ng-if="vm.pipelineOptions">
<label class="col-md-4 sm-label-right">Pipeline</label>
<div class="col-md-6">
Expand All @@ -18,20 +21,22 @@ <h3 ng-if="!vm.command.pipeline">Select Pipeline</h3>
on-select="vm.pipelineSelected()"
>
<ui-select-match>
<strong>{{$select.selected.name}}</strong>
<strong>{{ $select.selected.name }}</strong>
</ui-select-match>
<ui-select-choices
repeat="pipeline as pipeline in vm.pipelineOptions | anyFieldFilter: {name: $select.search }"
>
<div><strong>{{pipeline.name}}</strong></div>
<div>
<strong>{{ pipeline.name }}</strong>
</div>
</ui-select-choices>
</ui-select>
</div>
</div>

<div class="form-group" ng-if="vm.command.pipeline">
<div class="col-md-10">
<p>This will start a new run of <strong>{{vm.command.pipeline.name}}</strong>.</p>
<p>This will start a new run of <strong>{{ vm.command.pipeline.name }}</strong>.</p>
</div>
</div>

Expand All @@ -43,17 +48,17 @@ <h3 ng-if="!vm.command.pipeline">Select Pipeline</h3>
</strong>
</p>
<div ng-repeat="execution in vm.currentlyRunningExecutions | limitTo: 1" class="pad-left">
<strong>Execution started: </strong>{{execution.startTime | timestamp }}
<strong>Execution started: </strong>{{ execution.startTime | timestamp }}
<div>
<strong>Current stage:</strong>
<span ng-repeat="stage in execution.currentStages">
{{stage.name}}
{{ stage.name }}
</span>
</div>
</div>
<div ng-if="vm.currentlyRunningExecutions.length > 1">
<em>
&hellip;and {{vm.currentlyRunningExecutions.length - 1}} other execution<span
&hellip;and {{ vm.currentlyRunningExecutions.length - 1 }} other execution<span
ng-if="vm.currentlyRunningExecutions.length > 2"
>s</span
>
Expand All @@ -65,7 +70,7 @@ <h3 ng-if="!vm.command.pipeline">Select Pipeline</h3>
<div class="form-group">
<label class="col-md-4 sm-label-right">Trigger</label>
<div class="col-md-6">
<p class="form-control-static" ng-if="vm.triggers.length === 1">{{vm.triggers[0].description}}</p>
<p class="form-control-static" ng-if="vm.triggers.length === 1">{{ vm.triggers[0].description }}</p>
<select
class="form-control input-sm"
ng-if="vm.triggers.length > 1"
Expand All @@ -89,9 +94,9 @@ <h3 ng-if="!vm.command.pipeline">Select Pipeline</h3>
ng-if="!vm.hiddenParameters.has(parameter.name)"
>
<div class="col-md-4 sm-label-right break-word">
{{parameter.label || parameter.name}}
{{ parameter.label || parameter.name }}
<span ng-if="parameter.required">*</span>
<help-field content="{{parameter.description}}" ng-if="parameter.description"></help-field>
<help-field content="{{ parameter.description }}" ng-if="parameter.description"></help-field>
</div>
<div class="col-md-6" ng-if="!parameter.hasOptions && parameter.constraint === 'date'">
<p class="input-group">
Expand Down Expand Up @@ -136,10 +141,12 @@ <h3 ng-if="!vm.command.pipeline">Select Pipeline</h3>
class="form-control input-sm"
>
<ui-select-match>
<strong>{{$select.selected.value}}</strong>
<strong>{{ $select.selected.value }}</strong>
</ui-select-match>
<ui-select-choices repeat="option.value as option in parameter.options | filter: $select.search">
<div><strong>{{option.value}}</strong></div>
<div>
<strong>{{ option.value }}</strong>
</div>
</ui-select-choices>
</ui-select>
</div>
Expand All @@ -160,7 +167,7 @@ <h3 ng-if="!vm.command.pipeline">Select Pipeline</h3>
<div class="form-group" ng-if="vm.command.trigger.artifacts.length > 0">
<label class="col-md-4 sm-label-right">Artifacts</label>
<div class="col-md-8">
<artifact-list artifacts="vm.command.trigger.artifacts" />
<artifact-list artifacts="vm.command.trigger.artifacts"></artifact-list>
</div>
</div>

Expand All @@ -180,7 +187,7 @@ <h3 ng-if="!vm.command.pipeline">Select Pipeline</h3>
<div ng-if="vm.notifications.length > 1" class="small">
There are
<a uib-popover-template="vm.notificationTooltip" popover-placement="bottom" popover-trigger="'mouseenter'"
>{{vm.notifications.length}} notifications</a
>{{ vm.notifications.length }} notifications</a
>
configured for this pipeline
</div>
Expand Down

0 comments on commit 8553b1e

Please sign in to comment.