From ea5178b3d523fc6e16169a04d9baad2dea9d08f6 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Thu, 28 May 2020 02:45:40 +0530 Subject: [PATCH 1/3] Update ProfileStats.jsx --- src/shared/containers/ProfileStats.jsx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/shared/containers/ProfileStats.jsx b/src/shared/containers/ProfileStats.jsx index 307127c638..cddad713e4 100644 --- a/src/shared/containers/ProfileStats.jsx +++ b/src/shared/containers/ProfileStats.jsx @@ -24,10 +24,11 @@ class ProfileStatsContainer extends React.Component { loadStats, loadStatsHistoryAndDistribution, meta, + userId, } = this.props; const trackAndSubTrack = getQueryParamsQuery(location); - loadStats(handleParam, _.join(_.get(meta, 'groupIds', []))); + loadStats(handleParam, _.join(_.get(meta, 'groupIds', [])), userId); if (shouldShowGraph(trackAndSubTrack)) { loadStatsHistoryAndDistribution( handleParam, @@ -49,13 +50,14 @@ class ProfileStatsContainer extends React.Component { const { handleParam, location, + userId, } = this.props; const nextQueryParams = getQueryParamsQuery(nextLocation); const trackAndSubTrack = getQueryParamsQuery(location); if (nextHandleParam !== handleParam) { - loadStats(nextHandleParam, _.join(_.get(meta, 'groupIds', []))); + loadStats(nextHandleParam, _.join(_.get(meta, 'groupIds', [])), userId); if ( nextQueryParams.track !== trackAndSubTrack.track || nextQueryParams.subTrack !== trackAndSubTrack.subTrack @@ -114,6 +116,7 @@ ProfileStatsContainer.propTypes = { loadStats: PT.func.isRequired, loadStatsHistoryAndDistribution: PT.func.isRequired, handleParam: PT.string.isRequired, + userId: PT.number.isRequired, statsHistory: PT.arrayOf(PT.shape()), statsDistribution: PT.shape(), stats: PT.arrayOf(PT.shape()), @@ -126,6 +129,7 @@ ProfileStatsContainer.propTypes = { const mapStateToProps = (state, ownProps) => { const handleParam = ownProps.match.params.handle; const obj = _.get(state.members, handleParam, {}); + const userId = _.get(state.profile.info, 'userId'); return ({ handleParam, loadingError: state.members.loadingError, @@ -140,6 +144,7 @@ const mapStateToProps = (state, ownProps) => { info: state.profile.info, meta: ownProps.meta, achievements: state.profile.achievements, + userId, }); }; @@ -148,13 +153,13 @@ function mapDispatchToProps(dispatch) { const pa = actions.profile; return { - loadStats: (handle, groupIds) => { + loadStats: (handle, groupIds, userId) => { dispatch(a.getStatsInit(handle)); dispatch(a.getStatsDone(handle, groupIds)); dispatch(pa.getInfoInit(handle)); dispatch(pa.getInfoDone(handle)); - dispatch(a.getActiveChallengesInit(handle)); - dispatch(a.getActiveChallengesDone(handle)); + dispatch(a.getActiveChallengesInit(userId)); + dispatch(a.getActiveChallengesDone(userId)); }, loadStatsHistoryAndDistribution: (handle, groupIds, track, subTrack) => { dispatch(a.getStatsHistoryInit(handle)); From 4d11f4245894e7677413ebdd076b1f92a64bd794 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Fri, 29 May 2020 16:21:48 +0530 Subject: [PATCH 2/3] Update index.jsx --- .../challenge-listing/ChallengeCard/index.jsx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/shared/components/challenge-listing/ChallengeCard/index.jsx b/src/shared/components/challenge-listing/ChallengeCard/index.jsx index c91a01e1b5..1458b05d1b 100644 --- a/src/shared/components/challenge-listing/ChallengeCard/index.jsx +++ b/src/shared/components/challenge-listing/ChallengeCard/index.jsx @@ -91,12 +91,15 @@ function ChallengeCard({ {challenge.status === 'Active' ? 'Ends ' : 'Ended '} {getEndDate(challenge, challengeTypes)} - expandTag(challenge.id)} - /> + { challenge.tags.length > 0 + && ( + expandTag(challenge.id)} + /> + ) } From 7041a169c52ce2832a76d21cd10d1d43f529100f Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Fri, 29 May 2020 16:23:19 +0530 Subject: [PATCH 3/3] Update index.jsx --- .../ReviewOpportunityCard/index.jsx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/shared/components/challenge-listing/ReviewOpportunityCard/index.jsx b/src/shared/components/challenge-listing/ReviewOpportunityCard/index.jsx index a8fa5ae23b..25df3548a3 100644 --- a/src/shared/components/challenge-listing/ReviewOpportunityCard/index.jsx +++ b/src/shared/components/challenge-listing/ReviewOpportunityCard/index.jsx @@ -48,7 +48,8 @@ function ReviewOpportunityCard({ }) { const { challenge } = opportunity; const { subTrack, legacy } = challenge; - const tags = challenge.tags || challenge.technologies; + let tags = challenge.tags || challenge.technologies; + tags = tags.filter(tag => tag.trim().length); const track = legacy ? legacy.track : challenge.track; const start = moment(opportunity.startDate); return ( @@ -80,12 +81,15 @@ function ReviewOpportunityCard({ {' '} {start.format('MMM DD')} - expandTag(challenge.id)} - onTechTagClicked={onTechTagClicked} - /> + { tags.length > 0 + && ( + expandTag(challenge.id)} + onTechTagClicked={onTechTagClicked} + /> + ) }