Commit 2aa70b1c authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '292972-rollout-gl-tooltips' into 'master'

Define GlTooltips feature flag

See merge request gitlab-org/gitlab!50395
parents cd51cb56 aba18a4f
...@@ -50,7 +50,8 @@ export default { ...@@ -50,7 +50,8 @@ export default {
addTooltips(elements, config) { addTooltips(elements, config) {
const newTooltips = elements const newTooltips = elements
.filter(element => !this.tooltipExists(element)) .filter(element => !this.tooltipExists(element))
.map(element => newTooltip(element, config)); .map(element => newTooltip(element, config))
.filter(tooltip => tooltip.title);
newTooltips.forEach(tooltip => this.observe(tooltip)); newTooltips.forEach(tooltip => this.observe(tooltip));
...@@ -93,6 +94,9 @@ export default { ...@@ -93,6 +94,9 @@ export default {
return this.tooltips.find(tooltip => tooltip.target === element); return this.tooltips.find(tooltip => tooltip.target === element);
}, },
}, },
safeHtmlConfig: {
ADD_TAGS: ['gl-emoji'],
},
}; };
</script> </script>
<template> <template>
...@@ -110,7 +114,7 @@ export default { ...@@ -110,7 +114,7 @@ export default {
:disabled="tooltip.disabled" :disabled="tooltip.disabled"
:show="tooltip.show" :show="tooltip.show"
> >
<span v-if="tooltip.html" v-safe-html="tooltip.title"></span> <span v-if="tooltip.html" v-safe-html:[$options.safeHtmlConfig]="tooltip.title"></span>
<span v-else>{{ tooltip.title }}</span> <span v-else>{{ tooltip.title }}</span>
</gl-tooltip> </gl-tooltip>
</div> </div>
......
...@@ -68,7 +68,7 @@ const invokeBootstrapApi = (elements, method) => { ...@@ -68,7 +68,7 @@ const invokeBootstrapApi = (elements, method) => {
} }
}; };
const isGlTooltipsEnabled = () => Boolean(window.gon.glTooltipsEnabled); const isGlTooltipsEnabled = () => Boolean(window.gon.features?.glTooltips);
const tooltipApiInvoker = ({ glHandler, bsHandler }) => (elements, ...params) => { const tooltipApiInvoker = ({ glHandler, bsHandler }) => (elements, ...params) => {
if (isGlTooltipsEnabled()) { if (isGlTooltipsEnabled()) {
......
---
name: gl_tooltips
introduced_by_url:
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292972
milestone: '13.8'
type: development
group: group::editor
default_enabled: false
...@@ -48,6 +48,7 @@ module Gitlab ...@@ -48,6 +48,7 @@ module Gitlab
push_frontend_feature_flag(:snippets_binary_blob, default_enabled: false) push_frontend_feature_flag(:snippets_binary_blob, default_enabled: false)
push_frontend_feature_flag(:usage_data_api, default_enabled: true) push_frontend_feature_flag(:usage_data_api, default_enabled: true)
push_frontend_feature_flag(:security_auto_fix, default_enabled: false) push_frontend_feature_flag(:security_auto_fix, default_enabled: false)
push_frontend_feature_flag(:gl_tooltips, default_enabled: :yaml)
# Startup CSS feature is a special one as it can be enabled by means of cookies and params # Startup CSS feature is a special one as it can be enabled by means of cookies and params
gon.push({ features: { 'startupCss' => use_startup_css? } }, true) gon.push({ features: { 'startupCss' => use_startup_css? } }, true)
......
...@@ -51,6 +51,16 @@ describe('tooltips/components/tooltips.vue', () => { ...@@ -51,6 +51,16 @@ describe('tooltips/components/tooltips.vue', () => {
expect(wrapper.find(GlTooltip).props('target')).toBe(target); expect(wrapper.find(GlTooltip).props('target')).toBe(target);
}); });
it('does not attach a tooltip to a target with empty title', async () => {
target.setAttribute('title', '');
wrapper.vm.addTooltips([target]);
await wrapper.vm.$nextTick();
expect(wrapper.find(GlTooltip).exists()).toBe(false);
});
it('does not attach a tooltip twice to the same element', async () => { it('does not attach a tooltip twice to the same element', async () => {
wrapper.vm.addTooltips([target]); wrapper.vm.addTooltips([target]);
wrapper.vm.addTooltips([target]); wrapper.vm.addTooltips([target]);
......
...@@ -42,7 +42,7 @@ describe('tooltips/index.js', () => { ...@@ -42,7 +42,7 @@ describe('tooltips/index.js', () => {
}; };
beforeEach(() => { beforeEach(() => {
window.gon.glTooltipsEnabled = true; window.gon.features = { glTooltips: true };
}); });
afterEach(() => { afterEach(() => {
...@@ -149,7 +149,7 @@ describe('tooltips/index.js', () => { ...@@ -149,7 +149,7 @@ describe('tooltips/index.js', () => {
describe('when glTooltipsEnabled feature flag is disabled', () => { describe('when glTooltipsEnabled feature flag is disabled', () => {
beforeEach(() => { beforeEach(() => {
window.gon.glTooltipsEnabled = false; window.gon.features.glTooltips = false;
}); });
it.each` it.each`
......
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