Merge branch 'develop' into feature/profile-add-edgenet

Author: luizrrodrigues

.circleci/config.yml

@@ -341,7 +341,6 @@ workflows:
             branches:
               only:
                 - develop
-                - topgear-app
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -370,7 +369,6 @@ workflows:
             branches:
               only:
                 - develop
-                - feature/profile-add-edgenet
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration
@@ -392,9 +390,7 @@ workflows:
                 - develop
 
   Smoke Testing:
-    when: 
-      and:
-        - << pipeline.parameters.run_smoketesting >>
+    when: << pipeline.parameters.run_smoketesting >>
     jobs:
       - Hold [Smoke-Testing]:
           type: approval

automated-smoke-test/config/automation-config-beta.json

@@ -103,7 +103,8 @@
     "termUrl": "https://beta-community-app.topcoder.com/challenges/terms/detail/9ef9dec4-dddb-48c9-9cce-659db68bc5ac",
     "forumUrl": "https://apps.topcoder.com/forums/?module=Category&categoryID=82117",
     "submissionUrl": "https://beta-community-app.topcoder.com/challenges/4bd5cf15-41ee-4932-927d-fda5731ec023/submit",
-    "scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133"
+    "scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133",
+    "searchText": "KGuTnJmJ"
   },
   "myDashboard": {
     "url": "https://beta-community-app.topcoder.com/my-dashboard",

automated-smoke-test/config/automation-config-dev.json

@@ -104,7 +104,8 @@
     "termUrl": "https://community-app.topcoder-dev.com/challenges/terms/detail/b11da5cd-713f-478d-90f4-f679ef53ee95",
     "forumUrl": "https://apps.topcoder-dev.com/forums/?module=Category&categoryID=0",
     "submissionUrl": "https://community-app.topcoder-dev.com/challenges/e0db3e96-522e-4b56-b954-a514acfd536e/submit",
-    "scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30056744"
+    "scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30056744",
+    "searchText": "KGuTnJmJ"
   },
   "myDashboard": {
     "url": "https://community-app.topcoder-dev.com/my-dashboard",

automated-smoke-test/config/automation-config-local.json

@@ -99,7 +99,8 @@
     "termUrl": "http://localhost:3000/challenges/terms/detail/9ef9dec4-dddb-48c9-9cce-659db68bc5ac",
     "forumUrl": "https://apps.topcoder.com/forums/?module=Category&categoryID=82117",
     "submissionUrl": "http://localhost:3000/challenges/4bd5cf15-41ee-4932-927d-fda5731ec023/submit",
-    "scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133"
+    "scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133",
+    "searchText": "KGuTnJmJ"
   },
   "myDashboard": {
     "url": "http://localhost:3000/my-dashboard",

automated-smoke-test/config/automation-config-prod.json

@@ -99,7 +99,8 @@
     "termUrl": "https://www.topcoder.com/challenges/terms/detail/9ef9dec4-dddb-48c9-9cce-659db68bc5ac",
     "forumUrl": "https://apps.topcoder.com/forums/?module=Category&categoryID=82117",
     "submissionUrl": "https://www.topcoder.com/challenges/4bd5cf15-41ee-4932-927d-fda5731ec023/submit",
-    "scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133"
+    "scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133",
+    "searchText": "KGuTnJmJ"
   },
   "myDashboard": {
     "url": "https://www.topcoder.com/my-dashboard",

automated-smoke-test/config/automation-config-qa.json

@@ -104,7 +104,8 @@
     "termUrl": "https://qa-community-app.topcoder-dev.com/challenges/terms/detail/b11da5cd-713f-478d-90f4-f679ef53ee95",
     "forumUrl": "https://apps.topcoder-dev.com/forums/?module=Category&categoryID=0",
     "submissionUrl": "https://qa-community-app.topcoder-dev.com/challenges/ee951f3e-8c3d-41d7-b232-aa8774ff7f27/submit",
-    "scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30001610"
+    "scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30001610",
+    "searchText": "KGuTnJmJ"
   },
   "myDashboard": {
     "url": "https://qa-community-app.topcoder-dev.com/my-dashboard",

automated-smoke-test/config/automation-config-staging.json

@@ -104,7 +104,8 @@
     "termUrl": "https://staging-community-app.topcoder.com/challenges/terms/detail/9ef9dec4-dddb-48c9-9cce-659db68bc5ac",
     "forumUrl": "https://apps.topcoder.com/forums/?module=Category&categoryID=82117",
     "submissionUrl": "https://staging-community-app.topcoder.com/challenges/4bd5cf15-41ee-4932-927d-fda5731ec023/submit",
-    "scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133"
+    "scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133",
+    "searchText": "KGuTnJmJ"
   },
   "myDashboard": {
     "url": "https://staging-community-app.topcoder.com/my-dashboard",

automated-smoke-test/config/automation-config-test.json

@@ -104,7 +104,8 @@
     "termUrl": "https://test-community-app.topcoder-dev.com/challenges/terms/detail/b11da5cd-713f-478d-90f4-f679ef53ee95",
     "forumUrl": "https://apps.topcoder-dev.com/forums/?module=Category&categoryID=0",
     "submissionUrl": "https://test-community-app.topcoder-dev.com/challenges/ee951f3e-8c3d-41d7-b232-aa8774ff7f27/submit",
-    "scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30001610"
+    "scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30001610",
+    "searchText": "KGuTnJmJ"
   },
   "myDashboard": {
     "url": "https://test-community-app.topcoder-dev.com/my-dashboard",

automated-smoke-test/page-objects/pages/topcoder/challenge-listing/challenge-listing.helper.ts

@@ -67,14 +67,17 @@ export class ChallengeListingPageHelper {
       false
     );
 
-    const searchString = ConfigHelper.getChallengeDetail().challengeName;
+    const searchString = ConfigHelper.getChallengeDetail().searchText;
     await ChallengeListingPageObject.challengeSearchBox.sendKeys(searchString);
     await BrowserHelper.sleep(5000);
 
     const firstChallenge = ChallengeListingPageObject.firstChallengeLink;
-    let firstChallengeName = '';
-    if (await firstChallenge.isPresent()) {
-      firstChallengeName = await firstChallenge.getText();
+
+    const isPresent = await firstChallenge.isPresent();
+    expect(isPresent).toEqual(true);
+
+    if (isPresent) {
+      const firstChallengeName = await firstChallenge.getText();
       expect(firstChallengeName).toEqual(searchString);
     }
   }
@@ -218,6 +221,35 @@ export class ChallengeListingPageHelper {
     let filtersVisibility = await CommonHelper.isDisplayed(ChallengeListingPageObject.subCommunityLabel);
     expect(filtersVisibility).toBe(true);
 
+    // Filter by Development Challenges
+    let el = await ChallengeListingPageObject.designSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.designSwitchTurnedOff,
+      'wait for design switch turn off',
+      false
+    );
+
+    el = await ChallengeListingPageObject.dataScienceSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.dataScienceSwitchTurnedOff,
+      'wait for data science switch turn off',
+      false
+    );
+
+    el = await ChallengeListingPageObject.qaSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.qaSwitchTurnedOff,
+      'wait for qa switch turn off',
+      false
+    );
+
+    // Filter by Challenge type
+    await ChallengeListingPageObject.first2FinishCheckbox.click();
+    await ChallengeListingPageObject.taskCheckbox.click();
+
     await ChallengeListingPageObject.challengeSearchBox.sendKeys('ReactJS');
     await BrowserHelper.sleep(5000);
     await this.verifyChallengesMatchingKeyword(['ReactJS']);
