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
fb0be8ff
Commit
fb0be8ff
authored
Oct 06, 2020
by
Samantha Ming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve code base to reviewers and assignees partial
Issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/245532
parent
1014a0a3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
18 deletions
+16
-18
app/assets/javascripts/sidebar/stores/sidebar_store.js
app/assets/javascripts/sidebar/stores/sidebar_store.js
+14
-14
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+2
-2
app/views/shared/issuable/_sidebar_assignees.html.haml
app/views/shared/issuable/_sidebar_assignees.html.haml
+0
-1
app/views/shared/issuable/_sidebar_reviewers.html.haml
app/views/shared/issuable/_sidebar_reviewers.html.haml
+0
-1
No files found.
app/assets/javascripts/sidebar/stores/sidebar_store.js
View file @
fb0be8ff
...
...
@@ -37,17 +37,17 @@ export default class SidebarStore {
SidebarStore
.
singleton
=
this
;
}
setAssigneeData
(
data
)
{
setAssigneeData
(
{
assignees
}
)
{
this
.
isFetching
.
assignees
=
false
;
if
(
data
.
assignees
)
{
this
.
assignees
=
data
.
assignees
;
if
(
assignees
)
{
this
.
assignees
=
assignees
;
}
}
setReviewerData
(
data
)
{
setReviewerData
(
{
reviewers
}
)
{
this
.
isFetching
.
reviewers
=
false
;
if
(
data
.
reviewers
)
{
this
.
reviewers
=
data
.
reviewers
;
if
(
reviewers
)
{
this
.
reviewers
=
reviewers
;
}
}
...
...
@@ -91,22 +91,22 @@ export default class SidebarStore {
}
findAssignee
(
findAssignee
)
{
return
this
.
assignees
.
find
(
assignee
=>
assignee
.
id
===
findAssignee
.
id
);
return
this
.
assignees
.
find
(
({
id
})
=>
id
===
findAssignee
.
id
);
}
findReviewer
(
findReviewer
)
{
return
this
.
reviewers
.
find
(
reviewer
=>
reviewer
.
id
===
findReviewer
.
id
);
return
this
.
reviewers
.
find
(
({
id
})
=>
id
===
findReviewer
.
id
);
}
removeAssignee
(
removeA
ssignee
)
{
if
(
removeA
ssignee
)
{
this
.
assignees
=
this
.
assignees
.
filter
(
assignee
=>
assignee
.
id
!==
removeA
ssignee
.
id
);
removeAssignee
(
a
ssignee
)
{
if
(
a
ssignee
)
{
this
.
assignees
=
this
.
assignees
.
filter
(
({
id
})
=>
id
!==
a
ssignee
.
id
);
}
}
removeReviewer
(
re
moveRe
viewer
)
{
if
(
re
moveRe
viewer
)
{
this
.
reviewers
=
this
.
reviewers
.
filter
(
reviewer
=>
reviewer
.
id
!==
removeR
eviewer
.
id
);
removeReviewer
(
reviewer
)
{
if
(
reviewer
)
{
this
.
reviewers
=
this
.
reviewers
.
filter
(
({
id
})
=>
id
!==
r
eviewer
.
id
);
}
}
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
fb0be8ff
...
...
@@ -27,11 +27,11 @@
.block.todo.hide-expanded
=
render
"shared/issuable/sidebar_todo"
,
issuable_sidebar:
issuable_sidebar
,
is_collapsed:
true
.block.assignee.qa-assignee-block
=
render
"shared/issuable/sidebar_assignees"
,
issuable_sidebar:
issuable_sidebar
,
assignees:
assignees
=
render
"shared/issuable/sidebar_assignees"
,
issuable_sidebar:
issuable_sidebar
,
assignees:
assignees
,
signed_in:
signed_in
-
if
Feature
.
enabled?
(
:merge_request_reviewers
,
@project
)
&&
reviewers
.block.reviewer.qa-reviewer-block
=
render
"shared/issuable/sidebar_reviewers"
,
issuable_sidebar:
issuable_sidebar
,
reviewers:
reviewers
=
render
"shared/issuable/sidebar_reviewers"
,
issuable_sidebar:
issuable_sidebar
,
reviewers:
reviewers
,
signed_in:
signed_in
=
render_if_exists
'shared/issuable/sidebar_item_epic'
,
issuable_sidebar:
issuable_sidebar
...
...
app/views/shared/issuable/_sidebar_assignees.html.haml
View file @
fb0be8ff
-
issuable_type
=
issuable_sidebar
[
:type
]
-
signed_in
=
!!
issuable_sidebar
.
dig
(
:current_user
,
:id
)
#js-vue-sidebar-assignees
{
data:
{
field:
issuable_type
,
signed_in:
signed_in
}
}
.title.hide-collapsed
...
...
app/views/shared/issuable/_sidebar_reviewers.html.haml
View file @
fb0be8ff
-
issuable_type
=
issuable_sidebar
[
:type
]
-
signed_in
=
!!
issuable_sidebar
.
dig
(
:current_user
,
:id
)
#js-vue-sidebar-reviewers
{
data:
{
field:
issuable_type
,
signed_in:
signed_in
}
}
.title.hide-collapsed
...
...
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