V6 dev sync

.gitignore

@@ -28,6 +28,8 @@ yarn-error.log*
 *.pem
 *.vscode
 *.pem
+*.vscode
+
 # e2e test case
 test-automation/temp
 test-automation/test-results

config/constants/development.js

@@ -14,11 +14,11 @@ module.exports = {
   MEMBER_API_URL: `${DEV_API_HOSTNAME}/v6/members`,
   CHALLENGE_API_URL: `${DEV_API_HOSTNAME}/v6/challenges`,
   CHALLENGE_API_VERSION: '1.1.0',
-  CHALLENGE_TIMELINE_TEMPLATES_URL: `${DEV_API_HOSTNAME}/v6/timeline-templates`,
-  CHALLENGE_TYPES_URL: `${DEV_API_HOSTNAME}/v6/challenge-types`,
-  CHALLENGE_TRACKS_URL: `${DEV_API_HOSTNAME}/v6/challenge-tracks`,
-  CHALLENGE_PHASES_URL: `${DEV_API_HOSTNAME}/v6/challenge-phases`,
-  CHALLENGE_TIMELINES_URL: `${DEV_API_HOSTNAME}/v6/challenge-timelines`,
+  CHALLENGE_TIMELINE_TEMPLATES_URL: `${DEV_API_HOSTNAME}/v5/timeline-templates`,
+  CHALLENGE_TYPES_URL: `${DEV_API_HOSTNAME}/v5/challenge-types`,
+  CHALLENGE_TRACKS_URL: `${DEV_API_HOSTNAME}/v5/challenge-tracks`,
+  CHALLENGE_PHASES_URL: `${DEV_API_HOSTNAME}/v5/challenge-phases`,
+  CHALLENGE_TIMELINES_URL: `${DEV_API_HOSTNAME}/v5/challenge-timelines`,
   PROJECT_API_URL: `${DEV_API_HOSTNAME}/v5/projects`,
   GROUPS_API_URL: `${DEV_API_HOSTNAME}/v6/groups`,
   TERMS_API_URL: `${DEV_API_HOSTNAME}/v5/terms`,

package.json

@@ -129,8 +129,7 @@
     "build": "node scripts/build.js",
     "lint": "eslint ./src",
     "lint:fix": "eslint --fix ./src",
-    "test": "node scripts/test.js",
-    "restart": "node scripts/build.js && node server.js"
+    "test": "node scripts/test.js"
   },
   "eslintConfig": {
     "extends": [

server.js

@@ -17,10 +17,10 @@ function check () {
 }
 app.use(healthCheck.middleware([check]))
 app.use((req, res, next) => {
-  //res.header('Referrer-Policy', 'strict-origin-when-cross-origin')
+  res.header('Referrer-Policy', 'strict-origin-when-cross-origin')
   res.header('Permissions-Policy', 'geolocation=(), microphone=(), camera=()')
   res.header('X-Content-Type-Options', 'nosniff')
- // res.header('Strict-Transport-Security', 'max-age=31536000; includeSubDomains; preload')
+  res.header('Strict-Transport-Security', 'max-age=31536000; includeSubDomains; preload')
   res.header('Cache-control', 'public, max-age=0')
   res.header('Pragma', 'no-cache')
   res.setHeader('X-Frame-Options', 'DENY')

src/actions/projects.js

@@ -52,7 +52,7 @@ function _loadProjects (projectNameOrIdFilter = '', paramFilters = {}) {
       if (!isNaN(projectNameOrIdFilter)) { // if it is number
         filters['id'] = parseInt(projectNameOrIdFilter, 10)
       } else { // text search
-        filters['keyword'] = decodeURIComponent(projectNameOrIdFilter)
+        filters['keyword'] = `"${decodeURIComponent(projectNameOrIdFilter)}"`
       }
     }
 

src/actions/users.js

@@ -82,7 +82,7 @@ export function searchUserProjects (isAdmin = true, keyword) {
       sort: 'updatedAt desc',
       perPage: 20,
       page: 1,
-      keyword
+      keyword: `"${keyword}"`
     }
     if (!isAdmin) {
       filters['memberOnly'] = true

src/components/Buttons/OutlineButton/index.js

@@ -22,7 +22,7 @@ const OutlineButton = ({ type, text, link, onClick, url, className, submit, disa
 
   if (!_.isEmpty(link)) {
     return (
-      <Link className={cn(styles.container, styles[type], className)} to={`${link}`}>
+      <Link className={cn(styles.container, styles[type], className)} to={link}>
         <span>{text}</span>
       </Link>
     )
@@ -38,7 +38,7 @@ const OutlineButton = ({ type, text, link, onClick, url, className, submit, disa
 OutlineButton.propTypes = {
   type: PropTypes.string.isRequired,
   text: PropTypes.string.isRequired,
-  link: PropTypes.string,
+  link: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   url: PropTypes.string,
   className: PropTypes.string,
   onClick: PropTypes.func,

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

@@ -4,22 +4,47 @@ import styles from './ChallengeName-Field.module.scss'
 import cn from 'classnames'
 
 const ChallengeNameField = ({ challenge, onUpdateInput }) => {
+  const handleChange = (e) => {
+    // Remove any characters that are NOT letters, numbers, or spaces
+    const sanitizedValue = e.target.value.replace(/[^a-zA-Z0-9 ]/g, '')
+    onUpdateInput({
+      target: {
+        name: e.target.name,
+        value: sanitizedValue
+      }
+    })
+  }
+
   return (
     <>
       <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)}>
-          <label htmlFor='challengeName'>Work Name <span>*</span> :</label>
+          <label htmlFor='challengeName'>
+            Work Name <span>*</span> :
+          </label>
         </div>
         <div className={cn(styles.field, styles.col2)}>
-          <input className={styles.challengeName} id='name' name='name' type='text' placeholder='Work Name' value={challenge.name} maxLength='200' required onChange={onUpdateInput} />
+          <input
+            className={styles.challengeName}
+            id='name'
+            name='name'
+            type='text'
+            placeholder='Work Name'
+            value={challenge.name}
+            maxLength='200'
+            required
+            onChange={handleChange}
+          />
         </div>
       </div>
-      { challenge.submitTriggered && !challenge.name && <div className={styles.row}>
-        <div className={cn(styles.field, styles.col1)} />
-        <div className={cn(styles.field, styles.col2, styles.error)}>
-          Work Name is required field
+      {challenge.submitTriggered && !challenge.name && (
+        <div className={styles.row}>
+          <div className={cn(styles.field, styles.col1)} />
+          <div className={cn(styles.field, styles.col2, styles.error)}>
+            Work Name is required field
+          </div>
         </div>
-      </div> }
+      )}
     </>
   )
 }

src/components/ChallengeEditor/ChallengeViewTabs/index.js

@@ -210,7 +210,7 @@ const ChallengeViewTabs = ({
             (<div className={styles['cancel-button']}><CancelDropDown challenge={challenge} onSelectMenu={cancelChallenge} /></div>)}
           {canLaunch && (
             <div className={styles.button}>
-              {challenge ? (
+              {challenge.legacyId || isTask ? (
                 <PrimaryButton
                   text='Launch'
                   type='info'

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

@@ -7,14 +7,13 @@ import { PrimaryButton } from '../../Buttons'
 import CopilotCard from '../../CopilotCard'
 
 import styles from './Copilot-Field.module.scss'
-import { PRIZE_SETS_TYPE } from '../../../config/constants'
 
 const CopilotField = ({ copilots, challenge, onUpdateOthers, readOnly, assignYourselfCopilot, loggedInUser }) => {
   let errMessage = 'Please set a copilot'
   const handleProperty = copilots.handle ? 'handle' : 'memberHandle'
   const selectedCopilot = _.find(copilots, { [handleProperty]: challenge.copilot })
   const selectedCopilotHandle = selectedCopilot ? selectedCopilot[handleProperty] : undefined
-  const copilotFee = _.find(challenge.prizeSets, p => p.type === PRIZE_SETS_TYPE.COPILOT_PAYMENT, [])
+  const copilotFee = _.find(challenge.prizeSets, p => p.type === 'copilot', [])
   const selfService = challenge.selfService
   const copilotIsSelf = loggedInUser && selectedCopilotHandle === loggedInUser.handle
   const assignButtonText = `${selectedCopilot && copilotIsSelf ? 'Una' : 'A'}ssign Yourself`

src/components/ChallengeEditor/index.js

@@ -960,7 +960,7 @@ class ChallengeEditor extends Component {
       return { ...p, prizes }
     })
     challenge.status = status
-    if (status === CHALLENGE_STATUS.ACTIVE && isTask) {
+    if (status === 'Active' && isTask) {
       challenge.startDate = moment().format()
     }
 
@@ -1028,7 +1028,7 @@ class ChallengeEditor extends Component {
     }
 
     const newChallenge = {
-      status: CHALLENGE_STATUS.NEW,
+      status: 'New',
       projectId: this.props.projectId,
       name,
       typeId,
@@ -1100,7 +1100,7 @@ class ChallengeEditor extends Component {
       return ([
         {
           name: `${challenge.name} Discussion`,
-          type: 'CHALLENGE',
+          type: 'challenge',
           provider: 'vanilla'
         }
       ])
@@ -1295,11 +1295,11 @@ class ChallengeEditor extends Component {
   }
 
   async onActiveChallenge () {
-    this.updateAllChallengeInfo(CHALLENGE_STATUS.ACTIVE)
+    this.updateAllChallengeInfo('Active')
   }
 
   async saveDraft () {
-    this.updateAllChallengeInfo(CHALLENGE_STATUS.DRAFT)
+    this.updateAllChallengeInfo('Draft')
   }
 
   async onlySave () {
@@ -1492,7 +1492,7 @@ class ChallengeEditor extends Component {
       Closing Task Confirmation Modal and Error Modal
     */
     if (isCloseTask && !isConfirm) {
-      const taskPrize = _.get(_.find(challenge.prizeSets, { type: PRIZE_SETS_TYPE.CHALLENGE_PRIZES }), 'prizes[0].value')
+      const taskPrize = _.get(_.find(challenge.prizeSets, { type: 'placement' }), 'prizes[0].value')
       const assignedMemberId = _.get(assignedMemberDetails, 'userId')
       const assignedMember = _.get(assignedMemberDetails, 'handle', `User Id: ${assignedMemberId}`)
 
@@ -1540,7 +1540,7 @@ class ChallengeEditor extends Component {
         <AlertModal
           title='Success'
           message={
-            challenge.status === CHALLENGE_STATUS.DRAFT
+            challenge.status === 'Draft'
               ? 'Your challenge is saved as draft'
               : 'We have scheduled your challenge and processed the payment'
           }
@@ -1595,7 +1595,7 @@ class ChallengeEditor extends Component {
                   !preventCopilotFromActivatingTask
                 ) && (
                   <div className={styles.button}>
-                    {!this.state.hasValidationErrors ? (
+                    {(challenge.legacyId || isTask) && !this.state.hasValidationErrors ? (
                       <PrimaryButton text={'Launch as Active'} type={'info'} onClick={this.toggleLaunch} />
                     ) : (
                       <Tooltip content={MESSAGE.NO_LEGACY_CHALLENGE}>

src/components/ChallengesComponent/ChallengeCard/index.js

@@ -197,7 +197,7 @@ class ChallengeCard extends React.Component {
       this.setState({ isSaving: true })
       const isTask = _.get(challenge, 'task.isTask', false)
       const payload = {
-        status: CHALLENGE_STATUS.ACTIVE
+        status: 'Active'
       }
       if (isTask) {
         payload.startDate = moment().format()

src/components/ChallengesComponent/index.js

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types'
 import { Helmet } from 'react-helmet'
 import { Link } from 'react-router-dom'
 import ProjectStatus from './ProjectStatus'
-import { PROJECT_ROLES, PROJECT_STATUS, COPILOTS_URL } from '../../config/constants'
+import { PROJECT_ROLES, PROJECT_STATUS, COPILOTS_URL, CHALLENGE_STATUS } from '../../config/constants'
 import { PrimaryButton, OutlineButton } from '../Buttons'
 import ChallengeList from './ChallengeList'
 import styles from './ChallengesComponent.module.scss'
@@ -53,6 +53,12 @@ const ChallengesComponent = ({
   const isReadOnly = checkReadOnlyRoles(auth.token) || loginUserRoleInProject === PROJECT_ROLES.READ
   const isAdminOrCopilot = checkAdminOrCopilot(auth.token, activeProject)
 
+  const projectStatus = activeProject && activeProject.status
+    ? activeProject.status.toUpperCase()
+    : ''
+  const isCompletedOrCancelled =
+  projectStatus === CHALLENGE_STATUS.CANCELLED || projectStatus === CHALLENGE_STATUS.COMPLETED
+
   useEffect(() => {
     const loggedInUser = auth.user
     const projectMembers = activeProject.members
@@ -85,6 +91,16 @@ const ChallengesComponent = ({
         </div>
         {activeProject && activeProject.id && !isReadOnly ? (
           <div className={styles.projectActionButtonWrapper}>
+            <OutlineButton
+              text={'Users'}
+              type='info'
+              submit
+              link={{
+                pathname: '/users',
+                state: { projectId: activeProjectId, projectName: activeProject.name }
+              }}
+              className={styles.btnOutline}
+            />
             {isAdminOrCopilot && (
               <OutlineButton
                 text={'Assets Library'}
@@ -94,11 +110,11 @@ const ChallengesComponent = ({
                 className={styles.btnOutline}
               />
             )}
-            {(checkAdmin(auth.token) || checkManager(auth.token)) && (
+            {(checkAdmin(auth.token) || checkManager(auth.token)) && !isCompletedOrCancelled && (
               <OutlineButton
                 text='Request Copilot'
                 type={'info'}
-                url={`${COPILOTS_URL}/requests/new`}
+                url={`${COPILOTS_URL}/requests/new?projectId=${activeProject.id}`}
                 target={'_blank'}
               />
             )}

src/components/Select/styles.js

@@ -55,6 +55,9 @@ export default {
     paddingRight: '6px',
     paddingLeft: '10px',
     border: 'none',
+    width: '100%',
+    display: 'grid',
+    gridTemplateColumns: '1fr',
     input: {
       width: '100% !important',
       height: 'auto !important',

src/components/Users/Users.module.scss

@@ -40,15 +40,18 @@
   }
 }
 
+.textContent {
+  font-size: 18px;
+  margin-top: 25px;
+}
+
 
 .row {
   display: flex;
   margin-bottom: 16px;
   align-items: center;
 
   input {
-    max-width: 280px;
-
     @include upto-sm {
       display: block;
       padding-bottom: 10px;
@@ -400,22 +403,18 @@
   justify-content: center;
 }
 
-.addButtonContainer {
+.addButtonContainer, .buttonWrapper {
   display: flex;
   justify-content: flex-start;
   height: 30px;
   margin-top: 20px;
   margin-bottom: 20px;
   gap: 8px;
   > * {
-    width: 125px;
+    width: max-content;
   }
 }
 
-.addUserContentContainer {
-
-}
-
 .tcRadioButton {
   .tc-radioButton-label {
     @include roboto-light();