From 31999c35aa203d18c25686d97f2dc9aa65fca753 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 24 Jun 2020 00:09:40 -0300 Subject: [PATCH 1/9] Fix prop type of challengeId from Number to String --- src/shared/containers/SubmissionManagement/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx index 8b94da2a09..593c42c0b7 100644 --- a/src/shared/containers/SubmissionManagement/index.jsx +++ b/src/shared/containers/SubmissionManagement/index.jsx @@ -199,7 +199,7 @@ function mapStateToProps(state, props) { const submissionPhase = allPhases.find(phase => ['Submission', 'Checkpoint Submission'].includes(phase.name) && phase.isOpen) || {}; return { - challengeId: Number(challengeId), + challengeId: String(challengeId), challenge: state.challenge.details, challengesUrl: props.challengesUrl, From 272f5f2207edea3ec9bf390be9fff6ff9102dad2 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 24 Jun 2020 00:34:49 -0300 Subject: [PATCH 2/9] Updated getSubmissionsDone to get v3 token instead v2 --- src/shared/containers/SubmissionManagement/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx index 593c42c0b7..f85e969444 100644 --- a/src/shared/containers/SubmissionManagement/index.jsx +++ b/src/shared/containers/SubmissionManagement/index.jsx @@ -255,7 +255,7 @@ const mapDispatchToProps = dispatch => ({ loadMySubmissions: (tokens, challengeId) => { const a = actions.challenge; dispatch(a.getSubmissionsInit(challengeId)); - dispatch(a.getSubmissionsDone(challengeId, tokens.tokenV2)); + dispatch(a.getSubmissionsDone(challengeId, tokens.tokenV3)); }, }); From 93833a0f68e0e61e993d2b1bb57e553cf6789690 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Thu, 25 Jun 2020 17:47:03 -0300 Subject: [PATCH 3/9] Updated propTypes of challengeId to string instead number --- .../SubmissionManagement/SubmissionManagement/index.jsx | 3 ++- .../components/SubmissionPage/FilestackFilePicker/index.jsx | 2 +- src/shared/components/SubmissionPage/Header/index.jsx | 2 +- src/shared/components/SubmissionPage/Submit/index.jsx | 6 +++--- src/shared/components/SubmissionPage/Uploading/index.jsx | 2 +- src/shared/components/SubmissionPage/index.jsx | 4 ++-- src/shared/containers/ReviewOpportunityDetails.jsx | 4 ++-- src/shared/containers/SubmissionManagement/index.jsx | 2 +- src/shared/containers/SubmissionPage.jsx | 3 ++- src/shared/containers/tco/scoreboard/index.jsx | 6 +++--- src/shared/reducers/page/submission/index.js | 2 +- 11 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx index 836d6c729c..e0f4a707d8 100644 --- a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx +++ b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx @@ -185,6 +185,7 @@ SubmissionManagement.defaultProps = { helpPageUrl: '', loadingSubmissions: false, challengeUrl: '', + submissions: [], }; SubmissionManagement.propTypes = { @@ -195,7 +196,7 @@ SubmissionManagement.propTypes = { onDownload: PT.func, onShowDetails: PT.func, challenge: PT.shape().isRequired, - submissions: PT.arrayOf(PT.shape()).isRequired, + submissions: PT.arrayOf(PT.shape()), loadingSubmissions: PT.bool, challengeUrl: PT.string, submissionPhaseStartDate: PT.string.isRequired, diff --git a/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx b/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx index 9eab962531..848d8fc69d 100644 --- a/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx +++ b/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx @@ -334,7 +334,7 @@ FilestackFilePicker.defaultProps = { FilestackFilePicker.propTypes = { error: PT.string, userId: PT.string.isRequired, - challengeId: PT.number.isRequired, + challengeId: PT.string.isRequired, fileName: PT.string, fileExtensions: PT.arrayOf(PT.string).isRequired, title: PT.string.isRequired, diff --git a/src/shared/components/SubmissionPage/Header/index.jsx b/src/shared/components/SubmissionPage/Header/index.jsx index 96f427cddb..6196ac7427 100644 --- a/src/shared/components/SubmissionPage/Header/index.jsx +++ b/src/shared/components/SubmissionPage/Header/index.jsx @@ -37,7 +37,7 @@ const Header = ({ * Prop Validation */ Header.propTypes = { - challengeId: PT.number.isRequired, + challengeId: PT.string.isRequired, challengesUrl: PT.string.isRequired, title: PT.string.isRequired, }; diff --git a/src/shared/components/SubmissionPage/Submit/index.jsx b/src/shared/components/SubmissionPage/Submit/index.jsx index 54a43b7586..a4a1c3887e 100644 --- a/src/shared/components/SubmissionPage/Submit/index.jsx +++ b/src/shared/components/SubmissionPage/Submit/index.jsx @@ -356,7 +356,7 @@ const filestackDataProp = PT.shape({ size: PT.number.isRequired, key: PT.string.isRequired, container: PT.string.isRequired, - challengeId: PT.number.isRequired, + challengeId: PT.string.isRequired, fileUrl: PT.string.isRequired, }); @@ -366,7 +366,7 @@ const filestackDataProp = PT.shape({ Submit.propTypes = { phases: PT.arrayOf(PT.object).isRequired, userId: PT.string.isRequired, - challengeId: PT.number.isRequired, + challengeId: PT.string.isRequired, challengeName: PT.string.isRequired, challengesUrl: PT.string.isRequired, communitiesList: PT.shape({ @@ -377,7 +377,7 @@ Submit.propTypes = { loadingUuid: PT.string.isRequired, timestamp: PT.number.isRequired, }).isRequired, - groups: PT.shape({}).isRequired, + groups: PT.arrayOf(PT.shape()).isRequired, isSubmitting: PT.bool.isRequired, submitDone: PT.bool.isRequired, errorMsg: PT.string, diff --git a/src/shared/components/SubmissionPage/Uploading/index.jsx b/src/shared/components/SubmissionPage/Uploading/index.jsx index 4f4e0311e7..dac34c4b03 100644 --- a/src/shared/components/SubmissionPage/Uploading/index.jsx +++ b/src/shared/components/SubmissionPage/Uploading/index.jsx @@ -196,7 +196,7 @@ const Uploading = ({ * Prop Validation */ Uploading.propTypes = { - challengeId: PT.number.isRequired, + challengeId: PT.string.isRequired, challengeName: PT.string.isRequired, challengesUrl: PT.string.isRequired, isSubmitting: PT.bool.isRequired, diff --git a/src/shared/components/SubmissionPage/index.jsx b/src/shared/components/SubmissionPage/index.jsx index 937d264370..fa4d339f5f 100644 --- a/src/shared/components/SubmissionPage/index.jsx +++ b/src/shared/components/SubmissionPage/index.jsx @@ -75,7 +75,7 @@ const filestackDataProp = PT.shape({ SubmissionsPage.propTypes = { userId: PT.string.isRequired, challengesUrl: PT.string.isRequired, - challengeId: PT.number.isRequired, + challengeId: PT.string.isRequired, challengeName: PT.string.isRequired, communitiesList: PT.shape({ data: PT.arrayOf(PT.shape({ @@ -85,7 +85,7 @@ SubmissionsPage.propTypes = { loadingUuid: PT.string.isRequired, timestamp: PT.number.isRequired, }).isRequired, - groups: PT.shape({}).isRequired, + groups: PT.arrayOf(PT.shape()).isRequired, track: PT.string.isRequired, status: PT.string.isRequired, submitForm: PT.func.isRequired, diff --git a/src/shared/containers/ReviewOpportunityDetails.jsx b/src/shared/containers/ReviewOpportunityDetails.jsx index 57785c5ab3..bb40d2f79e 100644 --- a/src/shared/containers/ReviewOpportunityDetails.jsx +++ b/src/shared/containers/ReviewOpportunityDetails.jsx @@ -139,7 +139,7 @@ ReviewOpportunityDetailsContainer.propTypes = { applyModalOpened: PT.bool, authError: PT.bool, cancelApplications: PT.func.isRequired, - challengeId: PT.number.isRequired, + challengeId: PT.string.isRequired, details: PT.shape(), handle: PT.string.isRequired, isLoadingDetails: PT.bool, @@ -173,7 +173,7 @@ const mapStateToProps = (state, ownProps) => { return { authError: api.authError, applyModalOpened: page.applyModalOpened, - challengeId: Number(ownProps.match.params.challengeId), + challengeId: String(ownProps.match.params.challengeId), details: api.details, handle: state.auth.user ? state.auth.user.handle : '', isLoadingDetails: api.isLoadingDetails, diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx index f85e969444..0e3c9d7128 100644 --- a/src/shared/containers/SubmissionManagement/index.jsx +++ b/src/shared/containers/SubmissionManagement/index.jsx @@ -173,7 +173,7 @@ SubmissionManagementPageContainer.propTypes = { isLoadingChallenge: PT.bool, loadChallengeDetails: PT.func.isRequired, authTokens: PT.shape().isRequired, - challengeId: PT.number.isRequired, + challengeId: PT.string.isRequired, mySubmissions: PT.arrayOf(PT.shape()), loadingSubmissionsForChallengeId: PT.string.isRequired, loadMySubmissions: PT.func.isRequired, diff --git a/src/shared/containers/SubmissionPage.jsx b/src/shared/containers/SubmissionPage.jsx index 33396ecf26..9fdfe47a78 100644 --- a/src/shared/containers/SubmissionPage.jsx +++ b/src/shared/containers/SubmissionPage.jsx @@ -125,7 +125,7 @@ SubmissionsPageContainer.propTypes = { challenge: PT.shape().isRequired, status: PT.string.isRequired, isRegistered: PT.bool.isRequired, - groups: PT.shape({}).isRequired, + groups: PT.arrayOf(PT.shape()).isRequired, errorMsg: PT.string.isRequired, isSubmitting: PT.bool.isRequired, submitDone: PT.bool.isRequired, @@ -168,6 +168,7 @@ const mapStateToProps = (state, ownProps) => { communitiesList: state.tcCommunities.list, /* Older stuff below. */ userId: state.auth.user ? state.auth.user.userId : '', + handle: state.auth.user ? state.auth.user.handle : '', challengeId: String(ownProps.match.params.challengeId), challengeName: details.name, challengesUrl: ownProps.challengesUrl, diff --git a/src/shared/containers/tco/scoreboard/index.jsx b/src/shared/containers/tco/scoreboard/index.jsx index 9e275b0d1c..88f4bf7934 100644 --- a/src/shared/containers/tco/scoreboard/index.jsx +++ b/src/shared/containers/tco/scoreboard/index.jsx @@ -58,14 +58,14 @@ class ScoreboardPageContainer extends React.Component { } ScoreboardPageContainer.defaultProps = { - challengeId: 0, + challengeId: '', scoreboard: null, loading: false, loadScoreboard: _.noop, }; ScoreboardPageContainer.propTypes = { - challengeId: PT.number, + challengeId: PT.string, scoreboard: PT.shape({ details: PT.any, }), @@ -76,7 +76,7 @@ ScoreboardPageContainer.propTypes = { function mapStateToProps(state, props) { return { scoreboard: state.scoreboard, - challengeId: Number(props.match.params.challengeId), + challengeId: String(props.match.params.challengeId), }; } diff --git a/src/shared/reducers/page/submission/index.js b/src/shared/reducers/page/submission/index.js index 4bfed414f3..7f9c598f9d 100644 --- a/src/shared/reducers/page/submission/index.js +++ b/src/shared/reducers/page/submission/index.js @@ -179,7 +179,7 @@ function create(initialState) { uploadProgress: 0, filePickers: [], submissionFilestackData: { - challengeId: 0, + challengeId: '', fileUrl: '', filename: '', mimetype: '', From 4a198c2d50d72976de7d3e1e2b136949240de121 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Mon, 29 Jun 2020 22:42:09 -0300 Subject: [PATCH 4/9] Updated submissions fields name --- .../SubmissionManagement/Submission/index.jsx | 21 +++++++++---------- .../SubmissionsTable/index.jsx | 8 +++---- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx index 3cf517c545..0c4be5ab20 100644 --- a/src/shared/components/SubmissionManagement/Submission/index.jsx +++ b/src/shared/components/SubmissionManagement/Submission/index.jsx @@ -40,13 +40,13 @@ export default function Submission(props) { return ( - {submissionObject.submissionId} + {submissionObject.id} - {submissionObject.submissionType} + {submissionObject.type} - {formatDate(submissionObject.submissionDate)} + {formatDate(submissionObject.created)} { type === 'DESIGN' && ( @@ -56,7 +56,7 @@ export default function Submission(props) { )} @@ -67,7 +67,7 @@ export default function Submission(props) { @@ -80,14 +80,14 @@ export default function Submission(props) { downloads. Then we'll use this commented out code or remove it for good. */ } {status !== 'COMPLETED' && (