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

Do not display ingress IP help text 

if there isn’t an ingress IP assigned for the cluster yet
This commit is contained in:
Enrique Alcántara 2019-04-05 20:35:23 +00:00 committed by Clement Ho
parent 2210f5e869
commit 8906de3720
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/clusters/clusters_bundle.js
View File

@ -288,10 +288,11 @@ export default class Clusters {
}
toggleIngressDomainHelpText(ingressPreviousState, ingressNewState) {
const helpTextHidden = ingressNewState.status !== APPLICATION_STATUS.INSTALLED;
const domainSnippetText = `${ingressNewState.externalIp}${INGRESS_DOMAIN_SUFFIX}`;
const { externalIp, status } = ingressNewState;
const helpTextHidden = status !== APPLICATION_STATUS.INSTALLED || !externalIp;
const domainSnippetText = `${externalIp}${INGRESS_DOMAIN_SUFFIX}`;
if (ingressPreviousState.status !== ingressNewState.status) {
if (ingressPreviousState.status !== status) {
this.ingressDomainHelpText.classList.toggle('hide', helpTextHidden);
this.ingressDomainSnippet.textContent = domainSnippetText;
}

5
changelogs/unreleased/60068-avoid-null-domain-help-text.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Do not display Ingress IP help text when there isn’t an Ingress IP assigned
merge_request: 27057
author:
type: fixed

20
spec/javascripts/clusters/clusters_bundle_spec.js
View File

@ -300,9 +300,13 @@ describe('Clusters', () => {
describe('toggleIngressDomainHelpText', () => {
const { INSTALLED, INSTALLABLE, NOT_INSTALLABLE } = APPLICATION_STATUS;
let ingressPreviousState;
let ingressNewState;
const ingressPreviousState = { status: INSTALLABLE };
const ingressNewState = { status: INSTALLED, externalIp: '127.0.0.1' };
beforeEach(() => {
ingressPreviousState = { status: INSTALLABLE };
ingressNewState = { status: INSTALLED, externalIp: '127.0.0.1' };
});
describe(`when ingress application new status is ${INSTALLED}`, () => {
beforeEach(() => {
@ -333,7 +337,7 @@ describe('Clusters', () => {
});
describe('when ingress application new status and old status are the same', () => {
it('does not modify custom domain help text', () => {
it('does not display custom domain help text', () => {
ingressPreviousState.status = INSTALLED;
ingressNewState.status = ingressPreviousState.status;
@ -342,5 +346,15 @@ describe('Clusters', () => {
expect(cluster.ingressDomainHelpText.classList.contains('hide')).toEqual(true);
});
});
describe(`when ingress new status is ${INSTALLED} and there isn’t an ip assigned`, () => {
it('does not display custom domain help text', () => {
ingressNewState.externalIp = null;
cluster.toggleIngressDomainHelpText(ingressPreviousState, ingressNewState);
expect(cluster.ingressDomainHelpText.classList.contains('hide')).toEqual(true);
});
});
});
});