@@ -503,8 +535,9 @@ export class ChallengeListingPageHelper {
    */
   static async verifyChallengesByChallengeTag() {
     // const tagText = ConfigHelper.getChallengeDetail().challengeTag;
-    const tagText = 'ReactJS';
+    const tagText = 'EdgeNet';
     await this.waitForSubCommunity();
+
     await ChallengeListingPageObject.challengeSearchBox.sendKeys(tagText);
     await BrowserHelper.sleep(2000);
 
@@ -514,6 +547,36 @@ export class ChallengeListingPageHelper {
       false
     );
     await ChallengeListingPageObject.getChallengeTag(tagText).click();
+
+    // Filter by Development Challenges
+    let el = await ChallengeListingPageObject.designSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.designSwitchTurnedOff,
+      'wait for design switch turn off',
+      false
+    );
+
+    el = await ChallengeListingPageObject.dataScienceSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.dataScienceSwitchTurnedOff,
+      'wait for data science switch turn off',
+      false
+    );
+
+    el = await ChallengeListingPageObject.qaSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.qaSwitchTurnedOff,
+      'wait for qa switch turn off',
+      false
+    );
+
+    // Filter by Challenge type
+    await ChallengeListingPageObject.first2FinishCheckbox.click();
+    await ChallengeListingPageObject.taskCheckbox.click();
+
     // waiting for re-render to happen
     await BrowserHelper.sleep(15000);
 

automated-smoke-test/utils/config-helper.ts

