Skip to content

Commit 0f7b034

Browse files
committed
Git-2400:Fixed-Timeline content updates
1 parent c46aa48 commit 0f7b034

File tree

10 files changed

+32
-56
lines changed

10 files changed

+32
-56
lines changed

src/config/constants.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,13 @@ export const MILESTONE_STATUS = {
603603
CANCELLED: 'cancelled'
604604
}
605605

606+
export const MILESTONE_STATUS_TEXT = [
607+
{status: 'reviewed', textValue: 'plannedText' },
608+
{status: 'active', textValue: 'activeText' },
609+
{status: 'paused', textValue: 'blockedText' },
610+
{status: 'completed', textValue: 'completedText' }
611+
]
612+
606613
// minimum designs to select during checkpoint type milestone
607614
export const MIN_CHECKPOINT_REVIEW_DESIGNS = 5
608615

src/helpers/milestoneHelper.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import _ from 'lodash'
2+
3+
import { MILESTONE_STATUS } from '../config/constants'
4+
import { MILESTONE_STATUS_TEXT } from '../config/constants'
5+
6+
export const getMilestoneStatusText = (milestone) => {
7+
const status = milestone && milestone.status ? milestone.status : MILESTONE_STATUS.PLANNED
8+
const statusTextMap = _.find(MILESTONE_STATUS_TEXT, s => s.status === status)
9+
const statusText = statusTextMap ? statusTextMap.textValue : MILESTONE_STATUS.PLANNED
10+
return milestone[statusText]
11+
}

src/projects/detail/components/timeline/Timeline/Timeline.jsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import React from 'react'
55
import PT from 'prop-types'
66
import _ from 'lodash'
77

8-
import TimelineHeader from '../TimelineHeader'
98
import Milestone from '../Milestone'
109

