diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 12:09:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 12:09:13 +0000 |
commit | cd3e2c7b9355f8990ab294b34b5e4add4f3985fa (patch) | |
tree | 77264b3e569ec95da8476f604d3d5cf4b03e85dc /app/assets/javascripts/clusters/stores | |
parent | c1fc5da123a1fe670e32740669a9d5e59eff38f5 (diff) | |
download | gitlab-ce-cd3e2c7b9355f8990ab294b34b5e4add4f3985fa.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/clusters/stores')
-rw-r--r-- | app/assets/javascripts/clusters/stores/clusters_store.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js index 939c396e1b9..ffe71455b2d 100644 --- a/app/assets/javascripts/clusters/stores/clusters_store.js +++ b/app/assets/javascripts/clusters/stores/clusters_store.js @@ -54,6 +54,8 @@ export default class ClusterStore { modsecurity_enabled: false, externalIp: null, externalHostname: null, + isEditingModSecurityEnabled: false, + updateFailed: false, }, cert_manager: { ...applicationInitialState, @@ -208,8 +210,11 @@ export default class ClusterStore { if (appId === INGRESS) { this.state.applications.ingress.externalIp = serverAppEntry.external_ip; this.state.applications.ingress.externalHostname = serverAppEntry.external_hostname; - this.state.applications.ingress.modsecurity_enabled = - serverAppEntry.modsecurity_enabled || this.state.applications.ingress.modsecurity_enabled; + if (!this.state.applications.ingress.isEditingModSecurityEnabled) { + this.state.applications.ingress.modsecurity_enabled = + serverAppEntry.modsecurity_enabled || + this.state.applications.ingress.modsecurity_enabled; + } } else if (appId === CERT_MANAGER) { this.state.applications.cert_manager.email = this.state.applications.cert_manager.email || serverAppEntry.email; |