Merge pull request #1706 from topcoder-platform/develop

Don't force skills selection on Topgear challenge edits

Author: jmgasper

src/components/ChallengeEditor/SkillsField/index.js

@@ -4,7 +4,7 @@ import Select from '../../Select'
 import { searchSkills } from '../../../services/skills'
 import cn from 'classnames'
 import styles from './styles.module.scss'
-import { AUTOCOMPLETE_DEBOUNCE_TIME_MS } from '../../../config/constants'
+import { AUTOCOMPLETE_DEBOUNCE_TIME_MS, SKILLS_OPTIONAL_BILLING_ACCOUNT_IDS } from '../../../config/constants'
 import _ from 'lodash'
 
 const fetchSkills = _.debounce((inputValue, callback) => {
@@ -27,12 +27,15 @@ const SkillsField = ({ readOnly, challenge, onUpdateSkills }) => {
     value: skill.id
   })), [challenge.skills])
   const existingSkills = useMemo(() => selectedSkills.map(item => item.label).join(','), [selectedSkills])
+  const billingAccountId = _.get(challenge, 'billing.billingAccountId')
+  const normalizedBillingAccountId = _.isNil(billingAccountId) ? null : String(billingAccountId)
+  const skillsRequired = normalizedBillingAccountId ? !SKILLS_OPTIONAL_BILLING_ACCOUNT_IDS.includes(normalizedBillingAccountId) : true
 
   return (
     <>
       <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)}>
-          <label htmlFor='keywords'>Skills {!readOnly && (<span>*</span>)} :</label>
+          <label htmlFor='keywords'>Skills {!readOnly && skillsRequired && (<span>*</span>)} :</label>
         </div>
         <div className={cn(styles.field, styles.col2)}>
           <input type='hidden' />
@@ -58,7 +61,7 @@ const SkillsField = ({ readOnly, challenge, onUpdateSkills }) => {
         </div>
       </div>
 
-      { !readOnly && challenge.submitTriggered && (!selectedSkills || !selectedSkills.length) && <div className={styles.row}>
+      { !readOnly && skillsRequired && challenge.submitTriggered && (!selectedSkills || !selectedSkills.length) && <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)} />
         <div className={cn(styles.field, styles.col2, styles.error)}>
           Select at least one skill

src/components/ChallengeEditor/index.js

@@ -26,7 +26,8 @@ import {
   PHASE_PRODUCT_CHALLENGE_ID_FIELD,
   QA_TRACK_ID, DESIGN_CHALLENGE_TYPES, ROUND_TYPES,
   MULTI_ROUND_CHALLENGE_TEMPLATE_ID, DS_TRACK_ID,
-  CHALLENGE_STATUS
+  CHALLENGE_STATUS,
+  SKILLS_OPTIONAL_BILLING_ACCOUNT_IDS
 } from '../../config/constants'
 import {
   getDomainTypes,
@@ -867,14 +868,20 @@ class ChallengeEditor extends Component {
       return false
     }
 
+    const billingAccountId = _.get(challenge, 'billing.billingAccountId')
+    const normalizedBillingAccountId = _.isNil(billingAccountId) ? null : String(billingAccountId)
+    const isSkillsRequired = normalizedBillingAccountId ? !SKILLS_OPTIONAL_BILLING_ACCOUNT_IDS.includes(normalizedBillingAccountId) : true
+
     const requiredFields = [
       'trackId',
       'typeId',
       'name',
       'description',
-      'skills',
       'prizeSets'
     ]
+    if (isSkillsRequired) {
+      requiredFields.push('skills')
+    }
     let isRequiredMissing = false
 
     requiredFields.forEach((key) => {

src/config/constants.js

@@ -40,6 +40,7 @@ export const {
 
 export const CREATE_FORUM_TYPE_IDS = typeof process.env.CREATE_FORUM_TYPE_IDS === 'string' ? process.env.CREATE_FORUM_TYPE_IDS.split(',') : process.env.CREATE_FORUM_TYPE_IDS
 export const PROJECTS_API_URL = process.env.PROJECTS_API_URL || process.env.PROJECT_API_URL
+export const SKILLS_OPTIONAL_BILLING_ACCOUNT_IDS = ['80000062']
 
 /**
  * Filepicker config