Commit f1930dcc authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ph/fixWidgetExtensionTooltipLabelText' into 'master'

Fixes tooltip label for load performance in widget extension

See merge request gitlab-org/gitlab!71942
parents f0eac783 e72beb87
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
this.isCollapsed this.isCollapsed
? s__('mrWidget|Show %{widget} details') ? s__('mrWidget|Show %{widget} details')
: s__('mrWidget|Hide %{widget} details'), : s__('mrWidget|Hide %{widget} details'),
{ widget: this.$options.name }, { widget: this.$options.label || this.$options.name },
); );
}, },
statusIconName() { statusIconName() {
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
<section class="media-section" data-testid="widget-extension"> <section class="media-section" data-testid="widget-extension">
<div class="media gl-p-5"> <div class="media gl-p-5">
<status-icon <status-icon
:name="$options.name" :name="$options.label || $options.name"
:is-loading="isLoadingSummary" :is-loading="isLoadingSummary"
:icon-name="statusIconName" :icon-name="statusIconName"
/> />
...@@ -133,7 +133,10 @@ export default { ...@@ -133,7 +133,10 @@ export default {
</template> </template>
<div v-else v-safe-html="summary(collapsedData)"></div> <div v-else v-safe-html="summary(collapsedData)"></div>
</div> </div>
<actions :widget="$options.name" :tertiary-buttons="tertiaryActionsButtons" /> <actions
:widget="$options.label || $options.name"
:tertiary-buttons="tertiaryActionsButtons"
/>
<div <div
class="gl-float-right gl-align-self-center gl-border-l-1 gl-border-l-solid gl-border-gray-100 gl-ml-3 gl-pl-3" class="gl-float-right gl-align-self-center gl-border-l-1 gl-border-l-solid gl-border-gray-100 gl-ml-3 gl-pl-3"
> >
......
...@@ -7,6 +7,7 @@ export default { ...@@ -7,6 +7,7 @@ export default {
// Give the extension a name // Give the extension a name
// Make it easier to track in Vue dev tools // Make it easier to track in Vue dev tools
name: 'Issues', name: 'Issues',
label: 'Issues',
// Add an array of props // Add an array of props
// These then get mapped to values stored in the MR Widget store // These then get mapped to values stored in the MR Widget store
props: ['targetProjectFullPath', 'conflictsDocsPath'], props: ['targetProjectFullPath', 'conflictsDocsPath'],
......
...@@ -5,6 +5,7 @@ import { EXTENSION_ICONS } from '~/vue_merge_request_widget/constants'; ...@@ -5,6 +5,7 @@ import { EXTENSION_ICONS } from '~/vue_merge_request_widget/constants';
export default { export default {
name: 'WidgetLoadPerformance', name: 'WidgetLoadPerformance',
label: s__('ciReport|Load Performance'),
props: ['loadPerformance'], props: ['loadPerformance'],
computed: { computed: {
summary() { summary() {
......
...@@ -39859,6 +39859,9 @@ msgstr "" ...@@ -39859,6 +39859,9 @@ msgstr ""
msgid "ciReport|Investigate this vulnerability by creating an issue" msgid "ciReport|Investigate this vulnerability by creating an issue"
msgstr "" msgstr ""
msgid "ciReport|Load Performance"
msgstr ""
msgid "ciReport|Load performance test metrics detected %{strongStart}%{changesFound}%{strongEnd} change" msgid "ciReport|Load performance test metrics detected %{strongStart}%{changesFound}%{strongEnd} change"
msgid_plural "ciReport|Load performance test metrics detected %{strongStart}%{changesFound}%{strongEnd} changes" msgid_plural "ciReport|Load performance test metrics detected %{strongStart}%{changesFound}%{strongEnd} changes"
msgstr[0] "" msgstr[0] ""
......
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