Merge branch 'nursoltan-s-issue-44' into bugbash

Author: luizrrodrigues

src/actions/lookup.js

@@ -9,7 +9,12 @@ async function getCommunityList() {
   return service.getCommunityList();
 }
 
+async function isLoggedIn() {
+  return service.isLoggedIn();
+}
+
 export default createActions({
   GET_TAGS: getTags,
   GET_COMMUNITY_LIST: getCommunityList,
+  IS_LOGGED_IN: isLoggedIn,
 });

src/containers/Challenges/Listing/ChallengeItem/index.jsx

@@ -14,7 +14,7 @@ import TagsMoreTooltip from "../tooltips/TagsMoreTooltip";
 
 import "./styles.scss";
 
-const ChallengeItem = ({ challenge, onClickTag, onClickTrack }) => {
+const ChallengeItem = ({ challenge, onClickTag, onClickTrack, isLoggedIn }) => {
   const totalPrizes = challenge.overview.totalPrizes;
   const currencySymbol = utils.challenge.getCurrencySymbol(challenge.prizeSets);
   const placementPrizes = utils.challenge.getPlacementPrizes(
@@ -24,6 +24,12 @@ const ChallengeItem = ({ challenge, onClickTag, onClickTrack }) => {
     challenge.prizeSets
   );
 
+  let submissionLink = `${process.env.URL.BASE}/challenges/${challenge.id}`;
+
+  if (isLoggedIn && challenge.numOfSubmissions > 0) {
+    submissionLink += "?tab=submissions";
+  }
+
   return (
     <div styleName="challenge-item">
       <div styleName="track">
@@ -69,9 +75,7 @@ const ChallengeItem = ({ challenge, onClickTag, onClickTrack }) => {
           >
             <NumRegistrants numOfRegistrants={challenge.numOfRegistrants} />
           </a>
-          <a
-            href={`${process.env.URL.BASE}/challenges/${challenge.id}?tab=submissions`} // eslint-disable-line no-undef
-          >
+          <a href={submissionLink}>
             <NumSubmissions numOfSubmissions={challenge.numOfSubmissions} />
           </a>
         </div>
@@ -96,6 +100,7 @@ ChallengeItem.propTypes = {
   challenge: PT.shape(),
   onClickTag: PT.func,
   onClickTrack: PT.func,
+  isLoggedIn: PT.bool,
 };
 
 export default ChallengeItem;

src/containers/Challenges/Listing/index.jsx

@@ -26,6 +26,7 @@ const Listing = ({
   updateFilter,
   bucket,
   sortByLabels,
+  isLoggedIn,
 }) => {
   const sortByOptions = utils.createDropdownOptions(
     sortByLabels,
@@ -112,6 +113,7 @@ const Listing = ({
                 const filterChange = { tracks: [track] };
                 updateFilter(filterChange);
               }}
+              isLoggedIn={isLoggedIn}
             />
           </div>
         ))}
@@ -146,6 +148,7 @@ Listing.propTypes = {
   updateFilter: PT.func,
   bucket: PT.string,
   sortByLabels: PT.arrayOf(PT.string),
+  isLoggedIn: PT.bool,
 };
 
 export default Listing;

src/containers/Challenges/index.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import PT from "prop-types";
 import { connect } from "react-redux";
 import Listing from "./Listing";
@@ -26,7 +26,16 @@ const Challenges = ({
   recommendedChallenges,
   initialized,
   updateQuery,
+  userLoggedIn,
+  isLoggedIn,
 }) => {
+  const latestPropsRef = useRef(null);
+  latestPropsRef.current = { userLoggedIn };
+
+  useEffect(() => {
+    latestPropsRef.current.userLoggedIn();
+  }, []);
+
   const BUCKET_OPEN_FOR_REGISTRATION = constants.FILTER_BUCKETS[1];
   const isRecommended = recommended && bucket === BUCKET_OPEN_FOR_REGISTRATION;
   const sortByValue = isRecommended
@@ -76,6 +85,7 @@ const Challenges = ({
             }}
             bucket={bucket}
             sortByLabels={sortByLabels}
+            isLoggedIn={isLoggedIn}
           />
         </>
       )}
@@ -98,6 +108,7 @@ Challenges.propTypes = {
   recommendedChallenges: PT.arrayOf(PT.shape()),
   initialized: PT.bool,
   updateQuery: PT.func,
+  isLoggedIn: PT.bool,
 };
 
 const mapStateToProps = (state) => ({
@@ -114,11 +125,13 @@ const mapStateToProps = (state) => ({
   recommended: state.filter.challenge.recommended,
   recommendedChallenges: state.challenges.recommendedChallenges,
   initialized: state.challenges.initialized,
+  isLoggedIn: state.lookup.isLoggedIn,
 });
 
 const mapDispatchToProps = {
   updateFilter: actions.filter.updateFilter,
   updateQuery: actions.filter.updateChallengeQuery,
+  userLoggedIn: actions.lookup.isLoggedIn,
 };
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => ({

src/reducers/lookup.js

@@ -7,6 +7,7 @@ const defaultState = {
   tracks: constants.FILTER_CHALLENGE_TRACKS,
   tags: [],
   subCommunities: [],
+  isLoggedIn: false,
 };
 
 function onGetTagsDone(state, { payload }) {
@@ -17,10 +18,15 @@ function onGetCommunityListDone(state, { payload }) {
   return { ...state, subCommunities: payload };
 }
 
+function onIsLoggedInDone(state, { payload }) {
+  return { ...state, isLoggedIn: payload };
+}
+
 export default handleActions(
   {
     GET_TAGS_DONE: onGetTagsDone,
     GET_COMMUNITY_LIST_DONE: onGetCommunityListDone,
+    IS_LOGGED_IN_DONE: onIsLoggedInDone,
   },
   defaultState
 );

src/services/lookup.js

@@ -18,8 +18,13 @@ async function getTags() {
   return data.result.content.map((tag) => tag.name);
 }
 
-async function doGetUserGroups() {
+async function isLoggedIn() {
   const isLoggedIn = await utils.auth.isLoggedIn();
+  return isLoggedIn;
+}
+
+async function doGetUserGroups() {
+  const isLoggedIn = await isLoggedIn();
 
   if (isLoggedIn) {
     const userId = await utils.auth.getUserId();
@@ -51,4 +56,5 @@ async function getCommunityList() {
 export default {
   getTags,
   getCommunityList,
+  isLoggedIn,
 };