Merge branch 'develop' into issue-778

Author: maxceem

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,21 @@
+### Expected behavior
+Describe.
+
+### Actual behavior
+Describe.
+
+### Steps to reproduce the problem
+- TBD.
+- TBD.
+- TBD.
+
+### Screenshot/screencast
+Attach or link a resource.
+
+--
+
+#### Environment
+- OS:
+- Browser (w/version):
+- User role (client, copilot or manager):
+- Account used: 

.github/ISSUE_TEMPLATE/may-7-bug-hunt-functionality-bug.md

@@ -478,6 +478,8 @@ export function replaceResourceInRole (challengeId, roleId, newMember, oldMember
         }
       }
     }
-    await dispatch(createResource(challengeId, roleId, newMember))
+    if (newMember) {
+      await dispatch(createResource(challengeId, roleId, newMember))
+    }
   }
 }

.github/ISSUE_TEMPLATE/may-7-bug-hunt-security-bug.md

@@ -403,3 +403,19 @@
   }
 }
 
+ul.linkList {
+  display: inline;
+  margin: 0;
+  padding: 0;
+
+  > li {
+    display: inline;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  > li + li:before {
+    content:',\0000a0'; /* Non-breaking space */
+  }
+}

.github/ISSUE_TEMPLATE/may-7-bug-hunt-suggestion.md

@@ -52,6 +52,9 @@ class TextEditorField extends Component {
             readOnly={readOnly}
           />
         </div>)}
+        {challenge.submitTriggered && !challenge.description && (
+          <div className={styles.error}>Public Specification is required</div>
+        )}
         {!readOnly && shouldShowPrivateDescription && !showShowPrivateDescriptionField && (<div className={styles.button} onClick={this.addNewPrivateDescription}>
           <PrimaryButton text={'Add private specification'} type={'info'} />
         </div>)}
@@ -73,9 +76,6 @@ class TextEditorField extends Component {
             />
           </div>
         )}
-        {challenge.submitTriggered && !challenge.description && (
-          <div className={styles.error}>Public Specification is required</div>
-        )}
         <TagsField
           challengeTags={challengeTagsFiltered}
           challenge={challenge}

.github/ISSUE_TEMPLATE/may-7-bug-hunt-user-interface-bug.md

@@ -17,7 +17,8 @@ import {
   DEFAULT_NDA_UUID,
   SUBMITTER_ROLE_UUID,
   CREATE_FORUM_TYPE_IDS,
-  MESSAGE
+  MESSAGE,
+  COMMUNITY_APP_URL
 } from '../../config/constants'
 import { PrimaryButton, OutlineButton } from '../Buttons'
 import TrackField from './Track-Field'
