Commit 36bf7e77 authored by Gilang Gumilar's avatar Gilang Gumilar Committed by Natalia Tepluhina

Update deprecated slot syntax in `./app/assets/javascripts/clusters/components/applications.vue`

parent 14b11b07
...@@ -281,7 +281,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -281,7 +281,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
class="rounded-top" class="rounded-top"
title-link="https://docs.helm.sh/" title-link="https://docs.helm.sh/"
> >
<div slot="description"> <template #description>
<div>
{{ {{
s__(`ClusterIntegration|Helm streamlines installing s__(`ClusterIntegration|Helm streamlines installing
and managing Kubernetes applications. and managing Kubernetes applications.
...@@ -289,6 +290,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -289,6 +290,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
and manages releases of your charts.`) and manages releases of your charts.`)
}} }}
</div> </div>
</template>
</application-row> </application-row>
<div v-show="!helmInstalled" class="cluster-application-warning"> <div v-show="!helmInstalled" class="cluster-application-warning">
<div class="svg-container" v-html="$options.helmInstallIllustration"></div> <div class="svg-container" v-html="$options.helmInstallIllustration"></div>
...@@ -318,7 +320,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -318,7 +320,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:updateable="false" :updateable="false"
title-link="https://kubernetes.io/docs/concepts/services-networking/ingress/" title-link="https://kubernetes.io/docs/concepts/services-networking/ingress/"
> >
<div slot="description"> <template #description>
<div>
<p> <p>
{{ {{
s__(`ClusterIntegration|Ingress gives you a way to route s__(`ClusterIntegration|Ingress gives you a way to route
...@@ -334,7 +337,9 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -334,7 +337,9 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
<template v-if="ingressInstalled"> <template v-if="ingressInstalled">
<div class="form-group"> <div class="form-group">
<label for="ingress-endpoint">{{ s__('ClusterIntegration|Ingress Endpoint') }}</label> <label for="ingress-endpoint">{{
s__('ClusterIntegration|Ingress Endpoint')
}}</label>
<div class="input-group"> <div class="input-group">
<template v-if="ingressExternalEndpoint"> <template v-if="ingressExternalEndpoint">
<input <input
...@@ -388,6 +393,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -388,6 +393,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
</div> </div>
</template> </template>
</div> </div>
</template>
</application-row> </application-row>
<application-row <application-row
id="cert_manager" id="cert_manager"
...@@ -406,8 +412,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -406,8 +412,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:disabled="!helmInstalled" :disabled="!helmInstalled"
title-link="https://cert-manager.readthedocs.io/en/latest/#" title-link="https://cert-manager.readthedocs.io/en/latest/#"
> >
<template> <template #description>
<div slot="description"> <div>
<p v-html="certManagerDescription"></p> <p v-html="certManagerDescription"></p>
<div class="form-group"> <div class="form-group">
<label for="cert-manager-issuer-email"> <label for="cert-manager-issuer-email">
...@@ -455,7 +461,9 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -455,7 +461,9 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:disabled="!helmInstalled" :disabled="!helmInstalled"
title-link="https://prometheus.io/docs/introduction/overview/" title-link="https://prometheus.io/docs/introduction/overview/"
> >
<div slot="description" v-html="prometheusDescription"></div> <template #description>
<div v-html="prometheusDescription"></div>
</template>
</application-row> </application-row>
<application-row <application-row
id="runner" id="runner"
...@@ -478,7 +486,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -478,7 +486,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:disabled="!helmInstalled" :disabled="!helmInstalled"
title-link="https://docs.gitlab.com/runner/" title-link="https://docs.gitlab.com/runner/"
> >
<div slot="description"> <template #description>
<div>
{{ {{
s__(`ClusterIntegration|GitLab Runner connects to the s__(`ClusterIntegration|GitLab Runner connects to the
repository and executes CI/CD jobs, repository and executes CI/CD jobs,
...@@ -486,6 +495,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -486,6 +495,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
applications to production.`) applications to production.`)
}} }}
</div> </div>
</template>
</application-row> </application-row>
<application-row <application-row
id="crossplane" id="crossplane"
...@@ -504,8 +514,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -504,8 +514,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:disabled="!helmInstalled" :disabled="!helmInstalled"
title-link="https://crossplane.io" title-link="https://crossplane.io"
> >
<template> <template #description>
<div slot="description"> <div>
<p v-html="crossplaneDescription"></p> <p v-html="crossplaneDescription"></p>
<div class="form-group"> <div class="form-group">
<CrossplaneProviderStack :crossplane="crossplane" @set="setCrossplaneProviderStack" /> <CrossplaneProviderStack :crossplane="crossplane" @set="setCrossplaneProviderStack" />
...@@ -531,7 +541,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -531,7 +541,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:disabled="!helmInstalled" :disabled="!helmInstalled"
title-link="https://jupyterhub.readthedocs.io/en/stable/" title-link="https://jupyterhub.readthedocs.io/en/stable/"
> >
<div slot="description"> <template #description>
<div>
<p> <p>
{{ {{
s__(`ClusterIntegration|JupyterHub, a multi-user Hub, spawns, s__(`ClusterIntegration|JupyterHub, a multi-user Hub, spawns,
...@@ -544,7 +555,9 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -544,7 +555,9 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
<template v-if="ingressExternalEndpoint"> <template v-if="ingressExternalEndpoint">
<div class="form-group"> <div class="form-group">
<label for="jupyter-hostname">{{ s__('ClusterIntegration|Jupyter Hostname') }}</label> <label for="jupyter-hostname">{{
s__('ClusterIntegration|Jupyter Hostname')
}}</label>
<div class="input-group"> <div class="input-group">
<input <input
...@@ -575,6 +588,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -575,6 +588,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
</div> </div>
</template> </template>
</div> </div>
</template>
</application-row> </application-row>
<application-row <application-row
id="knative" id="knative"
...@@ -599,8 +613,9 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -599,8 +613,9 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
v-bind="applications.knative" v-bind="applications.knative"
title-link="https://github.com/knative/docs" title-link="https://github.com/knative/docs"
> >
<div slot="description"> <template #description>
<p v-if="!rbac" class="rbac-notice bs-callout bs-callout-info"> <div>
<p v-if="!rbac" class="rbac-notice bs-callout bs-callout-info gl-mb-0">
{{ {{
s__(`ClusterIntegration|You must have an RBAC-enabled cluster s__(`ClusterIntegration|You must have an RBAC-enabled cluster
to install Knative.`) to install Knative.`)
...@@ -609,6 +624,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -609,6 +624,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
{{ __('More information') }} {{ __('More information') }}
</a> </a>
</p> </p>
<br />
<p> <p>
{{ {{
s__(`ClusterIntegration|Knative extends Kubernetes to provide s__(`ClusterIntegration|Knative extends Kubernetes to provide
...@@ -626,6 +642,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -626,6 +642,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
@set="setKnativeDomain" @set="setKnativeDomain"
/> />
</div> </div>
</template>
</application-row> </application-row>
<application-row <application-row
id="elastic_stack" id="elastic_stack"
...@@ -648,7 +665,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -648,7 +665,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:disabled="!helmInstalled" :disabled="!helmInstalled"
title-link="https://gitlab.com/gitlab-org/charts/elastic-stack" title-link="https://gitlab.com/gitlab-org/charts/elastic-stack"
> >
<div slot="description"> <template #description>
<div>
<p> <p>
{{ {{
s__( s__(
...@@ -657,6 +675,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -657,6 +675,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
}} }}
</p> </p>
</div> </div>
</template>
</application-row> </application-row>
<application-row <application-row
...@@ -683,7 +702,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -683,7 +702,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:updateable="false" :updateable="false"
title-link="https://github.com/helm/charts/tree/master/stable/fluentd" title-link="https://github.com/helm/charts/tree/master/stable/fluentd"
> >
<div slot="description"> <template #description>
<div>
<p> <p>
{{ {{
s__( s__(
...@@ -702,6 +722,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -702,6 +722,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:update-failed="applications.fluentd.updateFailed" :update-failed="applications.fluentd.updateFailed"
/> />
</div> </div>
</template>
</application-row> </application-row>
</div> </div>
</section> </section>
......
...@@ -13,6 +13,14 @@ import FluentdOutputSettings from '~/clusters/components/fluentd_output_settings ...@@ -13,6 +13,14 @@ import FluentdOutputSettings from '~/clusters/components/fluentd_output_settings
describe('Applications', () => { describe('Applications', () => {
let vm; let vm;
let Applications; let Applications;
const ApplicationRowStub = {
name: 'application-row-stub',
template: `
<div>
<slot name="description"></slot>
</div>
`,
};
beforeEach(() => { beforeEach(() => {
Applications = Vue.extend(applications); Applications = Vue.extend(applications);
...@@ -202,7 +210,12 @@ describe('Applications', () => { ...@@ -202,7 +210,12 @@ describe('Applications', () => {
let wrapper; let wrapper;
beforeEach(() => { beforeEach(() => {
wrapper = shallowMount(Applications, { propsData }); wrapper = shallowMount(Applications, {
propsData,
stubs: {
ApplicationRow: ApplicationRowStub,
},
});
}); });
afterEach(() => { afterEach(() => {
wrapper.destroy(); wrapper.destroy();
...@@ -436,7 +449,10 @@ describe('Applications', () => { ...@@ -436,7 +449,10 @@ describe('Applications', () => {
let knativeDomainEditor; let knativeDomainEditor;
beforeEach(() => { beforeEach(() => {
wrapper = shallowMount(Applications, { propsData }); wrapper = shallowMount(Applications, {
propsData,
stubs: { ApplicationRow: ApplicationRowStub },
});
jest.spyOn(eventHub, '$emit'); jest.spyOn(eventHub, '$emit');
knativeDomainEditor = wrapper.find(KnativeDomainEditor); knativeDomainEditor = wrapper.find(KnativeDomainEditor);
...@@ -504,7 +520,10 @@ describe('Applications', () => { ...@@ -504,7 +520,10 @@ describe('Applications', () => {
let wrapper; let wrapper;
beforeEach(() => { beforeEach(() => {
wrapper = shallowMount(Applications, { propsData }); wrapper = shallowMount(Applications, {
propsData,
stubs: { ApplicationRow: ApplicationRowStub },
});
}); });
afterEach(() => { afterEach(() => {
wrapper.destroy(); wrapper.destroy();
...@@ -563,7 +582,10 @@ describe('Applications', () => { ...@@ -563,7 +582,10 @@ describe('Applications', () => {
let wrapper; let wrapper;
beforeEach(() => { beforeEach(() => {
wrapper = shallowMount(Applications, { propsData }); wrapper = shallowMount(Applications, {
propsData,
stubs: { ApplicationRow: ApplicationRowStub },
});
}); });
afterEach(() => { afterEach(() => {
wrapper.destroy(); wrapper.destroy();
......
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