Commit a5eb29c1 authored by Clement Ho's avatar Clement Ho

Merge branch '60068-avoid-null-domain-help-text' into 'master'

Do not display Ingress IP help text when there isn’t an Ingress IP assigned

Closes #60068

See merge request gitlab-org/gitlab-ce!27057
parents 2210f5e8 8906de37
...@@ -288,10 +288,11 @@ export default class Clusters { ...@@ -288,10 +288,11 @@ export default class Clusters {
} }
toggleIngressDomainHelpText(ingressPreviousState, ingressNewState) { toggleIngressDomainHelpText(ingressPreviousState, ingressNewState) {
const helpTextHidden = ingressNewState.status !== APPLICATION_STATUS.INSTALLED; const { externalIp, status } = ingressNewState;
const domainSnippetText = `${ingressNewState.externalIp}${INGRESS_DOMAIN_SUFFIX}`; 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.ingressDomainHelpText.classList.toggle('hide', helpTextHidden);
this.ingressDomainSnippet.textContent = domainSnippetText; this.ingressDomainSnippet.textContent = domainSnippetText;
} }
......
---
title: Do not display Ingress IP help text when there isn’t an Ingress IP assigned
merge_request: 27057
author:
type: fixed
...@@ -300,9 +300,13 @@ describe('Clusters', () => { ...@@ -300,9 +300,13 @@ describe('Clusters', () => {
describe('toggleIngressDomainHelpText', () => { describe('toggleIngressDomainHelpText', () => {
const { INSTALLED, INSTALLABLE, NOT_INSTALLABLE } = APPLICATION_STATUS; const { INSTALLED, INSTALLABLE, NOT_INSTALLABLE } = APPLICATION_STATUS;
let ingressPreviousState;
let ingressNewState;
const ingressPreviousState = { status: INSTALLABLE }; beforeEach(() => {
const ingressNewState = { status: INSTALLED, externalIp: '127.0.0.1' }; ingressPreviousState = { status: INSTALLABLE };
ingressNewState = { status: INSTALLED, externalIp: '127.0.0.1' };
});
describe(`when ingress application new status is ${INSTALLED}`, () => { describe(`when ingress application new status is ${INSTALLED}`, () => {
beforeEach(() => { beforeEach(() => {
...@@ -333,7 +337,7 @@ describe('Clusters', () => { ...@@ -333,7 +337,7 @@ describe('Clusters', () => {
}); });
describe('when ingress application new status and old status are the same', () => { 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; ingressPreviousState.status = INSTALLED;
ingressNewState.status = ingressPreviousState.status; ingressNewState.status = ingressPreviousState.status;
...@@ -342,5 +346,15 @@ describe('Clusters', () => { ...@@ -342,5 +346,15 @@ describe('Clusters', () => {
expect(cluster.ingressDomainHelpText.classList.contains('hide')).toEqual(true); 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);
});
});
}); });
}); });
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