diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue b/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue index 0ca4c92a5ae..38f83a61b30 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue @@ -39,6 +39,9 @@ export default { isArray(arr) { return Array.isArray(arr); }, + onClickedAction(action) { + this.$emit('clickedAction', action); + }, generateText, }, }; @@ -63,14 +66,14 @@ export default { <div class="gl-w-full"> <div class="gl-display-flex gl-flex-nowrap"> <div class="gl-flex-wrap gl-display-flex gl-w-full"> - <div class="gl-mr-4 gl-display-flex gl-align-items-center"> + <div class="gl-display-flex gl-align-items-center"> <p v-safe-html="generateText(data.text)" class="gl-m-0"></p> </div> - <div v-if="data.link"> + <div v-if="data.link" class="gl-pr-2"> <gl-link :href="data.link.href">{{ data.link.text }}</gl-link> </div> - <div v-if="data.modal"> - <gl-link v-gl-modal="modalId" @click="data.modal.onClick"> + <div v-if="data.modal" class="gl-pr-2"> + <gl-link v-gl-modal="modalId" data-testid="modal-link" @click="data.modal.onClick"> {{ data.modal.text }} </gl-link> </div> @@ -81,7 +84,12 @@ export default { {{ data.badge.text }} </gl-badge> </div> - <actions :widget="widgetLabel" :tertiary-buttons="data.actions" class="gl-ml-auto" /> + <actions + :widget="widgetLabel" + :tertiary-buttons="data.actions" + class="gl-ml-auto gl-pl-3" + @clickedAction="onClickedAction" + /> </div> <p v-if="data.subtext" @@ -101,6 +109,7 @@ export default { :modal-id="modalId" :level="3" data-testid="child-content" + @clickedAction="onClickedAction" /> </li> </ul> |