Skip to content

Commit 476e844

Browse files
Updated isRegistered function, now Lib will return this.
1 parent 4d7c8c4 commit 476e844

File tree

3 files changed

+9
-32
lines changed

3 files changed

+9
-32
lines changed

src/shared/containers/SubmissionManagement/index.jsx

+1-6
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,18 @@ class SubmissionManagementPageContainer extends React.Component {
5252
deleting,
5353
loadingSubmissionsForChallengeId,
5454
submissionPhaseStartDate,
55-
handle,
5655
isLoadingChallenge,
5756
mySubmissions,
5857
onCancelSubmissionDelete,
5958
onDownloadSubmission,
6059
onShowDetails,
6160
onSubmissionDelete,
6261
onSubmissionDeleteConfirmed,
63-
registrants,
6462
showDetails,
6563
showModal,
6664
toBeDeletedId,
6765
} = this.props;
68-
const isRegistered = registrants.find(r => _.toString(r.memberHandle) === _.toString(handle));
69-
if (!isRegistered) return <AccessDenied redirectLink={`${challengesUrl}/${challenge.id}`} cause={ACCESS_DENIED_REASON.HAVE_NOT_SUBMITTED_TO_THE_CHALLENGE} />;
66+
if (!challenge.isRegistered) return <AccessDenied redirectLink={`${challengesUrl}/${challenge.id}`} cause={ACCESS_DENIED_REASON.HAVE_NOT_SUBMITTED_TO_THE_CHALLENGE} />;
7067

7168
const isEmpty = _.isEmpty(challenge);
7269
const smConfig = {
@@ -189,8 +186,6 @@ SubmissionManagementPageContainer.propTypes = {
189186
toBeDeletedId: PT.number,
190187
onSubmissionDeleteConfirmed: PT.func.isRequired,
191188
submissionPhaseStartDate: PT.string.isRequired,
192-
registrants: PT.arrayOf(PT.object).isRequired,
193-
handle: PT.string.isRequired,
194189
};
195190

196191
function mapStateToProps(state, props) {

src/shared/containers/SubmissionPage.jsx

+2-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { PrimaryButton } from 'topcoder-react-ui-kit';
1313
import shortId from 'shortid';
1414
import React from 'react';
1515
import PT from 'prop-types';
16-
import _ from 'lodash';
1716
import { connect } from 'react-redux';
1817
import SubmissionsPage from 'components/SubmissionPage';
1918
import AccessDenied, { CAUSE as ACCESS_DENIED_REASON } from 'components/tc-communities/AccessDenied';
@@ -52,9 +51,8 @@ class SubmissionsPageContainer extends React.Component {
5251
}
5352

5453
render() {
55-
const { registrants, handle, challengeId } = this.props;
56-
const isRegistered = registrants.find(r => _.toString(r.memberHandle) === _.toString(handle));
57-
if (!isRegistered) {
54+
const { challenge, challengeId } = this.props;
55+
if (!challenge.isRegistered) {
5856
return (
5957
<React.Fragment>
6058
<AccessDenied cause={ACCESS_DENIED_REASON.NOT_AUTHORIZED}>
@@ -134,9 +132,7 @@ SubmissionsPageContainer.propTypes = {
134132
updateNotesLength: PT.func.isRequired,
135133
setSubmissionFilestackData: PT.func.isRequired,
136134
submissionFilestackData: filestackDataProp.isRequired,
137-
registrants: PT.arrayOf(PT.object).isRequired,
138135
winners: PT.arrayOf(PT.object).isRequired,
139-
handle: PT.string.isRequired,
140136
};
141137

142138
/**
@@ -174,9 +170,7 @@ const mapStateToProps = (state, ownProps) => {
174170
filePickers: submission.filePickers,
175171
notesLength: submission.notesLength,
176172
submissionFilestackData: submission.submissionFilestackData,
177-
registrants: state.challenge.details.registrants,
178173
winners: state.challenge.details.winners,
179-
handle: state.auth.user ? state.auth.user.handle : '',
180174
};
181175
};
182176

src/shared/containers/challenge-detail/index.jsx

+6-18
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,6 @@ function getOgImage(challenge, challengeTypes) {
112112
}
113113
}
114114

115-
function isRegistered(registrants, handle) {
116-
if (_.find(registrants, r => _.toString(r.memberHandle) === _.toString(handle))) {
117-
return true;
118-
}
119-
return false;
120-
}
121-
122115
// The container component
123116
class ChallengeDetailPageContainer extends React.Component {
124117
constructor(props, context) {
@@ -394,11 +387,6 @@ class ChallengeDetailPageContainer extends React.Component {
394387
const isEmpty = _.isEmpty(challenge);
395388
const isLegacyMM = isMM(challenge) && Boolean(challenge.roundId);
396389

397-
const hasRegistered = isRegistered(
398-
challenge.registrants,
399-
(auth.user || {}).handle,
400-
);
401-
402390
if (isLoadingChallenge || isLoadingTerms) {
403391
return <LoadingPagePlaceholder />;
404392
}
@@ -469,12 +457,12 @@ class ChallengeDetailPageContainer extends React.Component {
469457
}
470458
unregistering={unregistering}
471459
checkpoints={checkpoints}
472-
hasRegistered={hasRegistered}
460+
hasRegistered={challenge.isRegistered}
473461
hasFirstPlacement={hasFirstPlacement}
474462
challengeSubtracksMap={challengeSubtracksMap}
475463
isMenuOpened={isMenuOpened}
476464
submissionEnded={submissionEnded}
477-
mySubmissions={hasRegistered ? mySubmissions : []}
465+
mySubmissions={challenge.isRegistered ? mySubmissions : []}
478466
/>
479467
)
480468
}
@@ -488,7 +476,7 @@ class ChallengeDetailPageContainer extends React.Component {
488476
description={challenge.name}
489477
detailedRequirements={challenge.description}
490478
terms={terms}
491-
hasRegistered={hasRegistered}
479+
hasRegistered={challenge.isRegistered}
492480
savingChallenge={savingChallenge}
493481
setSpecsTabState={setSpecsTabState}
494482
specsTabState={specsTabState}
@@ -548,7 +536,7 @@ class ChallengeDetailPageContainer extends React.Component {
548536
this.setState({ notFoundCountryFlagUrl });
549537
}}
550538
onSortChange={sort => this.setState({ submissionsSort: sort })}
551-
hasRegistered={hasRegistered}
539+
hasRegistered={challenge.isRegistered}
552540
unregistering={unregistering}
553541
isLegacyMM={isLegacyMM}
554542
submissionEnded={submissionEnded}
@@ -562,14 +550,14 @@ class ChallengeDetailPageContainer extends React.Component {
562550
<MySubmissions
563551
challengesUrl={challengesUrl}
564552
challenge={challenge}
565-
hasRegistered={hasRegistered}
553+
hasRegistered={challenge.isRegistered}
566554
unregistering={unregistering}
567555
submissionEnded={submissionEnded}
568556
isLegacyMM={isLegacyMM}
569557
loadingMMSubmissionsForChallengeId={loadingMMSubmissionsForChallengeId}
570558
auth={auth}
571559
loadMMSubmissions={loadMMSubmissions}
572-
mySubmissions={hasRegistered ? mySubmissions : []}
560+
mySubmissions={challenge.isRegistered ? mySubmissions : []}
573561
reviewTypes={reviewTypes}
574562
submissionsSort={mySubmissionsSort}
575563
onSortChange={sort => this.setState({ mySubmissionsSort: sort })}

0 commit comments

Comments
 (0)