Skip to content

fix for issue #4384 #4483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 7, 2020
Merged

fix for issue #4384 #4483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d753a13
fix for issue #4384
srjr19 Jun 7, 2020
9257c9d
fix for issue #4384
srjr19 Jun 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export default function ChallengeStatus(props) {
newChallengeDetails,
selectChallengeDetailsTab,
openChallengesInNewTabs,
userId,
} = props;

/* TODO: Split into a separate ReactJS component! */
Expand Down Expand Up @@ -218,20 +219,11 @@ export default function ChallengeStatus(props) {
statusPhase.name = 'Submission';
}

const registrationPhase = allPhases
.find(p => p.name === 'Registration');
const isRegistrationOpen = registrationPhase
&& (
registrationPhase.isOpen
|| moment(registrationPhase.scheduledEndDate).diff(new Date()) > 0);


let phaseMessage = STALLED_MSG;
if (statusPhase) phaseMessage = statusPhase.name;
else if (status === 'Draft') phaseMessage = DRAFT_MSG;

// TODO: Find equivalent of !challenge.users[userHandle]
const showRegisterInfo = isRegistrationOpen;
const showRegisterInfo = challenge.registrationOpen === 'Yes' && !challenge.users[userId];

return (
<div styleName={showRegisterInfo ? 'challenge-progress with-register-button' : 'challenge-progress'}>
Expand Down Expand Up @@ -304,6 +296,7 @@ ChallengeStatus.defaultProps = {
detailLink: '',
openChallengesInNewTabs: false,
className: '',
userId: '',
};

ChallengeStatus.propTypes = {
Expand All @@ -314,4 +307,5 @@ ChallengeStatus.propTypes = {
openChallengesInNewTabs: PT.bool, // eslint-disable-line react/no-unused-prop-types
selectChallengeDetailsTab: PT.func.isRequired,
className: PT.string,
userId: PT.string,
};
8 changes: 4 additions & 4 deletions src/shared/components/challenge-listing/ChallengeCard/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function ChallengeCard({
openChallengesInNewTabs,
sampleWinnerProfile,
selectChallengeDetailsTab,
userHandle,
userId,
domRef,
}) {
const challenge = passedInChallenge;
Expand Down Expand Up @@ -116,7 +116,7 @@ function ChallengeCard({
openChallengesInNewTabs={openChallengesInNewTabs}
sampleWinnerProfile={sampleWinnerProfile}
selectChallengeDetailsTab={selectChallengeDetailsTab}
userHandle={userHandle}
userId={userId}
/>
</div>
</div>
Expand All @@ -130,7 +130,7 @@ ChallengeCard.defaultProps = {
onTechTagClicked: _.noop,
openChallengesInNewTabs: false,
sampleWinnerProfile: undefined,
userHandle: '',
userId: '',
expandedTags: [],
expandTag: null,
domRef: null,
Expand All @@ -145,7 +145,7 @@ ChallengeCard.propTypes = {
openChallengesInNewTabs: PT.bool,
sampleWinnerProfile: PT.shape(),
selectChallengeDetailsTab: PT.func.isRequired,
userHandle: PT.string,
userId: PT.string,
expandedTags: PT.arrayOf(PT.number),
expandTag: PT.func,
domRef: PT.func,
Expand Down
8 changes: 4 additions & 4 deletions src/shared/components/challenge-listing/Listing/Bucket/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function Bucket({
setFilterState,
setSort,
sort,
userHandle,
userId,
expandedTags,
expandTag,
activeBucket,
Expand Down Expand Up @@ -109,7 +109,7 @@ export default function Bucket({
prizeMode={prizeMode}
key={item.id}
selectChallengeDetailsTab={selectChallengeDetailsTab}
userHandle={userHandle}
userId={userId}
expandedTags={expandedTags}
expandTag={expandTag}
domRef={addToRefs}
Expand Down Expand Up @@ -187,7 +187,7 @@ Bucket.defaultProps = {
newChallengeDetails: false,
openChallengesInNewTabs: false,
sort: null,
userHandle: '',
userId: '',
expandedTags: [],
expandTag: null,
activeBucket: '',
Expand All @@ -214,7 +214,7 @@ Bucket.propTypes = {
setFilterState: PT.func.isRequired,
setSort: PT.func.isRequired,
sort: PT.string,
userHandle: PT.string,
userId: PT.string,
expandedTags: PT.arrayOf(PT.number),
expandTag: PT.func,
activeBucket: PT.string,
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/challenge-listing/Listing/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function Listing({
setFilterState={setFilterState}
setSort={sort => setSort(bucket, sort)}
sort={sorts[bucket]}
userHandle={_.get(auth, 'user.handle')}
userId={_.get(auth, 'user.userId')}
activeBucket={activeBucket}
searchTimestamp={searchTimestamp}
/>
Expand Down Expand Up @@ -183,7 +183,7 @@ Listing.propTypes = {
auth: PT.shape({
tokenV3: PT.string,
user: PT.shape({
handle: PT.string,
userId: PT.string,
}),
}).isRequired,
challenges: PT.arrayOf(PT.shape()),
Expand Down