Merge branch 'server_side_filtering' of https://github.com/nauhil/community-app into server_side_filtering

Author: ThomasKranitsas

src/shared/components/Contentful/Menu/index.jsx

@@ -7,12 +7,11 @@ import ContentfulLoader from 'containers/ContentfulLoader';
 import LoadingIndicator from 'components/LoadingIndicator';
 import PT from 'prop-types';
 import React from 'react';
-import { isomorphy } from 'topcoder-react-utils';
 import { url } from 'topcoder-react-lib';
-import { removeTrailingSlash } from 'utils/url';
 import { isActive, target } from 'utils/contentful';
 import NavMenu from './Menu';
 
+const { removeTrailingSlash } = url;
 /* eslint-disable global-require */
 const THEMES = {
   Default: require('./themes/default.scss'),

src/shared/containers/ChallengesBlock.jsx

@@ -4,7 +4,7 @@
  * to a separate component, to expose it to Contentful. Should be further
  * enhanced for usability in other places.
  */
-
+import _ from 'lodash';
 import { actions, challenge as challengeUtil } from 'topcoder-react-lib';
 import challengeListingSidebarActions from 'actions/challenge-listing/sidebar';
 import ChallengesBlock from 'components/ChallengesBlock';
@@ -15,6 +15,7 @@ import React from 'react';
 import shortId from 'shortid';
 import { connect } from 'react-redux';
 
+
 const { BUCKETS } = challengeUtil.buckets;
 
 /* Holds cache time [ms] for the data demanded by this container. */
@@ -76,7 +77,8 @@ ChallengesBlockContiner.propTypes = {
 
 function mapStateToProps(state) {
   return {
-    challenges: state.challengeListing.challenges,
+    challenges: !_.isEmpty(state.challengeListing.challenges[BUCKETS.ALL])
+      ? state.challengeListing.challenges[BUCKETS.ALL] : [],
     lastUpdateOfActiveChallenges:
     state.challengeListing.lastUpdateOfActiveChallenges,
     loadingActiveChallenges:
@@ -87,7 +89,7 @@ function mapStateToProps(state) {
 
 function mapDispatchToActions(dispatch) {
   const cla = actions.challengeListing;
-  const clsa = challengeListingSidebarActions.challengeListing.sidebar;
+  const clsa = challengeListingSidebarActions.challengeListingFrontend.sidebar;
   return {
     getAllActiveChallenges: (tokenV3) => {
       const uuid = shortId();

src/shared/containers/Dashboard/index.jsx

@@ -162,7 +162,6 @@ export class DashboardPageContainer extends React.Component {
       communityStats,
       finances,
       financesLoading,
-      handle,
       selectChallengeDetailsTab,
       setChallengeListingFilter,
       showChallengeFilter,
@@ -201,7 +200,7 @@ export class DashboardPageContainer extends React.Component {
         achievementsLoading={achievementsLoading}
         announcementPreviewId={announcementPreviewId}
         challengeFilter={challengeFilter}
-        challenges={activeChallenges.filter(x => x.users[handle])}
+        challenges={activeChallenges}
         challengesLoading={activeChallengesLoading}
         communities={communities}
         communitiesLoading={communitiesLoading}
@@ -238,7 +237,6 @@ DashboardPageContainer.defaultProps = {
   achievementsTimestamp: 0,
   finances: [],
   financesTimestamp: 0,
-  handle: '',
   profile: null,
   showEarnings:
     isomorphy.isClientSide() ? cookies.get('showEarningsInDashboard') !== 'false' : true,
@@ -275,7 +273,6 @@ DashboardPageContainer.propTypes = {
   getMemberStats: PT.func.isRequired, // eslint-disable-line react/no-unused-prop-types
   getSrms: PT.func.isRequired, // eslint-disable-line react/no-unused-prop-types
   getTopcoderBlogFeed: PT.func.isRequired, // eslint-disable-line react/no-unused-prop-types
-  handle: PT.string,
   profile: PT.shape(), // eslint-disable-line react/no-unused-prop-types
   selectChallengeDetailsTab: PT.func.isRequired,
   setChallengeListingFilter: PT.func.isRequired,
@@ -321,7 +318,8 @@ function mapStateToProps(state, props) {
     achievements: achievements.data,
     achievementsLoading: Boolean(achievements.loadingUuid),
     achievementsTimestamp: achievements.timestamp,
-    activeChallenges: state.challengeListing.challenges,
+    activeChallenges: !_.isEmpty(state.challengeListing.challenges[BUCKETS.MY])
+      ? state.challengeListing.challenges[BUCKETS.MY] : [],
     activeChallengesLoading:
       Boolean(state.challengeListing.loadingActiveChallengesUUID),
     activeChallengesTimestamp:

src/shared/containers/tc-communities/CommunityStats.jsx

@@ -52,8 +52,8 @@ class CommunityStatsContainer extends React.Component {
 
     if (nextProps.token
       && (nextProps.token !== token
-        || nextProps.community !== community
-        || nextProps.challenges !== challenges)) {
+        || !_.isEqual(nextProps.community, community)
+        || !_.isEqual(nextProps.challenges, challenges))) {
       getCommunityStats(nextProps.community, nextProps.challenges, nextProps.token);
     }
 

src/shared/containers/tc-communities/Loader.jsx

@@ -82,6 +82,12 @@ class Loader extends React.Component {
     if (!meta.authorizedGroupIds) return Community({ member, meta });
 
     /* Visitor is not authenticated. */
+    const viewportId = _.isEmpty(_.pick(meta, 'accessDeniedPage.viewportId'))
+      ? null : meta.accessDeniedPage.viewportId;
+    const spaceName = _.isEmpty(_.pick(meta, 'accessDeniedPage.spaceName'))
+      ? null : meta.accessDeniedPage.spaceName;
+    const environment = _.isEmpty(_.pick(meta, 'accessDeniedPage.environment'))
+      ? null : meta.accessDeniedPage.environment;
     if (!visitorGroups) {
       /* TODO: In case of TopGear (Wipro) community, if user is not
        * authenticated he is automatically redirected to SSO auth URL,
@@ -99,9 +105,9 @@ class Loader extends React.Component {
         <AccessDenied
           cause={ACCESS_DENIED_REASON.NOT_AUTHENTICATED}
           communityId={communityId}
-          viewportId={meta.accessDeniedPage.viewportId}
-          spaceName={meta.accessDeniedPage.spaceName}
-          environment={meta.accessDeniedPage.environment}
+          viewportId={viewportId}
+          spaceName={spaceName}
+          environment={environment}
         />
       );
     }
@@ -122,9 +128,9 @@ class Loader extends React.Component {
     return (
       <AccessDenied
         cause={ACCESS_DENIED_REASON.NOT_AUTHORIZED}
-        viewportId={meta.accessDeniedPage.viewportId}
-        spaceName={meta.accessDeniedPage.spaceName}
-        environment={meta.accessDeniedPage.environment}
+        viewportId={viewportId}
+        spaceName={spaceName}
+        environment={environment}
       />
     );
   }

src/shared/containers/tc-communities/cognitive/home.jsx

@@ -9,12 +9,14 @@ import shortId from 'shortid';
 import { USER_GROUP_MAXAGE } from 'config';
 
 import { connect } from 'react-redux';
-import { challenge as challengeUtils, actions } from 'topcoder-react-lib';
+import { challenge as challengeUtil, actions } from 'topcoder-react-lib';
+
+const { BUCKETS } = challengeUtil.buckets;
 
 /* Holds cache time [ms] for the data demanded by this container. */
 const MAXAGE = 30 * 60 * 1000;
 
-const Filter = challengeUtils.filter;
+const Filter = challengeUtil.filter;
 
 class HomeContainer extends React.Component {
   componentDidMount() {
@@ -96,7 +98,8 @@ HomeContainer.propTypes = {
 function mapStateToProps(state) {
   return {
     auth: state.auth,
-    activeChallenges: state.challengeListing.challenges,
+    activeChallenges: !_.isEmpty(state.challengeListing.challenges[BUCKETS.ALL])
+      ? state.challengeListing.challenges[BUCKETS.ALL] : [],
     activeChallengesTimestamp:
     state.challengeListing.lastUpdateOfActiveChallenges,
     allFaqItemsClosedInResourcesPage:

src/shared/utils/contentful.js

@@ -1,6 +1,8 @@
 import _ from 'lodash';
 import { isomorphy } from 'topcoder-react-utils';
-import { removeTrailingSlash } from 'utils/url';
+import { url as urlUtil } from 'topcoder-react-lib';
+
+const { removeTrailingSlash } = urlUtil;
 
 /**
  * Normalizes styles object to ReactJS format (camelCase property names).