Rapid corrections of Dashboard to make it work with updated ChallengeListing

birdofpreyru · birdofpreyru · commit 3f7f7b6a898b · 2017-06-29T15:12:18.000+02:00
diff --git a/src/shared/actions/challenge-listing/index.js b/src/shared/actions/challenge-listing/index.js
@@ -127,14 +127,17 @@ function getAllActiveChallengesDone(uuid, tokenV3) {
      * are not attributed to the user there. This block of code marks user
      * challenges in an efficient way. */
     if (uch) {
-      const set = new Set();
-      uch.forEach(item => set.add(item.id));
-      umm.forEach(item => set.add(item.id));
+      const map = {};
+      uch.forEach((item) => { map[item.id] = item; });
+      umm.forEach((item) => { map[item.id] = item; });
       challenges.forEach((item) => {
-        if (set.has(item.id)) {
+        if (map[item.id]) {
           /* It is fine to reassing, as the array we modifying is created just
            * above within the same function. */
-          item.users[user] = true; // eslint-disable-line no-param-reassign
+          /* eslint-disable no-param-reassign */
+          item.users[user] = true;
+          item.userDetails = map[item.id].userDetails;
+          /* eslint-enable no-param-reassign */
         }
       });
     }
diff --git a/src/shared/containers/Dashboard/index.jsx b/src/shared/containers/Dashboard/index.jsx
@@ -25,93 +25,29 @@ import './styles.scss';
 // The container component
 class DashboardPageContainer extends React.Component {
 
-  constructor(props) {
-    super(props);
-    this.state = {
-      loadingMyChallenges: false,
-      loadingMyMarathon: false,
-      loadingIosChallenges: false,
-    };
-  }
-
   componentDidMount() {
     if (!this.props.auth.tokenV2) {
+      /* TODO: dev/prod URLs should be generated based on the config,
+       * now it is hardcoded with dev URL - wrong! */
       location.href = 'http://accounts.topcoder-dev.com/#!/member?retUrl=http:%2F%2Flocal.topcoder-dev.com:3000%2Fmy-dashboard';
       return false;
     }
+    this.props.getAllActiveChallenges(this.props.auth.tokenV3);
     this.props.getBlogs();
     return true;
   }
 
   componentDidUpdate(prevProps) {
     const { user, tokenV3 } = this.props.auth;
-    const { challenges } = this.props.challengeListing;
-    const { iosRegistered } = this.props.dashboard;
     if (tokenV3 && tokenV3 !== prevProps.auth.tokenV3) {
       setImmediate(() => {
+        this.props.getAllActiveChallenges(tokenV3);
         this.props.getSubtrackRanks(tokenV3, user.handle);
         this.props.getSRMs(tokenV3, user.handle);
         this.props.getIosRegistration(tokenV3, user.userId);
         this.props.getUserFinancials(tokenV3, user.handle);
       });
     }
-    if (user && !prevProps.auth.user && (!challenges || !challenges.length)) {
-      setImmediate(
-        () => {
-          this.setState({ loadingMyChallenges: true });
-          this.props.getChallenges(
-            {
-              status: 'ACTIVE',
-            }, {
-              limit: 8,
-              orderBy: 'submissionEndDate',
-            }, tokenV3, 'active', user.handle,
-          ).then(() => {
-            this.setState({ loadingMyChallenges: false });
-          })
-          .catch(() => {
-            this.setState({ loadingMyChallenges: false });
-          });
-
-          this.setState({ loadingMyMarathon: true });
-          this.props.getMarathonMatches(
-            {
-              status: 'ACTIVE',
-            }, {
-              limit: 8,
-            }, tokenV3, 'myActiveMM', user.handle,
-          )
-          .then(() => {
-            this.setState({ loadingMyMarathon: false });
-          })
-          .catch(() => {
-            this.setState({ loadingMyMarathon: false });
-          });
-        },
-      );
-    }
-    if (iosRegistered && !prevProps.dashboard.iosRegistered) {
-      setImmediate(
-        () => {
-          this.setState({ loadingIosChallenges: true });
-          this.props.getChallenges({
-            platforms: 'ios',
-            technologies: 'swift',
-            status: 'active',
-          }, {
-            limit: 3,
-            offset: 0,
-            orderBy: 'submissionEndDate asc',
-          })
-          .then(() => {
-            this.setState({ loadingIosChallenges: false });
-          })
-          .catch(() => {
-            this.setState({ loadingIosChallenges: false });
-          });
-        },
-      );
-    }
   }
 
   render() {
@@ -131,7 +67,9 @@ class DashboardPageContainer extends React.Component {
       _.filter(challenges, c => c.platforms === 'iOS'),
     );
 
-    const { loadingMyChallenges, loadingMyMarathon, loadingIosChallenges } = this.state;
+    const loadingActiveChallenges =
+      Boolean(this.props.challengeListing.loadingActiveChallengesUUID);
+
     return (
       <div styleName="dashboard-container">
         <div styleName="page-container">
@@ -149,11 +87,11 @@ class DashboardPageContainer extends React.Component {
             </div>
             <div styleName="challenges">
               {
-                (loadingMyMarathon || loadingMyChallenges) &&
+                loadingActiveChallenges &&
                 <LoadingIndicator theme={{}} />
               }
               {
-                !loadingMyChallenges && !loadingMyMarathon &&
+                !loadingActiveChallenges &&
                 <MyChallenges
                   challenges={myChallenges.slice(0, 8)}
                   groups={profile ? profile.groups : []}
@@ -200,11 +138,11 @@ class DashboardPageContainer extends React.Component {
             </div>
             <div styleName="programs">
               {
-                loadingIosChallenges &&
+                loadingActiveChallenges &&
                 <LoadingIndicator theme={{}} />
               }
               {
-                !loadingIosChallenges &&
+                !loadingActiveChallenges &&
                 <Program
                   challenges={iosChallenges.slice(0, 3)}
                   iosRegistered={iosRegistered}
@@ -233,10 +171,9 @@ DashboardPageContainer.propTypes = {
   auth: PT.shape(),
   dashboard: PT.shape(),
   challengeListing: PT.shape(),
+  getAllActiveChallenges: PT.func.isRequired,
   getSubtrackRanks: PT.func.isRequired,
-  getChallenges: PT.func.isRequired,
   getSRMs: PT.func.isRequired,
-  getMarathonMatches: PT.func.isRequired,
   getIosRegistration: PT.func.isRequired,
   registerIos: PT.func.isRequired,
   getBlogs: PT.func.isRequired,
@@ -249,39 +186,6 @@ DashboardPageContainer.defaultProps = {
   challengeListing: {},
 };
 
-/**
- * Callback for loading challenges satisfying to the specified criteria.
- * All arguments starting from second should match corresponding arguments
- * of the getChallenges action.
- * @param {Function} dispatch
- */
-function getChallenges(dispatch, ...rest) {
-  const uuid = shortid();
-  dispatch(cActions.challengeListing.getInit(uuid));
-  const action = cActions.challengeListing.getChallenges(uuid, ...rest);
-  dispatch(action);
-  return action.payload;
-}
-
-/**
- * Callback for loading marathon matches satisfying to the specified criteria.
- * All arguments starting from second should match corresponding arguments
- * of the getChallenges action.
- * @param {Function} dispatch
- */
-function getMarathonMatches(dispatch, filters, ...rest) {
-  const uuid = shortid();
-  dispatch(cActions.challengeListing.getInit(uuid));
-  const f = _.clone(filters);
-  if (f.status === 'COMPLETED') f.status = 'PAST';
-  const action = cActions.challengeListing.getMarathonMatches(uuid, f, ...rest);
-  dispatch(action);
-  // TODO: This is hack to make the Redux loading of challenges to work
-  // with older code inside the InfiniteList, until it is properly
-  // refactored.
-  return action.payload;
-}
-
 const mapStateToProps = state => ({
   auth: state.auth,
   dashboard: state.dashboard,
@@ -293,8 +197,11 @@ const mapDispatchToProps = dispatch => ({
     dispatch(actions.dashboard.getSubtrackRanksInit());
     dispatch(actions.dashboard.getSubtrackRanksDone(tokenV3, handle));
   },
-  getChallenges: (...rest) => getChallenges(dispatch, ...rest),
-  getMarathonMatches: (...rest) => getMarathonMatches(dispatch, ...rest),
+  getAllActiveChallenges: (tokenV3) => {
+    const uuid = shortid();
+    dispatch(cActions.challengeListing.getAllActiveChallengesInit(uuid));
+    dispatch(cActions.challengeListing.getAllActiveChallengesDone(uuid, tokenV3));
+  },
   getSRMs: (tokenV3, handle) => {
     dispatch(actions.dashboard.getSrmsInit());
     dispatch(actions.dashboard.getSrmsDone(tokenV3, handle, {
diff --git a/src/shared/utils/tc.js b/src/shared/utils/tc.js
@@ -143,6 +143,8 @@ export function stripUnderscore(string) {
  * @param  {array} challenges  challenges array to process
  * @return {array}            processed challenges array
  */
+/* TODO: This function should be mixed into normalization function
+ * of the challenges service. */
 export function processActiveDevDesignChallenges(challenges) {
   return _.map(challenges, (c) => {
     const challenge = _.cloneDeep(c);
