Commit b4cfe83f authored by Illya Klymov's avatar Illya Klymov

Merge branch...

Merge branch '337662-allow-filtering-of-issues-within-boards-by-negate-issue-type-in-graphql' into 'master'

Allow filtering of issues within boards by negate issue type

See merge request gitlab-org/gitlab!74354
parents 45ab9d9b 5dfd0d27
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
:data-item-path="item.referencePath" :data-item-path="item.referencePath"
data-testid="board_card" data-testid="board_card"
class="board-card gl-p-5 gl-rounded-base" class="board-card gl-p-5 gl-rounded-base"
@mouseup="toggleIssue($event)" @click="toggleIssue($event)"
> >
<board-card-inner :list="list" :item="item" :update-filters="true" /> <board-card-inner :list="list" :item="item" :update-filters="true" />
</li> </li>
......
...@@ -160,7 +160,6 @@ export default { ...@@ -160,7 +160,6 @@ export default {
icon: 'issues', icon: 'issues',
title: type, title: type,
type: 'types', type: 'types',
operators: [{ value: '=', description: is }],
token: GlFilteredSearchToken, token: GlFilteredSearchToken,
unique: true, unique: true,
options: [ options: [
......
...@@ -461,7 +461,6 @@ export const mockTokens = (fetchLabels, fetchAuthors, fetchMilestones) => [ ...@@ -461,7 +461,6 @@ export const mockTokens = (fetchLabels, fetchAuthors, fetchMilestones) => [
icon: 'issues', icon: 'issues',
title: __('Type'), title: __('Type'),
type: 'types', type: 'types',
operators: [{ value: '=', description: 'is' }],
token: GlFilteredSearchToken, token: GlFilteredSearchToken,
unique: true, unique: true,
options: [ options: [
......
...@@ -64,12 +64,12 @@ describe('Board card', () => { ...@@ -64,12 +64,12 @@ describe('Board card', () => {
}; };
const selectCard = async () => { const selectCard = async () => {
wrapper.trigger('mouseup'); wrapper.trigger('click');
await wrapper.vm.$nextTick(); await wrapper.vm.$nextTick();
}; };
const multiSelectCard = async () => { const multiSelectCard = async () => {
wrapper.trigger('mouseup', { ctrlKey: true }); wrapper.trigger('click', { ctrlKey: true });
await wrapper.vm.$nextTick(); await wrapper.vm.$nextTick();
}; };
......
...@@ -615,7 +615,6 @@ export const mockTokens = (fetchLabels, fetchAuthors, fetchMilestones, hasEmoji) ...@@ -615,7 +615,6 @@ export const mockTokens = (fetchLabels, fetchAuthors, fetchMilestones, hasEmoji)
icon: 'issues', icon: 'issues',
title: __('Type'), title: __('Type'),
type: 'types', type: 'types',
operators: [{ value: '=', description: 'is' }],
token: GlFilteredSearchToken, token: GlFilteredSearchToken,
unique: true, unique: true,
options: [ options: [
......
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