Commit 81ba4565 authored by Mike Greiling's avatar Mike Greiling

Merge branch...

Merge branch '196692-replace-underscore-with-lodash-for-app-assets-javascripts-clusters' into 'master'

Replace underscore with lodash in ./clusters

Closes #196692

See merge request gitlab-org/gitlab!27938
parents 8f824482 e2e62be4
<script> <script>
import _ from 'underscore'; import { escape as esc } from 'lodash';
import helmInstallIllustration from '@gitlab/svgs/dist/illustrations/kubernetes-installation.svg'; import helmInstallIllustration from '@gitlab/svgs/dist/illustrations/kubernetes-installation.svg';
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon } from '@gitlab/ui';
import elasticsearchLogo from 'images/cluster_app_logos/elasticsearch.png'; import elasticsearchLogo from 'images/cluster_app_logos/elasticsearch.png';
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
}, },
ingressDescription() { ingressDescription() {
return sprintf( return sprintf(
_.escape( esc(
s__( s__(
`ClusterIntegration|Installing Ingress may incur additional costs. Learn more about %{pricingLink}.`, `ClusterIntegration|Installing Ingress may incur additional costs. Learn more about %{pricingLink}.`,
), ),
...@@ -138,14 +138,14 @@ export default { ...@@ -138,14 +138,14 @@ export default {
{ {
pricingLink: `<a href="https://cloud.google.com/compute/pricing#lb" pricingLink: `<a href="https://cloud.google.com/compute/pricing#lb"
target="_blank" rel="noopener noreferrer"> target="_blank" rel="noopener noreferrer">
${_.escape(s__('ClusterIntegration|pricing'))}</a>`, ${esc(s__('ClusterIntegration|pricing'))}</a>`,
}, },
false, false,
); );
}, },
certManagerDescription() { certManagerDescription() {
return sprintf( return sprintf(
_.escape( esc(
s__( s__(
`ClusterIntegration|Cert-Manager is a native Kubernetes certificate management controller that helps with issuing certificates. `ClusterIntegration|Cert-Manager is a native Kubernetes certificate management controller that helps with issuing certificates.
Installing Cert-Manager on your cluster will issue a certificate by %{letsEncrypt} and ensure that certificates Installing Cert-Manager on your cluster will issue a certificate by %{letsEncrypt} and ensure that certificates
...@@ -155,14 +155,14 @@ export default { ...@@ -155,14 +155,14 @@ export default {
{ {
letsEncrypt: `<a href="https://letsencrypt.org/" letsEncrypt: `<a href="https://letsencrypt.org/"
target="_blank" rel="noopener noreferrer"> target="_blank" rel="noopener noreferrer">
${_.escape(s__("ClusterIntegration|Let's Encrypt"))}</a>`, ${esc(s__("ClusterIntegration|Let's Encrypt"))}</a>`,
}, },
false, false,
); );
}, },
crossplaneDescription() { crossplaneDescription() {
return sprintf( return sprintf(
_.escape( esc(
s__( s__(
`ClusterIntegration|Crossplane enables declarative provisioning of managed services from your cloud of choice using %{kubectl} or %{gitlabIntegrationLink}. `ClusterIntegration|Crossplane enables declarative provisioning of managed services from your cloud of choice using %{kubectl} or %{gitlabIntegrationLink}.
Crossplane runs inside your Kubernetes cluster and supports secure connectivity and secrets management between app containers and the cloud services they depend on.`, Crossplane runs inside your Kubernetes cluster and supports secure connectivity and secrets management between app containers and the cloud services they depend on.`,
...@@ -171,7 +171,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -171,7 +171,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
{ {
gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ee/user/clusters/applications.html#crossplane" gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ee/user/clusters/applications.html#crossplane"
target="_blank" rel="noopener noreferrer"> target="_blank" rel="noopener noreferrer">
${_.escape(s__('ClusterIntegration|Gitlab Integration'))}</a>`, ${esc(s__('ClusterIntegration|Gitlab Integration'))}</a>`,
kubectl: `<code>kubectl</code>`, kubectl: `<code>kubectl</code>`,
}, },
false, false,
...@@ -180,7 +180,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -180,7 +180,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
prometheusDescription() { prometheusDescription() {
return sprintf( return sprintf(
_.escape( esc(
s__( s__(
`ClusterIntegration|Prometheus is an open-source monitoring system `ClusterIntegration|Prometheus is an open-source monitoring system
with %{gitlabIntegrationLink} to monitor deployed applications.`, with %{gitlabIntegrationLink} to monitor deployed applications.`,
...@@ -189,7 +189,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -189,7 +189,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
{ {
gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html" gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html"
target="_blank" rel="noopener noreferrer"> target="_blank" rel="noopener noreferrer">
${_.escape(s__('ClusterIntegration|GitLab Integration'))}</a>`, ${esc(s__('ClusterIntegration|GitLab Integration'))}</a>`,
}, },
false, false,
); );
...@@ -215,11 +215,11 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity ...@@ -215,11 +215,11 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
installedVia() { installedVia() {
if (this.cloudRun) { if (this.cloudRun) {
return sprintf( return sprintf(
_.escape(s__(`ClusterIntegration|installed via %{installed_via}`)), esc(s__(`ClusterIntegration|installed via %{installed_via}`)),
{ {
installed_via: `<a href="${ installed_via: `<a href="${
this.cloudRunHelpPath this.cloudRunHelpPath
}" target="_blank" rel="noopener noreferrer">${_.escape( }" target="_blank" rel="noopener noreferrer">${esc(
s__('ClusterIntegration|Cloud Run'), s__('ClusterIntegration|Cloud Run'),
)}</a>`, )}</a>`,
}, },
......
<script> <script>
import _ from 'underscore'; import { escape as esc } from 'lodash';
import SplitButton from '~/vue_shared/components/split_button.vue'; import SplitButton from '~/vue_shared/components/split_button.vue';
import { GlModal, GlButton, GlFormInput } from '@gitlab/ui'; import { GlModal, GlButton, GlFormInput } from '@gitlab/ui';
import { s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
) )
: s__('ClusterIntegration|To remove your integration, type %{clusterName} to confirm:'), : s__('ClusterIntegration|To remove your integration, type %{clusterName} to confirm:'),
{ {
clusterName: `<code>${_.escape(this.clusterName)}</code>`, clusterName: `<code>${esc(this.clusterName)}</code>`,
}, },
false, false,
); );
......
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