PROD - AI Ratings

.circleci/config.yml

@@ -228,7 +228,7 @@ workflows:
                       branches:
                           only:
                               - dev
-                              - hide_ba_details
+                              - ai-ratings
                       tags:
                           only: /^dev-.*/
 

.environments/.env.prod

@@ -14,6 +14,9 @@ REACT_APP_MEMBER_VERIFY_LOOKER=3322
 REACT_APP_SPRIG_ENV_ID=a-IZBZ6-r7bU
 
 # Filestack configuration for uploading Submissions
-REACT_APP_FILESTACK_API_KEY=
-REACT_APP_FILESTACK_REGION=
-REACT_APP_FILESTACK_SUBMISSION_CONTAINER=
+REACT_APP_FILESTACK_API_KEY='AzFINuQoqTmqw0QEoaw9az'
+REACT_APP_FILESTACK_REGION=us-east-1
+REACT_APP_FILESTACK_SUBMISSION_CONTAINER='topcoder-submissions-dmz'
+REACT_APP_FILESTACK_UPLOAD_PROGRESS_INTERVAL=100
+REACT_APP_FILESTACK_UPLOAD_RETRY=2
+REACT_APP_FILESTACK_UPLOAD_TIMEOUT=1800000

src/apps/engagements/src/lib/hooks/useTermsAgreementGate.ts

@@ -8,7 +8,11 @@ import {
     getDocuSignUrl,
     getTermDetails,
 } from '../services'
