Commit 8f6ec252 authored by Enrique Alcantara's avatar Enrique Alcantara

Determine if app is installed in the store

- Create installed property for cluster apps
- Pass installed property to the application_row component
parent b15a78df
...@@ -63,6 +63,11 @@ export default { ...@@ -63,6 +63,11 @@ export default {
type: String, type: String,
required: false, required: false,
}, },
installed: {
type: Boolean,
required: false,
default: false
},
version: { version: {
type: String, type: String,
required: false, required: false,
...@@ -92,15 +97,7 @@ export default { ...@@ -92,15 +97,7 @@ export default {
return ( return (
this.status === APPLICATION_STATUS.SCHEDULED || this.status === APPLICATION_STATUS.SCHEDULED ||
this.status === APPLICATION_STATUS.INSTALLING || this.status === APPLICATION_STATUS.INSTALLING ||
(this.requestStatus === REQUEST_SUBMITTED && !this.statusReason && !this.isInstalled) (this.requestStatus === REQUEST_SUBMITTED && !this.statusReason && !this.installed)
);
},
isInstalled() {
return (
this.status === APPLICATION_STATUS.INSTALLED ||
this.status === APPLICATION_STATUS.UPDATED ||
this.status === APPLICATION_STATUS.UPDATING ||
this.status === APPLICATION_STATUS.UPDATE_ERRORED
); );
}, },
canInstall() { canInstall() {
...@@ -145,7 +142,7 @@ export default { ...@@ -145,7 +142,7 @@ export default {
label = s__('ClusterIntegration|Install'); label = s__('ClusterIntegration|Install');
} else if (this.isInstalling) { } else if (this.isInstalling) {
label = s__('ClusterIntegration|Installing'); label = s__('ClusterIntegration|Installing');
} else if (this.isInstalled) { } else if (this.installed) {
label = s__('ClusterIntegration|Installed'); label = s__('ClusterIntegration|Installed');
} }
...@@ -257,7 +254,7 @@ export default { ...@@ -257,7 +254,7 @@ export default {
<div <div
:class="[ :class="[
rowJsClass, rowJsClass,
isInstalled && 'cluster-application-installed', installed && 'cluster-application-installed',
disabled && 'cluster-application-disabled', disabled && 'cluster-application-disabled',
]" ]"
class="cluster-application-row gl-responsive-table-row gl-responsive-table-row-col-span" class="cluster-application-row gl-responsive-table-row gl-responsive-table-row-col-span"
......
...@@ -15,9 +15,24 @@ export const APPLICATION_STATUS = { ...@@ -15,9 +15,24 @@ export const APPLICATION_STATUS = {
UPDATING: 'updating', UPDATING: 'updating',
UPDATED: 'updated', UPDATED: 'updated',
UPDATE_ERRORED: 'update_errored', UPDATE_ERRORED: 'update_errored',
UNINSTALLING: 'uninstalling',
UNINSTALL_ERRORED: 'uninstall_errored',
ERROR: 'errored', ERROR: 'errored',
}; };
/*
* The application cannot be in any of the following states without
* not being installed.
*/
export const APPLICATION_INSTALLED_STATUSES = [
APPLICATION_STATUS.INSTALLED,
APPLICATION_STATUS.UPDATING,
APPLICATION_STATUS.UPDATED,
APPLICATION_STATUS.UPDATE_ERRORED,
APPLICATION_STATUS.UNINSTALLING,
APPLICATION_STATUS.UNINSTALL_ERRORED,
];
// These are only used client-side // These are only used client-side
export const REQUEST_SUBMITTED = 'request-submitted'; export const REQUEST_SUBMITTED = 'request-submitted';
export const REQUEST_FAILURE = 'request-failure'; export const REQUEST_FAILURE = 'request-failure';
......
import { s__ } from '../../locale'; import { s__ } from '../../locale';
import { parseBoolean } from '../../lib/utils/common_utils'; import { parseBoolean } from '../../lib/utils/common_utils';
import { INGRESS, JUPYTER, KNATIVE, CERT_MANAGER, RUNNER } from '../constants'; import {
INGRESS,
JUPYTER,
KNATIVE,
CERT_MANAGER,
RUNNER,
APPLICATION_INSTALLED_STATUSES,
} from '../constants';
const isApplicationInstalled = appStatus => APPLICATION_INSTALLED_STATUSES.includes(appStatus);
const applicationInitialState = {
status: null,
statusReason: null,
requestReason: null,
requestStatus: null,
installed: false,
};
export default class ClusterStore { export default class ClusterStore {
constructor() { constructor() {
...@@ -12,60 +29,39 @@ export default class ClusterStore { ...@@ -12,60 +29,39 @@ export default class ClusterStore {
statusReason: null, statusReason: null,
applications: { applications: {
helm: { helm: {
...applicationInitialState,
title: s__('ClusterIntegration|Helm Tiller'), title: s__('ClusterIntegration|Helm Tiller'),
status: null,
statusReason: null,
requestStatus: null,
requestReason: null,
}, },
ingress: { ingress: {
...applicationInitialState,
title: s__('ClusterIntegration|Ingress'), title: s__('ClusterIntegration|Ingress'),
status: null,
statusReason: null,
requestStatus: null,
requestReason: null,
externalIp: null, externalIp: null,
externalHostname: null, externalHostname: null,
}, },
cert_manager: { cert_manager: {
...applicationInitialState,
title: s__('ClusterIntegration|Cert-Manager'), title: s__('ClusterIntegration|Cert-Manager'),
status: null,
statusReason: null,
requestStatus: null,
requestReason: null,
email: null, email: null,
}, },
runner: { runner: {
...applicationInitialState,
title: s__('ClusterIntegration|GitLab Runner'), title: s__('ClusterIntegration|GitLab Runner'),
status: null,
statusReason: null,
requestStatus: null,
requestReason: null,
version: null, version: null,
chartRepo: 'https://gitlab.com/charts/gitlab-runner', chartRepo: 'https://gitlab.com/charts/gitlab-runner',
upgradeAvailable: null, upgradeAvailable: null,
}, },
prometheus: { prometheus: {
...applicationInitialState,
title: s__('ClusterIntegration|Prometheus'), title: s__('ClusterIntegration|Prometheus'),
status: null,
statusReason: null,
requestStatus: null,
requestReason: null,
}, },
jupyter: { jupyter: {
...applicationInitialState,
title: s__('ClusterIntegration|JupyterHub'), title: s__('ClusterIntegration|JupyterHub'),
status: null,
statusReason: null,
requestStatus: null,
requestReason: null,
hostname: null, hostname: null,
}, },
knative: { knative: {
...applicationInitialState,
title: s__('ClusterIntegration|Knative'), title: s__('ClusterIntegration|Knative'),
status: null,
statusReason: null,
requestStatus: null,
requestReason: null,
hostname: null, hostname: null,
isEditingHostName: false, isEditingHostName: false,
externalIp: null, externalIp: null,
...@@ -118,6 +114,7 @@ export default class ClusterStore { ...@@ -118,6 +114,7 @@ export default class ClusterStore {
...(this.state.applications[appId] || {}), ...(this.state.applications[appId] || {}),
status, status,
statusReason, statusReason,
installed: isApplicationInstalled(status),
}; };
if (appId === INGRESS) { if (appId === INGRESS) {
......
...@@ -114,21 +114,11 @@ describe('Application Row', () => { ...@@ -114,21 +114,11 @@ describe('Application Row', () => {
expect(vm.installButtonDisabled).toEqual(true); expect(vm.installButtonDisabled).toEqual(true);
}); });
it('has disabled "Installed" when APPLICATION_STATUS.INSTALLED', () => { it('has disabled "Installed" when application is installed', () => {
vm = mountComponent(ApplicationRow, { vm = mountComponent(ApplicationRow, {
...DEFAULT_APPLICATION_STATE, ...DEFAULT_APPLICATION_STATE,
status: APPLICATION_STATUS.INSTALLED, status: APPLICATION_STATUS.INSTALLED,
}); installed: true,
expect(vm.installButtonLabel).toEqual('Installed');
expect(vm.installButtonLoading).toEqual(false);
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.installButtonLabel).toEqual('Installed');
......
import ClustersStore from '~/clusters/stores/clusters_store'; import ClustersStore from '~/clusters/stores/clusters_store';
import { APPLICATION_STATUS } from '~/clusters/constants'; import { APPLICATION_INSTALLED_STATUSES, APPLICATION_STATUS, RUNNER } from '~/clusters/constants';
import { CLUSTERS_MOCK_DATA } from '../services/mock_data'; import { CLUSTERS_MOCK_DATA } from '../services/mock_data';
describe('Clusters Store', () => { describe('Clusters Store', () => {
...@@ -70,6 +70,7 @@ describe('Clusters Store', () => { ...@@ -70,6 +70,7 @@ describe('Clusters Store', () => {
statusReason: mockResponseData.applications[0].status_reason, statusReason: mockResponseData.applications[0].status_reason,
requestStatus: null, requestStatus: null,
requestReason: null, requestReason: null,
installed: false,
}, },
ingress: { ingress: {
title: 'Ingress', title: 'Ingress',
...@@ -79,6 +80,7 @@ describe('Clusters Store', () => { ...@@ -79,6 +80,7 @@ describe('Clusters Store', () => {
requestReason: null, requestReason: null,
externalIp: null, externalIp: null,
externalHostname: null, externalHostname: null,
installed: false,
}, },
runner: { runner: {
title: 'GitLab Runner', title: 'GitLab Runner',
...@@ -89,6 +91,7 @@ describe('Clusters Store', () => { ...@@ -89,6 +91,7 @@ describe('Clusters Store', () => {
version: mockResponseData.applications[2].version, version: mockResponseData.applications[2].version,
upgradeAvailable: mockResponseData.applications[2].update_available, upgradeAvailable: mockResponseData.applications[2].update_available,
chartRepo: 'https://gitlab.com/charts/gitlab-runner', chartRepo: 'https://gitlab.com/charts/gitlab-runner',
installed: false,
}, },
prometheus: { prometheus: {
title: 'Prometheus', title: 'Prometheus',
...@@ -96,6 +99,7 @@ describe('Clusters Store', () => { ...@@ -96,6 +99,7 @@ describe('Clusters Store', () => {
statusReason: mockResponseData.applications[3].status_reason, statusReason: mockResponseData.applications[3].status_reason,
requestStatus: null, requestStatus: null,
requestReason: null, requestReason: null,
installed: false,
}, },
jupyter: { jupyter: {
title: 'JupyterHub', title: 'JupyterHub',
...@@ -104,6 +108,7 @@ describe('Clusters Store', () => { ...@@ -104,6 +108,7 @@ describe('Clusters Store', () => {
requestStatus: null, requestStatus: null,
requestReason: null, requestReason: null,
hostname: '', hostname: '',
installed: false,
}, },
knative: { knative: {
title: 'Knative', title: 'Knative',
...@@ -115,6 +120,7 @@ describe('Clusters Store', () => { ...@@ -115,6 +120,7 @@ describe('Clusters Store', () => {
isEditingHostName: false, isEditingHostName: false,
externalIp: null, externalIp: null,
externalHostname: null, externalHostname: null,
installed: false,
}, },
cert_manager: { cert_manager: {
title: 'Cert-Manager', title: 'Cert-Manager',
...@@ -123,11 +129,26 @@ describe('Clusters Store', () => { ...@@ -123,11 +129,26 @@ describe('Clusters Store', () => {
requestStatus: null, requestStatus: null,
requestReason: null, requestReason: null,
email: mockResponseData.applications[6].email, email: mockResponseData.applications[6].email,
installed: false,
}, },
}, },
}); });
}); });
describe.each(APPLICATION_INSTALLED_STATUSES)('given the current app status is %s', () => {
it('marks application as installed', () => {
const mockResponseData =
CLUSTERS_MOCK_DATA.GET['/gitlab-org/gitlab-shell/clusters/2/status.json'].data;
const runnerAppIndex = 2;
mockResponseData.applications[runnerAppIndex].status = APPLICATION_STATUS.INSTALLED;
store.updateStateFromServer(mockResponseData);
expect(store.state.applications[RUNNER].installed).toBe(true);
});
});
it('sets default hostname for jupyter when ingress has a ip address', () => { it('sets default hostname for jupyter when ingress has a ip address', () => {
const mockResponseData = const mockResponseData =
CLUSTERS_MOCK_DATA.GET['/gitlab-org/gitlab-shell/clusters/2/status.json'].data; CLUSTERS_MOCK_DATA.GET['/gitlab-org/gitlab-shell/clusters/2/status.json'].data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment