Merge pull request #1316 from topcoder-platform/develop

Self-Service dashboard updates

Author: ThomasKranitsas

src/actions/challenges.js

@@ -88,7 +88,7 @@ export function loadChallengesByPage (page, projectId, status, filterChallengeNa
     }
     if (selfService) {
       filters.selfService = true
-      if (userHandle && filters.status.toUpperCase() !== CHALLENGE_STATUS.DRAFT) {
+      if (userHandle && filters.status.toUpperCase() !== CHALLENGE_STATUS.DRAFT && filters.status.toUpperCase() !== CHALLENGE_STATUS.NEW) {
         filters.selfServiceCopilot = userHandle
       }
     }

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

@@ -42,7 +42,13 @@ class DescriptionField extends Component {
         }
       })
     } else {
-      this.ref.current.innerHTML = challenge[type] ? marked(challenge[type]) : ''
+      if (challenge.legacy.selfService) {
+        const regex = new RegExp('{{[a-zA-Z0-9.]+}}', 'g')
+        const newDescription = challenge[type] ? challenge[type].replace(regex, '<span style="color:red">MISSING DATA FROM INTAKE FORM</span>') : ''
+        this.ref.current.innerHTML = marked(newDescription)
+      } else {
+        this.ref.current.innerHTML = challenge[type] ? marked(challenge[type]) : ''
+      }
     }
   }
 

src/components/ChallengeEditor/index.js

@@ -1605,7 +1605,7 @@ class ChallengeEditor extends Component {
             )}
           </div>
           <div className={styles.group}>
-            <div className={styles.title}>Public specification <span>*</span></div>
+            <div className={styles.title}>Public specification<span>*</span></div>
             <div className={styles.templateLink}>
               <i>Access specification templates <a href='https://github.com/topcoder-platform-templates/specification-templates' target='_blank'>here</a></i>
             </div>

src/components/ChallengesComponent/ChallengeList/index.js

@@ -20,6 +20,7 @@ import Message from '../Message'
 import {
   CHALLENGE_STATUS
 } from '../../../config/constants'
+import { checkAdmin } from '../../../util/tc'
 
 require('bootstrap/scss/bootstrap.scss')
 
@@ -105,6 +106,9 @@ class ChallengeList extends Component {
   }
 
   getHandle () {
+    if (checkAdmin(this.props.auth.token)) {
+      return null
+    }
     return this.props.auth && this.props.auth.user ? this.props.auth.user.handle : null
   }
 
@@ -130,9 +134,11 @@ class ChallengeList extends Component {
     let selectedTab = 0
     switch (status) {
       case CHALLENGE_STATUS.APPROVED:
-      case CHALLENGE_STATUS.NEW:
         selectedTab = 1
         break
+      case CHALLENGE_STATUS.NEW:
+        selectedTab = selfService ? 3 : 1
+        break
       case CHALLENGE_STATUS.DRAFT:
         selectedTab = 2
         break
@@ -194,7 +200,8 @@ class ChallengeList extends Component {
                 break
               }
               case 3: {
-                this.directUpdateSearchParam(searchText, CHALLENGE_STATUS.COMPLETED)
+                const status = selfService ? CHALLENGE_STATUS.NEW : CHALLENGE_STATUS.COMPLETED
+                this.directUpdateSearchParam(searchText, status)
                 break
               }
               case 4: {
@@ -203,12 +210,18 @@ class ChallengeList extends Component {
               }
             }
           }}>
+          {
+            selfService && <h4>Total Challenges: {totalChallenges}</h4>
+          }
           <TabList>
             <Tab>{(selfService ? 'Assigned challenges' : 'Active')}</Tab>
             <Tab>{(selfService ? 'Approved' : 'New')}</Tab>
             <Tab>{this.getStatusTextFunc(selfService)(CHALLENGE_STATUS.DRAFT)}</Tab>
             {(!selfService && <Tab>Completed</Tab>)}
             {(!selfService && <Tab>Cancelled</Tab>)}
+            {
+              selfService && checkAdmin(this.props.auth.token) && <Tab>Draft</Tab>
+            }
           </TabList>
           <TabPanel />
           <TabPanel />

src/containers/Challenges/index.js

@@ -15,6 +15,7 @@ import { loadProject } from '../../actions/projects'
 import { loadProjects, setActiveProject, resetSidebarActiveParams } from '../../actions/sidebar'
 import { CHALLENGE_STATUS } from '../../config/constants'
 import styles from './Challenges.module.scss'
+import { checkAdmin } from '../../util/tc'
 
 class Challenges extends Component {
   constructor (props) {
@@ -48,7 +49,8 @@ class Challenges extends Component {
   reloadChallenges (props) {
     const { activeProjectId, projectDetail: reduxProjectInfo, projectId, challengeProjectId, loadProject, selfService } = props
     if (activeProjectId !== challengeProjectId || selfService) {
-      this.props.loadChallengesByPage(1, projectId ? parseInt(projectId) : -1, CHALLENGE_STATUS.ACTIVE, '', selfService)
+      const isAdmin = checkAdmin(this.props.auth.token)
+      this.props.loadChallengesByPage(1, projectId ? parseInt(projectId) : -1, CHALLENGE_STATUS.ACTIVE, '', selfService, isAdmin ? null : this.props.auth.user.handle)
       if (!selfService && (!reduxProjectInfo || `${reduxProjectInfo.id}` !== projectId)
       ) {
         loadProject(projectId)
@@ -103,23 +105,27 @@ class Challenges extends Component {
     return (
       <Fragment>
         <div className={styles.projectSearch}>
-          <div className={styles.projectSearchHeader}>
-            <label>Switch Project</label>
-            <DebounceInput
-              minLength={2}
-              debounceTimeout={300}
-              placeholder='Search projects (Enter project id or project title in double quotes or any text from project)'
-              onChange={(e) => this.updateProjectName(e.target.value)}
-              value={searchProjectName}
-            />
-            <input
-              type='checkbox'
-              label='My Projects'
-              checked={onlyMyProjects}
-              onChange={this.toggleMyProjects}
-            />
-            <label>My Projects</label>
-          </div>
+          {
+            !selfService && (
+              <div className={styles.projectSearchHeader}>
+                <label>Switch Project</label>
+                <DebounceInput
+                  minLength={2}
+                  debounceTimeout={300}
+                  placeholder='Search projects (Enter project id or project title in double quotes or any text from project)'
+                  onChange={(e) => this.updateProjectName(e.target.value)}
+                  value={searchProjectName}
+                />
+                <input
+                  type='checkbox'
+                  label='My Projects'
+                  checked={onlyMyProjects}
+                  onChange={this.toggleMyProjects}
+                />
+                <label>My Projects</label>
+              </div>
+            )
+          }
           {
             activeProjectId === -1 && !selfService && <div>No project selected. Select one below</div>
           }