@@ -934,35 +935,67 @@ class ChallengeEditor extends Component {
   async updateAllChallengeInfo (status, cb = () => {}) {
     const { updateChallengeDetails, assignedMemberDetails: oldAssignedMember } = this.props
     if (this.state.isSaving) return
-    this.setState({ isSaving: true })
-    const challenge = this.collectChallengeData(status)
-    let newChallenge = _.cloneDeep(this.state.challenge)
-    newChallenge.status = status
-    try {
-      const challengeId = this.getCurrentChallengeId()
-      const action = await updateChallengeDetails(challengeId, challenge)
-      const { copilot: previousCopilot, reviewer: previousReviewer } = this.state.draftChallenge.data
-      const { challenge: { copilot, reviewer }, assignedMemberDetails: assignedMember } = this.state
-      if (copilot) await this.updateResource(challengeId, 'Copilot', copilot, previousCopilot)
-      if (reviewer) await this.updateResource(challengeId, 'Reviewer', reviewer, previousReviewer)
-      const oldMemberHandle = _.get(oldAssignedMember, 'handle')
-      // assigned member has been updated
-      if (assignedMember && assignedMember.handle !== oldMemberHandle) {
-        await this.updateResource(challengeId, 'Submitter', assignedMember.handle, oldMemberHandle)
+    this.setState({ isSaving: true }, async () => {
+      const challenge = this.collectChallengeData(status)
+      let newChallenge = _.cloneDeep(this.state.challenge)
+      newChallenge.status = status
+      try {
+        const challengeId = this.getCurrentChallengeId()
+        // state can have updated assigned member (in cases where user changes assignments without refreshing the page)
+        const { challenge: { copilot, reviewer }, assignedMemberDetails: assignedMember } = this.state
+        const oldMemberHandle = _.get(oldAssignedMember, 'handle')
+        const assignedMemberHandle = _.get(assignedMember, 'handle')
+        // assigned member has been updated
+        if (assignedMemberHandle !== oldMemberHandle) {
+          await this.updateResource(challengeId, 'Submitter', assignedMemberHandle, oldMemberHandle)
+        }
+        const action = await updateChallengeDetails(challengeId, challenge)
+        const { copilot: previousCopilot, reviewer: previousReviewer } = this.state.draftChallenge.data
+        if (copilot !== previousCopilot) await this.updateResource(challengeId, 'Copilot', copilot, previousCopilot)
+        if (reviewer !== previousReviewer) await this.updateResource(challengeId, 'Reviewer', reviewer, previousReviewer)
+
+        const draftChallenge = { data: action.challengeDetails }
+        draftChallenge.data.copilot = copilot
+        draftChallenge.data.reviewer = reviewer
+        this.setState({ isLaunch: true,
+          isConfirm: newChallenge.id,
+          draftChallenge,
+          challenge: newChallenge,
+          isSaving: false }, cb)
+      } catch (e) {
+        const error = this.formatResponseError(e) || `Unable to update the challenge to status ${status}`
+        this.setState({ isSaving: false, error }, cb)
       }
+    })
+  }
 
-      const draftChallenge = { data: action.challengeDetails }
-      draftChallenge.data.copilot = copilot
-      draftChallenge.data.reviewer = reviewer
-      this.setState({ isLaunch: true,
-        isConfirm: newChallenge.id,
-        draftChallenge,
-        challenge: newChallenge,
-        isSaving: false }, cb)
-    } catch (e) {
-      const error = _.get(e, 'response.data.message', `Unable to update the challenge to status ${status}`)
-      this.setState({ isSaving: false, error }, cb)
+  /**
+   * Format the error we might get from some API endpoint.
+   *
+   * @param {Error} error error
+   *
+   * @returns {import('react').ReactNode}
+   */
+  formatResponseError (error) {
+    const errorMessage = _.get(error, 'response.data.message')
+    const errorMetadata = _.get(error, 'response.data.metadata')
+
+    if (errorMetadata.missingTerms && errorMetadata.missingTerms.length > 0) {
+      return <>
+        {errorMessage}
+        <ul className={styles.linkList}>{' '}
+          {errorMetadata.missingTerms.map((terms, index) => {
+            const termsNumber = errorMetadata.missingTerms.length > 1 ? ` ${index + 1}` : ''
+            return (
+              <li key={index}><a href={`${COMMUNITY_APP_URL}/challenges/terms/detail/${terms.termId}`} target='_blank'>link to terms{termsNumber}</a></li>
+            )
+          })}
+        </ul>
+      </>
     }
+
+    // if no special error data, just use message
+    return errorMessage
   }
 
   async onActiveChallenge () {
@@ -1055,7 +1088,6 @@ class ChallengeEditor extends Component {
       return <div>Error loading challenge</div>
     }
     const isTask = _.get(challenge, 'task.isTask', false)
-    console.log(this.props.assignedMemberDetails)
     const { assignedMemberDetails, error } = this.state
     let isActive = false
     let isDraft = false
@@ -1206,7 +1238,7 @@ class ChallengeEditor extends Component {
                 <OutlineButton text={isSaving ? 'Saving...' : 'Save'} type={'success'} onClick={this.onSaveChallenge} />
               </div> */}
               <div className={styles.button}>
-                <PrimaryButton text={'Save Draft'} type={'info'} onClick={this.createDraftHandler} />
+                <PrimaryButton text={isSaving ? 'Saving...' : 'Save Draft'} type={'info'} onClick={this.createDraftHandler} />
               </div>
               {isDraft && (
                 <div className={styles.button}>
@@ -1222,9 +1254,9 @@ class ChallengeEditor extends Component {
               )}
             </div>}
             {!isLoading && isActive && <div className={styles.buttonContainer}>
-              {/* <div className={styles.button}>
+              <div className={styles.button}>
                 <OutlineButton text={isSaving ? 'Saving...' : 'Save'} type={'success'} onClick={this.onSaveChallenge} />
-              </div> */}
+              </div>
               {isTask && (
                 <div className={styles.button}>
                   <PrimaryButton text={'Close Task'} type={'danger'} onClick={this.openCloseTaskConfirmation} />

src/actions/challenges.js

@@ -17,10 +17,10 @@ const Sidebar = ({
       <div className={styles.title}>Work Manager</div>
       <Link to='/'>
         <div className={cn(styles.homeLink, { [styles.active]: !projectId })} onClick={resetSidebarActiveParams}>
-          Active challenges
+          All Work
         </div>
       </Link>
-      <a href='https://forms.gle/CsaVawSDkdR5E92B8' target='_blank' rel='noopener noreferrer' className='chameleon-feedback'>
+      <a href='https://github.com/topcoder-platform/work-manager/issues/new' target='_blank' rel='noopener noreferrer' className='chameleon-feedback'>
         <div className={cn(styles.homeLink, { [styles.active]: !projectId })}>
           Give Application Feedback
         </div>