Merge branch 'develop' into issue-917

Author: maxceem

.gitignore

@@ -24,4 +24,6 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-*.env
+*.env
+
+*.vscode

config/constants/development.js

@@ -25,7 +25,7 @@ module.exports = {
   DIRECT_PROJECT_URL: `https://www.${DOMAIN}/direct`,
   ONLINE_REVIEW_URL: `https://software.${DOMAIN}`,
   DEFAULT_TERM_UUID: '64d6e249-d7a5-4591-8ff5-e872f8a051f9', // Terms & Conditions of Use at TopCoder
-  DEFAULT_NDA_UUID: '77f558c1-56fb-427c-b974-61ea0a060ca7', // Appirio NDA v2.0
+  DEFAULT_NDA_UUID: 'e5811a7b-43d1-407a-a064-69e5015b4900', // NDA v3.0
   SUBMITTER_ROLE_UUID: '732339e7-8e30-49d7-9198-cccf9451e221',
   DEV_TRACK_ID: '9b6fc876-f4d9-4ccb-9dfd-419247628825',
   DES_TRACK_ID: '5fa04185-041f-49a6-bfd1-fe82533cd6c8',

package.json

@@ -90,7 +90,7 @@
     "sass-loader": "7.1.0",
     "simplemde": "^1.11.2",
     "style-loader": "0.23.0",
-    "tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.1",
+    "tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.3",
     "terser": "^3.16.1",
     "terser-webpack-plugin": "1.1.0",
     "topcoder-healthcheck-dropin": "^1.0.3",

src/components/Buttons/PrimaryButton/PrimaryButton.module.scss

@@ -14,6 +14,18 @@
   border: none;
   padding: 0 20px;
 
+  // don't underline if button is done as a link
+  &:hover {
+    text-decoration: none;
+  }
+
+  // hide outline for buttons and links
+  &:focus,
+  &:active,
+  &:visited {
+    outline: none;
+  }
+
   span {
     color: $white;
   }

src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss

@@ -244,11 +244,15 @@
 
 .actionButtonsRight {
   right: 20px;
-
-  button:not(:last-child),
+  
+  .button:not(:last-child),
   a:not(:last-child) {
     margin-right: 20px;
   }
+
+  button { 
+    white-space: nowrap;
+  }
 }
 
 .button {

src/components/ChallengeEditor/ChallengeView/index.js

@@ -20,6 +20,9 @@ import Loader from '../../Loader'
 import PhaseInput from '../../PhaseInput'
 import LegacyLinks from '../../LegacyLinks'
 import AssignedMemberField from '../AssignedMember-Field'
+import { getResourceRoleByName } from '../../../util/tc'
+import Tooltip from '../../Tooltip'
+import { MESSAGE } from '../../../config/constants'
 
 const ChallengeView = ({
   projectDetail,
@@ -31,19 +34,17 @@ const ChallengeView = ({
   isLoading,
   challengeId,
   assignedMemberDetails,
-  enableEdit }) => {
+  enableEdit,
+  onLaunchChallenge,
+  onCloseTask }) => {
   const selectedType = _.find(metadata.challengeTypes, { id: challenge.typeId })
   const challengeTrack = _.find(metadata.challengeTracks, { id: challenge.trackId })
 
   const [openAdvanceSettings, setOpenAdvanceSettings] = useState(false)
 
-  const getResourceRoleByName = (name) => {
-    const { resourceRoles } = metadata
-    return resourceRoles ? resourceRoles.find(role => role.name === name) : null
-  }
-
   const getResourceFromProps = (name) => {
-    const role = getResourceRoleByName(name)
+    const { resourceRoles } = metadata
+    const role = getResourceRoleByName(resourceRoles, name)
     return challengeResources && role && challengeResources.find(resource => resource.roleId === role.id)
   }
 
@@ -74,6 +75,34 @@ const ChallengeView = ({
       </div>
       <div className={styles.title}>View Details</div>
       <div className={cn(styles.actionButtons, styles.button, styles.actionButtonsRight)}>
+        {
+          challenge.status === 'Draft' && (
+            <div className={styles.button}>
+              {challenge.legacyId ? (
+                <PrimaryButton text={'Launch'} type={'info'} onClick={onLaunchChallenge} />
+              ) : (
+                <Tooltip content={MESSAGE.NO_LEGACY_CHALLENGE}>
+                  {/* Don't disable button for real inside tooltip, otherwise mouseEnter/Leave events work not good */}
+                  <PrimaryButton text={'Launch'} type={'disabled'} />
+                </Tooltip>
+              )}
+            </div>
+          )
+        }
+        {
+          isTask && challenge.status === 'Active' && (
+            <div className={styles.button}>
+              { assignedMemberDetails ? (
+                <PrimaryButton text={'Close Task'} type={'danger'} onClick={onCloseTask} />
+              ) : (
+                <Tooltip content={MESSAGE.NO_TASK_ASSIGNEE}>
+                  {/* Don't disable button for real inside tooltip, otherwise mouseEnter/Leave events work not good */}
+                  <PrimaryButton text={'Close Task'} type={'disabled'} />
+                </Tooltip>
+              )}
+            </div>
+          )
+        }
         { enableEdit && <PrimaryButton text={'Edit'} type={'info'} submit link={`./edit`} /> }
         <PrimaryButton text={'Back'} type={'info'} submit link={`..`} />
       </div>
@@ -222,7 +251,9 @@ ChallengeView.propTypes = {
   challengeId: PropTypes.string.isRequired,
   challengeResources: PropTypes.arrayOf(PropTypes.object),
   assignedMemberDetails: PropTypes.shape(),
-  enableEdit: PropTypes.bool
+  enableEdit: PropTypes.bool,
+  onLaunchChallenge: PropTypes.func,
+  onCloseTask: PropTypes.func
 }
 
 export default withRouter(ChallengeView)

src/components/ChallengeEditor/index.js

@@ -16,7 +16,8 @@ import {
   DEFAULT_TERM_UUID,
   DEFAULT_NDA_UUID,
   SUBMITTER_ROLE_UUID,
-  CREATE_FORUM_TYPE_IDS
+  CREATE_FORUM_TYPE_IDS,
+  MESSAGE
 } from '../../config/constants'
 import { PrimaryButton, OutlineButton } from '../Buttons'
 import TrackField from './Track-Field'
@@ -44,6 +45,8 @@ import AlertModal from '../Modal/AlertModal'
 import PhaseInput from '../PhaseInput'
 import LegacyLinks from '../LegacyLinks'
 import AssignedMemberField from './AssignedMember-Field'
+import Tooltip from '../Tooltip'
+import { getResourceRoleByName } from '../../util/tc'
 
 const theme = {
   container: styles.modalContainer
@@ -113,6 +116,7 @@ class ChallengeEditor extends Component {
     this.getTemplatePhases = this.getTemplatePhases.bind(this)
     this.getAvailableTimelineTemplates = this.getAvailableTimelineTemplates.bind(this)
     this.autoUpdateChallengeThrottled = _.throttle(this.autoUpdateChallenge.bind(this), 3000) // 3s
+    this.updateResource = this.updateResource.bind(this)
   }
 
   componentDidMount () {
@@ -193,22 +197,25 @@ class ChallengeEditor extends Component {
    * Close task when user confirm it
    */
   onCloseTask () {
-    const { challenge: oldChallenge, assignedMemberDetails } = this.state
-
-    // set assigned user as the only one winner
-    const newChallenge = {
-      ...oldChallenge,
-      winners: [{
-        userId: assignedMemberDetails.userId,
-        handle: assignedMemberDetails.handle,
-        placement: 1
-      }]
-    }
+    // before marking challenge as complete, save all the changes user might have made
+    this.updateAllChallengeInfo(this.state.challenge.status, () => {
+      const { challenge: oldChallenge, assignedMemberDetails } = this.state
+
+      // set assigned user as the only one winner
+      const newChallenge = {
+        ...oldChallenge,
+        winners: [{
+          userId: assignedMemberDetails.userId,
+          handle: assignedMemberDetails.handle,
+          placement: 1
+        }]
+      }
 
-    this.setState({
-      challenge: newChallenge
-    }, () => {
-      this.updateAllChallengeInfo('Completed')
+      this.setState({
+        challenge: newChallenge
+      }, () => {
+        this.updateAllChallengeInfo('Completed')
+      })
     })
   }
 
@@ -629,15 +636,24 @@ class ChallengeEditor extends Component {
       return false
     }
 
-    return !(Object.values(pick([
+    const requiredFields = [
       'trackId',
       'typeId',
       'name',
       'description',
       'tags',
       'prizeSets'
-    ], challenge)).filter(v => !v.length).length ||
-      _.isEmpty(this.state.currentTemplate))
+    ]
+    let isRequiredMissing = false
+
+    requiredFields.forEach((key) => {
+      const value = challenge[key]
+
+      // this check works for string and array values
+      isRequiredMissing = isRequiredMissing || !value || !value.length
+    })
+
+    return !(isRequiredMissing || _.isEmpty(this.state.currentTemplate))
   }
 
   validateChallenge () {
@@ -939,13 +955,9 @@ class ChallengeEditor extends Component {
     this.updateAllChallengeInfo(this.state.challenge.status)
   }
 
-  getResourceRoleByName (name) {
-    const { resourceRoles } = this.props.metadata
-    return resourceRoles ? resourceRoles.find(role => role.name === name) : null
-  }
-
   async updateResource (challengeId, name, value, prevValue) {
-    const resourceRole = this.getResourceRoleByName(name)
+    const { resourceRoles } = this.props.metadata
+    const resourceRole = getResourceRoleByName(resourceRoles, name)
     const roleId = resourceRole.id
     await this.props.replaceResourceInRole(challengeId, roleId, value, prevValue)
   }
@@ -966,8 +978,8 @@ class ChallengeEditor extends Component {
   }
 
   getResourceFromProps (name) {
-    const { challengeResources } = this.props
-    const role = this.getResourceRoleByName(name)
+    const { challengeResources, metadata: { resourceRoles } } = this.props
+    const role = getResourceRoleByName(resourceRoles, name)
     return challengeResources && role && challengeResources.find(resource => resource.roleId === role.id)
   }
 
@@ -1175,9 +1187,18 @@ class ChallengeEditor extends Component {
               <div className={styles.button}>
                 <PrimaryButton text={'Save Draft'} type={'info'} onClick={this.createDraftHandler} />
               </div>
-              { isDraft && <div className={styles.button}>
-                <PrimaryButton text={'Launch as Active'} type={'info'} onClick={this.toggleLaunch} />
-              </div>}
+              {isDraft && (
+                <div className={styles.button}>
+                  {challenge.legacyId ? (
+                    <PrimaryButton text={'Launch as Active'} type={'info'} onClick={this.toggleLaunch} />
+                  ) : (
+                    <Tooltip content={MESSAGE.NO_LEGACY_CHALLENGE}>
+                      {/* Don't disable button for real inside tooltip, otherwise mouseEnter/Leave events work not good */}
+                      <PrimaryButton text={'Launch as Active'} type={'disabled'} />
+                    </Tooltip>
+                  )}
+                </div>
+              )}
             </div>}
             {!isLoading && isActive && <div className={styles.buttonContainer}>
               {/* <div className={styles.button}>

src/components/ChallengesComponent/ChallengeCard/ChallengeCard.module.scss

@@ -49,6 +49,13 @@
           text-decoration-line: underline;
         }
 
+        span.link,
+        span.link:hover,
+        span.link:visited {
+          color: $inactive;
+          cursor: default;
+        }
+
         &.onlyOne {
           justify-content: center;
         }
@@ -160,6 +167,13 @@
       text-decoration-line: underline;
     }
 
+    span.link,
+    span.link:hover,
+    span.link:visited {
+      color: $inactive;
+      cursor: default;
+    }
+
     &.onlyOne {
       justify-content: center;
     }
@@ -171,14 +185,19 @@
       height: 100%;
       justify-content: center;
 
-      span {
+      span.linkDivider {
         margin: 0 5px;
       }
 
       .linkGroupLeftBottom {
-        a {
+        a,
+        span {
           font-size: 12px;
         }
+
+        span.linkDivider {
+          font-size: 16px;
+        }
       }
     }
   }
@@ -227,6 +246,15 @@
     align-items: center;
     color: $status-green;
   }
+
+  &.activateButtonDisabled {
+    border-color: $inactive;
+    cursor: default;
+
+    > span {
+      color: $inactive;
+    }
+  }
 }
 
 .icon {