Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove project-wide deployment settings #1023

Merged
merged 5 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/node-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
104 changes: 0 additions & 104 deletions i18n/english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,49 +135,6 @@ components:
danger: Danger!
success: Success!
warning: Warning!
DeploymentSettings:
boundsPlaceholder: 'min_lon, min_lat, max_lon, max_lat'
buildConfig:
elevationBucket:
accessKey: Access Key
bucketName: S3 Bucket Name
secretKey: Secret Key
fares: Fares
fetchElevationUS: Fetch Elevation
save: Save
stationTransfers: Sta. Transfers
subwayAccessTime: Subway Access Time
title: Build Config
clear: Clear
manageServers: Manage deployment servers
osm:
bounds: Custom Extract Bounds
custom: Use Custom Extract Bounds
gtfs: Use GTFS-Derived Extract Bounds
title: OSM Extract
routerConfig:
brandingUrlRoot: Branding URL Root
carDropoffTime: Car Dropoff Time
driveDistanceReluctance: Drive Distance Reluctance
numItineraries: '# of itineraries'
requestLogFile: Request log file
stairsReluctance: Stairs Reluctance
title: Router Config
itineraryFilters:
nonTransitGeneralizedCostLimit: Non-Transit Generalized Cost Limit
updaters:
$index:
feedId: Feed ID
frequencySec: Frequency (in seconds)
sourceType: Source type
type: Type
url: URL
new: Add updater
title: Real-time updaters
placeholder: Updater name
walkSpeed: Walk Speed
save: Save
title: Deployment
DeploymentVersionsTable:
dateRetrieved: Date Retrieved
errorCount: Error Count
Expand Down Expand Up @@ -578,7 +535,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
Expand Down Expand Up @@ -935,66 +891,6 @@ components:
noAccess: No Access
permissions: Permissions
title: Project Settings for
ProjectSettings:
deployment:
buildConfig:
elevationBucket:
accessKey: Access Key
bucketName: S3 Bucket Name
secretKey: Secret Key
fares: Fares
fetchElevationUS: Fetch Elevation
stationTransfers: Sta. Transfers
subwayAccessTime: Subway Access Time
title: Build Config
osm:
bounds: Custom Extract Bounds
custom: Use Custom Extract Bounds
gtfs: Use GTFS-Derived Extract Bounds
title: OSM Extract
otpServers:
$index:
admin: Admin access only?
delete: Remove
internalUrl: Internal URLs
name: Name
namePlaceholder: Production
publicUrl: Public URL
r5: R5 Server?
s3Bucket: S3 bucket name
targetGroupArn: Target Group ARN
new: Add server
serverPlaceholder: Server name
title: Servers
routerConfig:
brandingUrlRoot: Branding URL Root
carDropoffTime: Car Dropoff Time
driveDistanceReluctance: Drive Distance Reluctance
numItineraries: '# of itineraries'
requestLogFile: Request log file
stairsReluctance: Stairs Reluctance
title: Router Config
itineraryFilters:
nonTransitGeneralizedCostLimit: Non-Transit Generalized Cost Limit
updaters:
$index:
feedId: Feed ID
frequencySec: Frequency (in seconds)
sourceType: Source type
type: Type
url: URL
new: Add updater
title: Real-time updaters
placeholder: Updater name
walkSpeed: Walk Speed
title: Deployment
project:
cannotFetchFeeds: Cannot fetch feeds
feeds: Feeds
permissions: Permissions
rename: Rename
save: Save
title: Settings
ProjectSettingsForm:
cancel: Cancel
confirmDelete: Are you sure you want to delete this project? This action cannot be undone and all feed sources and their versions will be permanently deleted.
Expand Down
97 changes: 0 additions & 97 deletions i18n/german.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,46 +136,6 @@ components:
danger: Gefahr!
success: Erfolg!
warning: Warnung!
DeploymentSettings:
boundsPlaceholder: min_lon, min_lat, max_lon, max_lat
buildConfig:
elevationBucket:
accessKey: Zugangs-Schlüssel
bucketName: S3 Bucket Name
secretKey: Secret Key
fares: Tarife
fetchElevationUS: Höhenmodell abrufen
save: Speichern
stationTransfers: Umstiege
subwayAccessTime: U-Bahn-Zugangszeiten
title: Build-Konfiguration
clear: Zurücksetzen
manageServers: Deployment-Server verwalten
osm:
bounds: Selbst-definierte Extrakt-Grenzen
custom: Benutze selbst-definierte Extrakt-Grenzen
gtfs: Grenzen aus GTFS ableiten
title: OSM-Extrakt
routerConfig:
brandingUrlRoot: Branding-URL Wurzel
carDropoffTime: PKW-Rückgabe-Zeit
numItineraries: '# of Reisevorschläge'
requestLogFile: Log-Datei anfordern
stairsReluctance: Treppen-Abneigung
title: Router Konfiguration
updaters:
$index:
defaultAgencyId: Standard-Betreiber ID
frequencySec: Frequenz (in Sekunden)
sourceType: Quellen-Typ
type: Typ
url: URL
new: Aktualisierer hinzufügen
placeholder: Aktualisierer-Name
title: Echtzeit-Aktualisierungs-Updater
walkSpeed: Geh-Geschwindigkeit
save: Speichern
title: Deployment
DeploymentVersionsTable:
dateRetrieved: Abrufdatum
errorCount: Fehlerzahl
Expand Down Expand Up @@ -1014,63 +974,6 @@ components:
transitland: Sync von transit.land
url: Feed-Abruf URL
version: Version
ProjectSettings:
deployment:
buildConfig:
elevationBucket:
accessKey: Zugriffs-Schlüssel (access)
bucketName: S3 Bucket Name
secretKey: Geheim-Schlüssel (secret)
fares: Tarife
fetchElevationUS: Rufe Geländemodell ab
stationTransfers: Umstiege
subwayAccessTime: U-Bahn-Zugangszeiten
title: Build Konfiguration
osm:
bounds: Benutzerdefinierte Extraktions-Grenzen
custom: Benutzerdefinierte Extraktions-Grenzen verwenden
gtfs: Benutzerdefinierte Extraktions-Grenzen verwenden
title: OSM Extrakt
otpServers:
$index:
admin: Nur Admin-Zugriff?
delete: Entfernen
internalUrl: Interne URLs
name: Name
namePlaceholder: Produktion
publicUrl: Öffentliche URL
r5: R5 Server?
s3Bucket: S3 Bucket Name
targetGroupArn: Zielgruppen ARN
new: Server hinzufügen
serverPlaceholder: Server-Name
title: Server
routerConfig:
brandingUrlRoot: Branding-URL Wurzel
carDropoffTime: PKW-Abstell-Zeit
numItineraries: '# Reisevorschläge'
requestLogFile: Log-Datei anfordern
stairsReluctance: Treppen-Vermeidung
title: Router Konfiguration
updaters:
$index:
defaultAgencyId: Default Betreiber-ID
frequencySec: Frequenz (in Sekunden)
sourceType: Quellen-Typ
type: Typ
url: URL
new: Updater hinzufügen
placeholder: Updater-Name
title: Real-time Updater
walkSpeed: Lauf-Geschwindigkeit
title: Deployment
project:
cannotFetchFeeds: Feeds können nicht abgerufen werden
feeds: Feeds
permissions: Berechtigungen
rename: Umbennenen
save: Speichern
title: Einstellungen
ProjectSettingsForm:
cancel: Abbrechen
confirmDelete: Sind Sie sicher, dass Sie dieses Projekt löschen möchten? Diese
Expand Down
97 changes: 0 additions & 97 deletions i18n/polish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,46 +139,6 @@ components:
danger: Uwaga!
success: Sukces!
warning: Ostrzeżenie!
DeploymentSettings:
boundsPlaceholder: min_lon, min_lat, max_lon, max_lat
buildConfig:
elevationBucket:
accessKey: Access Key
bucketName: S3 Bucket Name
secretKey: Secret Key
fares: Taryfy
fetchElevationUS: Fetch Elevation
save: Zapisz
stationTransfers: Transfery na stacji
subwayAccessTime: Godziny otwarcia metra
title: Build Config
clear: Wyczyść
manageServers: Manage deployment servers
osm:
bounds: Custom Extract Bounds
custom: Use Custom Extract Bounds
gtfs: Use GTFS-Derived Extract Bounds
title: Wyciąg z OSM
routerConfig:
brandingUrlRoot: Branding URL Root
carDropoffTime: Car Dropoff Time
numItineraries: '# of itineraries'
requestLogFile: Request log file
stairsReluctance: Stairs Reluctance
title: Router Config
updaters:
$index:
defaultAgencyId: Domyślny ID przewoźnika
frequencySec: Częstotliwość (w sekundach)
sourceType: Rodzaj źródła
type: Typ
url: URL
new: Add updater
placeholder: Updater name
title: Real-time updaters
walkSpeed: Walk Speed
save: Zapisz
title: Wdrożenie
DeploymentVersionsTable:
dateRetrieved: Data pozyskania
errorCount: Licznik błędów
Expand Down Expand Up @@ -1003,63 +963,6 @@ components:
transitland: Sync from transit.land
url: Feed download URL
version: version
ProjectSettings:
deployment:
buildConfig:
elevationBucket:
accessKey: Access Key
bucketName: S3 Bucket Name
secretKey: Secret Key
fares: Fares
fetchElevationUS: Fetch Elevation
stationTransfers: Sta. Transfers
subwayAccessTime: Subway Access Time
title: Build Config
osm:
bounds: Custom Extract Bounds
custom: Use Custom Extract Bounds
gtfs: Use GTFS-Derived Extract Bounds
title: OSM Extract
otpServers:
$index:
admin: Admin access only?
delete: Remove
internalUrl: Internal URLs
name: Name
namePlaceholder: Production
publicUrl: Public URL
r5: R5 Server?
s3Bucket: S3 bucket name
targetGroupArn: Target Group ARN
new: Add server
serverPlaceholder: Server name
title: Servers
routerConfig:
brandingUrlRoot: Branding URL Root
carDropoffTime: Car Dropoff Time
numItineraries: '# of itineraries'
requestLogFile: Request log file
stairsReluctance: Stairs Reluctance
title: Router Config
updaters:
$index:
defaultAgencyId: Default agency ID
frequencySec: Frequency (in seconds)
sourceType: Source type
type: Type
url: URL
new: Add updater
placeholder: Updater name
title: Real-time updaters
walkSpeed: Walk Speed
title: Deployment
project:
cannotFetchFeeds: Cannot fetch feeds
feeds: Feeds
permissions: Permissions
rename: Rename
save: Save
title: Settings
ProjectSettingsForm:
cancel: Cancel
confirmDelete: Are you sure you want to delete this project? This action cannot
Expand Down
Loading
Loading