Merge pull request #3359 from topcoder-platform/develop

Merge Develop to Master

Author: sushilshinde

.circleci/config.yml

@@ -175,25 +175,21 @@ workflows:
             branches:
               only: 
                 - develop
-                - hot-fixes-4
-                - feature-contentful
+                - hot-fix
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
                 only:
-                  - legacy-tco
                   - hot-fix
-                  - mm-leaderboard-misc-fixes
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
                 - develop
-                - hot-fix
       # Production builds are exectuted only on tagged commits to the
       # master branch.
       - "build-prod":

src/shared/components/tc-communities/Footer2/index.jsx

@@ -4,17 +4,18 @@
  */
 
 import React from 'react';
-
+import moment from 'moment';
 import TopcoderLogoGray from '../../../../assets/images/tc-communities/logo_topcoder_gray.svg';
 import './style.scss';
 
+
 export default function Footer2() {
   return (
     <div styleName="footer">
       <div styleName="content">
         <TopcoderLogoGray />
         <span styleName="copyright">
-&copy; Topcoder, 2017
+&copy; Topcoder, {moment().year()}
         </span>
         <div styleName="right">
           <a

src/shared/components/tc-communities/communities/veterans/Footer/index.jsx

@@ -1,3 +1,4 @@
+import moment from 'moment';
 import React from 'react';
 import PT from 'prop-types';
 import { themr } from 'react-css-super-themr';
@@ -8,7 +9,7 @@ function Footer({ theme }) {
   return (
     <footer className={theme.footer}>
       <div className={theme.footerText}>
-        &copy; Copyright Topcoder Ltd 2017
+        &copy; Copyright Topcoder Ltd {moment().year()}
       </div>
     </footer>
   );

src/shared/components/tc-communities/communities/wipro/Footer/index.jsx

@@ -1,3 +1,4 @@
+import moment from 'moment';
 import React from 'react';
 import PT from 'prop-types';
 import { themr } from 'react-css-super-themr';
@@ -8,7 +9,7 @@ function Footer({ theme }) {
   return (
     <footer className={theme.footer}>
       <div className={theme.footerText}>
-        &copy; Copyright Wipro Ltd 2017
+        &copy; Copyright Wipro Ltd {moment().year()}
       </div>
     </footer>
   );

src/shared/components/tc-communities/communities/wipro/Home/index.jsx

@@ -165,14 +165,6 @@ export default function Home(props) {
             link={[{
               title: 'Start Earning',
               url: 'challenges',
-            }, {
-              newTab: true,
-              title: 'Become a Reviewer',
-              url: 'https://help.topcoder.com/hc/requests/new',
-            }, {
-              newTab: true,
-              title: 'Become a Copilot',
-              url: 'https://help.topcoder.com/hc/requests/new',
             }]}
             theme={ImageTextStyles}
             imageSrc="/community-app-assets/themes/wipro/home/image-text-do.png"

src/shared/containers/challenge-listing/Listing/index.jsx

@@ -117,13 +117,18 @@ export class ListingContainer extends React.Component {
     const {
       communitiesList,
       selectedCommunityId,
+      groupIds,
+      communityId,
     } = this.props;
     let { filter } = this.props;
     let communityFilter = communitiesList.data.find(
       item => item.communityId === selectedCommunityId,
     );
     if (communityFilter) communityFilter = communityFilter.challengeFilter;
     if (communityFilter) filter = combine(filter, communityFilter);
+    if (communityId && groupIds.length > 0) {
+      filter.groupIds = groupIds;
+    }
     return {
       back: mapToBackend(filter),
       front: filter,

src/shared/routes/Communities/Zurich/Routes.jsx

@@ -81,6 +81,7 @@ function Zurich({ base, meta, userGroups }) {
                     meta,
                     newChallengeDetails: true,
                     ChallengeListingBanner,
+                    groupIds: meta.groupIds,
                   })}
                   exact
                   path={`${base}/challenges`}