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
64d0aa9a
Commit
64d0aa9a
authored
Jun 04, 2020
by
Donald Cook
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Used parent fullPath instead of group fullPath for roadmap children
parent
d59c77bb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
ee/app/assets/javascripts/roadmap/store/actions.js
ee/app/assets/javascripts/roadmap/store/actions.js
+3
-3
ee/spec/frontend/roadmap/mock_data.js
ee/spec/frontend/roadmap/mock_data.js
+6
-0
No files found.
ee/app/assets/javascripts/roadmap/store/actions.js
View file @
64d0aa9a
...
@@ -63,13 +63,13 @@ const fetchGroupEpics = (
...
@@ -63,13 +63,13 @@ const fetchGroupEpics = (
};
};
export
const
fetchChildrenEpics
=
(
state
,
{
parentItem
})
=>
{
export
const
fetchChildrenEpics
=
(
state
,
{
parentItem
})
=>
{
const
{
iid
}
=
parentItem
;
const
{
iid
,
group
}
=
parentItem
;
const
{
f
ullPath
,
f
ilterParams
,
epicsState
}
=
state
;
const
{
filterParams
,
epicsState
}
=
state
;
return
epicUtils
.
gqClient
return
epicUtils
.
gqClient
.
query
({
.
query
({
query
:
epicChildEpics
,
query
:
epicChildEpics
,
variables
:
{
iid
,
fullPath
,
state
:
epicsState
,
...
filterParams
},
variables
:
{
iid
,
fullPath
:
group
?.
fullPath
,
state
:
epicsState
,
...
filterParams
},
})
})
.
then
(({
data
})
=>
{
.
then
(({
data
})
=>
{
const
edges
=
data
?.
group
?.
epic
?.
children
?.
edges
||
[];
const
edges
=
data
?.
group
?.
epic
?.
children
?.
edges
||
[];
...
...
ee/spec/frontend/roadmap/mock_data.js
View file @
64d0aa9a
...
@@ -129,6 +129,9 @@ export const mockRawEpic = {
...
@@ -129,6 +129,9 @@ export const mockRawEpic = {
openedEpics
:
3
,
openedEpics
:
3
,
closedEpics
:
2
,
closedEpics
:
2
,
},
},
group
:
{
fullPath
:
'
/groups/gitlab-org/marketing/
'
,
},
};
};
export
const
mockFormattedChildEpic1
=
{
export
const
mockFormattedChildEpic1
=
{
...
@@ -203,6 +206,9 @@ export const mockFormattedEpic = {
...
@@ -203,6 +206,9 @@ export const mockFormattedEpic = {
closedEpics
:
2
,
closedEpics
:
2
,
},
},
isChildEpic
:
false
,
isChildEpic
:
false
,
group
:
{
fullPath
:
'
/groups/gitlab-org/marketing/
'
,
},
};
};
export
const
rawEpics
=
[
export
const
rawEpics
=
[
...
...
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