1110
class Timeline extends React.Component {
@@ -79,12 +78,6 @@ class Timeline extends React.Component {
7978
const orderedMilestones = timeline.milestones ? _.orderBy(timeline.milestones, ['order']) : []
8079
return (
8180
<div>
82-
<TimelineHeader
83-
postContent={{
84-
title: timeline.name,
85-
postMsg: timeline.description,
86-
}}
87-
/>
8881
{_.reject(orderedMilestones, { hidden: true }).map((milestone) => (
8982
<Milestone
9083
key={milestone.id}

src/projects/detail/components/timeline/milestones/MilestoneTypeAddLinks/MilestoneTypeAddLinks.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import MilestonePostMessage from '../../MilestonePostMessage'
1313
import ProjectProgress from '../../../ProjectProgress'
1414
import MilestoneDescription from '../../MilestoneDescription'
1515
import { withMilestoneExtensionRequest } from '../../MilestoneExtensionRequest'
16+
import { getMilestoneStatusText } from '../../../../../../helpers/milestoneHelper'
1617

1718
import {
1819
MILESTONE_STATUS
@@ -94,12 +95,6 @@ class MilestoneTypeAddLinks extends React.Component {
9495
})
9596
}
9697

97-
getDescription() {
98-
const { milestone } = this.props
99-
100-
return milestone[`${milestone.status}Text`]
101-
}
102-
10398
render() {
10499
const {
105100
milestone,
@@ -135,7 +130,7 @@ class MilestoneTypeAddLinks extends React.Component {
135130
return (
136131
<div styleName={cn('milestone-post', theme)}>
137132
<DotIndicator hideDot>
138-
<MilestoneDescription description={this.getDescription()} />
133+
<MilestoneDescription description={getMilestoneStatusText(milestone)} />
139134
</DotIndicator>
140135

141136
{/*

src/projects/detail/components/timeline/milestones/MilestoneTypeCheckpointReview/MilestoneTypeCheckpointReview.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import MilestonePostMessage from '../../MilestonePostMessage'
1313
import ProjectProgress from '../../../ProjectProgress'
1414
import MilestoneDescription from '../../MilestoneDescription'
1515
import { withMilestoneExtensionRequest } from '../../MilestoneExtensionRequest'
16+
import { getMilestoneStatusText } from '../../../../../../helpers/milestoneHelper'
1617

1718
import {
1819
MILESTONE_STATUS,
@@ -175,12 +176,6 @@ class MilestoneTypeCheckpointReview extends React.Component {
175176
}
176177
}
177178

178-
getDescription() {
179-
const { milestone } = this.props
180-
181-
return milestone[`${milestone.status}Text`]
182-
}
183-
184179
shouldDisableCompleteReviewButton(links, selectedLinks) {
185180
const linksLength = links.length
186181
const selectedLinksLength = selectedLinks.length
@@ -240,7 +235,7 @@ class MilestoneTypeCheckpointReview extends React.Component {
240235
return (
241236
<div styleName={cn('milestone-post', theme)}>
242237
<DotIndicator hideDot>
243-
<MilestoneDescription description={this.getDescription()} />
238+
<MilestoneDescription description={getMilestoneStatusText(milestone)} />
244239
</DotIndicator>
245240

246241
{/*

src/projects/detail/components/timeline/milestones/MilestoneTypeDelivery/MilestoneTypeDelivery.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import LinkList from '../../LinkList'
1111
import MilestonePostMessage from '../../MilestonePostMessage'
1212
import MilestonePostEditText from '../../MilestonePostEditText'
1313
import MilestoneDescription from '../../MilestoneDescription'
14+
import { getMilestoneStatusText } from '../../../../../../helpers/milestoneHelper'
1415

1516
import { MILESTONE_STATUS } from '../../../../../../config/constants'
1617

@@ -177,12 +178,6 @@ class MilestoneTypeDelivery extends React.Component {
177178
completeMilestone()
178179
}
179180

180-
getDescription() {
181-
const { milestone } = this.props
182-
183-
return milestone[`${milestone.status}Text`]
184-
}
185-
186181
render() {
187182
const { milestone, theme, currentUser, previousMilestone } = this.props
188183
const { isShowFinalFixesRequestForm, finalFixRequests } = this.state
@@ -209,7 +204,7 @@ class MilestoneTypeDelivery extends React.Component {
209204
return (
210205
<div styleName={cn('milestone-post', theme)}>
211206
<DotIndicator hideDot>
212-
<MilestoneDescription description={this.getDescription()} />
207+
<MilestoneDescription description={getMilestoneStatusText(milestone)} />
213208
</DotIndicator>
214209

215210
{/*

src/projects/detail/components/timeline/milestones/MilestoneTypeFinalDesigns/MilestoneTypeFinalDesigns.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import ProjectProgress from '../../../ProjectProgress'
1414
import WinnerSelectionBar from '../../WinnerSelectionBar'
1515
import MilestoneDescription from '../../MilestoneDescription'
1616
import { withMilestoneExtensionRequest } from '../../MilestoneExtensionRequest'
17+
import { getMilestoneStatusText } from '../../../../../../helpers/milestoneHelper'
1718

1819
import {
1920
MILESTONE_STATUS,
@@ -214,12 +215,6 @@ class MilestoneTypeFinalDesigns extends React.Component {
214215
})
215216
}
216217

217-
getDescription() {
218-
const { milestone } = this.props
219-
220-
return milestone[`${milestone.status}Text`]
221-
}
222-
223218
render() {
224219
const {
225220
milestone,
@@ -268,7 +263,7 @@ class MilestoneTypeFinalDesigns extends React.Component {
268263
return (
269264
<div styleName={cn('milestone-post', theme)}>
270265
<DotIndicator hideDot>
271-
<MilestoneDescription description={this.getDescription()} />
266+
<MilestoneDescription description={getMilestoneStatusText(milestone)} />
272267
</DotIndicator>
273268

274269
{/*

src/projects/detail/components/timeline/milestones/MilestoneTypeFinalFixes/MilestoneTypeFinalFixes.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import LinkList from '../../LinkList'
1515
import { withMilestoneExtensionRequest } from '../../MilestoneExtensionRequest'
1616

1717
import { MILESTONE_STATUS } from '../../../../../../config/constants'
18+
import { getMilestoneStatusText } from '../../../../../../helpers/milestoneHelper'
1819

1920
import './MilestoneTypeFinalFixes.scss'
2021

@@ -62,12 +63,6 @@ class MilestoneTypeFinalFixes extends React.Component {
6263
})
6364
}
6465

65-
getDescription() {
66-
const { milestone } = this.props
67-
68-
return milestone[`${milestone.status}Text`]
69-
}
70-
7166
completeMilestone() {
7267
const { completeFinalFixesMilestone } = this.props
7368

@@ -104,7 +99,7 @@ class MilestoneTypeFinalFixes extends React.Component {
10499
return (
105100
<div styleName={cn('milestone-post', theme)}>
106101
<DotIndicator hideDot>
107-
<MilestoneDescription description={this.getDescription()} />
102+
<MilestoneDescription description={getMilestoneStatusText(milestone)} />
108103
</DotIndicator>
109104

110105
{isActive && (

src/projects/detail/components/timeline/milestones/MilestoneTypePhaseSpecification/MilestoneTypePhaseSpecification.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { withMilestoneExtensionRequest } from '../../MilestoneExtensionRequest'
1313

1414
import { MILESTONE_STATUS } from '../../../../../../config/constants'
1515

16+
import { getMilestoneStatusText } from '../../../../../../helpers/milestoneHelper'
1617
import './MilestoneTypePhaseSpecification.scss'
1718

1819
class MilestoneTypePhaseSpecification extends React.Component {
@@ -64,12 +65,6 @@ class MilestoneTypePhaseSpecification extends React.Component {
6465
completeMilestone()
6566
}
6667

67-
getDescription() {
68-
const { milestone } = this.props
69-
70-
return milestone[`${milestone.status}Text`]
71-
}
72-
7368
render() {
7469
const {
7570
milestone,
@@ -89,7 +84,7 @@ class MilestoneTypePhaseSpecification extends React.Component {
8984
return (
9085
<div styleName={cn('milestone-post', theme)}>
9186
<DotIndicator hideFirstLine={currentUser.isCustomer} hideDot>
92-
<MilestoneDescription description={this.getDescription()} />
87+
<MilestoneDescription description={getMilestoneStatusText(milestone)} />
9388
</DotIndicator>
9489

9590
{/*

src/projects/detail/components/timeline/milestones/MilestoneTypeProgress/MilestoneTypeProgress.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import MilestoneDescription from '../../MilestoneDescription'
1414
import { withMilestoneExtensionRequest } from '../../MilestoneExtensionRequest'
1515

1616
import { MILESTONE_STATUS } from '../../../../../../config/constants'
17+
import { getMilestoneStatusText } from '../../../../../../helpers/milestoneHelper'
1718

1819
import './MilestoneTypeProgress.scss'
1920

@@ -63,12 +64,6 @@ class MilestoneTypeProgress extends React.Component {
6364
completeMilestone()
6465
}
6566

66-
getDescription() {
67-
const { milestone } = this.props
68-
69-
return milestone[`${milestone.status}Text`]
70-
}
71-
7267
render() {
7368
const {
7469
milestone,
@@ -100,7 +95,7 @@ class MilestoneTypeProgress extends React.Component {
10095
return (
10196
<div styleName={cn('milestone-post', theme)}>
10297
<DotIndicator hideDot>
103-
<MilestoneDescription description={this.getDescription()} />
98+
<MilestoneDescription description={getMilestoneStatusText(milestone)} />
10499
</DotIndicator>
105100

106101
{/*

0 commit comments

Comments
 (0)