Commit 60921a97 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '220401-epic-roadmap-not-unfurling-descendent-epics' into 'master'

Used parent fullPath instead of group fullPath for roadmap children

See merge request gitlab-org/gitlab!33922
parents 919d0b02 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 { fullPath, filterParams, 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 || [];
......
...@@ -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 = [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment