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
34ff5a78
Commit
34ff5a78
authored
Aug 18, 2021
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate epic sidebar participants to widget
Changelog: changed EE: true
parent
86022ed9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
11 deletions
+17
-11
app/assets/javascripts/sidebar/components/participants/sidebar_participants_widget.vue
...r/components/participants/sidebar_participants_widget.vue
+6
-0
ee/app/assets/javascripts/epic/components/epic_sidebar.vue
ee/app/assets/javascripts/epic/components/epic_sidebar.vue
+8
-9
ee/spec/frontend/epic/components/epic_sidebar_spec.js
ee/spec/frontend/epic/components/epic_sidebar_spec.js
+3
-2
No files found.
app/assets/javascripts/sidebar/components/participants/sidebar_participants_widget.vue
View file @
34ff5a78
...
...
@@ -56,6 +56,11 @@ export default {
return
this
.
$apollo
.
queries
.
participants
.
loading
;
},
},
methods
:
{
expandSidebar
()
{
this
.
$emit
(
'
expandSidebar
'
);
},
},
};
</
script
>
...
...
@@ -66,5 +71,6 @@ export default {
:number-of-less-participants=
"7"
:lazy=
"false"
class=
"block participants"
@
toggleSidebar=
"expandSidebar"
/>
</
template
>
ee/app/assets/javascripts/epic/components/epic_sidebar.vue
View file @
34ff5a78
...
...
@@ -8,7 +8,7 @@ import { convertToGraphQLId } from '~/graphql_shared/utils';
import
{
IssuableType
}
from
'
~/issue_show/constants
'
;
import
notesEventHub
from
'
~/notes/event_hub
'
;
import
SidebarConfidentialityWidget
from
'
~/sidebar/components/confidential/sidebar_confidentiality_widget.vue
'
;
import
SidebarParticipants
from
'
~/sidebar/components/participants/participants
.vue
'
;
import
SidebarParticipants
Widget
from
'
~/sidebar/components/participants/sidebar_participants_widget
.vue
'
;
import
SidebarReferenceWidget
from
'
~/sidebar/components/reference/sidebar_reference_widget.vue
'
;
import
SidebarSubscriptionsWidget
from
'
~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
'
;
import
SidebarTodoWidget
from
'
~/sidebar/components/todo_toggle/sidebar_todo_widget.vue
'
;
...
...
@@ -29,7 +29,7 @@ export default {
SidebarDatePickerCollapsed
,
SidebarLabels
,
SidebarAncestorsWidget
,
SidebarParticipants
,
SidebarParticipants
Widget
,
SidebarConfidentialityWidget
,
SidebarSubscriptionsWidget
,
SidebarReferenceWidget
,
...
...
@@ -46,7 +46,6 @@ export default {
'
canUpdate
'
,
'
allowSubEpics
'
,
'
sidebarCollapsed
'
,
'
participants
'
,
'
startDateSourcingMilestoneTitle
'
,
'
startDateSourcingMilestoneDates
'
,
'
startDateIsFixed
'
,
...
...
@@ -251,12 +250,12 @@ export default {
:full-path=
"fullPath"
:issuable-type=
"issuableType"
/>
<
div
class=
"block participants"
>
<sidebar-participants
:participants=
"participants
"
@
toggleSidebar=
"toggleSidebar(
{ sidebarCollapsed })
"
/>
</div
>
<
sidebar-participants-widget
:iid=
"String(iid)"
:full-path=
"fullPath
"
:issuable-type=
"issuableType
"
@
expandSidebar=
"handleSidebarToggle"
/
>
<sidebar-subscriptions-widget
:iid=
"String(iid)"
:full-path=
"fullPath"
...
...
ee/spec/frontend/epic/components/epic_sidebar_spec.js
View file @
34ff5a78
...
...
@@ -12,6 +12,7 @@ import SidebarAncestorsWidget from 'ee_component/sidebar/components/ancestors_tr
import
{
parsePikadayDate
}
from
'
~/lib/utils/datetime_utility
'
;
import
SidebarParticipantsWidget
from
'
~/sidebar/components/participants/sidebar_participants_widget.vue
'
;
import
SidebarReferenceWidget
from
'
~/sidebar/components/reference/sidebar_reference_widget.vue
'
;
import
SidebarSubscriptionsWidget
from
'
~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
'
;
import
SidebarTodoWidget
from
'
~/sidebar/components/todo_toggle/sidebar_todo_widget.vue
'
;
...
...
@@ -242,8 +243,8 @@ describe('EpicSidebarComponent', () => {
});
});
it
(
'
renders participants
list elemen
t
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.block.participants
'
).
exists
()).
toBe
(
true
);
it
(
'
renders participants
widge
t
'
,
()
=>
{
expect
(
wrapper
.
find
Component
(
SidebarParticipantsWidget
).
exists
()).
toBe
(
true
);
});
it
(
'
renders subscription toggle element
'
,
()
=>
{
...
...
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