Merge pull request #5289 from topcoder-platform/hide-my-communities

Hide My Communities from My Dashboard

Author: luizrrodrigues

.circleci/config.yml

@@ -244,7 +244,7 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - hide-my-communities
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap

@@ -601,7 +601,7 @@ exports[`Matches shallow shapshot 1`] = `
       <span
         className="src-shared-components-TopcoderFooter-___style__copyright-notice___24f5v"
       >
-        © 2020 Topcoder
+        © 2021 Topcoder
         <a
           className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           href="https://www.topcoder-dev.com/policy"

__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/Footer.jsx.snap

@@ -69,7 +69,7 @@ exports[`Matches shallow shapshot 1`] = `
     className="src-shared-components-challenge-listing-Sidebar-Footer-___style__copyright___ghkHg"
   >
     Topcoder ©
-    2020
+    2021
   </p>
 </div>
 `;

src/shared/components/Dashboard/CurrentActivity/Header/index.jsx

@@ -10,7 +10,7 @@ import './style.scss';
 
 export default function Header({
   // numChallenges,
-  numCommunities,
+  // numCommunities,
   switchTab,
   tab,
 }) {
@@ -22,39 +22,43 @@ export default function Header({
   if (numChallenges) myChallengesTitle += ` (${numChallenges})`;
   */
 
-  let myCommunitiesTitle = 'My Communities';
-  if (numCommunities) myCommunitiesTitle += ` (${numCommunities})`;
+  // let myCommunitiesTitle = 'My Communities';
+  // if (numCommunities) myCommunitiesTitle += ` (${numCommunities})`;
 
   return (
     <div styleName="container">
       <Carousel
         alignItems="start"
       >
+        <Option />
         {/* {/* Temporary hide My Active Challenges - community-app#5004
         <Option
           selected={tab === TABS.MY_ACTIVE_CHALLENGES}
           select={() => switchTab(TABS.MY_ACTIVE_CHALLENGES)}
           title={myChallengesTitle}
         />
         */}
+        {/* Hide My Communities community-app#5288
         <Option
           selected={tab === TABS.COMMUNITIES}
           select={() => switchTab(TABS.COMMUNITIES)}
           title={myCommunitiesTitle}
         />
+        */}
         <Option
           selected={tab === TABS.SRMS}
           select={() => switchTab(TABS.SRMS)}
           title="SRMs"
         />
+        <Option />
       </Carousel>
     </div>
   );
 }
 
 Header.propTypes = {
   // numChallenges: PT.number.isRequired,
-  numCommunities: PT.number.isRequired,
+  // numCommunities: PT.number.isRequired,
   switchTab: PT.func.isRequired,
   tab: PT.string.isRequired,
 };

src/shared/components/Dashboard/CurrentActivity/index.jsx

@@ -5,16 +5,16 @@ import PT from 'prop-types';
 import _ from 'lodash';
 import { TABS } from 'actions/page/dashboard';
 
-import { challenge as challengeUtils } from 'topcoder-react-lib';
+// import { challenge as challengeUtils } from 'topcoder-react-lib';
 
-import Challenges from './Challenges';
-import Communities from './Communities';
+// import Challenges from './Challenges';
+// import Communities from './Communities';
 import Header from './Header';
 import Srms from './Srms';
 
 import './styles.scss';
 
-const Filter = challengeUtils.filter;
+// const Filter = challengeUtils.filter;
 
 /* eslint-disable react/no-unused-state */
 
@@ -52,44 +52,46 @@ export default class MyChallenges extends React.Component {
 
   render() {
     const {
-      challengeFilter,
-      challenges,
-      challengesLoading,
-      communities,
-      communitiesLoading,
-      communityStats,
-      selectChallengeDetailsTab,
-      setChallengeListingFilter,
-      showChallengeFilter,
+      // challengeFilter,
+      // challenges,
+      // challengesLoading,
+      // communities,
+      // communitiesLoading,
+      // communityStats,
+      // selectChallengeDetailsTab,
+      // setChallengeListingFilter,
+      // showChallengeFilter,
       srms,
       srmsLoading,
-      switchChallengeFilter,
-      switchShowChallengeFilter,
+      // switchChallengeFilter,
+      // switchShowChallengeFilter,
       switchTab,
       tab,
-      unregisterFromChallenge,
-      userGroups,
-      userResources,
-      challengeTypesMap,
+      // unregisterFromChallenge,
+      // userGroups,
+      // userResources,
+      // challengeTypesMap,
     } = this.props;
 
+    /* Hide My Communities community-app#5288
     const myCommunities = communities.filter(x => _.intersection(userGroups, x.groupIds).length)
       .map((community) => {
         const filter = Filter.getFilterFunction(community.challengeFilter);
         const res = _.clone(community);
         res.number = challenges.filter(x => filter(x)).length;
         return res;
       });
+    */
 
     return (
       <div styleName="container">
         <Header
-          numChallenges={challenges.length}
-          numCommunities={myCommunities.length}
+          // numChallenges={challenges.length}
+          // numCommunities={myCommunities.length}
           switchTab={switchTab}
           tab={tab}
         />
-        {
+        { /*
           tab === TABS.MY_ACTIVE_CHALLENGES ? (
             <Challenges
               challengeFilter={challengeFilter}
@@ -111,16 +113,16 @@ export default class MyChallenges extends React.Component {
               challengeTypesMap={challengeTypesMap}
             />
           ) : null
-        }
-        {
+        */}
+        {/* Hide My Communities community-app#5288
           tab === TABS.COMMUNITIES ? (
             <Communities
               communities={myCommunities}
               communitiesLoading={communitiesLoading}
               communityStats={communityStats}
             />
           ) : null
-        }
+        */}
         {
           tab === TABS.SRMS ? (
             <Srms
@@ -135,28 +137,28 @@ export default class MyChallenges extends React.Component {
 }
 
 MyChallenges.defaultProps = {
-  challenges: [],
-  userResources: [],
+  // challenges: [],
+  // userResources: [],
 };
 
 MyChallenges.propTypes = {
-  challengeFilter: PT.string.isRequired,
-  challenges: PT.arrayOf(PT.object),
-  challengesLoading: PT.bool.isRequired,
-  communities: PT.arrayOf(PT.object).isRequired,
-  communitiesLoading: PT.bool.isRequired,
-  communityStats: PT.shape().isRequired,
-  selectChallengeDetailsTab: PT.func.isRequired,
-  setChallengeListingFilter: PT.func.isRequired,
-  showChallengeFilter: PT.bool.isRequired,
+  // challengeFilter: PT.string.isRequired,
+  // challenges: PT.arrayOf(PT.object),
+  // challengesLoading: PT.bool.isRequired,
+  // communities: PT.arrayOf(PT.object).isRequired,
+  // communitiesLoading: PT.bool.isRequired,
+  // communityStats: PT.shape().isRequired,
+  // selectChallengeDetailsTab: PT.func.isRequired,
+  // setChallengeListingFilter: PT.func.isRequired,
+  // showChallengeFilter: PT.bool.isRequired,
   srms: PT.arrayOf(PT.object).isRequired,
   srmsLoading: PT.bool.isRequired,
-  switchChallengeFilter: PT.func.isRequired,
-  switchShowChallengeFilter: PT.func.isRequired,
+  // switchChallengeFilter: PT.func.isRequired,
+  // switchShowChallengeFilter: PT.func.isRequired,
   switchTab: PT.func.isRequired,
   tab: PT.oneOf(_.values(TABS)).isRequired,
-  unregisterFromChallenge: PT.func.isRequired,
-  userGroups: PT.arrayOf(PT.string).isRequired,
-  userResources: PT.arrayOf(PT.shape()),
-  challengeTypesMap: PT.shape().isRequired,
+  // unregisterFromChallenge: PT.func.isRequired,
+  // userGroups: PT.arrayOf(PT.string).isRequired,
+  // userResources: PT.arrayOf(PT.shape()),
+  // challengeTypesMap: PT.shape().isRequired,
 };

src/shared/reducers/page/dashboard.js

@@ -93,7 +93,7 @@ function create(state = {}) {
     [a.switchTab]: onSwitchTab,
   }, _.defaults(state, {
     challengeFilter: '',
-    tab: TABS.COMMUNITIES, // Temporary hide MY ACTIVE CHALLENGES - community-app#5004
+    tab: TABS.SRMS, // Temporary hide MY ACTIVE CHALLENGES - community-app#5004
     showAnnouncement: true,
     showChallengeFilter: false,
     xlBadge: '',