Commit ed1c5289 authored by Mark Florian's avatar Mark Florian

Merge branch...

Merge branch '241924-remove-v-html-from-ee-app-assets-javascripts-clusters-components-environments-vue' into 'master'

Replace v-html with gl-sprintf in ee/app/assets/javascripts/clusters/components/environments.vue

Closes #241924

See merge request gitlab-org/gitlab!41510
parents f73bb238 437708c0
<script> <script>
/* eslint-disable vue/no-v-html */ import { GlTable, GlEmptyState, GlLoadingIcon, GlIcon, GlLink, GlSprintf } from '@gitlab/ui';
import { GlTable, GlEmptyState, GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { __ } from '~/locale';
import { __, sprintf } from '~/locale';
import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
export default { export default {
...@@ -10,7 +9,9 @@ export default { ...@@ -10,7 +9,9 @@ export default {
GlTable, GlTable,
GlIcon, GlIcon,
TimeAgo, TimeAgo,
GlLink,
GlLoadingIcon, GlLoadingIcon,
GlSprintf,
deploymentInstance: () => import('ee_component/vue_shared/components/deployment_instance.vue'), deploymentInstance: () => import('ee_component/vue_shared/components/deployment_instance.vue'),
}, },
props: { props: {
...@@ -39,24 +40,6 @@ export default { ...@@ -39,24 +40,6 @@ export default {
isEmpty() { isEmpty() {
return !this.isFetching && this.environments.length === 0; return !this.isFetching && this.environments.length === 0;
}, },
tableEmptyStateText() {
const text = __(
'Ensure your %{linkStart}environment is part of the deploy stage%{linkEnd} of your CI pipeline to track deployments to your cluster.',
);
const linkStart = `<a href="${this.environmentsHelpPath}">`;
const linkEnd = `</a>`;
return sprintf(text, { linkStart, linkEnd }, false);
},
deploymentsEmptyStateText() {
const text = __(
'Deploy progress not found. To see pods, ensure your environment matches %{linkStart}deploy board criteria%{linkEnd}.',
);
const linkStart = `<a href="${this.deployBoardsHelpPath}">`;
const linkEnd = `</a>`;
return sprintf(text, { linkStart, linkEnd }, false);
},
podsInUseCount() { podsInUseCount() {
let podsInUse = 0; let podsInUse = 0;
...@@ -97,7 +80,19 @@ export default { ...@@ -97,7 +80,19 @@ export default {
:primary-button-link="clustersHelpPath" :primary-button-link="clustersHelpPath"
:primary-button-text="__('Learn more about deploying to a cluster')" :primary-button-text="__('Learn more about deploying to a cluster')"
> >
<div slot="description" v-html="tableEmptyStateText"></div> <div slot="description">
<gl-sprintf
:message="
__(
'Ensure your %{linkStart}environment is part of the deploy stage%{linkEnd} of your CI pipeline to track deployments to your cluster.',
)
"
>
<template #link="{ content }">
<gl-link :href="environmentsHelpPath">{{ content }}</gl-link>
</template>
</gl-sprintf>
</div>
</gl-empty-state> </gl-empty-state>
<gl-table <gl-table
...@@ -158,7 +153,19 @@ export default { ...@@ -158,7 +153,19 @@ export default {
:size="18" :size="18"
class="cluster-deployments-warning mr-2 align-self-center flex-shrink-0" class="cluster-deployments-warning mr-2 align-self-center flex-shrink-0"
/> />
<span v-html="deploymentsEmptyStateText"></span> <span>
<gl-sprintf
:message="
__(
'Deploy progress not found. To see pods, ensure your environment matches %{linkStart}deploy board criteria%{linkEnd}.',
)
"
>
<template #link="{ content }">
<gl-link :href="deployBoardsHelpPath">{{ content }}</gl-link>
</template>
</gl-sprintf>
</span>
</div> </div>
</template> </template>
......
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