diff --git a/src/apps/work/src/lib/constants.ts b/src/apps/work/src/lib/constants.ts index f89755041..f2dc69d8c 100644 --- a/src/apps/work/src/lib/constants.ts +++ b/src/apps/work/src/lib/constants.ts @@ -165,17 +165,9 @@ const rawTermsApiUrl = process.env.REACT_APP_TERMS_API_URL export const TERMS_API_URL = normalizeApiUrlForEnvironment(rawTermsApiUrl) -const DEFAULT_NDA_UUID_FROM_CONFIG = (EnvironmentConfig as unknown as Record) - .DEFAULT_NDA_UUID - export const DEFAULT_NDA_UUID = process.env.REACT_APP_DEFAULT_NDA_UUID || process.env.DEFAULT_NDA_UUID - || ( - typeof DEFAULT_NDA_UUID_FROM_CONFIG === 'string' - ? DEFAULT_NDA_UUID_FROM_CONFIG - : undefined - ) - || '21193' + || EnvironmentConfig.DEFAULT_NDA_UUID function normalizeApiUrlForEnvironment(url: string): string { const normalizedUrl = url.replace(/\/$/, '') diff --git a/src/apps/work/src/lib/constants/challenge-editor.constants.ts b/src/apps/work/src/lib/constants/challenge-editor.constants.ts index 3e94b218f..30513c620 100644 --- a/src/apps/work/src/lib/constants/challenge-editor.constants.ts +++ b/src/apps/work/src/lib/constants/challenge-editor.constants.ts @@ -128,7 +128,9 @@ export const CHALLENGE_TYPES_WITH_MULTIPLE_PRIZES = [ }, ] as const -export const DEFAULT_NDA_UUID = 'c41e90e5-4d0e-4811-bd09-38ff72674490' +export const DEFAULT_NDA_UUID = process.env.REACT_APP_DEFAULT_NDA_UUID + || process.env.DEFAULT_NDA_UUID + || EnvironmentConfig.DEFAULT_NDA_UUID export const DEFAULT_STANDARD_TERMS_UUID = process.env.REACT_APP_DEFAULT_STANDARD_TERMS_UUID || process.env.DEFAULT_STANDARD_TERMS_UUID diff --git a/src/config/environments/default.env.ts b/src/config/environments/default.env.ts index a30ba376f..960b209c2 100644 --- a/src/config/environments/default.env.ts +++ b/src/config/environments/default.env.ts @@ -224,6 +224,10 @@ export const TERMS_URL = 'https://www.topcoder-dev.com/challenges/terms/detail/317cd8f9-d66c-4f2a-8774-63c612d99cd4' export const NDA_TERMS_URL = 'https://www.topcoder-dev.com/challenges/terms/detail/e5811a7b-43d1-407a-a064-69e5015b4900' +export const DEFAULT_NDA_UUID = getReactEnv( + 'DEFAULT_NDA_UUID', + 'e5811a7b-43d1-407a-a064-69e5015b4900', +) export const DEFAULT_STANDARD_TERMS_UUID = '0a507fb7-3fe0-402b-b121-1a24af4a9cf1' export const NDA_DOCUSIGN_TEMPLATE_ID = '400b989d-1c75-4889-b6f6-421e1f924709' diff --git a/src/config/environments/global-config.model.ts b/src/config/environments/global-config.model.ts index 512e9aa6e..a94d2544b 100644 --- a/src/config/environments/global-config.model.ts +++ b/src/config/environments/global-config.model.ts @@ -61,6 +61,7 @@ export interface GlobalConfig { } TERMS_URL?: string NDA_TERMS_URL?: string + DEFAULT_NDA_UUID: string DEFAULT_STANDARD_TERMS_UUID?: string NDA_DOCUSIGN_TEMPLATE_ID?: string MEMBER_VERIFY_LOOKER: number diff --git a/src/config/environments/prod.env.ts b/src/config/environments/prod.env.ts index 02846e86b..032961e6b 100644 --- a/src/config/environments/prod.env.ts +++ b/src/config/environments/prod.env.ts @@ -4,7 +4,11 @@ import { getReactEnv } from './react-env' export * from './default.env' export const TERMS_URL = 'https://www.topcoder.com/challenges/terms/detail/564a981e-6840-4a5c-894e-d5ad22e9cd6f' -export const NDA_TERMS_URL = 'https://www.topcoder.com/challenges/terms/detail/c41e90e5-4d0e-4811-bd09-38ff72674490' +export const NDA_TERMS_URL = 'https://www.topcoder.com/challenges/terms/detail/4bc0e7fc-8413-4de6-a231-9f9c6bcc65d9' +export const DEFAULT_NDA_UUID = getReactEnv( + 'DEFAULT_NDA_UUID', + '4bc0e7fc-8413-4de6-a231-9f9c6bcc65d9', +) export const NDA_DOCUSIGN_TEMPLATE_ID = getReactEnv( 'NDA_DOCUSIGN_TEMPLATE_ID', '8b101e82-87c0-42c9-8440-d922749c4076',