Merge branch 'develop' of github.com:topcoder-platform/work-manager into v6

Author: vas3a

.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-lock.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": [

package.json

@@ -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')

server.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/projects.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/actions/users.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/Buttons/OutlineButton/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/ChallengeName-Field/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'