Merge pull request #5568 from topcoder-platform/develop

luizrrodrigues · web-flow · commit 62200882b2db · 2021-06-05T04:55:55.000-03:00
Release v1.9.6
diff --git a/.circleci/config.yml b/.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
-                - topgear-app
       # 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
diff --git a/automated-smoke-test/config/automation-config-beta.json b/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",
diff --git a/automated-smoke-test/config/automation-config-dev.json b/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",
diff --git a/automated-smoke-test/config/automation-config-local.json b/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",
diff --git a/automated-smoke-test/config/automation-config-prod.json b/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",
diff --git a/automated-smoke-test/config/automation-config-qa.json b/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",
diff --git a/automated-smoke-test/config/automation-config-staging.json b/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",
diff --git a/automated-smoke-test/config/automation-config-test.json b/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",
diff --git a/automated-smoke-test/page-objects/pages/topcoder/challenge-listing/challenge-listing.helper.ts b/automated-smoke-test/page-objects/pages/topcoder/challenge-listing/challenge-listing.helper.ts
@@ -67,7 +67,7 @@ export class ChallengeListingPageHelper {
       false
     );
 
-    const searchString = ConfigHelper.getChallengeDetail().challengeName;
+    const searchString = ConfigHelper.getChallengeDetail().searchText;
     await ChallengeListingPageObject.challengeSearchBox.sendKeys(searchString);
     await BrowserHelper.sleep(5000);
 
@@ -503,7 +503,7 @@ 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);
diff --git a/automated-smoke-test/utils/config-helper.ts b/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 {
diff --git a/src/shared/containers/tc-communities/Loader.jsx b/src/shared/containers/tc-communities/Loader.jsx
@@ -56,6 +56,12 @@ class Loader extends React.Component {
       }
       window.location = `${config.URL.AUTH}/member?retUrl=${returnUrl}&utm_source=${communityId}`;
     }
+
+    /* Redirect odl TopGear home to new TopGear App */
+    if (communityId === 'wipro'
+      && (window.location.pathname === '/' || window.location.pathname === '/__community__/wipro')) {
+      window.location = config.URL.TOPGEAR;
+    }
   }
 
   render() {
diff --git a/src/shared/routes/Communities/Wipro/Routes.jsx b/src/shared/routes/Communities/Wipro/Routes.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"

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ export interface ChallengeDetail {`
`20`	`20`	`forumUrl: string;`
`21`	`21`	`submissionUrl: string;`
`22`	`22`	`scorecardUrl: string;`
	`23`	`+ searchText: string,`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`export interface CommunityCardInfo {`