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.

Sign up for GitHub

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

Sandbox #24

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Sandbox #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76d71ed
changes needed to go from staging to sandbox
sandyhider Mar 3, 2025
b937f24
Merge pull request #23 from aplbrain/staging-to-sandbox
sandyhider Mar 3, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/backend-staging-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy backend to staging
on:
push:
branches:
- staging
- sandbox
paths-ignore:
- "web/**"
- "CHANGELOG.md"
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
python -m build --sdist

- name: Create Heroku Build
run: heroku builds:create -a ember-dandi-api-staging --source-tar dist/*.tar.gz
run: heroku builds:create -a ember-dandi-api-sandbox --source-tar dist/*.tar.gz
env:
HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
HEROKU_EMAIL: ${{ secrets.HEROKU_EMAIL }}
2 changes: 1 addition & 1 deletion dandiapi/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def mutate_configuration(configuration: type[ComposedConfiguration]):

ALLOWED_HOSTS += [
'api-dandi.emberarchive.org',
'api-dandi-staging.emberarchive.org',
'api-dandi-sandbox.emberarchive.org',
# Example from Linc-Archive
# 'linc-staging-terraform-0b817cb1246b.herokuapp.com/',
# 'api.lincbrain.org'
Expand Down
8 changes: 4 additions & 4 deletions web/netlify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ ignore = "false"
# Staging
[context.master.environment]
NODE_VERSION = "20"
VITE_APP_OAUTH_API_ROOT = "https://api-dandi-staging.emberarchive.org/oauth/"
VITE_APP_OAUTH_API_ROOT = "https://api-dandi-sandbox.emberarchive.org/oauth/"
VITE_APP_OAUTH_CLIENT_ID = "Ov23liQeSrvR2UvwCAO2"
VITE_APP_DANDI_API_ROOT = "https://api-dandi-staging.emberarchive.org/api/"
VITE_APP_DANDI_API_ROOT = "https://api-dandi-sandbox.emberarchive.org/api/"
VITE_APP_SENTRY_DSN = "https://47b58f7fd49191d6d771509e8834788f@o4508337180966912.ingest.us.sentry.io/4508337195909120"
VITE_APP_SENTRY_ENVIRONMENT = "staging"

# Deploy previews
[context.deploy-preview.environment]
NODE_VERSION = "20"
VITE_APP_OAUTH_API_ROOT = "https://api-dandi-staging.emberarchive.org/oauth/"
VITE_APP_OAUTH_API_ROOT = "https://api-dandi-sandbox.emberarchive.org/oauth/"
VITE_APP_OAUTH_CLIENT_ID = "Ov23liQeSrvR2UvwCAO2"
VITE_APP_DANDI_API_ROOT = "https://api-dandi-staging.emberarchive.org/api/"
VITE_APP_DANDI_API_ROOT = "https://api-dandi-sandbox.emberarchive.org/api/"
VITE_APP_SENTRY_DSN = "https://47b58f7fd49191d6d771509e8834788f@o4508337180966912.ingest.us.sentry.io/4508337195909120"
VITE_APP_SENTRY_ENVIRONMENT = "staging"

Expand Down
2 changes: 1 addition & 1 deletion web/src/views/DandisetLandingView/ExternalDandisetServicesDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const neurosiftURL = computed(() => {
const metadata = currentDandiset.value.metadata;
const dandisetId = currentDandiset.value.dandiset.identifier;
const dandisetVersion = metadata.version;
const stagingParam = metadata.url!.startsWith('https://gui-staging.dandiarchive.org/') ? '&staging=1' : '';
const stagingParam = metadata.url!.startsWith('https://gui-dandi-sandbox.emberarchive.org/') ? '&staging=1' : '';

return `https://neurosift.app/?p=/dandiset&dandisetId=${dandisetId}&dandisetVersion=${dandisetVersion}${stagingParam}`;
});
Expand Down
Loading