Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
983f7d1e
Commit
983f7d1e
authored
Nov 25, 2021
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Confidential filter to issue boards new filtered search
New filtered search
parent
8e4fed9e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
81 additions
and
3 deletions
+81
-3
app/assets/javascripts/boards/boards_util.js
app/assets/javascripts/boards/boards_util.js
+5
-0
app/assets/javascripts/boards/components/board_filtered_search.vue
...s/javascripts/boards/components/board_filtered_search.vue
+13
-0
app/assets/javascripts/boards/components/issue_board_filtered_search.vue
...scripts/boards/components/issue_board_filtered_search.vue
+15
-0
app/assets/javascripts/boards/constants.js
app/assets/javascripts/boards/constants.js
+1
-0
ee/spec/frontend/boards/mock_data.js
ee/spec/frontend/boards/mock_data.js
+12
-0
spec/features/boards/board_filters_spec.rb
spec/features/boards/board_filters_spec.rb
+20
-1
spec/frontend/boards/mock_data.js
spec/frontend/boards/mock_data.js
+15
-2
No files found.
app/assets/javascripts/boards/boards_util.js
View file @
983f7d1e
import
{
sortBy
,
cloneDeep
}
from
'
lodash
'
;
import
{
isGid
}
from
'
~/graphql_shared/utils
'
;
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
{
ListType
,
MilestoneIDs
,
AssigneeFilterType
,
MilestoneFilterType
}
from
'
./constants
'
;
export
function
getMilestone
()
{
...
...
@@ -220,6 +221,10 @@ export const FiltersInfo = {
types
:
{
negatedSupport
:
true
,
},
confidential
:
{
negatedSupport
:
false
,
transform
:
(
val
)
=>
parseBoolean
(
val
),
},
search
:
{
negatedSupport
:
false
,
},
...
...
app/assets/javascripts/boards/components/board_filtered_search.vue
View file @
983f7d1e
...
...
@@ -45,6 +45,7 @@ export default {
epicId
,
myReactionEmoji
,
releaseTag
,
confidential
,
}
=
this
.
filterParams
;
const
filteredSearchValue
=
[];
...
...
@@ -113,6 +114,13 @@ export default {
});
}
if
(
confidential
!==
undefined
)
{
filteredSearchValue
.
push
({
type
:
'
confidential
'
,
value
:
{
data
:
confidential
},
});
}
if
(
epicId
)
{
filteredSearchValue
.
push
({
type
:
'
epic
'
,
...
...
@@ -211,6 +219,7 @@ export default {
myReactionEmoji
,
iterationId
,
releaseTag
,
confidential
,
}
=
this
.
filterParams
;
let
notParams
=
{};
...
...
@@ -245,6 +254,7 @@ export default {
epic_id
:
isGid
(
epicId
)
?
getIdFromGraphQLId
(
epicId
)
:
epicId
,
my_reaction_emoji
:
myReactionEmoji
,
release_tag
:
releaseTag
,
confidential
,
};
},
},
...
...
@@ -311,6 +321,9 @@ export default {
case
'
release
'
:
filterParams
.
releaseTag
=
filter
.
value
.
data
;
break
;
case
'
confidential
'
:
filterParams
.
confidential
=
filter
.
value
.
data
;
break
;
case
'
filtered-search-term
'
:
if
(
filter
.
value
.
data
)
plainText
.
push
(
filter
.
value
.
data
);
break
;
...
...
app/assets/javascripts/boards/components/issue_board_filtered_search.vue
View file @
983f7d1e
...
...
@@ -13,6 +13,7 @@ import { __ } from '~/locale';
import
{
TOKEN_TITLE_MY_REACTION
,
OPERATOR_IS_AND_IS_NOT
,
OPERATOR_IS_ONLY
,
}
from
'
~/vue_shared/components/filtered_search_bar/constants
'
;
import
AuthorToken
from
'
~/vue_shared/components/filtered_search_bar/tokens/author_token.vue
'
;
import
EmojiToken
from
'
~/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
'
;
...
...
@@ -36,6 +37,7 @@ export default {
issue
:
__
(
'
Issue
'
),
milestone
:
__
(
'
Milestone
'
),
release
:
__
(
'
Release
'
),
confidential
:
__
(
'
Confidential
'
),
},
components
:
{
BoardFilteredSearch
},
inject
:
[
'
isSignedIn
'
,
'
releasesFetchPath
'
],
...
...
@@ -68,6 +70,7 @@ export default {
type
,
milestone
,
release
,
confidential
,
}
=
this
.
$options
.
i18n
;
const
{
types
}
=
this
.
$options
;
const
{
fetchAuthors
,
fetchLabels
}
=
issueBoardFilters
(
...
...
@@ -132,6 +135,18 @@ export default {
});
},
},
{
type
:
'
confidential
'
,
icon
:
'
eye-slash
'
,
title
:
confidential
,
unique
:
true
,
token
:
GlFilteredSearchToken
,
operators
:
OPERATOR_IS_ONLY
,
options
:
[
{
icon
:
'
eye-slash
'
,
value
:
true
,
title
:
__
(
'
Yes
'
)
},
{
icon
:
'
eye
'
,
value
:
false
,
title
:
__
(
'
No
'
)
},
],
},
]
:
[]),
{
...
...
app/assets/javascripts/boards/constants.js
View file @
983f7d1e
...
...
@@ -104,6 +104,7 @@ export const FilterFields = {
'
assigneeUsername
'
,
'
assigneeWildcardId
'
,
'
authorUsername
'
,
'
confidential
'
,
'
labelName
'
,
'
milestoneTitle
'
,
'
milestoneWildcardId
'
,
...
...
ee/spec/frontend/boards/mock_data.js
View file @
983f7d1e
...
...
@@ -448,6 +448,18 @@ export const mockTokens = (fetchLabels, fetchAuthors, fetchMilestones, fetchIter
token
:
EmojiToken
,
fetchEmojis
:
expect
.
any
(
Function
),
},
{
type
:
'
confidential
'
,
icon
:
'
eye-slash
'
,
title
:
'
Confidential
'
,
unique
:
true
,
token
:
GlFilteredSearchToken
,
operators
:
[{
value
:
'
=
'
,
description
:
'
is
'
}],
options
:
[
{
icon
:
'
eye-slash
'
,
value
:
true
,
title
:
'
Yes
'
},
{
icon
:
'
eye
'
,
value
:
false
,
title
:
'
No
'
},
],
},
{
icon
:
'
clock
'
,
title
:
__
(
'
Milestone
'
),
...
...
spec/features/boards/board_filters_spec.rb
View file @
983f7d1e
...
...
@@ -12,7 +12,7 @@ RSpec.describe 'Issue board filters', :js do
let_it_be
(
:release
)
{
create
(
:release
,
tag:
'v1.0'
,
project:
project
,
milestones:
[
milestone_1
])
}
let_it_be
(
:release_2
)
{
create
(
:release
,
tag:
'v2.0'
,
project:
project
,
milestones:
[
milestone_2
])
}
let_it_be
(
:issue_1
)
{
create
(
:issue
,
project:
project
,
milestone:
milestone_1
,
author:
user
)
}
let_it_be
(
:issue_2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
milestone_2
,
assignees:
[
user
],
labels:
[
project_label
])
}
let_it_be
(
:issue_2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
milestone_2
,
assignees:
[
user
],
labels:
[
project_label
]
,
confidential:
true
)
}
let_it_be
(
:award_emoji1
)
{
create
(
:award_emoji
,
name:
'thumbsup'
,
user:
user
,
awardable:
issue_1
)
}
let
(
:filtered_search
)
{
find
(
'[data-testid="issue_1-board-filtered-search"]'
)
}
...
...
@@ -100,6 +100,25 @@ RSpec.describe 'Issue board filters', :js do
end
end
describe
'filters by confidentiality'
do
before
do
filter_input
.
click
filter_input
.
set
(
"confidential:"
)
end
it
'loads all the confidentiality options when opened and submit one as filter'
,
:aggregate_failures
do
expect
(
find
(
'.board:nth-child(1)'
)).
to
have_selector
(
'.board-card'
,
count:
2
)
expect_filtered_search_dropdown_results
(
filter_dropdown
,
2
)
filter_dropdown
.
click_on
'Yes'
filter_submit
.
click
expect
(
find
(
'.board:nth-child(1)'
)).
to
have_selector
(
'.board-card'
,
count:
1
)
expect
(
find
(
'.board-card'
)).
to
have_content
(
issue_2
.
title
)
end
end
describe
'filters by milestone'
do
before
do
set_filter
(
'milestone'
)
...
...
spec/frontend/boards/mock_data.js
View file @
983f7d1e
...
...
@@ -552,7 +552,20 @@ export const mockEmojiToken = {
fetchEmojis
:
expect
.
any
(
Function
),
};
export
const
mockTokens
=
(
fetchLabels
,
fetchAuthors
,
fetchMilestones
,
hasEmoji
)
=>
[
export
const
mockConfidentialToken
=
{
type
:
'
confidential
'
,
icon
:
'
eye-slash
'
,
title
:
'
Confidential
'
,
unique
:
true
,
token
:
GlFilteredSearchToken
,
operators
:
[{
value
:
'
=
'
,
description
:
'
is
'
}],
options
:
[
{
icon
:
'
eye-slash
'
,
value
:
true
,
title
:
'
Yes
'
},
{
icon
:
'
eye
'
,
value
:
false
,
title
:
'
No
'
},
],
};
export
const
mockTokens
=
(
fetchLabels
,
fetchAuthors
,
fetchMilestones
,
isSignedIn
)
=>
[
{
icon
:
'
user
'
,
title
:
__
(
'
Assignee
'
),
...
...
@@ -593,7 +606,7 @@ export const mockTokens = (fetchLabels, fetchAuthors, fetchMilestones, hasEmoji)
symbol
:
'
~
'
,
fetchLabels
,
},
...(
hasEmoji
?
[
mockEmoji
Token
]
:
[]),
...(
isSignedIn
?
[
mockEmojiToken
,
mockConfidential
Token
]
:
[]),
{
icon
:
'
clock
'
,
title
:
__
(
'
Milestone
'
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment