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

DEVOPSs1412 : Europa on Next #135

Merged
merged 3 commits into from
Dec 20, 2023
Merged

DEVOPSs1412 : Europa on Next #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dbee46
Adding env options for next cluster
Dec 19, 2023
c4c6da2
Adding env options for next cluster
Dec 19, 2023
5f77420
Adding env options for next cluster
Dec 19, 2023
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: 6 additions & 0 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
"public_url": "/"
},

"next": {
"domain": "next.kbase.us",
"legacy": "legacy.next.kbase.us",
"public_url": "/"
},

Comment on lines +27 to +32
Copy link
Collaborator

@dakotablair dakotablair Dec 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only place that was required to be updated to prevent the 404s that you ran into. It is the situation "using a deployed build with an undefined environment" which usually does not happen during development since the defaults from the .env file are used. We might want to update scripts/build_deploy.sh to use defaults from .env.

"production": {
"domain": "narrative.kbase.us",
"legacy": "legacy.narrative.kbase.us",
Expand Down
2 changes: 2 additions & 0 deletions src/features/layout/TopBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,15 @@ const Enviroment: FC = () => {
ci: faFlask,
'ci-europa': faFlask,
'narrative-dev': faWrench,
next: faWrench,
unknown: faQuestionCircle,
}[env];
const txt = {
appdev: 'APPDEV',
ci: 'CI',
'ci-europa': 'EUR',
'narrative-dev': 'NARDEV',
next: 'NEXT',
unknown: 'ENV?',
}[env];
return (
Expand Down
7 changes: 4 additions & 3 deletions src/features/layout/layoutSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ import { useEffect } from 'react';
import { useAppDispatch } from '../../common/hooks';

const environments = [
'unknown',
'production',
'ci',
'appdev',
'ci',
'ci-europa',
'narrative-dev',
'next',
'production',
'unknown',
] as const;

interface PageState {
Expand Down
Loading