Commit d97a015a authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'russell/migrate-tooltip-for-ide-status-bar' into 'master'

Replace the tooltip component in web IDE status bar

See merge request gitlab-org/gitlab!45354
parents 4a490939 32753600
<script> <script>
/* eslint-disable @gitlab/vue-require-i18n-strings */ /* eslint-disable @gitlab/vue-require-i18n-strings */
import { mapActions, mapState, mapGetters } from 'vuex'; import { mapActions, mapState, mapGetters } from 'vuex';
import { GlIcon } from '@gitlab/ui'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
import IdeStatusList from './ide_status_list.vue'; import IdeStatusList from './ide_status_list.vue';
import IdeStatusMr from './ide_status_mr.vue'; import IdeStatusMr from './ide_status_mr.vue';
import tooltip from '~/vue_shared/directives/tooltip';
import timeAgoMixin from '~/vue_shared/mixins/timeago'; import timeAgoMixin from '~/vue_shared/mixins/timeago';
import CiIcon from '../../vue_shared/components/ci_icon.vue'; import CiIcon from '../../vue_shared/components/ci_icon.vue';
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
...@@ -19,7 +18,7 @@ export default { ...@@ -19,7 +18,7 @@ export default {
IdeStatusMr, IdeStatusMr,
}, },
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
mixins: [timeAgoMixin], mixins: [timeAgoMixin],
data() { data() {
...@@ -85,7 +84,7 @@ export default { ...@@ -85,7 +84,7 @@ export default {
@click="openRightPane($options.rightSidebarViews.pipelines)" @click="openRightPane($options.rightSidebarViews.pipelines)"
> >
<ci-icon <ci-icon
v-tooltip v-gl-tooltip
:status="latestPipeline.details.status" :status="latestPipeline.details.status"
:title="latestPipeline.details.status.text" :title="latestPipeline.details.status.text"
/> />
...@@ -99,7 +98,7 @@ export default { ...@@ -99,7 +98,7 @@ export default {
<gl-icon name="commit" /> <gl-icon name="commit" />
<a <a
v-tooltip v-gl-tooltip
:title="lastCommit.message" :title="lastCommit.message"
:href="getCommitPath(lastCommit.short_id)" :href="getCommitPath(lastCommit.short_id)"
class="commit-sha" class="commit-sha"
...@@ -116,7 +115,7 @@ export default { ...@@ -116,7 +115,7 @@ export default {
/> />
{{ lastCommit.author_name }} {{ lastCommit.author_name }}
<time <time
v-tooltip v-gl-tooltip
:datetime="lastCommit.committed_date" :datetime="lastCommit.committed_date"
:title="tooltipTitle(lastCommit.committed_date)" :title="tooltipTitle(lastCommit.committed_date)"
data-placement="top" data-placement="top"
......
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