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
882e5ff1
Commit
882e5ff1
authored
Jul 22, 2021
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix subgroup epic path on epic boards
Changelog: fixed EE: true
parent
051507de
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
ee/app/assets/javascripts/boards/components/epic_board_content_sidebar.vue
...ascripts/boards/components/epic_board_content_sidebar.vue
+4
-1
ee/spec/frontend/boards/components/epic_board_content_sidebar_spec.js
...tend/boards/components/epic_board_content_sidebar_spec.js
+4
-1
ee/spec/frontend/boards/mock_data.js
ee/spec/frontend/boards/mock_data.js
+1
-0
No files found.
ee/app/assets/javascripts/boards/components/epic_board_content_sidebar.vue
View file @
882e5ff1
...
...
@@ -28,13 +28,16 @@ export default {
inheritAttrs
:
false
,
computed
:
{
...
mapGetters
([
'
isSidebarOpen
'
,
'
activeBoardItem
'
]),
...
mapState
([
'
sidebarType
'
,
'
fullPath
'
,
'
issuableType
'
]),
...
mapState
([
'
sidebarType
'
,
'
issuableType
'
]),
isIssuableSidebar
()
{
return
this
.
sidebarType
===
ISSUABLE
;
},
showSidebar
()
{
return
this
.
isIssuableSidebar
&&
this
.
isSidebarOpen
;
},
fullPath
()
{
return
this
.
activeBoardItem
?.
referencePath
?.
split
(
'
&
'
)[
0
]
||
''
;
},
},
methods
:
{
...
mapActions
([
'
toggleBoardItem
'
,
'
setActiveItemConfidential
'
,
'
setActiveItemSubscribed
'
]),
...
...
ee/spec/frontend/boards/components/epic_board_content_sidebar_spec.js
View file @
882e5ff1
...
...
@@ -87,8 +87,11 @@ describe('EpicBoardContentSidebar', () => {
expect
(
wrapper
.
findComponent
(
GlDrawer
).
props
(
'
open
'
)).
toBe
(
true
);
});
it
(
'
renders SidebarTodoWidget
'
,
()
=>
{
it
(
'
renders SidebarTodoWidget
passing correct epic fullPath
'
,
()
=>
{
expect
(
wrapper
.
findComponent
(
SidebarTodoWidget
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
findComponent
(
SidebarTodoWidget
).
props
(
'
fullPath
'
)).
toBe
(
'
gitlab-org/gitlab-subgroup
'
,
);
});
it
(
'
renders BoardSidebarLabelsSelect
'
,
()
=>
{
...
...
ee/spec/frontend/boards/mock_data.js
View file @
882e5ff1
...
...
@@ -246,6 +246,7 @@ export const mockFormattedBoardEpic = {
id
:
41
,
iid
:
'
1
'
,
title
:
'
Epic title
'
,
referencePath
:
'
gitlab-org/gitlab-subgroup&41
'
,
state
:
'
opened
'
,
webUrl
:
'
/groups/gitlab-org/-/epics/1
'
,
group
:
{
fullPath
:
'
gitlab-org
'
},
...
...
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