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

Add missing state on the application row component 

This fixes the application row component weird state when an
`updating` status is fetched, this causes apps to show as uninstalled
even though they are installed in the cluster.
This commit is contained in:
Jose Vargas 2018-10-16 16:56:07 -05:00
parent d87e88a616
commit d4763515c1
No known key found for this signature in database
GPG Key ID: 01F49A6AE27697FB
3 changed files with 184 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/assets/javascripts/clusters/components/application_row.vue
View File

@ -74,7 +74,9 @@
}, },
isInstalled() { isInstalled() {
return ( return (
this.status === APPLICATION_STATUS.INSTALLED || this.status === APPLICATION_STATUS.UPDATED this.status === APPLICATION_STATUS.INSTALLED ||
this.status === APPLICATION_STATUS.UPDATED ||
this.status === APPLICATION_STATUS.UPDATING
); );
}, },
hasLogo() { hasLogo() {
@ -88,19 +90,24 @@
return `js-cluster-application-row-${this.id}`; return `js-cluster-application-row-${this.id}`;
}, },
installButtonLoading() { installButtonLoading() {
return !this.status || return (
!this.status ||
this.status === APPLICATION_STATUS.SCHEDULED || this.status === APPLICATION_STATUS.SCHEDULED ||
this.status === APPLICATION_STATUS.INSTALLING || this.status === APPLICATION_STATUS.INSTALLING ||
this.requestStatus === REQUEST_LOADING; this.requestStatus === REQUEST_LOADING
);
}, },
installButtonDisabled() { installButtonDisabled() {
// Avoid the potential for the real-time data to say APPLICATION_STATUS.INSTALLABLE but // Avoid the potential for the real-time data to say APPLICATION_STATUS.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_STATUS.INSTALLABLE return (
&& this.status !== APPLICATION_STATUS.ERROR) || ((this.status !== APPLICATION_STATUS.INSTALLABLE &&
this.status !== APPLICATION_STATUS.ERROR) ||
this.requestStatus === REQUEST_LOADING || this.requestStatus === REQUEST_LOADING ||
this.requestStatus === REQUEST_SUCCESS) && this.isKnownStatus; this.requestStatus === REQUEST_SUCCESS) &&
this.isKnownStatus
);
}, },
installButtonLabel() { installButtonLabel() {
let label; let label;
@ -111,11 +118,16 @@
this.isUnknownStatus this.isUnknownStatus
) { ) {
label = s__('ClusterIntegration|Install'); label = s__('ClusterIntegration|Install');
} else if (this.status === APPLICATION_STATUS.SCHEDULED || } else if (
this.status === APPLICATION_STATUS.INSTALLING) { this.status === APPLICATION_STATUS.SCHEDULED ||
this.status === APPLICATION_STATUS.INSTALLING
) {
label = s__('ClusterIntegration|Installing'); label = s__('ClusterIntegration|Installing');
} else if (this.status === APPLICATION_STATUS.INSTALLED || } else if (
this.status === APPLICATION_STATUS.UPDATED) { this.status === APPLICATION_STATUS.INSTALLED ||
this.status === APPLICATION_STATUS.UPDATED ||
this.status === APPLICATION_STATUS.UPDATING
) {
label = s__('ClusterIntegration|Installed'); label = s__('ClusterIntegration|Installed');
} }
@ -128,15 +140,12 @@
return s__('ClusterIntegration|Manage'); return s__('ClusterIntegration|Manage');
}, },
hasError() { hasError() {
return this.status === APPLICATION_STATUS.ERROR || return this.status === APPLICATION_STATUS.ERROR || this.requestStatus === REQUEST_FAILURE;
this.requestStatus === REQUEST_FAILURE;
}, },
generalErrorDescription() { generalErrorDescription() {
return sprintf( return sprintf(s__('ClusterIntegration|Something went wrong while installing %{title}'), {
s__('ClusterIntegration|Something went wrong while installing %{title}'), {
title: this.title, title: this.title,
}, });
);
}, },
}, },
methods: { methods: {

1
app/assets/javascripts/clusters/constants.js
View File

@ -6,6 +6,7 @@ export const APPLICATION_STATUS = {
INSTALLING: 'installing', INSTALLING: 'installing',
INSTALLED: 'installed', INSTALLED: 'installed',
UPDATED: 'updated', UPDATED: 'updated',
UPDATING: 'updating',
ERROR: 'errored', ERROR: 'errored',
}; };

39
spec/javascripts/clusters/components/application_row_spec.js
View File

@ -112,6 +112,17 @@ describe('Application Row', () => {
expect(vm.installButtonDisabled).toEqual(true); expect(vm.installButtonDisabled).toEqual(true);
}); });
it('has disabled "Installed" when APPLICATION_STATUS.UPDATING', () => {
vm = mountComponent(ApplicationRow, {
...DEFAULT_APPLICATION_STATE,
status: APPLICATION_STATUS.UPDATING,
});
expect(vm.installButtonLabel).toEqual('Installed');
expect(vm.installButtonLoading).toEqual(false);
expect(vm.installButtonDisabled).toEqual(true);
});
it('has enabled "Install" when APPLICATION_STATUS.ERROR', () => { it('has enabled "Install" when APPLICATION_STATUS.ERROR', () => {
vm = mountComponent(ApplicationRow, { vm = mountComponent(ApplicationRow, {
...DEFAULT_APPLICATION_STATE, ...DEFAULT_APPLICATION_STATE,
@ -215,7 +226,9 @@ describe('Application Row', () => {
status: null, status: null,
requestStatus: null, requestStatus: null,
}); });
const generalErrorMessage = vm.$el.querySelector('.js-cluster-application-general-error-message'); const generalErrorMessage = vm.$el.querySelector(
'.js-cluster-application-general-error-message',
);
expect(generalErrorMessage).toBeNull(); expect(generalErrorMessage).toBeNull();
}); });
@ -227,10 +240,16 @@ describe('Application Row', () => {
status: APPLICATION_STATUS.ERROR, status: APPLICATION_STATUS.ERROR,
statusReason, statusReason,
}); });
const generalErrorMessage = vm.$el.querySelector('.js-cluster-application-general-error-message'); const generalErrorMessage = vm.$el.querySelector(
const statusErrorMessage = vm.$el.querySelector('.js-cluster-application-status-error-message'); '.js-cluster-application-general-error-message',
);
const statusErrorMessage = vm.$el.querySelector(
'.js-cluster-application-status-error-message',
);
expect(generalErrorMessage.textContent.trim()).toEqual(`Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`); expect(generalErrorMessage.textContent.trim()).toEqual(
`Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`,
);
expect(statusErrorMessage.textContent.trim()).toEqual(statusReason); expect(statusErrorMessage.textContent.trim()).toEqual(statusReason);
}); });
@ -242,10 +261,16 @@ describe('Application Row', () => {
requestStatus: REQUEST_FAILURE, requestStatus: REQUEST_FAILURE,
requestReason, requestReason,
}); });
const generalErrorMessage = vm.$el.querySelector('.js-cluster-application-general-error-message'); const generalErrorMessage = vm.$el.querySelector(
const requestErrorMessage = vm.$el.querySelector('.js-cluster-application-request-error-message'); '.js-cluster-application-general-error-message',
);
const requestErrorMessage = vm.$el.querySelector(
'.js-cluster-application-request-error-message',
);
expect(generalErrorMessage.textContent.trim()).toEqual(`Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`); expect(generalErrorMessage.textContent.trim()).toEqual(
`Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`,
);
expect(requestErrorMessage.textContent.trim()).toEqual(requestReason); expect(requestErrorMessage.textContent.trim()).toEqual(requestReason);
}); });
}); });