pr review fixes

Author: SleepyZenitsu

src/components/ChallengeEditor/ChallengeView/index.js

@@ -37,9 +37,7 @@ const ChallengeView = ({
   assignedMemberDetails,
   enableEdit,
   onLaunchChallenge,
-  onCloseTask,
-  location }) => {
-  const params = new URLSearchParams(location.search)
+  onCloseTask }) => {
   const selectedType = _.find(metadata.challengeTypes, { id: challenge.typeId })
   const challengeTrack = _.find(metadata.challengeTracks, { id: challenge.trackId })
 
@@ -183,16 +181,6 @@ const ChallengeView = ({
             {openAdvanceSettings && (
               <>
                 <NDAField beta challenge={challenge} readOnly />
-                {params.get('beta') === 'true' && (
-                  <div className={styles.row}>
-                    <div className={styles.col}>
-                      <span>
-                        <span className={styles.fieldTitle}>Terms:</span>
-                        {challenge.terms.map(term => term.id).join(', ')}
-                      </span>
-                    </div>
-                  </div>
-                )}
                 <div className={cn(styles.row, styles.topRow)}>
                   <div className={styles.col}>
                     <span><span className={styles.fieldTitle}>Groups:</span> {groups}</span>
@@ -283,8 +271,7 @@ ChallengeView.propTypes = {
   assignedMemberDetails: PropTypes.shape(),
   enableEdit: PropTypes.bool,
   onLaunchChallenge: PropTypes.func,
-  onCloseTask: PropTypes.func,
-  location: PropTypes.object
+  onCloseTask: PropTypes.func
 }
 
 export default withRouter(ChallengeView)

src/components/ChallengeEditor/NDAField/NDAField.module.scss

@@ -173,7 +173,7 @@
     }
 
     height: 18px;
-    width: 210px;
+    width: 80px;
     margin: 0;
     padding: 0;
     vertical-align: bottom;

src/components/ChallengeEditor/NDAField/index.js

@@ -8,6 +8,21 @@ import { DEFAULT_NDA_UUID } from '../../../config/constants'
 const NDAField = ({ challenge, toggleNdaRequire, readOnly }) => {
   const isRequiredNda = challenge.terms && _.some(challenge.terms, { id: DEFAULT_NDA_UUID })
 
+  if (readOnly) {
+    return (
+      <div className={styles.row}>
+        <div className={cn(styles.field, styles.col1, styles.fieldTitle)}>NDA Required :</div>
+        <div className={cn(styles.field, styles.col2)}>
+          {
+            isRequiredNda
+              ? <div>Yes</div>
+              : <div>No</div>
+          }
+        </div>
+      </div>
+    )
+  }
+
   return (
     <div className={styles.row}>
       <div className={cn(styles.field, styles.col1, styles.fieldTitle)}>NDA Required :</div>
@@ -18,7 +33,7 @@ const NDAField = ({ challenge, toggleNdaRequire, readOnly }) => {
             type='radio'
             id='nda-yes'
             checked={isRequiredNda}
-            onChange={!readOnly && toggleNdaRequire}
+            onChange={toggleNdaRequire}
           />
           <label className={styles['tc-RadioButton-label']} htmlFor='nda-yes'>
             <div>yes</div>
@@ -31,7 +46,7 @@ const NDAField = ({ challenge, toggleNdaRequire, readOnly }) => {
             type='radio'
             id='nda-no'
             checked={!isRequiredNda}
-            onChange={!readOnly && toggleNdaRequire}
+            onChange={toggleNdaRequire}
           />
           <label className={styles['tc-RadioButton-label']} htmlFor='nda-no'>
             <div>No</div>

src/components/ChallengeEditor/Terms-Field/index.js

@@ -4,16 +4,17 @@ import Select from '../../Select'
 import cn from 'classnames'
 import styles from './Terms-Field.module.scss'
 
-const TermsField = ({ terms, projectTerms, challenge, onUpdateMultiSelect }) => {
-  const mapOps = item => ({ label: item, value: item })
+const TermsField = ({ terms, challenge, onUpdateMultiSelect }) => {
+  const mapOps = item => ({ label: item.title, value: item.id })
 
   const [currTerms, setCurrTerms] = React.useState([])
 
   React.useEffect(() => {
-    const challengeTermsIds = challenge.terms.map(({ id }) => id)
-    const allTerms = [...new Set([...projectTerms, ...challengeTermsIds])]
+    const challengeTerms = new Set(challenge.terms)
+    const defaultValue = terms
+      .filter(term => challengeTerms.has(term.id))
       .map(mapOps)
-    setCurrTerms(allTerms)
+    setCurrTerms(defaultValue)
   }, [])
 
   return (
@@ -31,7 +32,7 @@ const TermsField = ({ terms, projectTerms, challenge, onUpdateMultiSelect }) =>
           value={currTerms}
           onChange={(value) => {
             onUpdateMultiSelect(value, 'terms')
-            setCurrTerms(value)
+            setCurrTerms(setCurrTerms(terms))
           }}
         />
       </div>
@@ -46,8 +47,7 @@ TermsField.defaultProps = {
 TermsField.propTypes = {
   challenge: PropTypes.shape().isRequired,
   terms: PropTypes.arrayOf(PropTypes.shape()).isRequired,
-  onUpdateMultiSelect: PropTypes.func.isRequired,
-  projectTerms: PropTypes.array
+  onUpdateMultiSelect: PropTypes.func.isRequired
 }
 
 export default TermsField

src/components/ChallengeEditor/index.js

@@ -810,7 +810,7 @@ class ChallengeEditor extends Component {
 
   async createNewChallenge () {
     if (!this.props.isNew) return
-    const { metadata, createChallenge } = this.props
+    const { metadata, createChallenge, projectDetail } = this.props
     const { name, trackId, typeId } = this.state.challenge
     const { timelineTemplates } = metadata
     const isDesignChallenge = trackId === DES_TRACK_ID
@@ -839,6 +839,14 @@ class ChallengeEditor extends Component {
       terms: [{ id: DEFAULT_TERM_UUID, roleId: SUBMITTER_ROLE_UUID }]
       // prizeSets: this.getDefaultPrizeSets()
     }
+    if (projectDetail.terms) {
+      const currTerms = new Set(newChallenge.terms.map(term => term.id))
+      newChallenge.terms.push(
+        ...projectDetail.terms
+          .filter(term => !currTerms.has(term))
+          .map(term => ({ id: term, roleId: SUBMITTER_ROLE_UUID }))
+      )
+    }
     const discussions = this.getDiscussionsConfig(newChallenge)
     if (discussions) {
       newChallenge.discussions = discussions
@@ -1117,8 +1125,6 @@ class ChallengeEditor extends Component {
   }
 
   render () {
-    const params = new URLSearchParams(this.props.location.search)
-
     const {
       isLaunch,
       isConfirm,
@@ -1395,14 +1401,8 @@ class ChallengeEditor extends Component {
             { isOpenAdvanceSettings && (
               <React.Fragment>
                 <NDAField challenge={challenge} toggleNdaRequire={this.toggleNdaRequire} />
-                {params.get('beta') && (
-                  <TermsField
-                    terms={metadata.challengeTerms}
-                    projectTerms={projectDetail.terms}
-                    challenge={challenge}
-                    onUpdateMultiSelect={this.onUpdateMultiSelect}
-                  />
-                )}
+                {/* remove terms field and use default term */}
+                {false && (<TermsField terms={metadata.challengeTerms} challenge={challenge} onUpdateMultiSelect={this.onUpdateMultiSelect} />)}
                 <GroupsField onUpdateMultiSelect={this.onUpdateMultiSelect} challenge={challenge} />
               </React.Fragment>
             )}
@@ -1535,8 +1535,7 @@ ChallengeEditor.propTypes = {
   replaceResourceInRole: PropTypes.func,
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
   deleteChallenge: PropTypes.func.isRequired,
-  loggedInUser: PropTypes.shape().isRequired,
-  location: PropTypes.object
+  loggedInUser: PropTypes.shape().isRequired
 }
 
 export default withRouter(ChallengeEditor)