diff options
Diffstat (limited to 'app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue')
-rw-r--r-- | app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue b/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue index 93ac94a6f4f..e3d3360cd0c 100644 --- a/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue +++ b/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue @@ -1,9 +1,19 @@ <script> -import { GlAvatarLabeled, GlAvatarLink, GlIcon } from '@gitlab/ui'; +import { GlAvatarLabeled, GlAvatarLink, GlIcon, GlSprintf } from '@gitlab/ui'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import TargetLink from '../target_link.vue'; +import ResourceParentLink from '../resource_parent_link.vue'; export default { - components: { GlAvatarLabeled, GlAvatarLink, GlIcon, TimeAgoTooltip }, + components: { + GlAvatarLabeled, + GlAvatarLink, + GlIcon, + GlSprintf, + TimeAgoTooltip, + TargetLink, + ResourceParentLink, + }, props: { event: { type: Object, @@ -13,6 +23,11 @@ export default { type: String, required: true, }, + message: { + type: String, + required: false, + default: '', + }, iconClass: { type: String, required: false, @@ -44,7 +59,15 @@ export default { <div class="gl-pl-8 gl-mt-2" data-testid="event-body"> <div class="gl-text-secondary"> <gl-icon :class="iconClass" :name="iconName" /> - <slot></slot> + <gl-sprintf v-if="message" :message="message"> + <template #targetLink> + <target-link :event="event" /> + </template> + <template #resourceParentLink> + <resource-parent-link :event="event" /> + </template> + </gl-sprintf> + <slot v-else></slot> </div> <div v-if="$scopedSlots['additional-info']" class="gl-mt-2"> <slot name="additional-info"></slot> |