remove project-wide deployment settings

.github/workflows/node-ci.yml

@@ -74,9 +74,9 @@ jobs:
       - name: Run e2e tests
         if: inputs.e2e
         run: |
-          (echo "E2E Test Attempt 1" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
-          (echo "E2E Test Attempt 2" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
-          (echo "E2E Test Attempt 3" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
+          (echo "E2E Test Attempt 1" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
+          (echo "E2E Test Attempt 2" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
+          (echo "E2E Test Attempt 3" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
           (echo "E2E Tests Failed" && exit 1)
       # At this point, the build is successful.
       - name: Semantic Release

README.md

@@ -11,7 +11,7 @@ A pre-configured datatools instance can be lauched via Docker by running
 ```bash
 cd docker
 cp ../configurations/default/env.yml.tmp ../configurations/default/env.yml
-docker-compose up
+docker compose up
 ```
 
 from the datatools-ui directory. Datatools will then be running on port `9966`.

docs/dev/development.md

@@ -47,6 +47,6 @@ yarn start -- --config /path/to/config
 
 ## E2E tests
 
-The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker-compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker-compose` will alert you as to which variables must be present.
+The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker compose` will alert you as to which variables must be present.
 
-To run the tests, run `docker-compose -f docker-compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.
+To run the tests, run `docker compose -f docker compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.

i18n/english.yml

@@ -578,7 +578,6 @@ components:
         custom: Use Custom Extract Bounds
         gtfs: Use GTFS-Derived Extract Bounds
         title: OSM Extract
-      title: Deployment
     routerConfig:
       brandingUrlRoot: Branding URL Root
       carDropoffTime: Car Dropoff Time

lib/manager/components/ProjectSettings.js

@@ -1,18 +1,12 @@
 // @flow
 
 import React, { Component } from 'react'
-import { Row, Col, Panel, ListGroup, ListGroupItem } from 'react-bootstrap'
-import { LinkContainer } from 'react-router-bootstrap'
+import { Row, Col } from 'react-bootstrap'
 
 import * as projectActions from '../actions/projects'
-import {
-  getComponentMessages,
-  isModuleEnabled
-} from '../../common/util/config'
 import type { ManagerUserState } from '../../types/reducers'
 import type { Project } from '../../types'
 
-import DeploymentSettings from './deployment/DeploymentSettings'
 import ProjectSettingsForm from './ProjectSettingsForm'
 
 type Props = {
@@ -25,66 +19,33 @@ type Props = {
 }
 
 export default class ProjectSettings extends Component<Props> {
-  messages = getComponentMessages('ProjectSettings')
-
   _updateProjectSettings = (project: Project, settings: Object) => {
-    const {updateProject} = this.props
+    const { updateProject } = this.props
     // Update project and re-fetch feeds.
     updateProject(project.id, settings, true)
   }
 
   render () {
     const {
-      activeSettingsPanel,
       deleteProject,
       project,
       projectEditDisabled,
       updateProject,
       user
     } = this.props
-    const activePanel = !activeSettingsPanel
-      ? <ProjectSettingsForm
-        deleteProject={deleteProject}
-        editDisabled={projectEditDisabled}
-        onCancelUrl={`project/${project.id}/`}
-        project={project}
-        updateProject={updateProject}
-        showDangerZone
-        user={user}
-      />
-      : <DeploymentSettings
-        project={project}
-        updateProject={updateProject}
-        editDisabled={projectEditDisabled} />
-    return (
-      <Row>
-        <Col xs={12} sm={3}>
-          <Panel>
-            <ListGroup>
-              <LinkContainer
-                to={`/project/${project.id}/settings`}>
-                <ListGroupItem>
-                  {this.messages('title')}
-                </ListGroupItem>
-              </LinkContainer>
-              {isModuleEnabled('deployment')
-                ? (
-                  <LinkContainer
-                    data-test-id='deployment-settings-link'
-                    to={`/project/${project.id}/settings/deployment`}
-                  >
-                    <ListGroupItem>{this.messages('deployment.title')}</ListGroupItem>
-                  </LinkContainer>
-                )
-                : null
-              }
-            </ListGroup>
-          </Panel>
-        </Col>
-        <Col xs={12} sm={7}>
-          {activePanel}
-        </Col>
-      </Row>
-    )
+    return <Row>
+      <Col xs={12} sm={2} />
+      <Col xs={12} sm={7}>
+        <ProjectSettingsForm
+          deleteProject={deleteProject}
+          editDisabled={projectEditDisabled}
+          onCancelUrl={`project/${project.id}/`}
+          project={project}
+          updateProject={updateProject}
+          showDangerZone
+          user={user}
+        />
+      </Col>
+    </Row>
   }
 }