Merge pull request #3462 from rashmi73/issue_3459

issue 3459 fix

Author: cwdcwd

src/shared/components/Dashboard/index.jsx

@@ -2,7 +2,7 @@ import Announcement from 'containers/Dashboard/Announcement';
 import PT from 'prop-types';
 import React from 'react';
 
-import CommunityBlog from './CommunityBlog';
+// import CommunityBlog from './CommunityBlog';
 import MemberMetrics from './MemberMetrics';
 import CurrentActivity from './CurrentActivity';
 import Header from './Header';
@@ -35,12 +35,12 @@ export default function Dashboard({
   switchShowEarnings,
   switchTab,
   tab,
-  tcBlogLoading,
-  tcBlogPosts,
+  // tcBlogLoading,
+  // tcBlogPosts,
   unregisterFromChallenge,
   userGroups,
   xlBadge,
-  errorLoadingRss,
+  // errorLoadingRss,
 }) {
   return (
     <div styleName="container">
@@ -82,7 +82,9 @@ export default function Dashboard({
           unregisterFromChallenge={unregisterFromChallenge}
           userGroups={userGroups}
         />
-        {!errorLoadingRss && <CommunityBlog isLoading={tcBlogLoading} posts={tcBlogPosts} />}
+        {/* {!errorLoadingRss && (
+            <CommunityBlog isLoading={tcBlogLoading} posts={tcBlogPosts} />
+        )} */}
       </div>
     </div>
   );
@@ -118,10 +120,10 @@ Dashboard.propTypes = {
   switchShowEarnings: PT.func.isRequired,
   switchTab: PT.func.isRequired,
   tab: PT.string.isRequired,
-  tcBlogLoading: PT.bool.isRequired,
-  tcBlogPosts: PT.arrayOf(PT.object).isRequired,
+  // tcBlogLoading: PT.bool.isRequired,
+  // tcBlogPosts: PT.arrayOf(PT.object).isRequired,
   unregisterFromChallenge: PT.func.isRequired,
   userGroups: PT.arrayOf(PT.string).isRequired,
   xlBadge: PT.string.isRequired,
-  errorLoadingRss: PT.bool.isRequired,
+  // errorLoadingRss: PT.bool.isRequired,
 };

src/shared/containers/Contentful/BlogFeed/BlogFeed.jsx

@@ -3,52 +3,53 @@
  */
 
 import LoadingIndicator from 'components/LoadingIndicator';
-import BlogFeed from 'components/Contentful/BlogFeed';
+// import BlogFeed from 'components/Contentful/BlogFeed';
 import rssActions from 'actions/rss';
 import shortId from 'shortid';
 import PT from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
 
 /* Holds 1 min in ms. */
-const MIN = 60 * 1000;
+// const MIN = 60 * 1000;
 const FEED_ID_PREFIX = 'feedFor';
 
 class BlogFeedContainer extends React.Component {
   componentDidMount() {
-    this.updateRssFeedData();
+    // this.updateRssFeedData();
   }
 
   /*
   * Updates Rss feed data, if necessary.
   */
-  updateRssFeedData() {
-    const { rssFeedData, loadRssFeedData } = this.props;
-    if (rssFeedData && Date.now() - rssFeedData.timestamp < 5 * MIN) return;
-    loadRssFeedData();
-  }
+  // updateRssFeedData() {
+  //   const { rssFeedData } = this.props;
+  //   if (rssFeedData && Date.now() - rssFeedData.timestamp < 5 * MIN) return;
+  //   loadRssFeedData();
+  // }
 
   render() {
     const {
-      blogFeed,
+      // blogFeed,
       rssFeedData,
     } = this.props;
 
     return (
       rssFeedData && rssFeedData.data ? (
-        <BlogFeed
-          blogFeed={blogFeed}
-          rssFeedData={rssFeedData}
-        />
+        // <BlogFeed
+        //   blogFeed={blogFeed}
+        //   rssFeedData={rssFeedData}
+        // />
+        <div />
       ) : <LoadingIndicator />
     );
   }
 }
 
 BlogFeedContainer.propTypes = {
-  blogFeed: PT.shape().isRequired,
+  // blogFeed: PT.shape().isRequired,
   rssFeedData: PT.shape().isRequired,
-  loadRssFeedData: PT.func.isRequired,
+  // loadRssFeedData: PT.func.isRequired,
 };
 
 function mapStateToProps(state, ownProps) {

src/shared/containers/Dashboard/index.jsx

@@ -108,15 +108,15 @@ export class DashboardPageContainer extends React.Component {
     getMemberFinances,
     getMemberStats,
     getSrms,
-    getTopcoderBlogFeed,
+    // getTopcoderBlogFeed,
     handle,
     profile,
     srmsLoading,
     srmsTimestamp,
     statsLoading,
     statsTimestamp,
-    tcBlogLoading,
-    tcBlogTimestamp,
+    // tcBlogLoading,
+    // tcBlogTimestamp,
     tokenV3,
   }) {
     if (authenticating || !this.authCheck(tokenV3)) return;
@@ -141,8 +141,8 @@ export class DashboardPageContainer extends React.Component {
     if (now - statsTimestamp > CACHE_MAX_AGE
     && !statsLoading) getMemberStats(handle, tokenV3);
 
-    if (now - tcBlogTimestamp > CACHE_MAX_AGE
-    && !tcBlogLoading) getTopcoderBlogFeed();
+    // if (now - tcBlogTimestamp > CACHE_MAX_AGE
+    // && !tcBlogLoading) getTopcoderBlogFeed();
 
     if (now - communitiesTimestamp < CACHE_MAX_AGE
     && now - activeChallengesTimestamp < CACHE_MAX_AGE) {

src/shared/containers/tc-communities/blockchain/Learn.jsx

@@ -2,7 +2,7 @@
  * Container for the Learn page of Blockchain community.
  */
 
-import LearnPage from 'components/tc-communities/communities/blockchain/Learn';
+// import LearnPage from 'components/tc-communities/communities/blockchain/Learn';
 import rssActions from 'actions/rss';
 import PT from 'prop-types';
 import React from 'react';
@@ -25,8 +25,8 @@ const TOPCODER_BLOCKCHAIN_BLOG_RSS_URL = `/community-app-assets/api/proxy-get?ur
 
 class LearnPageContainer extends React.Component {
   componentDidMount() {
-    this.updateConsenSysRss();
-    this.updateTopcoderBlockchainBlogRss();
+    // this.updateConsenSysRss();
+    // this.updateTopcoderBlockchainBlogRss();
   }
 
   /**
@@ -52,17 +52,18 @@ class LearnPageContainer extends React.Component {
   }
 
   render() {
-    const {
-      baseUrl,
-      consenSysRss,
-      topcoderBlockchainBlogRss,
-    } = this.props;
+    // const {
+    //   baseUrl,
+    //   consenSysRss,
+    //   topcoderBlockchainBlogRss,
+    // } = this.props;
     return (
-      <LearnPage
-        baseUrl={baseUrl}
-        consenSysRss={consenSysRss}
-        topcoderBlockchainBlogRss={topcoderBlockchainBlogRss}
-      />
+      // <LearnPage
+      //   baseUrl={baseUrl}
+      //   consenSysRss={consenSysRss}
+      //   topcoderBlockchainBlogRss={topcoderBlockchainBlogRss}
+      // />
+      <div />
     );
   }
 }
@@ -73,7 +74,7 @@ LearnPageContainer.defaultProps = {
 };
 
 LearnPageContainer.propTypes = {
-  baseUrl: PT.string.isRequired,
+  // baseUrl: PT.string.isRequired,
   consenSysRss: PT.shape({
     data: PT.object,
     loadingUuid: PT.string.isRequired,