Merge pull request #6909 from topcoder-platform/justin_redirects

Justin redirects
topcoder-platform · Aug 28, 2023 · 5189b5d · 5189b5d
2 parents dc63db8 + cb9cd5a
commit 5189b5d
Show file tree

Hide file tree

Showing 55 changed files with 67 additions and 448 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -352,6 +352,7 @@ workflows:
                 - PROD-4183
                 - MP-327
                 - fix_country_setting_in_profile
+                - justin_redirects
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global

diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
@@ -154,7 +154,7 @@ exports[`Default render 1`] = `
         accountMenu={
           Array [
             Object {
-              "href": "/settings/profile",
+              "href": "/settings/account",
               "title": "Settings",
             },
             Object {

diff --git a/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -38,7 +38,6 @@ afterAll(() => {
 //   setSearchText,
 //   showTrackModal,
 //   trackModalShown: true,
-//   validKeywords: [''],
 //   validTypes: [''],
 // }, {
 //   challengeGroupId: '1',
@@ -60,7 +59,6 @@ afterAll(() => {
 //   setSearchText,
 //   showTrackModal,
 //   trackModalShown: true,
-//   validKeywords: [''],
 //   validTypes: [''],
 // }];
 

diff --git a/__tests__/shared/components/challenge-listing/Filters/FiltersPanel.jsx b/__tests__/shared/components/challenge-listing/Filters/FiltersPanel.jsx
@@ -31,7 +31,6 @@ const mockDatas = [{
   setFilterState,
   setSearchText,
   activeBucket: 'all',
-  validKeywords: ['key', 'word'],
   validTypes: [{ name: 'sub', subTrack: 'sub' }, { name: 'track', subTrack: 'track' }],
   onClose,
 }, {
@@ -55,7 +54,6 @@ const mockDatas = [{
   selectedCommunityId: '1',
   setFilterState,
   setSearchText,
-  validKeywords: [],
   validTypes: [],
   onClose,
 }];

diff --git a/__tests__/shared/containers/challenge-listing/FilterPanel.jsx b/__tests__/shared/containers/challenge-listing/FilterPanel.jsx
@@ -23,9 +23,7 @@ describe('shallow render connnected component', () => {
       },
       communityFilters: [],
       filter: {},
-      loadingChallengeTags: false,
       loadingChallengeTypes: false,
-      challengeTags: [],
       challengeTypes: [],
       selectedCommunityId: '1',
     },
@@ -69,14 +67,11 @@ describe('shallow render connnected component', () => {
 //   communityFilters: [],
 //   filterState: {},
 //   getAvailableFilterName: jest.fn(),
-//   loadingKeywords: false,
 //   loadingTypes: false,
-//   validKeywords: [],
 //   validTypes: [],
 //   selectedCommunityId: '1',
 //   tokenV2: 'tokenV2',
 //   getTypes: jest.fn(),
-//   getKeywords: jest.fn(),
 //   saveFilter: jest.fn(),
 //   selectBucket: jest.fn(),
 //   selectCommunity: jest.fn(),
@@ -112,19 +107,16 @@ describe('shallow render connnected component', () => {
 // test('load data if not loading', () => {
 //   instance = mount(<FilterPanel {...initialProps} challengeGroupId="1" />);
 //   expect(initialProps.getTypes).toHaveBeenCalledTimes(1);
-//   expect(initialProps.getKeywords).toHaveBeenCalledTimes(1);
 // });
 
 // test('do not load data if loading', () => {
 //   instance = mount(<FilterPanel
 //     {...initialProps}
 //     challengeGroupId="1"
 //     loadingTypes
-//     loadingKeywords
 //   />);
 
 //   expect(initialProps.getTypes).toHaveBeenCalledTimes(0);
-//   expect(initialProps.getKeywords).toHaveBeenCalledTimes(0);
 // });
 
 // test.skip('saveFilter', () => {
@@ -182,9 +174,7 @@ describe('shallow render connnected component', () => {
 //       },
 //       communityFilters: [],
 //       filter: {},
-//       loadingChallengeTags: true,
 //       loadingChallengeTypes: true,
-//       challengeTags: [],
 //       challengeTypes: [],
 //       selectedCommunityId: '1',
 //     },
@@ -232,13 +222,6 @@ describe('shallow render connnected component', () => {
 //     expect(actions[1].type).toEqual(cActions.challengeListing.getChallengeTypesDone.toString());
 //   });
 
-//   test('getKeywords', () => {
-//     filterPanel.prop('getKeywords')();
-//     const actions = store.getActions();
-//     expect(actions[0].type).toEqual(cActions.challengeListing.getChallengeTagsInit.toString());
-//     expect(actions[1].type).toEqual(cActions.challengeListing.getChallengeTagsDone.toString());
-//   });
-
 // test.skip('saveFilter', () => {
 //   filterPanel.prop('saveFilter')();
 //   const actions = store.getActions();

diff --git a/__tests__/shared/containers/challenge-listing/Listing.jsx b/__tests__/shared/containers/challenge-listing/Listing.jsx
@@ -41,7 +41,6 @@ describe('full render pure component', () => {
     allPastChallengesLoaded: false,
     challenges: [],
     challengeTypes: [],
-    challengeTags: [],
     getCommunitiesList: () => {},
     communityFilters: [{ communityId: '1', name: 'My Filter', filter: {} }],
     dropChallenges: jest.fn(),
@@ -178,7 +177,6 @@ describe('full render connnected component and dispatch actions', () => {
       allPastChallengesLoaded: false,
       challenges: [{ id: '1' }],
       challengeTypes: [],
-      challengeTags: [],
       // communityFilters: [{ id: '1', name: 'My Filter', filter: {} }],
       dropChallenges: jest.fn(),
       filter: {},

diff --git a/config/default.js b/config/default.js
@@ -427,7 +427,7 @@ module.exports = {
   ACCOUNT_MENU: [
     {
       title: 'Settings',
-      href: '/settings/profile',
+      href: '/settings/account',
     },
     { separator: true },
     {
@@ -474,6 +474,7 @@ module.exports = {
   /* development id - makes surveys have warning about environment */
   UNIVERSAL_NAV_URL: '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js',
   MEMBER_PROFILE_REDIRECT_URL: 'https://profiles.topcoder-dev.com',
+  MEMBER_SEARCH_REDIRECT_URL: 'https://talent-search.topcoder-dev.com',
   ACCOUNT_SETTINGS_REDIRECT_URL: 'https://account-settings.topcoder-dev.com',
   SPRIG_ENVIRONMENT_ID: 'bUcousVQ0-yF',
 };
diff --git a/config/production.js b/config/production.js
@@ -211,7 +211,7 @@ module.exports = {
   ACCOUNT_MENU: [
     {
       title: 'Settings',
-      href: '/settings/profile?ref=nav',
+      href: '/settings/account',
     },
     { separator: true },
     {
@@ -237,6 +237,7 @@ module.exports = {
   /* development id - makes surveys have warning about environment */
   UNIVERSAL_NAV_URL: '//uni-nav.topcoder.com/v1/tc-universal-nav.js',
   MEMBER_PROFILE_REDIRECT_URL: 'https://profiles.topcoder.com',
+  MEMBER_SEARCH_REDIRECT_URL: 'https://talent-search.topcoder.com',
   SPRIG_ENVIRONMENT_ID: 'a-IZBZ6-r7bU',
   ACCOUNT_SETTINGS_REDIRECT_URL: 'https://account-settings.topcoder.com',
 };
diff --git a/src/shared/actions/challenge-listing/index.js b/src/shared/actions/challenge-listing/index.js
@@ -57,17 +57,6 @@ function getChallengeTypesDone() {
     .then(res => res.sort((a, b) => a.name.localeCompare(b.name)));
 }
 
-/**
- * Gets possible challenge tags (technologies).
- * @return {Promise}
- */
-function getChallengeTagsDone() {
-  return getService()
-    .getChallengeTags()
-    .then(res => res.map(item => item.name)
-      .sort((a, b) => a.localeCompare(b)));
-}
-
 /**
  * Notifies about reloading of all active challenges. The UUID is stored in the
  * state, and only challenges fetched by getAllActiveChallengesDone action with
@@ -587,9 +576,6 @@ export default createActions({
     GET_TOTAL_CHALLENGES_COUNT_INIT: getTotalChallengesCountInit,
     GET_TOTAL_CHALLENGES_COUNT_DONE: getTotalChallengesCountDone,
 
-    GET_CHALLENGE_TAGS_INIT: _.noop,
-    GET_CHALLENGE_TAGS_DONE: getChallengeTagsDone,
-
     GET_PAST_CHALLENGES_INIT: getPastChallengesInit,
     GET_PAST_CHALLENGES_DONE: getPastChallengesDone,
 

diff --git a/src/shared/components/TopcoderHeader/index.jsx b/src/shared/components/TopcoderHeader/index.jsx
@@ -288,7 +288,7 @@ export default class TopcoderHeader extends React.Component {
         }, {
           enforceA: true,
           icon: <IconNavSettings />,
-          link: '/settings/profile',
+          link: '/settings/account',
           title: 'Settings',
         }, {
           enforceA: true,

diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -12,7 +12,7 @@
  *
  * Challenge keywords and tracks filters allow to choose multiple keywords from
  * the predefined sets, which should be passed into the component as string arrays
- * via the 'validKeywords' and 'validTracks' properties. The whole filters panel
+ * via the 'validTracks' properties. The whole filters panel
  * can be hidden/displayed by setting the boolean 'hidden' property.
  *
  * Each time the user modifies any filter, this component triggers the callback
@@ -64,7 +64,6 @@ export default function FiltersPanel({
   // selectedCommunityId,
   setFilterState,
   setSearchText,
-  // validKeywords,
   validTypes,
   // isSavingFilter,
   expanded,
@@ -343,7 +342,6 @@ export default function FiltersPanel({
                 const tags = value ? value.split(',') : undefined;
                 setFilterState({ ..._.clone(filterState), tags });
               }}
-              options={validKeywords.map(mapOps)}
               simpleValue
               value={filterState.tags ? filterState.tags.join(',') : null}
             />
@@ -726,7 +724,6 @@ FiltersPanel.propTypes = {
   // selectedCommunityId: PT.string.isRequired,
   setFilterState: PT.func.isRequired,
   setSearchText: PT.func.isRequired,
-  // validKeywords: PT.arrayOf(PT.string).isRequired,
   validTypes: PT.arrayOf(PT.shape()).isRequired,
   onClose: PT.func,
   expanded: PT.bool.isRequired,

diff --git a/src/shared/components/tc-communities/Header/index.jsx b/src/shared/components/tc-communities/Header/index.jsx
@@ -87,7 +87,7 @@ function Header(props) {
         title: 'Payments',
       }, {
         icon: <IconNavSettings />,
-        link: `${meta ? _.replace(BASE_URL, 'www', meta.subdomains[0]) : BASE_URL}/settings/profile`,
+        link: `${meta ? _.replace(BASE_URL, 'www', meta.subdomains[0]) : BASE_URL}/settings/account`,
         title: 'Settings',
       }, {
         icon: <IconNavExit />,

diff --git a/src/shared/containers/challenge-listing/FilterPanel.jsx b/src/shared/containers/challenge-listing/FilterPanel.jsx
@@ -29,9 +29,7 @@ export class Container extends React.Component {
 
   componentDidMount() {
     const {
-      getKeywords,
       getTypes,
-      loadingKeywords,
       loadingTypes,
       setFilterState,
       // filterState,
@@ -46,7 +44,6 @@ export class Container extends React.Component {
       getCommunityList(auth);
     }
     if (!loadingTypes) getTypes();
-    if (!loadingKeywords) getKeywords();
 
     const query = qs.parse(window.location.search.slice(1));
 
@@ -182,9 +179,7 @@ Container.propTypes = {
   }).isRequired,
   filterState: PT.shape().isRequired,
   selectedCommunityId: PT.string.isRequired,
-  getKeywords: PT.func.isRequired,
   getTypes: PT.func.isRequired,
-  loadingKeywords: PT.bool.isRequired,
   loadingTypes: PT.bool.isRequired,
   setFilterState: PT.func.isRequired,
   auth: PT.shape().isRequired,
@@ -214,10 +209,6 @@ function mapDispatchToProps(dispatch) {
       dispatch(communityActions.tcCommunity.getListInit(uuid));
       dispatch(communityActions.tcCommunity.getListDone(uuid, auth));
     },
-    getKeywords: () => {
-      dispatch(cla.getChallengeTagsInit());
-      dispatch(cla.getChallengeTagsDone());
-    },
     selectCommunity: id => dispatch(cla.selectCommunity(id)),
     setFilterState: s => dispatch(cla.setFilter(s)),
     onClose: () => dispatch(a.setExpanded(false)),
@@ -237,9 +228,7 @@ function mapStateToProps(state, ownProps) {
     communityList: tc.list,
     defaultCommunityId: ownProps.defaultCommunityId,
     filterState: cl.filter,
-    loadingKeywords: cl.loadingChallengeTags,
     loadingTypes: cl.loadingChallengeTypes,
-    validKeywords: cl.challengeTags,
     validTypes: cl.challengeTypes,
     selectedCommunityId: cl.selectedCommunityId,
     auth: state.auth,

diff --git a/src/shared/containers/challenge-listing/Listing/index.jsx b/src/shared/containers/challenge-listing/Listing/index.jsx
@@ -466,7 +466,6 @@ export class ListingContainer extends React.Component {
       pastChallenges,
       challengeTypes,
       challengesUrl,
-      challengeTags,
       communityFilters,
       communityName,
       defaultCommunityId,
@@ -646,7 +645,6 @@ export class ListingContainer extends React.Component {
           allChallenges={allChallenges}
           pastChallenges={pastChallenges}
           challengeTypes={challengeTypes}
-          challengeTags={challengeTags}
           challengesUrl={challengesUrl}
           communityFilter={communityFilter}
           communityName={communityName}
@@ -765,7 +763,6 @@ ListingContainer.propTypes = {
   pastChallenges: PT.arrayOf(PT.shape({})),
   challengeTypes: PT.arrayOf(PT.shape()),
   challengesUrl: PT.string,
-  challengeTags: PT.arrayOf(PT.string).isRequired,
   communitiesList: PT.shape({
     data: PT.arrayOf(PT.shape({
       challengeFilter: PT.shape(),
@@ -864,7 +861,6 @@ const mapStateToProps = (state, ownProps) => {
     allChallenges: cl.allChallenges,
     pastChallenges: cl.pastChallenges,
     challengeTypes: cl.challengeTypes,
-    challengeTags: cl.challengeTags,
     communitiesList: tc.list,
     communityFilters: tc.list.data,
     domain: state.domain,
@@ -888,7 +884,6 @@ const mapStateToProps = (state, ownProps) => {
     loadingPastChallengesUUID: cl.loadingPastChallengesUUID,
     loadingReviewOpportunitiesUUID: cl.loadingReviewOpportunitiesUUID,
     loadingChallengeTypes: cl.loadingChallengeTypes,
-    loadingChallengeTags: cl.loadingChallengeTags,
     newChallengeDetails: ownProps.newChallengeDetails,
     openChallengesInNewTabs: ownProps.openChallengesInNewTabs,
     preListingMsg: ownProps.preListingMsg,

diff --git a/src/shared/reducers/challenge-listing/index.js b/src/shared/reducers/challenge-listing/index.js
@@ -305,21 +305,6 @@ function onGetChallengeTypesDone(state, action) {
   };
 }
 
-/**
- * Handles CHALLENGE_LISTING/GET_CHALLENGE_TAGS_DONE action.
- * @param {Object} state
- * @param {Object} action
- * @return {Object}
- */
-function onGetChallengeTagsDone(state, action) {
-  if (action.error) logger.error(action.payload);
-  return {
-    ...state,
-    challengeTags: action.error ? [] : action.payload,
-    loadingChallengeTags: false,
-  };
-}
-
 function onGetPastChallengesInit(state, action) {
   const { frontFilter, page, uuid } = action.payload;
   const tracks = frontFilter && frontFilter.tracks;
@@ -830,12 +815,6 @@ function create(initialState) {
     }),
     [a.getChallengeTypesDone]: onGetChallengeTypesDone,
 
-    [a.getChallengeTagsInit]: state => ({
-      ...state,
-      loadingChallengeTags: true,
-    }),
-    [a.getChallengeTagsDone]: onGetChallengeTagsDone,
-
     [a.getPastChallengesInit]: onGetPastChallengesInit,
     [a.getPastChallengesDone]: onGetPastChallengesDone,
 
@@ -906,7 +885,6 @@ function create(initialState) {
     loadingReviewOpportunitiesUUID: '',
 
     loadingChallengeTypes: false,
-    loadingChallengeTags: false,
 
     reviewOpportunities: [],
     filter: {