@@ -20,6 +20,7 @@ export interface ChallengeDetail {
   forumUrl: string;
   submissionUrl: string;
   scorecardUrl: string;
+  searchText: string,
 }
 
 export interface CommunityCardInfo {

src/assets/images/tc-edu/icon-radio-checked.svg

@@ -324,7 +324,7 @@ export class SearchBarInner extends Component {
                     <a className={theme.authorLink} href={`${config.TC_EDU_BASE_PATH}${config.TC_EDU_SEARCH_PATH}?author=${item.name}`}>
                       {item.tcHandle}
                       {
-                        item.tcHandle ? (
+                        item.name ? (
                           <span className={theme.authorName}>
                             {item.name}
                           </span>

src/assets/images/tc-edu/icon-radio-un-check.svg

@@ -72,7 +72,7 @@ export class FilterAuthorInner extends Component {
           }}
         >
           <span>{selected}</span>
-          <IconArrow className={theme['icon-arrow']} />
+          <IconArrow className={theme[isShowPopup ? 'icon-arrow-popup' : 'icon-arrow']} />
         </button>
         {isShowPopup && (
           <div className={theme.popup}>

src/shared/components/Contentful/SearchBar/SearchBar.jsx

@@ -53,6 +53,17 @@ $text-black: #2a2a2a;
   }
 }
 
+.icon-arrow-popup {
+  -moz-transform: none;
+  -o-transform: none;
+  -webkit-transform: none;
+  transform: none;
+
+  polygon {
+    fill: #aaa;
+  }
+}
+
 .popup {
   position: absolute;
   left: 0;

src/shared/components/Contentful/SearchPageFilter/FilterAuthor/index.jsx

@@ -28,5 +28,6 @@ $text-black: #2a2a2a;
 
   span {
     margin-left: 11px;
+    cursor: default;
   }
 }

src/shared/components/Contentful/SearchPageFilter/FilterAuthor/themes/default.scss

@@ -66,11 +66,12 @@ export class FilterTagsInner extends Component {
           value={inputValue}
           onChange={(e) => { this.setState({ inputValue: e.target.value }); }}
           onKeyDown={(e) => {
-            if (e.key === 'Enter' && inputValue && inputValue.trim() && !isTagExist(inputValue)) {
+            if (e.key === 'Enter' && inputValue && inputValue.trim() && !isTagExist(inputValue) && tags.length <= 4) {
               onAddNewTag(inputValue);
               this.setState({ inputValue: '' });
             }
           }}
+          maxLength="40"
         />
         <div className={theme['tag-container']}>
           {

src/shared/components/Contentful/SearchPageFilter/FilterRadio/themes/default.scss

@@ -85,6 +85,7 @@ export class TracksTagsInner extends Component {
             type="text"
             className={theme['tags-field']}
             placeholder="Add tags to filter content..."
+            maxLength="40"
           />
         </div>
       </div>

src/shared/components/Contentful/SearchPageFilter/FilterTags/index.jsx

@@ -46,16 +46,20 @@ class Loader extends React.Component {
       !meta /* || (Date.now() - meta.timestamp) > MAXAGE */
     )) nextProps.loadMetaData(communityId, tokenV3);
 
-    /* TODO: This is a hacky way to handle SSO authentication for TopGear
-     * (Wipro) and Zurich community visitors. Should be re-factored, but not it is not
-     * clear, what exactly do we need to support it in general. */
-    if ((communityId === 'wipro' || communityId === 'comcast') && !visitorGroups) {
+    /* TODO: This is a hacky way to handle SSO authentication for TopGear */
+    if (communityId === 'comcast' && !visitorGroups) {
       const returnUrl = encodeURIComponent(window.location.href);
-      if (communityId === 'wipro') {
-        window.location = `${config.URL.AUTH}/?retUrl=${config.URL.TOPGEAR}`;
-      }
       window.location = `${config.URL.AUTH}/member?retUrl=${returnUrl}&utm_source=${communityId}`;
     }
+
+    /* Redirect old TopGear home to new TopGear App and login redirect */
+    if (communityId === 'wipro') {
+      if (!visitorGroups) {
+        window.location = `${config.URL.AUTH}/?retUrl=${config.URL.TOPGEAR}&utm_source=${communityId}`;
+      } else if (window.location.pathname === '/' || window.location.pathname === '/__community__/wipro') {
+        window.location = config.URL.TOPGEAR;
+      }
+    }
   }
 
   render() {

src/shared/components/Contentful/TracksFilter/TracksTags/index.jsx

@@ -20,7 +20,7 @@ import Viewport from 'components/Contentful/Viewport';
 import theme from 'components/tc-communities/communities/wipro/theme';
 import { ThemeProvider } from 'react-css-super-themr';
 import { Route, Switch } from 'react-router-dom';
-import { config, isomorphy } from 'topcoder-react-utils';
+import { config } from 'topcoder-react-utils';
 
 import Leaderboard from '../Leaderboard';
 
@@ -122,15 +122,6 @@ export default function Wipro({ base, meta }) {
                 spaceName="topgear"
               />
               */}
-              <Route
-                path={base}
-                component={() => {
-                  if (isomorphy.isClientSide()) {
-                    window.location = config.URL.TOPGEAR;
-                  }
-                  return null;
-                }}
-              />
             </Switch>
             <Viewport
               id="2rJCDsGCHTDygyx4dqxlNq"