Commit 47701bf1 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch...

Merge branch '35448-issuables-list-refactor-when-clicking-milestone-adds-search-filter' into 'master'

Add correct link for milestone in issuable

Closes #35448

See merge request gitlab-org/gitlab!19841
parents 04804f6e 39c75124
...@@ -54,6 +54,11 @@ export default { ...@@ -54,6 +54,11 @@ export default {
}, },
}, },
computed: { computed: {
milestoneLink() {
const { title } = this.issuable.milestone;
return this.issuableLink({ milestone_title: title });
},
hasLabels() { hasLabels() {
return Boolean(this.issuable.labels && this.issuable.labels.length); return Boolean(this.issuable.labels && this.issuable.labels.length);
}, },
...@@ -167,8 +172,11 @@ export default { ...@@ -167,8 +172,11 @@ export default {
color: label.text_color, color: label.text_color,
}; };
}, },
issuableLink(params) {
return mergeUrlParams(params, this.baseUrl);
},
labelHref({ name }) { labelHref({ name }) {
return mergeUrlParams({ 'label_name[]': name }, this.baseUrl); return this.issuableLink({ 'label_name[]': name });
}, },
onSelect(ev) { onSelect(ev) {
this.$emit('select', { this.$emit('select', {
...@@ -216,9 +224,9 @@ export default { ...@@ -216,9 +224,9 @@ export default {
></i> ></i>
<gl-link :href="issuable.web_url">{{ issuable.title }}</gl-link> <gl-link :href="issuable.web_url">{{ issuable.title }}</gl-link>
</span> </span>
<span v-if="issuable.has_tasks" class="ml-1 task-status d-none d-sm-inline-block"> <span v-if="issuable.has_tasks" class="ml-1 task-status d-none d-sm-inline-block">{{
{{ issuable.task_status }} issuable.task_status
</span> }}</span>
</div> </div>
<div class="issuable-info"> <div class="issuable-info">
...@@ -233,7 +241,7 @@ export default { ...@@ -233,7 +241,7 @@ export default {
v-if="issuable.milestone" v-if="issuable.milestone"
v-gl-tooltip v-gl-tooltip
class="d-none d-sm-inline-block mr-1 js-milestone" class="d-none d-sm-inline-block mr-1 js-milestone"
:href="issuable.milestone.web_url" :href="milestoneLink"
:title="milestoneTooltipText" :title="milestoneTooltipText"
> >
<i class="fa fa-clock-o"></i> <i class="fa fa-clock-o"></i>
......
---
title: Add correct link to milestone in groups for issuables list after refactor
merge_request:
author:
type: fixed
...@@ -196,6 +196,13 @@ describe('Issuable component', () => { ...@@ -196,6 +196,13 @@ describe('Issuable component', () => {
`${formatDate(dueDate, DATE_FORMAT)} (${expectedTooltipPart})`, `${formatDate(dueDate, DATE_FORMAT)} (${expectedTooltipPart})`,
); );
}); });
it('renders milestone with the correct href', () => {
const { title } = issuable.milestone;
const expected = mergeUrlParams({ milestone_title: title }, TEST_BASE_URL);
expect(findMilestone().attributes('href')).toBe(expected);
});
}); });
describe.each` describe.each`
......
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