From c9503706bb9dd37354f7eecc60f3971c2949b6f3 Mon Sep 17 00:00:00 2001 From: pranotipr Date: Wed, 7 Aug 2019 10:51:39 -0700 Subject: [PATCH] Handle epic roadmap for basic process (#163) On progress error display message --- .../react/Components/EpicRoadmapView.tsx | 24 +++++++++++++++---- .../redux/sagas/FetchAllMetadata.ts | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/EpicRoadmap/react/Components/EpicRoadmapView.tsx b/src/EpicRoadmap/react/Components/EpicRoadmapView.tsx index 706ca1b..a4b280c 100644 --- a/src/EpicRoadmap/react/Components/EpicRoadmapView.tsx +++ b/src/EpicRoadmap/react/Components/EpicRoadmapView.tsx @@ -28,6 +28,7 @@ export interface IEpicRoadmapViewProps { launchWorkItemForm: (id: number) => void; portfolioPlansBannerDismissed: boolean; dismissPortfolioPlansBanner: () => void; + progressAwareError: Error; } export interface IEpicRoadmapViewContentState { @@ -46,6 +47,7 @@ class EpicRoadmapViewContent extends React.Component + + {progressAwareError.message} + + + ) + } + let contents = null; if (uiState === UIStatus.NoTeamIterations) { contents = ( @@ -93,13 +108,13 @@ class EpicRoadmapViewContent extends React.Component + >
this._calloutContainer = ref} onClick={this._toggleCallout}>{"Some Work Items are excluded as they are in iterations that the current team does not subscribe to. Click here to see the details"}
); @@ -117,7 +132,7 @@ class EpicRoadmapViewContent extends React.Component {!this.props.portfolioPlansBannerDismissed && - } + }
{showSelector && } {additionalMessage} @@ -180,7 +195,8 @@ const makeMapStateToProps = () => { teamId: getTeamId(), uiState: uiStateSelector(state), outOfScopeWorkItems: outOfScopeWorkItems(state), - portfolioPlansBannerDismissed: state.settingsState.dismissedPortfolioPlansBanner + portfolioPlansBannerDismissed: state.settingsState.dismissedPortfolioPlansBanner, + progressAwareError: state.progress.error } } } diff --git a/src/EpicRoadmap/redux/sagas/FetchAllMetadata.ts b/src/EpicRoadmap/redux/sagas/FetchAllMetadata.ts index cf35563..c2eb870 100644 --- a/src/EpicRoadmap/redux/sagas/FetchAllMetadata.ts +++ b/src/EpicRoadmap/redux/sagas/FetchAllMetadata.ts @@ -25,7 +25,7 @@ export function* FetchAllMetadata() { const backlogConfiguration: BacklogConfiguration = yield select(backlogConfigurationForProjectSelector); if (backlogConfiguration.portfolioBacklogs.length < 2) { - yield put(ProgressAwareActionCreator.setError(new Error("Epics backlog level is not configured."))); + yield put(ProgressAwareActionCreator.setError(new Error("Epic Roadmap requires at least two levels of Portfolio Backlogs."))); return; }