Skip to content

Release v1.9.6 #5568

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.

Sign up for GitHub

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 10 commits into from
Jun 5, 2021
Merged

Release v1.9.6 #5568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b82791c
Fix TC_006 and TC-020 - Search challenge
luizrrodrigues Jun 1, 2021
5d006d1
Fix logic
luizrrodrigues Jun 3, 2021
c65a8d0
Update verifyChallengesByChallengeTag to PostgreSQL
luizrrodrigues Jun 3, 2021
a245f8b
ci: Deploy ast-fix-search to Stag env
luizrrodrigues Jun 3, 2021
bdda413
Improve TopGear home redirect
luizrrodrigues Jun 3, 2021
f4f9ed0
ci: Deploy topgear-redirect to Stag env Dev env
luizrrodrigues Jun 3, 2021
068a279
Merge branch 'develop' into ast-fix-search
luizrrodrigues Jun 4, 2021
5f672af
Merge pull request #5566 from topcoder-platform/topgear-redirect
luizrrodrigues Jun 4, 2021
be0777a
Merge branch 'develop' into ast-fix-search
luizrrodrigues Jun 4, 2021
369d928
Merge pull request #5567 from topcoder-platform/ast-fix-search
luizrrodrigues Jun 4, 2021
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
6 changes: 1 addition & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ workflows:
branches:
only:
- develop
- topgear-app
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion automated-smoke-test/config/automation-config-beta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion automated-smoke-test/config/automation-config-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion automated-smoke-test/config/automation-config-local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion automated-smoke-test/config/automation-config-prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion automated-smoke-test/config/automation-config-qa.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion automated-smoke-test/config/automation-config-staging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion automated-smoke-test/config/automation-config-test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions ...ated-smoke-test/page-objects/pages/topcoder/challenge-listing/challenge-listing.helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions automated-smoke-test/utils/config-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export interface ChallengeDetail {
forumUrl: string;
submissionUrl: string;
scorecardUrl: string;
searchText: string,
}

export interface CommunityCardInfo {
Expand Down
6 changes: 6 additions & 0 deletions src/shared/containers/tc-communities/Loader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
11 changes: 1 addition & 10 deletions src/shared/routes/Communities/Wipro/Routes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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"
Expand Down