-import { extractTermId } from '../utils'
+import {
+    extractTermId,
+    resolveDocuSignTemplateId,
+    resolveStandardTermsConfig,
+} from '../utils'
 
 type TermsConfig = {
     id: string
@@ -56,11 +60,15 @@ type TermsViewData = {
     isElectronicallyAgreeable: boolean
 }
 
-const TERMS_ID = extractTermId(EnvironmentConfig.TERMS_URL)
+const STANDARD_TERMS = resolveStandardTermsConfig(
+    EnvironmentConfig.DEFAULT_STANDARD_TERMS_UUID,
+    EnvironmentConfig.TERMS_URL,
+)
+const TERMS_ID = STANDARD_TERMS.id
 const NDA_TERMS_ID = extractTermId(EnvironmentConfig.NDA_TERMS_URL)
 
 const TERMS_CONFIG: TermsConfig[] = [
-    { id: TERMS_ID ?? '', label: 'Standard Topcoder Terms', url: EnvironmentConfig.TERMS_URL },
+    { id: TERMS_ID ?? '', label: 'Standard Topcoder Terms', url: STANDARD_TERMS.url },
     { id: NDA_TERMS_ID ?? '', label: 'Topcoder NDA', url: EnvironmentConfig.NDA_TERMS_URL },
 ].filter(term => term.id)
 
@@ -281,11 +289,12 @@ export const useTermsAgreementGate = (
         () => getTermsViewData(termsDetails),
         [termsDetails],
     )
-    const docuSignTemplateId = termsDetails?.docusignTemplateId
+    const docuSignTemplateId = resolveDocuSignTemplateId(
+        termsDetails,
+        EnvironmentConfig.NDA_DOCUSIGN_TEMPLATE_ID,
+    )
     const isDocuSignTerm = Boolean(
-        termsDetails?.agreeabilityType
-            && termsDetails.agreeabilityType !== 'Electronically-agreeable'
-            && docuSignTemplateId,
+        termsDetails && docuSignTemplateId,
     )
     const termsUrl = activeTerm?.url || termsDetails?.url
 

src/apps/engagements/src/lib/utils/terms.utils.spec.ts

@@ -0,0 +1,55 @@
+import {
+    extractTermId,
+    replaceTermIdInUrl,
+    resolveDocuSignTemplateId,
+    resolveStandardTermsConfig,
+} from './terms.utils'
+
+describe('engagement terms utils', () => {
+    const OLD_TERMS_ID = '317cd8f9-d66c-4f2a-8774-63c612d99cd4'
+    const NEW_TERMS_ID = '0a507fb7-3fe0-402b-b121-1a24af4a9cf1'
+    const NEW_NDA_TEMPLATE_ID = '400b989d-1c75-4889-b6f6-421e1f924709'
+    const TERMS_URL = `https://www.topcoder-dev.com/challenges/terms/detail/${OLD_TERMS_ID}`
+
+    it('extracts the terms id from a terms detail URL', () => {
+        expect(extractTermId(TERMS_URL))
+            .toBe(OLD_TERMS_ID)
+    })
+
+    it('rewrites a terms detail URL with the configured term id', () => {
+        expect(replaceTermIdInUrl(TERMS_URL, NEW_TERMS_ID))
+            .toBe(`https://www.topcoder-dev.com/challenges/terms/detail/${NEW_TERMS_ID}`)
+    })
+
+    it('prefers the configured Standard Terms id over the fallback terms URL id', () => {
+        expect(resolveStandardTermsConfig(NEW_TERMS_ID, TERMS_URL))
+            .toEqual({
+                id: NEW_TERMS_ID,
+                url: `https://www.topcoder-dev.com/challenges/terms/detail/${NEW_TERMS_ID}`,
+            })
+    })
+
+    it('falls back to the terms URL id when no configured Standard Terms id is provided', () => {
+        expect(resolveStandardTermsConfig(undefined, TERMS_URL))
+            .toEqual({
+                id: OLD_TERMS_ID,
+                url: TERMS_URL,
+            })
+    })
+
+    it('prefers the configured DocuSign template for NDA terms', () => {
+        expect(resolveDocuSignTemplateId({
+            docusignTemplateId: 'old-template-id',
+            title: 'Topcoder Member Non-Disclosure Agreement v3.0',
+        }, NEW_NDA_TEMPLATE_ID))
+            .toBe(NEW_NDA_TEMPLATE_ID)
+    })
+
+    it('keeps the Terms API DocuSign template for non-NDA terms', () => {
+        expect(resolveDocuSignTemplateId({
+            docusignTemplateId: 'assignment-template-id',
+            title: 'Assignment Terms',
+        }, NEW_NDA_TEMPLATE_ID))
+            .toBe('assignment-template-id')
+    })
+})

src/apps/engagements/src/lib/utils/terms.utils.ts

@@ -1,3 +1,21 @@
+export type ResolvedTermsConfig = {
+    id?: string
+    url?: string
+}
+
+type TermsTemplateDetails = {
+    docusignTemplateId?: string | number
+    title?: string
+}
+
+const NDA_TITLE_PATTERN = /\bnda\b|non[-\s]?disclosure/i
+
+/**
+ * Extracts the trailing terms identifier from a terms detail URL or path.
+ *
+ * @param termsUrl - Full terms URL, relative path, or plain slash-delimited terms path.
+ * @returns The trailing terms identifier, or undefined when the input is empty.
+ */
 export const extractTermId = (termsUrl?: string): string | undefined => {
     if (!termsUrl) {
         return undefined
@@ -19,3 +37,98 @@ export const extractTermId = (termsUrl?: string): string | undefined => {
         return parts[parts.length - 1]
     }
 }
+
+/**
+ * Rewrites an existing terms detail URL so it points at the supplied terms identifier.
+ *
+ * @param termsUrl - Current terms detail URL or path used as the URL template.
+ * @param termId - Terms identifier that should replace the trailing URL segment.
+ * @returns A terms detail URL for the supplied identifier, or the original URL when it cannot be rewritten.
+ */
+export const replaceTermIdInUrl = (
+    termsUrl?: string,
+    termId?: string,
+): string | undefined => {
+    const trimmedTermId = termId?.trim()
+    if (!termsUrl || !trimmedTermId) {
+        return termsUrl
+    }
+
+    const trimmedTermsUrl = termsUrl.trim()
+    if (!trimmedTermsUrl) {
+        return undefined
+    }
+
+    try {
+        const parsed = new URL(trimmedTermsUrl)
+        const parts = parsed.pathname.split('/')
+            .filter(Boolean)
+
+        if (parts.length === 0) {
+            return trimmedTermsUrl
+        }
+
+        parts[parts.length - 1] = trimmedTermId
+        parsed.pathname = `/${parts.join('/')}`
+        return parsed.toString()
+    } catch {
+        const parts = trimmedTermsUrl.split('/')
+            .filter(Boolean)
+
+        if (parts.length === 0) {
+            return trimmedTermsUrl
+        }
+
+        parts[parts.length - 1] = trimmedTermId
+        return parts.join('/')
+    }
+}
+
+/**
+ * Resolves the Standard Terms ID and detail URL used by engagement agreement checks.
+ *
+ * @param defaultStandardTermsId - Preferred Standard Terms UUID from environment configuration.
+ * @param termsUrl - Fallback Standard Terms detail URL.
+ * @returns The resolved Standard Terms identifier and a matching detail URL.
+ */
+export const resolveStandardTermsConfig = (
+    defaultStandardTermsId?: string,
+    termsUrl?: string,
+): ResolvedTermsConfig => {
+    const id = defaultStandardTermsId?.trim() || extractTermId(termsUrl)
+
+    return {
+        id,
+        url: replaceTermIdInUrl(termsUrl, id),
+    }
+}
+
+/**
+ * Checks whether a terms record represents an NDA-style agreement.
+ *
+ * @param term - Terms API details or search result payload.
+ * @returns true when the term title is NDA/non-disclosure related.
+ */
+export const isNdaTerm = (term?: TermsTemplateDetails): boolean => (
+    NDA_TITLE_PATTERN.test(term?.title ?? '')
+)
+
+/**
+ * Resolves the DocuSign template id for a terms record.
+ *
+ * @param term - Terms API details or search result payload.
+ * @param configuredNdaTemplateId - Preferred DocuSign template id for NDA terms.
+ * @returns The configured NDA template id for NDA terms, otherwise the Terms API template id.
+ */
+export const resolveDocuSignTemplateId = (
+    term?: TermsTemplateDetails,
+    configuredNdaTemplateId?: string,
+): string | number | undefined => {
+    const normalizedConfiguredNdaTemplateId = configuredNdaTemplateId?.trim()
+
+    if (normalizedConfiguredNdaTemplateId && isNdaTerm(term)) {
+        return normalizedConfiguredNdaTemplateId
+    }
+
+    return term?.docusignTemplateId
+}

src/apps/engagements/src/pages/application-form/ApplicationFormPage.tsx

@@ -19,7 +19,7 @@ import {
     getUserDataForApplication,
     updateUserDataForApplication,
 } from '../../lib/services'
-import { extractTermId } from '../../lib/utils'
+import { extractTermId, resolveStandardTermsConfig } from '../../lib/utils'
 import { rootRoute } from '../../engagements.routes'
 
 import type { ApplicationFormData, PrePopulatedUserData } from './application-form.types'
@@ -50,9 +50,14 @@ const getIsSubmitDisabled = (params: SubmitDisabledParams): boolean => (
     || (params.hasSubmitted && !params.isValid)
 )
 
+const STANDARD_TERMS = resolveStandardTermsConfig(
+    EnvironmentConfig.DEFAULT_STANDARD_TERMS_UUID,
+    EnvironmentConfig.TERMS_URL,
+)
+
 const TERMS_STATUS_CONFIG: TermsStatusConfig[] = [
     {
-        id: extractTermId(EnvironmentConfig.TERMS_URL) ?? '',
+        id: STANDARD_TERMS.id ?? '',
         label: 'Standard Topcoder Terms',
     },
     {

src/apps/onboarding/src/models/PersonalizationInfo.ts

@@ -1,25 +1,24 @@
 export interface OpenToWorkTrait {
     availability?: string
-    preferredRoles?: string[]
 }
 
 export default interface PersonalizationInfo {
     referAs?: string
     profileSelfTitle?: string
+    preferredRoles?: string[]
     shortBio?: string
     links?: Array<{ url: string; name: string }>
     openToWork?: {
         availability?: string,
-        preferredRoles?: string[],
     }
 }
 
 export const emptyPersonalizationInfo: () => PersonalizationInfo = () => ({
     links: [],
     openToWork: {
         availability: '',
-        preferredRoles: [],
     },
+    preferredRoles: [],
     profileSelfTitle: '',
     referAs: '',
     shortBio: '',

src/apps/onboarding/src/pages/open-to-work/index.tsx

@@ -44,7 +44,6 @@ export const PageOpenToWorkContent: FC<PageOpenToWorkContentProps> = props => {
     const [formValue, setFormValue] = useState<OpenToWorkData>({
         availability: undefined,
         availableForGigs: !!props.availableForGigs,
-        preferredRoles: [],
     })
 
     const [submitAttempted, setSubmitAttempted] = useState(false)
@@ -66,7 +65,6 @@ export const PageOpenToWorkContent: FC<PageOpenToWorkContentProps> = props => {
             ...prev,
             availability: openToWorkItem?.availability,
             availableForGigs: !!props.availableForGigs,
-            preferredRoles: openToWorkItem?.preferredRoles ?? [],
         }))
     }, [memberPersonalizationTraits, props.availableForGigs])
 
@@ -103,13 +101,14 @@ export const PageOpenToWorkContent: FC<PageOpenToWorkContentProps> = props => {
         setLoading(true)
 
         const existing = memberPersonalizationTraits?.[0]?.traits?.data?.[0] || {}
+        const openToWork = { ...(existing.openToWork || {}) }
+        delete openToWork.preferredRoles
 
         const personalizationData = [{
             ...existing,
             openToWork: {
-                ...(existing.openToWork || {}),
+                ...openToWork,
                 availability: formValue.availability,
-                preferredRoles: formValue.preferredRoles,
             },
         }]
 

src/apps/onboarding/src/redux/actions/member.ts

@@ -376,7 +376,6 @@ export const createPersonalizationsPayloadData: any = (personalizations: Persona
             openToWork: openToWork
                 ? {
                     availability: openToWork.availability,
-                    preferredRoles: openToWork.preferredRoles,
                 }
                 : undefined,
             profileSelfTitle,