Merge pull request #1515 from topcoder-platform/develop

jmgasper · web-flow · commit 91245017a7f4 · 2023-03-16T14:58:55.000+11:00
Allow admins to see all challenges
diff --git a/config/constants/development.js b/config/constants/development.js
@@ -41,7 +41,7 @@ module.exports = {
   CHALLENGE_TYPE_ID: '927abff4-7af9-4145-8ba1-577c16e64e2e',
   MARATHON_TYPE_ID: '929bc408-9cf2-4b3e-ba71-adfbf693046c',
   SEGMENT_API_KEY: 'QBtLgV8vCiuRX1lDikbMjcoe9aCHkF6n',
-  CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c', 'ecd58c69-238f-43a4-a4bb-d172719b9f31'],
+  CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c', 'ecd58c69-238f-43a4-a4bb-d172719b9f31', '78b37a69-92d5-4ad7-bf85-c79b65420c79', '929bc408-9cf2-4b3e-ba71-adfbf693046c'],
   FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY,
   FILE_PICKER_CONTAINER_NAME: 'tc-challenge-v5-dev',
   FILE_PICKER_REGION: 'us-east-1',
diff --git a/config/constants/production.js b/config/constants/production.js
@@ -41,7 +41,7 @@ module.exports = {
   CHALLENGE_TYPE_ID: '927abff4-7af9-4145-8ba1-577c16e64e2e',
   MARATHON_TYPE_ID: '929bc408-9cf2-4b3e-ba71-adfbf693046c',
   SEGMENT_API_KEY: 'QSQAW5BWmZfLoKFNRgNKaqHvLDLJoGqF',
-  CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c', 'ecd58c69-238f-43a4-a4bb-d172719b9f31'],
+  CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c', 'ecd58c69-238f-43a4-a4bb-d172719b9f31', '78b37a69-92d5-4ad7-bf85-c79b65420c79', '929bc408-9cf2-4b3e-ba71-adfbf693046c'],
   FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY,
   FILE_PICKER_CONTAINER_NAME: 'tc-challenge-v5-prod',
   FILE_PICKER_REGION: 'us-east-1',
diff --git a/src/actions/challenges.js b/src/actions/challenges.js
@@ -58,6 +58,19 @@ import { removeChallengeFromPhaseProduct, saveChallengeAsPhaseProduct } from '..
 
 /**
  * Loads active challenges of project by page
+ *
+ * @param {number} page
+ * @param {string} projectId
+ * @param {string} status
+ * @param {string} filterChallengeName
+ * @param {bool} selfService
+ * @param {string} userHandle this will be null for admin user(we will return all datas for admin user)
+ * @param {string} filterChallengeType
+ * @param {object} filterDate
+ * @param {string} filterSortBy
+ * @param {string} filterSortOrder
+ * @param {number} perPage
+ * @returns redux action
  */
 export function loadChallengesByPage (
   page,
@@ -66,7 +79,6 @@ export function loadChallengesByPage (
   filterChallengeName = null,
   selfService = false,
   userHandle = null,
-  filterCreatedBy = null,
   filterChallengeType = {},
   filterDate = {},
   filterSortBy = null,
@@ -126,8 +138,8 @@ export function loadChallengesByPage (
     if (filterSortBy) {
       filters['sortBy'] = filterSortBy
     }
-    if (filterCreatedBy) {
-      filters['createdBy'] = filterCreatedBy
+    if (userHandle) {
+      filters['createdBy'] = userHandle
     }
     if (filterSortOrder) {
       filters['sortOrder'] = filterSortOrder
diff --git a/src/actions/sidebar.js b/src/actions/sidebar.js
@@ -2,7 +2,14 @@
  * Sidebar related redux actions
  */
 import { fetchMemberProjects } from '../services/projects'
-import { SET_ACTIVE_PROJECT, LOAD_PROJECTS_FAILURE, LOAD_PROJECTS_PENDING, LOAD_PROJECTS_SUCCESS, RESET_SIDEBAR_ACTIVE_PARAMS } from '../config/constants'
+import {
+  SET_ACTIVE_PROJECT,
+  LOAD_PROJECTS_FAILURE,
+  LOAD_PROJECTS_PENDING,
+  LOAD_PROJECTS_SUCCESS,
+  RESET_SIDEBAR_ACTIVE_PARAMS,
+  UNLOAD_PROJECTS_SUCCESS
+} from '../config/constants'
 import _ from 'lodash'
 
 /**
@@ -58,8 +65,7 @@ export function loadProjects (filterProjectName = '', myProjects = true) {
 export function unloadProjects () {
   return (dispatch) => {
     dispatch({
-      type: LOAD_PROJECTS_SUCCESS,
-      projects: []
+      type: UNLOAD_PROJECTS_SUCCESS
     })
   }
 }
diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js
@@ -30,7 +30,7 @@ import {
   MULTI_ROUND_CHALLENGE_TEMPLATE_ID, DS_TRACK_ID,
   CHALLENGE_STATUS
 } from '../../config/constants'
-import { getDomainTypes, getResourceRoleByName } from '../../util/tc'
+import { getDomainTypes, getResourceRoleByName, is2RoundsChallenge } from '../../util/tc'
 import { PrimaryButton, OutlineButton } from '../Buttons'
 import TrackField from './Track-Field'
 import TypeField from './Type-Field'
@@ -838,8 +838,7 @@ class ChallengeEditor extends Component {
       const { phases } = this.state.challenge
       let newChallenge = _.cloneDeep(this.state.challenge)
       const isDesignChallenge = newChallenge.trackId === DES_TRACK_ID
-      const is2RoundChallenge =
-        newChallenge.timelineTemplateId === MULTI_ROUND_CHALLENGE_TEMPLATE_ID
+      const is2RoundChallenge = is2RoundsChallenge(newChallenge)
       const is2RoundDesignChallenge = isDesignChallenge && is2RoundChallenge
 
       for (let index = 0; index < phases.length; ++index) {
diff --git a/src/components/ChallengesComponent/ChallengeCard/index.js b/src/components/ChallengesComponent/ChallengeCard/index.js
@@ -323,7 +323,7 @@ class ChallengeCard extends React.Component {
           <a className={styles.link} href={communityAppUrl} target='_blank'>CA</a>
         </div>
         <div className={styles.col6}>
-          {forumLink ? (<a className={styles.link} href={forumLink} target='_blank'>CA</a>)
+          {forumLink ? (<a className={styles.link} href={forumLink} target='_blank'>Forum</a>)
             : (<a className={styles.link} href='javascript:void(0)'>Forum</a>)}
         </div>
       </div>
diff --git a/src/components/ChallengesComponent/ChallengeList/index.js b/src/components/ChallengesComponent/ChallengeList/index.js
@@ -116,7 +116,6 @@ class ChallengeList extends Component {
             searchText,
             selfService,
             this.getHandle(),
-            this.getLoginHandle(),
             challengeType,
             challengeDate
           )
@@ -153,7 +152,6 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
-        this.getLoginHandle(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -191,7 +189,6 @@ class ChallengeList extends Component {
         searchText,
         selfService,
         this.getHandle(),
-        this.getLoginHandle(),
         filterChallengeType,
         filterDate,
         sortBy,
@@ -219,8 +216,7 @@ class ChallengeList extends Component {
       status,
       searchText,
       selfService,
-      this.getHandle(),
-      this.getLoginHandle()
+      this.getHandle()
     )
   }
 
@@ -298,7 +294,6 @@ class ChallengeList extends Component {
       searchText,
       selfService,
       this.getHandle(),
-      this.getLoginHandle(),
       challengeType,
       challengeDate,
       name,
@@ -344,7 +339,6 @@ class ChallengeList extends Component {
       '',
       selfService,
       this.getHandle(),
-      this.getLoginHandle(),
       null,
       {},
       null,
diff --git a/src/config/constants.js b/src/config/constants.js
@@ -55,6 +55,7 @@ export const getAWSContainerFileURL = (key) => `https://${FILE_PICKER_CONTAINER_
 export const LOAD_PROJECTS_SUCCESS = 'LOAD_PROJECTS_SUCCESS'
 export const LOAD_PROJECTS_PENDING = 'LOAD_PROJECTS_PENDING'
 export const LOAD_PROJECTS_FAILURE = 'LOAD_PROJECTS_FAILURE'
+export const UNLOAD_PROJECTS_SUCCESS = 'UNLOAD_PROJECTS_SUCCESS'
 
 // project billingAccount
 export const LOAD_PROJECT_BILLING_ACCOUNT = 'LOAD_PROJECT_BILLING_ACCOUNT'
diff --git a/src/containers/Challenges/index.js b/src/containers/Challenges/index.js
@@ -62,11 +62,11 @@ class Challenges extends Component {
       (nextProps.dashboard && this.props.dashboard !== nextProps.dashboard) ||
       this.props.activeProjectId !== nextProps.activeProjectId
     ) {
-      this.reloadChallenges(nextProps, false, true)
+      this.reloadChallenges(nextProps, false)
     }
   }
 
-  reloadChallenges (props, forceLoad, loadMyChallenge) {
+  reloadChallenges (props, forceLoad) {
     const {
       activeProjectId,
       projectDetail: reduxProjectInfo,
@@ -84,8 +84,7 @@ class Challenges extends Component {
         dashboard ? 'all' : '',
         '',
         selfService,
-        isAdmin ? null : this.props.auth.user.handle,
-        loadMyChallenge ? this.props.auth.user.handle : ''
+        isAdmin ? null : this.props.auth.user.handle
       )
       const projectLoading =
         window.localStorage.getItem('projectLoading') !== null
diff --git a/src/containers/Users/index.js b/src/containers/Users/index.js
@@ -3,7 +3,6 @@ import { connect } from 'react-redux'
 import _ from 'lodash'
 import PT from 'prop-types'
 import UsersComponent from '../../components/Users'
-import { loadProjects } from '../../actions/sidebar'
 import { loadProject, reloadProjectMembers } from '../../actions/projects'
 import { PROJECT_ROLES } from '../../config/constants'
 
@@ -17,7 +16,6 @@ class Users extends Component {
   }
 
   componentDidMount () {
-    this.props.loadProjects()
   }
 
   isEditable () {
@@ -76,13 +74,11 @@ const mapStateToProps = ({ sidebar, challenges, auth, projects }) => {
 
 const mapDispatchToProps = {
   loadProject,
-  loadProjects,
   reloadProjectMembers
 }
 
 Users.propTypes = {
   loadProject: PT.func.isRequired,
-  loadProjects: PT.func.isRequired,
   reloadProjectMembers: PT.func.isRequired,
   projects: PT.arrayOf(PT.object),
   projectMembers: PT.arrayOf(PT.object),
diff --git a/src/reducers/sidebar.js b/src/reducers/sidebar.js
@@ -6,7 +6,8 @@ import {
   LOAD_PROJECTS_SUCCESS,
   LOAD_PROJECTS_PENDING,
   LOAD_PROJECTS_FAILURE,
-  RESET_SIDEBAR_ACTIVE_PARAMS
+  RESET_SIDEBAR_ACTIVE_PARAMS,
+  UNLOAD_PROJECTS_SUCCESS
 } from '../config/constants'
 
 const initialState = {
@@ -19,9 +20,11 @@ const initialState = {
 export default function (state = initialState, action) {
   switch (action.type) {
     case SET_ACTIVE_PROJECT:
-      return { ...state, activeProjectId: action.projectId, projects: [], isLoading: false }
+      return { ...state, activeProjectId: action.projectId, projects: [], isLoading: false, isLoadProjectsSuccess: false }
     case LOAD_PROJECTS_SUCCESS:
       return { ...state, projects: action.projects, isLoading: false, isLoggedIn: true, isLoadProjectsSuccess: true }
+    case UNLOAD_PROJECTS_SUCCESS:
+      return { ...state, projects: [], isLoading: false, isLoggedIn: true, isLoadProjectsSuccess: false }
     case LOAD_PROJECTS_PENDING:
       return { ...state, isLoading: true }
     case LOAD_PROJECTS_FAILURE:
diff --git a/src/util/tc.js b/src/util/tc.js
@@ -269,3 +269,11 @@ export function getChallengeTypeAbbr (track, challengeTypes) {
   }
   return null
 }
+
+/**
+ * Check if challenge is 2 rounds challenge or not
+ * @param {Object} challenge challenge info
+ */
+export function is2RoundsChallenge (challenge) {
+  return !!_.find(challenge.phases, { name: 'Checkpoint Submission' })
+}
