diff --git a/config.json b/config.json index 3b38e95b..2f929817 100644 --- a/config.json +++ b/config.json @@ -9,7 +9,8 @@ "ci": { "domain": "ci.kbase.us", "legacy": "legacy.ci.kbase.us", - "public_url": "/" + "public_url": "/", + "cdm_domain": "cdmhub.ci.kbase.us" }, "ci-europa": { @@ -42,7 +43,11 @@ "domain": "narrative.kbase.us", "legacy": "legacy.narrative.kbase.us", "public_url": "/", - "backup_cookie": { "name": "kbase_session_backup", "domain": ".kbase.us" } + "backup_cookie": { + "name": "kbase_session_backup", + "domain": ".kbase.us" + }, + "cdm_domain": "hub.berdl.kbase.us" } } } diff --git a/scripts/build_deploy.ts b/scripts/build_deploy.ts index cbcd0840..077afd27 100755 --- a/scripts/build_deploy.ts +++ b/scripts/build_deploy.ts @@ -18,6 +18,7 @@ interface EnvironmentConfig { name: string; domain: string; }; + cdm_domain?: string; } interface BuildParameters { @@ -52,6 +53,7 @@ const setEnvironment = ( legacy, public_url: publicURL, backup_cookie: backupCookie, + cdm_domain: cdmDomain, } = environmentConfig; const envsNew: Record = { @@ -62,6 +64,7 @@ const setEnvironment = ( REACT_APP_KBASE_LEGACY_DOMAIN: legacy, REACT_APP_KBASE_BACKUP_COOKIE_NAME: backupCookie?.name || '', REACT_APP_KBASE_BACKUP_COOKIE_DOMAIN: backupCookie?.domain || '', + REACT_APP_KBASE_CDM_DOMAIN: cdmDomain || 'cdmhub.' + domain, }; Object.assign(process.env, envsNew); }; diff --git a/src/features/cdm/CDMRedirect.tsx b/src/features/cdm/CDMRedirect.tsx index 482ee5a5..656c47e7 100644 --- a/src/features/cdm/CDMRedirect.tsx +++ b/src/features/cdm/CDMRedirect.tsx @@ -4,7 +4,7 @@ import { Loader } from '../../common/components'; export const CDMRedirect = () => { useEffect(() => { - window.location.href = `https://cdmhub.${process.env.REACT_APP_KBASE_DOMAIN}/hub`; + window.location.href = `https://${process.env.REACT_APP_KBASE_CDM_DOMAIN}/hub`; }); return (