Skip to content

Commit 6024897

Browse files
author
vikasrohit
authored
Merge pull request #2907 from appirio-tech/hotfix/unable_to_activate_v2_projects
Hotfix/unable to activate v2 projects
2 parents 7019a9d + 1170985 commit 6024897

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/components/ProjectInfo/ProjectInfo.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ class ProjectInfo extends Component {
5353

5454
const activePhases = phases ? phases.filter((phase) => phase.status === PHASE_STATUS_ACTIVE) : []
5555
const hasReviewedOrActivePhases = !!_.find(phases, (phase) => _.includes([PHASE_STATUS_REVIEWED, PHASE_STATUS_ACTIVE], phase.status))
56-
const projectCanBeActive = (project.status !== PROJECT_STATUS_ACTIVE && hasReviewedOrActivePhases) || project.status === PROJECT_STATUS_ACTIVE
56+
const isProjectActive = project.status === PROJECT_STATUS_ACTIVE
57+
const isV3Project = project.version === 'v3'
58+
const projectCanBeActive = (isV3Project && !isProjectActive && hasReviewedOrActivePhases) || isProjectActive
5759

5860

5961
// prepare review button

src/projects/list/components/Projects/ProjectsGridView.jsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ import ProjectListTimeSortColHeader from './ProjectListTimeSortColHeader'
1111
import ProjectListFilterColHeader from './ProjectListFilterColHeader'
1212
import GridView from '../../../../components/Grid/GridView'
1313
import UserTooltip from '../../../../components/User/UserTooltip'
14-
import { PROJECTS_LIST_PER_PAGE, SORT_OPTIONS, PROJECT_STATUS_COMPLETED, DATE_TO_USER_FIELD_MAP } from '../../../../config/constants'
14+
import {
15+
PROJECTS_LIST_PER_PAGE, SORT_OPTIONS, PROJECT_STATUS_COMPLETED, DATE_TO_USER_FIELD_MAP, PHASE_STATUS_REVIEWED,
16+
PHASE_STATUS_ACTIVE
17+
} from '../../../../config/constants'
1518
import { getProjectTemplateByKey } from '../../../../helpers/templates'
1619
import TextTruncate from 'react-text-truncate'
1720
import ProjectStatus from '../../../../components/ProjectStatus/ProjectStatus'
@@ -196,6 +199,10 @@ const ProjectsGridView = props => {
196199
classes: 'item-status',
197200
renderText: item => {
198201
const canEdit = item.status !== PROJECT_STATUS_COMPLETED
202+
const hasReviewedOrActivePhases = !!_.find(item.phases, (phase) => _.includes([PHASE_STATUS_REVIEWED, PHASE_STATUS_ACTIVE], phase.status))
203+
const isProjectActive = item.status === PROJECT_STATUS_ACTIVE
204+
const isV3Project = item.version === 'v3'
205+
const projectCanBeActive = (isV3Project && !isProjectActive && hasReviewedOrActivePhases) || isProjectActive
199206
return (
200207
<div className="spacing">
201208
<EnhancedProjectStatus
@@ -206,6 +213,7 @@ const ProjectsGridView = props => {
206213
unifiedHeader={false}
207214
onChangeStatus={onChangeStatus}
208215
projectId={item.id}
216+
projectCanBeActive={projectCanBeActive}
209217
/>
210218
</div>
211219
)

0 commit comments

Comments
 (0)