diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-18 14:10:59 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-18 14:10:59 +0000 |
commit | 070285d4d4ad897dfc3119078df0cf8a052b5edf (patch) | |
tree | ace1111352c7aef5ee15dfb17ea363af077a770e | |
parent | ae534a17cc9b79524ba5bb727bbee574f0f1c510 (diff) | |
parent | edc096b7e9d0013871a47e17ee3479920f5a6d08 (diff) | |
download | gitlab-ce-070285d4d4ad897dfc3119078df0cf8a052b5edf.tar.gz |
Merge branch '10012-move-ee-diff-for-boards-issue-card-inner' into 'master'
Replace ee-specific code for boards/issue_card_inner
Closes gitlab-ee#10012
See merge request gitlab-org/gitlab-ce!27394
4 files changed, 23 insertions, 8 deletions
diff --git a/app/assets/javascripts/boards/components/issue_card_inner.vue b/app/assets/javascripts/boards/components/issue_card_inner.vue index 7c03f06e650..6aa689b4056 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.vue +++ b/app/assets/javascripts/boards/components/issue_card_inner.vue @@ -4,6 +4,7 @@ import { GlTooltipDirective } from '@gitlab/ui'; import { sprintf, __ } from '~/locale'; import Icon from '~/vue_shared/components/icon.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; +import issueCardInner from 'ee_else_ce/boards/mixins/issue_card_inner'; import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import eventHub from '../eventhub'; import IssueDueDate from './issue_due_date.vue'; @@ -19,11 +20,13 @@ export default { TooltipOnTruncate, IssueDueDate, IssueTimeEstimate, + IssueCardWeight: () => import('ee_component/boards/components/issue_card_weight.vue'), IssueCardInnerScopedLabel, }, directives: { GlTooltip: GlTooltipDirective, }, + mixins: [issueCardInner], props: { issue: { type: Object, @@ -135,14 +138,6 @@ export default { this.applyFilter(filter); }, - filterByWeight(weight) { - if (!this.updateFilters) return; - - const issueWeight = encodeURIComponent(weight); - const filter = `weight=${issueWeight}`; - - this.applyFilter(filter); - }, applyFilter(filter) { const filterPath = boardsStore.filter.path.split('&'); const filterIndex = filterPath.indexOf(filter); @@ -232,6 +227,10 @@ export default { <issue-due-date v-if="issue.dueDate" :date="issue.dueDate" /><issue-time-estimate v-if="issue.timeEstimate" :estimate="issue.timeEstimate" + /><issue-card-weight + v-if="issue.weight" + :weight="issue.weight" + @click="filterByWeight(issue.weight)" /> </span> </div> diff --git a/app/assets/javascripts/boards/mixins/issue_card_inner.js b/app/assets/javascripts/boards/mixins/issue_card_inner.js new file mode 100644 index 00000000000..8000237da6d --- /dev/null +++ b/app/assets/javascripts/boards/mixins/issue_card_inner.js @@ -0,0 +1,5 @@ +export default { + methods: { + filterByWeight() {}, + }, +}; diff --git a/changelogs/unreleased/10012-move-ee-diff-for-boards-issue-card-inner.yml b/changelogs/unreleased/10012-move-ee-diff-for-boards-issue-card-inner.yml new file mode 100644 index 00000000000..f15375e83f4 --- /dev/null +++ b/changelogs/unreleased/10012-move-ee-diff-for-boards-issue-card-inner.yml @@ -0,0 +1,5 @@ +--- +title: Move ee-specific code from boards/components/issue_card_inner.vue +merge_request: 27394 +author: Roman Rodionov +type: other diff --git a/spec/javascripts/boards/issue_card_spec.js b/spec/javascripts/boards/issue_card_spec.js index 6eda5047dd0..a5bf97bdcc2 100644 --- a/spec/javascripts/boards/issue_card_spec.js +++ b/spec/javascripts/boards/issue_card_spec.js @@ -285,4 +285,10 @@ describe('Issue card component', () => { .catch(done.fail); }); }); + + describe('weights', () => { + it('not shows weight component', () => { + expect(component.$el.querySelector('.board-card-weight')).toBeNull(); + }); + }); }); |