Commit 83dcb762 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '242022-bscallout-to-glalert-applications' into 'master'

Migrate bs-callout to GlAlert in clusters components

See merge request gitlab-org/gitlab!47331
parents cb2b3395 05214682
<script> <script>
import { GlLoadingIcon, GlSprintf, GlLink } from '@gitlab/ui'; import { GlLoadingIcon, GlSprintf, GlLink, GlAlert } from '@gitlab/ui';
import gitlabLogo from 'images/cluster_app_logos/gitlab.png'; import gitlabLogo from 'images/cluster_app_logos/gitlab.png';
import helmLogo from 'images/cluster_app_logos/helm.png'; import helmLogo from 'images/cluster_app_logos/helm.png';
import jupyterhubLogo from 'images/cluster_app_logos/jupyterhub.png'; import jupyterhubLogo from 'images/cluster_app_logos/jupyterhub.png';
...@@ -30,6 +30,7 @@ export default { ...@@ -30,6 +30,7 @@ export default {
CrossplaneProviderStack, CrossplaneProviderStack,
IngressModsecuritySettings, IngressModsecuritySettings,
FluentdOutputSettings, FluentdOutputSettings,
GlAlert,
}, },
props: { props: {
type: { type: {
...@@ -293,8 +294,8 @@ export default { ...@@ -293,8 +294,8 @@ export default {
</p> </p>
</template> </template>
<template v-else> <template v-else>
<div class="bs-callout bs-callout-info"> <gl-alert variant="info" :dismissible="false">
<strong data-testid="ingressCostWarning"> <span data-testid="ingressCostWarning">
<gl-sprintf <gl-sprintf
:message=" :message="
s__( s__(
...@@ -308,8 +309,8 @@ export default { ...@@ -308,8 +309,8 @@ export default {
}}</gl-link> }}</gl-link>
</template> </template>
</gl-sprintf> </gl-sprintf>
</strong> </span>
</div> </gl-alert>
</template> </template>
</template> </template>
</application-row> </application-row>
...@@ -572,13 +573,13 @@ export default { ...@@ -572,13 +573,13 @@ export default {
title-link="https://github.com/knative/docs" title-link="https://github.com/knative/docs"
> >
<template #description> <template #description>
<p v-if="!rbac" class="rbac-notice bs-callout bs-callout-info"> <gl-alert v-if="!rbac" variant="info" class="rbac-notice gl-my-3" :dismissible="false">
{{ {{
s__(`ClusterIntegration|You must have an RBAC-enabled cluster s__(`ClusterIntegration|You must have an RBAC-enabled cluster
to install Knative.`) to install Knative.`)
}} }}
<gl-link :href="helpPath" target="_blank">{{ __('More information') }}</gl-link> <gl-link :href="helpPath" target="_blank">{{ __('More information') }}</gl-link>
</p> </gl-alert>
<p> <p>
{{ {{
s__(`ClusterIntegration|Knative extends Kubernetes to provide s__(`ClusterIntegration|Knative extends Kubernetes to provide
......
---
title: Replaces elements with the bs-callout class with gl-alert vue component
merge_request: 47331
author: Gary Bell @garybell
type: other
...@@ -55,7 +55,7 @@ exports[`Applications Crossplane application shows the correct description 1`] = ...@@ -55,7 +55,7 @@ exports[`Applications Crossplane application shows the correct description 1`] =
`; `;
exports[`Applications Ingress application shows the correct warning message 1`] = ` exports[`Applications Ingress application shows the correct warning message 1`] = `
<strong <span
data-testid="ingressCostWarning" data-testid="ingressCostWarning"
> >
Installing Ingress may incur additional costs. Learn more about Installing Ingress may incur additional costs. Learn more about
...@@ -68,7 +68,7 @@ exports[`Applications Ingress application shows the correct warning message 1`] ...@@ -68,7 +68,7 @@ exports[`Applications Ingress application shows the correct warning message 1`]
pricing pricing
</a> </a>
. .
</strong> </span>
`; `;
exports[`Applications Knative application shows the correct description 1`] = ` exports[`Applications Knative application shows the correct description 1`] = `
......
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