Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(pipelines): show indicator when deleting pipeline config #4216

Merged
merged 2 commits into from
Oct 4, 2017
Merged

fix(pipelines): show indicator when deleting pipeline config #4216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c85ad66
fix(pipelines): show indicator when deleting pipeline config
anotherchrisberry Oct 4, 2017
3b5ced8
Merge branch 'master' into delete-pipe
anotherchrisberry Oct 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/scripts/modules/core/src/naming/naming.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class NamingService {

public getSequence(monikerSequence: number): string {
if (isNil(monikerSequence)) {
return "N/A";
return 'N/A';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(unrelated to this PR's title)

} else {
return `v${padStart(monikerSequence.toString(), 3, '0')}`;
}
Expand Down
15 changes: 9 additions & 6 deletions app/scripts/modules/core/src/pipeline/config/actions/delete/delete.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,24 @@ module.exports = angular.module('spinnaker.core.pipeline.config.actions.delete',

$scope.pipeline = pipeline;

this.deletePipeline = function() {
this.deletePipeline = () => {
$scope.viewState.deleting = true;
return pipelineConfigService.deletePipeline(application.name, pipeline, pipeline.name).then(
function() {
application.pipelineConfigs.data.splice(application.pipelineConfigs.data.indexOf(pipeline), 1);
application.pipelineConfigs.data.forEach(function(pipeline, index) {
() => {
const data = pipeline.strategy ? application.strategyConfigs.data : application.pipelineConfigs.data;
data.splice(data.findIndex(p => p.id === pipeline.id), 1);
data.forEach(function(pipeline, index) {
if (pipeline.index !== index) {
pipeline.index = index;
pipelineConfigService.savePipeline(pipeline);
}
});
$state.go('^.executions', null, { location: 'replace' });
},
function(response) {
(response) => {
$log.warn(response);
$scope.viewState.saveError = true;
$scope.viewState.deleting = false;
$scope.viewState.deleteError = true;
$scope.viewState.errorMessage = response.message || 'No message provided';
}
);
Expand Down
8 changes: 4 additions & 4 deletions ...ts/modules/core/src/pipeline/config/actions/delete/deletePipelineModal.controller.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe('Controller: deletePipelineModal', function() {
expect(newStateOptions).toEqual({location: 'replace'});
});

it('sets error flag, message when save is rejected', function() {
it('sets error flag, message when delete is rejected', function() {
var $q = this.$q;
spyOn(this.pipelineConfigService, 'deletePipeline').and.callFake(function () {
return $q.reject({message: 'something went wrong'});
Expand All @@ -92,11 +92,11 @@ describe('Controller: deletePipelineModal', function() {
this.controller.deletePipeline();
this.$scope.$digest();

expect(this.$scope.viewState.saveError).toBe(true);
expect(this.$scope.viewState.deleteError).toBe(true);
expect(this.$scope.viewState.errorMessage).toBe('something went wrong');
});

it('provides default error message when none provided on failed save', function() {
it('provides default error message when none provided on failed delete', function() {
var $q = this.$q;
spyOn(this.pipelineConfigService, 'deletePipeline').and.callFake(function () {
return $q.reject({});
Expand All @@ -106,7 +106,7 @@ describe('Controller: deletePipelineModal', function() {
this.controller.deletePipeline();
this.$scope.$digest();

expect(this.$scope.viewState.saveError).toBe(true);
expect(this.$scope.viewState.deleteError).toBe(true);
expect(this.$scope.viewState.errorMessage).toBe('No message provided');
});
});
Expand Down
11 changes: 8 additions & 3 deletions app/scripts/modules/core/src/pipeline/config/actions/delete/deletePipelineModal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<h3>Really Delete {{pipeline.strategy === true ? 'Strategy' : 'Pipeline'}}?</h3>
</div>
<div class="modal-body">
<div class="alert alert-danger" ng-if="viewState.saveError">
<div class="alert alert-danger" ng-if="viewState.deleteError">
<p>Could not delete {{pipeline.strategy === true ? 'strategy' : 'pipeline'}}.</p>
<p><b>Reason: </b>{{viewState.errorMessage}}</p>
<p><a href ng-click="viewState.saveError = false">[dismiss]</a></p>
<p><a href ng-click="viewState.deleteError = false">[dismiss]</a></p>
</div>
<form role="form" name="form" class="form-horizontal">
<div class="form-group">
Expand All @@ -21,7 +21,12 @@ <h3>Really Delete {{pipeline.strategy === true ? 'Strategy' : 'Pipeline'}}?</h3>
<button class="btn btn-default" ng-click="deletePipelineModalCtrl.cancel()">Cancel</button>
<button class="btn btn-primary"
ng-click="deletePipelineModalCtrl.deletePipeline()">
<span class="glyphicon glyphicon-remove-circle"></span> Delete
<span ng-if="!viewState.deleting">
<span class="fa fa-check-circle-o"></span> Delete
</span>
<span ng-if="viewState.deleting" class="pulsing">
<span class="fa fa-cog fa-spin"></span> Deleting&hellip;
</span>
</button>
</div>
</div>