Merge branch...

Merge branch '411822-expand-caret-should-not-be-displayed-if-there-are-no-epics-to-display-on-roadmap' into 'master' 

Roadmap - Expand caret does not display if no children in timeframe

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156595



Merged-by: Florie Guibert <fguibert@gitlab.com>
Approved-by: Anastasia Khomchenko <akhomchenko@gitlab.com>
Approved-by: Natalia Tepluhina <ntepluhina@gitlab.com>
Approved-by: Nick Brandt <nbrandt@gitlab.com>

ee/app/assets/javascripts/roadmap/components/epic_item_details.vue

@@ -73,7 +73,7 @@ export default {
       return this.currentGroupId !== this.epicGroupId;
     },
     isExpandIconHidden() {
-      return !this.epic.hasChildren;
+      return !this.epic.hasChildrenWithinTimeframe;
     },
     isEmptyChildrenWithFilter() {
       return this.isExpanded && this.hasFiltersApplied && this.isChildrenEmpty;

ee/app/assets/javascripts/roadmap/queries/epic.fragment.graphql

@@ -8,6 +8,7 @@ fragment BaseEpic on Epic {
   startDate
   dueDate
   hasChildren
+  hasChildrenWithinTimeframe
   hasParent
   confidential
   blocked

ee/spec/frontend/roadmap/components/epic_item_details_spec.js

@@ -167,7 +167,7 @@ describe('EpicItemDetails', () => {
       describe('when epic has no child epics', () => {
         beforeEach(() => {
           const epic = createMockEpic({
-            hasChildren: false,
+            hasChildrenWithinTimeframe: false,
             descendantCounts: {
               openedEpics: 0,
               closedEpics: 0,
@@ -189,7 +189,7 @@ describe('EpicItemDetails', () => {
         let epic;
         beforeEach(() => {
           epic = createMockEpic({
-            hasChildren: true,
+            hasChildrenWithinTimeframe: true,
             children: {
               edges: [mockFormattedChildEpic1],
             },

ee/spec/frontend/roadmap/mock_data.js

@@ -234,6 +234,7 @@ export const mockRawEpic = {
   dueDate: '2018-03-10',
   webUrl: 'http://gdk.test:3000/groups/gitlab-org/marketing/-/epics/1',
   hasChildren: false,
+  hasChildrenWithinTimeframe: false,
   hasParent: false,
   confidential: false,
   descendantWeightSum: {
@@ -656,6 +657,7 @@ export const mockAncestorEpicNode = {
   webUrl: 'http://gdk.test:3000/groups/gitlab-org/marketing/-/epics/3',
   hasChildren: true,
   hasParent: false,
+  hasChildrenWithinTimeframe: true,
   confidential: false,
   descendantWeightSum: {
     closedIssues: 3,
@@ -688,6 +690,7 @@ export const mockEpicNode1 = {
   dueDate: '2018-02-15',
   webUrl: 'http://gdk.test:3000/groups/gitlab-org/marketing/-/epics/1',
   hasChildren: false,
+  hasChildrenWithinTimeframe: false,
   hasParent: false,
   confidential: false,
   color: '#ff0000',
@@ -724,6 +727,7 @@ export const mockEpicNode2 = {
   dueDate: '2018-03-10',
   state: 'opened',
   hasChildren: false,
+  hasChildrenWithinTimeframe: false,
   hasParent: false,
   confidential: false,
   webUrl: 'http://gdk.test:3000/groups/gitlab-org/marketing/-/epics/2',
@@ -805,6 +809,7 @@ export const mockChildEpicNode1 = {
   startDate: null,
   dueDate: null,
   hasChildren: false,
+  hasChildrenWithinTimeframe: false,
   hasParent: true,
   confidential: false,
   blocked: false,
@@ -843,6 +848,7 @@ export const mockEpicChildEpicsQueryResponse = {
         id: 'gid://gitlab/Epic/1',
         title: 'Error omnis quos consequatur',
         hasChildren: true,
+        hasChildrenWithinTimeframe: true,
         children: {
           nodes: [mockChildEpicNode1],
           __typename: 'EpicConnection',
@@ -863,6 +869,7 @@ export const mockEpicChildEpicsWithColorQueryResponse = {
         id: 'gid://gitlab/Epic/1',
         title: 'Error omnis quos consequatur',
         hasChildren: true,
+        hasChildrenWithinTimeframe: true,
         children: {
           nodes: [
             {