diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 03:09:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 03:09:37 +0300 |
commit | e3bdfa1a13d7e6c92716324c78b5b20c07eeb7c6 (patch) | |
tree | e8776263096b027d32d4be5118cccc87b00de2bc /app/assets/javascripts/clusters/clusters_bundle.js | |
parent | c1a50b8195f4e36fda9b233acbde57a449bcf6c3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/clusters/clusters_bundle.js')
-rw-r--r-- | app/assets/javascripts/clusters/clusters_bundle.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js index da34c5030f9..1b11ec355bb 100644 --- a/app/assets/javascripts/clusters/clusters_bundle.js +++ b/app/assets/javascripts/clusters/clusters_bundle.js @@ -259,7 +259,7 @@ export default class Clusters { eventHub.$on('installApplication', this.installApplication); eventHub.$on('updateApplication', data => this.updateApplication(data)); eventHub.$on('saveKnativeDomain', data => this.saveKnativeDomain(data)); - eventHub.$on('setKnativeHostname', data => this.setKnativeHostname(data)); + eventHub.$on('setKnativeDomain', data => this.setKnativeDomain(data)); eventHub.$on('uninstallApplication', data => this.uninstallApplication(data)); eventHub.$on('setCrossplaneProviderStack', data => this.setCrossplaneProviderStack(data)); eventHub.$on('setIngressModSecurityEnabled', data => this.setIngressModSecurityEnabled(data)); @@ -275,7 +275,7 @@ export default class Clusters { eventHub.$off('installApplication', this.installApplication); eventHub.$off('updateApplication', this.updateApplication); eventHub.$off('saveKnativeDomain'); - eventHub.$off('setKnativeHostname'); + eventHub.$off('setKnativeDomain'); eventHub.$off('setCrossplaneProviderStack'); eventHub.$off('uninstallApplication'); eventHub.$off('setIngressModSecurityEnabled'); @@ -521,10 +521,10 @@ export default class Clusters { }); } - setKnativeHostname(data) { - const appId = data.id; - this.store.updateAppProperty(appId, 'isEditingHostName', true); - this.store.updateAppProperty(appId, 'hostname', data.hostname); + setKnativeDomain({ id: appId, domain, domainId }) { + this.store.updateAppProperty(appId, 'isEditingDomain', true); + this.store.updateAppProperty(appId, 'hostname', domain); + this.store.updateAppProperty(appId, 'pagesDomain', domainId ? { id: domainId, domain } : null); } setCrossplaneProviderStack(data) { |