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

Fix remaining domainname -> hostname rebranding

Browse source
This commit is contained in:
Chris Baumbauer 2018-10-30 22:15:23 -07:00
parent 6aa0645fa7
commit 0a62588be7
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/clusters/components/applications.vue
View file

@ -383,7 +383,7 @@ export default {
:status-reason="applications.knative.statusReason" :status-reason="applications.knative.statusReason"
:request-status="applications.knative.requestStatus" :request-status="applications.knative.requestStatus"
:request-reason="applications.knative.requestReason" :request-reason="applications.knative.requestReason"
:install-application-request-params="{ hostname: applications.knative.domainname}" :install-application-request-params="{ hostname: applications.knative.hostname}"
:disabled="!helmInstalled" :disabled="!helmInstalled"
class="hide-bottom-border rounded-bottom" class="hide-bottom-border rounded-bottom"
title-link="https://github.com/knative/docs" title-link="https://github.com/knative/docs"
@ -405,7 +405,7 @@ export default {
</label> </label>
<input <input
id="knative-domainname" id="knative-domainname"
v-model="applications.knative.domainname" v-model="applications.knative.hostname"
type="text" type="text"
class="form-control js-domainname" class="form-control js-domainname"
readonly readonly
@ -419,7 +419,7 @@ export default {
</label> </label>
<input <input
id="knative-domainname" id="knative-domainname"
v-model="applications.knative.domainname" v-model="applications.knative.hostname"
type="text" type="text"
class="form-control js-domainname" class="form-control js-domainname"
/> />

1
app/assets/javascripts/clusters/constants.js
View file

@ -16,3 +16,4 @@ export const REQUEST_SUCCESS = 'request-success';
export const REQUEST_FAILURE = 'request-failure'; export const REQUEST_FAILURE = 'request-failure';
export const INGRESS = 'ingress'; export const INGRESS = 'ingress';
export const JUPYTER = 'jupyter'; export const JUPYTER = 'jupyter';
export const KNATIVE = 'knative';

4
app/assets/javascripts/clusters/stores/clusters_store.js
View file

@ -1,5 +1,5 @@
import { s__ } from '../../locale'; import { s__ } from '../../locale';
import { INGRESS, JUPYTER } from '../constants'; import { INGRESS, JUPYTER, KNATIVE } from '../constants';
export default class ClusterStore { export default class ClusterStore {
constructor() { constructor() {
@ -105,6 +105,8 @@ export default class ClusterStore {
(this.state.applications.ingress.externalIp (this.state.applications.ingress.externalIp
? `jupyter.${this.state.applications.ingress.externalIp}.nip.io` ? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`
: ''); : '');
} else if (appId === KNATIVE) {
this.state.applications.knative.hostname = serverAppEntry.hostname ? serverAppEntry.hostname : '';
} }
}); });
} }

2
spec/javascripts/clusters/components/applications_spec.js
View file

@ -68,7 +68,7 @@ describe('Applications', () => {
runner: { title: 'GitLab Runner' }, runner: { title: 'GitLab Runner' },
prometheus: { title: 'Prometheus' }, prometheus: { title: 'Prometheus' },
jupyter: { title: 'JupyterHub', hostname: '' }, jupyter: { title: 'JupyterHub', hostname: '' },
knative: { title: 'Knative', domainname: '' }, knative: { title: 'Knative', hostname: '' },
}, },
}); });