kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Update Cluster application install to be enabled when errored

Browse source
This commit is contained in:
Eric Eastwood 2017-11-07 06:27:33 -06:00
parent 68a9229502
commit 0c27de5f45
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/clusters/components/application_row.vue
View file

@ -66,7 +66,7 @@ export default {
// Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but // Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but
// we already made a request to install and are just waiting for the real-time // we already made a request to install and are just waiting for the real-time
// to sync up. // to sync up.
return this.status !== APPLICATION_INSTALLABLE || return (this.status !== APPLICATION_INSTALLABLE && this.status !== APPLICATION_ERROR) ||
this.requestStatus === REQUEST_LOADING || this.requestStatus === REQUEST_LOADING ||
this.requestStatus === REQUEST_SUCCESS; this.requestStatus === REQUEST_SUCCESS;
}, },

4
spec/javascripts/clusters/components/application_row_spec.js
View file

@ -117,7 +117,7 @@ describe('Application Row', () => {
expect(vm.installButtonDisabled).toEqual(true); expect(vm.installButtonDisabled).toEqual(true);
}); });
it('has disabled "Install" when APPLICATION_ERROR', () => { it('has enabled "Install" when APPLICATION_ERROR', () => {
vm = mountComponent(ApplicationRow, { vm = mountComponent(ApplicationRow, {
...DEFAULT_APPLICATION_STATE, ...DEFAULT_APPLICATION_STATE,
status: APPLICATION_ERROR, status: APPLICATION_ERROR,
@ -125,7 +125,7 @@ describe('Application Row', () => {
expect(vm.installButtonLabel).toEqual('Install'); expect(vm.installButtonLabel).toEqual('Install');
expect(vm.installButtonLoading).toEqual(false); expect(vm.installButtonLoading).toEqual(false);
expect(vm.installButtonDisabled).toEqual(true); expect(vm.installButtonDisabled).toEqual(false);
}); });
it('has loading "Install" when REQUEST_LOADING', () => { it('has loading "Install" when REQUEST_LOADING', () => {