Commit 666187aa authored by Simon Knox's avatar Simon Knox

Merge branch '230452-truncate-job-title' into 'master'

Truncate job title on log page

See merge request gitlab-org/gitlab!40107
parents 9080942c 398968c0
......@@ -4,6 +4,7 @@ import { mapActions, mapState } from 'vuex';
import { GlLink, GlDeprecatedButton, GlIcon } from '@gitlab/ui';
import { __, sprintf } from '~/locale';
import timeagoMixin from '~/vue_shared/mixins/timeago';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
import DetailRow from './sidebar_detail_row.vue';
import ArtifactsBlock from './artifacts_block.vue';
......@@ -24,6 +25,7 @@ export default {
JobsContainer,
GlLink,
GlDeprecatedButton,
TooltipOnTruncate,
},
mixins: [timeagoMixin],
props: {
......@@ -111,7 +113,11 @@ export default {
<div class="sidebar-container">
<div class="blocks-container">
<div class="block d-flex flex-nowrap align-items-center">
<h4 class="my-0 mr-2 text-break-word">{{ job.name }}</h4>
<tooltip-on-truncate :title="job.name" truncate-target="child"
><h4 class="my-0 mr-2 gl-text-truncate">
{{ job.name }}
</h4>
</tooltip-on-truncate>
<div class="flex-grow-1 flex-shrink-0 text-right">
<gl-link
v-if="job.retry_path"
......
......@@ -61,9 +61,9 @@ export default {
v-tooltip
:title="title"
:data-placement="placement"
class="js-show-tooltip"
class="js-show-tooltip gl-min-w-0"
>
<slot></slot>
</span>
<span v-else> <slot></slot> </span>
<span v-else class="gl-min-w-0"> <slot></slot> </span>
</template>
---
title: Truncate job title on log page
merge_request: 40107
author:
type: changed
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