Skip to content

Release 2021/01/07 (v1.7.3) - Hot-Fix : Hide My Communities #5290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ workflows:
filters:
branches:
only:
- free
- develop
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
`;
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import './style.scss';

export default function Header({
// numChallenges,
numCommunities,
// numCommunities,
switchTab,
tab,
}) {
Expand All @@ -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,
};
86 changes: 44 additions & 42 deletions src/shared/components/Dashboard/CurrentActivity/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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}
Expand All @@ -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
Expand All @@ -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,
};
2 changes: 1 addition & 1 deletion src/shared/reducers/page/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: '',
Expand Down