Skip to content

Commit 4778738

Browse files
remove project-wide deployment settings
1 parent dce68d2 commit 4778738

File tree

2 files changed

+17
-387
lines changed

2 files changed

+17
-387
lines changed
+17-51
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
// @flow
22

33
import React, { Component } from 'react'
4-
import { Row, Col, Panel, ListGroup, ListGroupItem } from 'react-bootstrap'
5-
import { LinkContainer } from 'react-router-bootstrap'
4+
import { Row, Col } from 'react-bootstrap'
65

76
import * as projectActions from '../actions/projects'
87
import {
9-
getComponentMessages,
10-
isModuleEnabled
8+
getComponentMessages
119
} from '../../common/util/config'
1210
import type { ManagerUserState } from '../../types/reducers'
1311
import type { Project } from '../../types'
1412

15-
import DeploymentSettings from './deployment/DeploymentSettings'
1613
import ProjectSettingsForm from './ProjectSettingsForm'
1714

1815
type Props = {
@@ -28,63 +25,32 @@ export default class ProjectSettings extends Component<Props> {
2825
messages = getComponentMessages('ProjectSettings')
2926

3027
_updateProjectSettings = (project: Project, settings: Object) => {
31-
const {updateProject} = this.props
28+
const { updateProject } = this.props
3229
// Update project and re-fetch feeds.
3330
updateProject(project.id, settings, true)
3431
}
3532

3633
render () {
3734
const {
38-
activeSettingsPanel,
3935
deleteProject,
4036
project,
4137
projectEditDisabled,
4238
updateProject,
4339
user
4440
} = this.props
45-
const activePanel = !activeSettingsPanel
46-
? <ProjectSettingsForm
47-
deleteProject={deleteProject}
48-
editDisabled={projectEditDisabled}
49-
onCancelUrl={`project/${project.id}/`}
50-
project={project}
51-
updateProject={updateProject}
52-
showDangerZone
53-
user={user}
54-
/>
55-
: <DeploymentSettings
56-
project={project}
57-
updateProject={updateProject}
58-
editDisabled={projectEditDisabled} />
59-
return (
60-
<Row>
61-
<Col xs={12} sm={3}>
62-
<Panel>
63-
<ListGroup>
64-
<LinkContainer
65-
to={`/project/${project.id}/settings`}>
66-
<ListGroupItem>
67-
{this.messages('title')}
68-
</ListGroupItem>
69-
</LinkContainer>
70-
{isModuleEnabled('deployment')
71-
? (
72-
<LinkContainer
73-
data-test-id='deployment-settings-link'
74-
to={`/project/${project.id}/settings/deployment`}
75-
>
76-
<ListGroupItem>{this.messages('deployment.title')}</ListGroupItem>
77-
</LinkContainer>
78-
)
79-
: null
80-
}
81-
</ListGroup>
82-
</Panel>
83-
</Col>
84-
<Col xs={12} sm={7}>
85-
{activePanel}
86-
</Col>
87-
</Row>
88-
)
41+
return <Row>
42+
<Col xs={12} sm={2} />
43+
<Col xs={12} sm={7}>
44+
<ProjectSettingsForm
45+
deleteProject={deleteProject}
46+
editDisabled={projectEditDisabled}
47+
onCancelUrl={`project/${project.id}/`}
48+
project={project}
49+
updateProject={updateProject}
50+
showDangerZone
51+
user={user}
52+
/>
53+
</Col>
54+
</Row>
8955
}
9056
}

0 commit comments

Comments
 (0)