Merge pull request #1653 from topcoder-platform/develop

[PROD RELEASE]

Author: kkartunov

.circleci/config.yml

@@ -152,7 +152,7 @@ workflows:
           context: org-global
           filters: &filters-dev
             branches:
-              only: ["develop", "PM-803_wm-regression-fixes", "PM-902_show-all-projects-on-challenge-page"]
+              only: ["develop", "PM-803_wm-regression-fixes", "PM-902_show-all-projects-on-challenge-page", "pm-1355_1"]
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

config/constants/development.js

@@ -19,6 +19,7 @@ module.exports = {
   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`,
+  COPILOTS_URL: `https://copilots.${DOMAIN}`,
   PROJECT_API_URL: `${DEV_API_HOSTNAME}/v5/projects`,
   GROUPS_API_URL: `${DEV_API_HOSTNAME}/v5/groups`,
   TERMS_API_URL: `${DEV_API_HOSTNAME}/v5/terms`,
@@ -61,6 +62,5 @@ module.exports = {
   SKILLS_V5_API_URL: `${API_V5}/standardized-skills/skills/autocomplete`,
   UPDATE_SKILLS_V5_API_URL: `${API_V5}/standardized-skills/challenge-skills`,
   SALESFORCE_BILLING_ACCOUNT_LINK: 'https://c.cs18.visual.force.com/apex/baredirect?id=',
-  TYPEFORM_URL: 'https://topcoder.typeform.com/to/YJ7AL4p8',
   PROFILE_URL: 'https://profiles.topcoder-dev.com/'
 }

config/constants/production.js

@@ -18,6 +18,7 @@ module.exports = {
   CHALLENGE_TRACKS_URL: `${PROD_API_HOSTNAME}/v5/challenge-tracks`,
   CHALLENGE_PHASES_URL: `${PROD_API_HOSTNAME}/v5/challenge-phases`,
   CHALLENGE_TIMELINES_URL: `${PROD_API_HOSTNAME}/v5/challenge-timelines`,
+  COPILOTS_URL: `https://copilots.${DOMAIN}`,
   PROJECT_API_URL: `${PROD_API_HOSTNAME}/v5/projects`,
   GROUPS_API_URL: `${PROD_API_HOSTNAME}/v5/groups`,
   TERMS_API_URL: `${PROD_API_HOSTNAME}/v5/terms`,
@@ -58,6 +59,5 @@ module.exports = {
   SKILLS_V5_API_URL: `${API_V5}/standardized-skills/skills/autocomplete`,
   UPDATE_SKILLS_V5_API_URL: `${API_V5}/standardized-skills/challenge-skills`,
   SALESFORCE_BILLING_ACCOUNT_LINK: 'https://topcoder.my.salesforce.com/apex/baredirect?id=',
-  TYPEFORM_URL: 'https://topcoder.typeform.com/to/YJ7AL4p8',
   PROFILE_URL: 'https://profiles.topcoder.com/'
 }

src/actions/challengeSubmissions.js

@@ -2,12 +2,12 @@ import { fetchSubmissions } from '../services/challenges'
 
 import { LOAD_CHALLENGE_SUBMISSIONS } from '../config/constants'
 
-export function loadSubmissions (challengeId) {
-  return dispatch => {
+export function loadSubmissions (challengeId, page) {
+  return (dispatch) => {
     if (challengeId) {
       dispatch({
         type: LOAD_CHALLENGE_SUBMISSIONS,
-        payload: fetchSubmissions(challengeId)
+        payload: fetchSubmissions(challengeId, page)
       })
     }
   }

src/components/ChallengeEditor/ChallengeViewTabs/index.js

@@ -55,7 +55,11 @@ const ChallengeViewTabs = ({
   loggedInUser,
   onApproveChallenge,
   createResource,
-  deleteResource
+  deleteResource,
+  loadSubmissions,
+  totalSubmissions,
+  submissionsPerPage,
+  page
 }) => {
   const [selectedTab, setSelectedTab] = useState(0)
   const [showAddResourceModal, setShowAddResourceModal] = useState(false)
@@ -114,7 +118,7 @@ const ChallengeViewTabs = ({
       })
       return s
     })
-  }, [challengeSubmissions, allResources])
+  }, [challengeSubmissions, allResources, page])
 
   const isTask = _.get(challenge, 'task.isTask', false)
 
@@ -298,7 +302,7 @@ const ChallengeViewTabs = ({
         >
           RESOURCES
         </a>
-        {challengeSubmissions.length ? (
+        {totalSubmissions ? (
           <a
             tabIndex='2'
             role='tab'
@@ -311,7 +315,7 @@ const ChallengeViewTabs = ({
             }}
             className={getSelectorStyle(selectedTab, 2)}
           >
-            SUBMISSIONS ({submissions.length})
+            SUBMISSIONS ({totalSubmissions})
           </a>
         ) : null}
       </div>
@@ -353,6 +357,10 @@ const ChallengeViewTabs = ({
           submissions={submissions}
           token={token}
           loggedInUserResource={loggedInUserResource}
+          loadSubmissions={loadSubmissions}
+          totalSubmissions={totalSubmissions}
+          submissionsPerPage={submissionsPerPage}
+          page={page}
         />
       )}
       {showAddResourceModal ? (<ResourcesAdd
@@ -396,7 +404,11 @@ ChallengeViewTabs.propTypes = {
   deleteResource: PropTypes.func.isRequired,
   showRejectChallengeModal: PropTypes.func.isRequired,
   loggedInUser: PropTypes.object.isRequired,
-  onApproveChallenge: PropTypes.func
+  onApproveChallenge: PropTypes.func,
+  loadSubmissions: PropTypes.func,
+  totalSubmissions: PropTypes.number,
+  submissionsPerPage: PropTypes.number,
+  page: PropTypes.number
 }
 
 export default ChallengeViewTabs

src/components/ChallengeEditor/Submissions/Submissions.module.scss

@@ -401,3 +401,25 @@ $base-unit: 5px;
     overflow: hidden;
   }
 }
+
+.paginationWrapper {
+  display: flex;
+  margin-top: 30px;
+  flex: 1;
+  justify-content: center;
+}
+
+.footer {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 30px;
+}
+
+.perPageContainer {
+  margin-right: 20px;
+  max-width: 150px;
+}
+
+.paginationContainer {
+  display: flex;
+}