From 7ff1230b300e3e2bbe2b8d105cf0a29043edcae4 Mon Sep 17 00:00:00 2001 From: rashmi73 Date: Wed, 17 Mar 2021 02:48:44 +0530 Subject: [PATCH 01/10] issue 5433 fix --- config/default.js | 1 + config/production.js | 1 + src/shared/components/Settings/Preferences/index.jsx | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/default.js b/config/default.js index ec2de811b4..3fe013f902 100644 --- a/config/default.js +++ b/config/default.js @@ -111,6 +111,7 @@ module.exports = { BLOG_FEED: 'https://www.topcoder.com/blog/feed/', COMMUNITY: 'https://community.topcoder-dev.com', FORUMS: 'https://apps.topcoder-dev.com/forums', + DISCUSSION_FORUM: 'https://discussions.topcoder.com', FORUMS_VANILLA: 'https://vanilla.topcoder-dev.com', HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles', SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com', diff --git a/config/production.js b/config/production.js index f83da0fbc1..f48acfd915 100644 --- a/config/production.js +++ b/config/production.js @@ -31,6 +31,7 @@ module.exports = { HOME: '/my-dashboard', COMMUNITY: 'https://community.topcoder.com', FORUMS: 'https://apps.topcoder.com/forums', + DISCUSSION_FORUM: 'https://discussions.topcoder.com', FORUMS_VANILLA: 'https://discussions.topcoder.com', HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles', SUBMISSION_REVIEW: 'https://submission-review.topcoder.com', diff --git a/src/shared/components/Settings/Preferences/index.jsx b/src/shared/components/Settings/Preferences/index.jsx index 5db18e1be9..72fd95024b 100644 --- a/src/shared/components/Settings/Preferences/index.jsx +++ b/src/shared/components/Settings/Preferences/index.jsx @@ -88,7 +88,7 @@ export default class Preferences extends React.Component { case 'e-mail': return ; case 'forum': - return (window.location.href = `${config.URL.FORUMS}/?module=Settings`) && ; + return (window.location.href = `${config.URL.DISCUSSION_FORUM}/profile/preferences`) && ; case 'payment': return (window.location.href = `${config.URL.COMMUNITY}/tc?module=EditPaymentPreferences`) && ; default: From d4cf9b4c25c3ea1b98c3daadcf3c60db46a172f0 Mon Sep 17 00:00:00 2001 From: draco-malfoy <46344490+draco-malfoy@users.noreply.github.com> Date: Wed, 17 Mar 2021 10:21:08 +0530 Subject: [PATCH 02/10] Update index.jsx --- .../challenge-detail/Specification/SideBar/index.jsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx index 793278de7d..7c5465c066 100644 --- a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx +++ b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx @@ -432,6 +432,16 @@ export default function SideBar({ + + + Topcoder Templates
repository + + { shareable && (
From b70978a794f1f0ffa8e2cab897dbf3bd82c217c8 Mon Sep 17 00:00:00 2001 From: draco-malfoy <46344490+draco-malfoy@users.noreply.github.com> Date: Wed, 17 Mar 2021 10:21:55 +0530 Subject: [PATCH 03/10] Update default.js --- config/default.js | 1 + 1 file changed, 1 insertion(+) diff --git a/config/default.js b/config/default.js index ec2de811b4..161136e9e2 100644 --- a/config/default.js +++ b/config/default.js @@ -140,6 +140,7 @@ module.exports = { HOWTOCOMPETEINMARATHON: 'https://www.topcoder.com/thrive/articles/How%20To%20Compete%20in%20a%20Marathon%20Match', USABLECODEDEV: 'https://www.topcoder.com/thrive/articles/Usable%20Code%20in%20Dev%20Challenges', EXTENSIONVSCODE: 'https://marketplace.visualstudio.com/items?itemName=Topcoder.topcoder-workflow&ssr=false#overview', + TEMPLATES_REPO: 'https://github.com/topcoder-platform-templates', }, IOS: 'https://ios.topcoder-dev.com', From 2bb0ef796f93c754e9f2fa9002749818a047557b Mon Sep 17 00:00:00 2001 From: gets0ul Date: Thu, 18 Mar 2021 21:19:36 +0700 Subject: [PATCH 04/10] fix: "window is not defined" error on accessing winners tab directly --- .../challenge-detail/Winners/Winner/index.jsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/shared/components/challenge-detail/Winners/Winner/index.jsx b/src/shared/components/challenge-detail/Winners/Winner/index.jsx index 1a28490688..bd545f7808 100644 --- a/src/shared/components/challenge-detail/Winners/Winner/index.jsx +++ b/src/shared/components/challenge-detail/Winners/Winner/index.jsx @@ -1,6 +1,6 @@ import { Avatar } from 'topcoder-react-ui-kit'; import PT from 'prop-types'; -import React from 'react'; +import React, { useEffect, useState } from 'react'; import _ from 'lodash'; import { config } from 'topcoder-react-utils'; @@ -20,6 +20,11 @@ export default function Winner({ viewable, winner, }) { + const [windowOrigin, setWindowOrigin] = useState(); + useEffect(() => { + setWindowOrigin(window.origin); + }, []); + const submissionId = viewable && getId(submissions, winner.placement); let placeStyle = winner.placement < 4 ? `place-${winner.placement}` : ''; @@ -69,9 +74,9 @@ export default function Winner({ />
{winner.handle} From f0cc8b0fe63acd3fbab902e5cbe72c69e119ca46 Mon Sep 17 00:00:00 2001 From: rashmi73 Date: Wed, 31 Mar 2021 12:15:28 +0530 Subject: [PATCH 05/10] issue 5433 feedback --- config/default.js | 1 - config/production.js | 1 - src/shared/components/Settings/Preferences/index.jsx | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config/default.js b/config/default.js index 3fe013f902..ec2de811b4 100644 --- a/config/default.js +++ b/config/default.js @@ -111,7 +111,6 @@ module.exports = { BLOG_FEED: 'https://www.topcoder.com/blog/feed/', COMMUNITY: 'https://community.topcoder-dev.com', FORUMS: 'https://apps.topcoder-dev.com/forums', - DISCUSSION_FORUM: 'https://discussions.topcoder.com', FORUMS_VANILLA: 'https://vanilla.topcoder-dev.com', HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles', SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com', diff --git a/config/production.js b/config/production.js index f48acfd915..f83da0fbc1 100644 --- a/config/production.js +++ b/config/production.js @@ -31,7 +31,6 @@ module.exports = { HOME: '/my-dashboard', COMMUNITY: 'https://community.topcoder.com', FORUMS: 'https://apps.topcoder.com/forums', - DISCUSSION_FORUM: 'https://discussions.topcoder.com', FORUMS_VANILLA: 'https://discussions.topcoder.com', HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles', SUBMISSION_REVIEW: 'https://submission-review.topcoder.com', diff --git a/src/shared/components/Settings/Preferences/index.jsx b/src/shared/components/Settings/Preferences/index.jsx index 72fd95024b..ed7c3456d7 100644 --- a/src/shared/components/Settings/Preferences/index.jsx +++ b/src/shared/components/Settings/Preferences/index.jsx @@ -88,7 +88,7 @@ export default class Preferences extends React.Component { case 'e-mail': return ; case 'forum': - return (window.location.href = `${config.URL.DISCUSSION_FORUM}/profile/preferences`) && ; + return (window.location.href = `${config.URL.FORUMS_VANILLA}/profile/preferences`) && ; case 'payment': return (window.location.href = `${config.URL.COMMUNITY}/tc?module=EditPaymentPreferences`) && ; default: From 9a05cb13e8827dafa24bfd6fc7755b6b2ef85109 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Fri, 2 Apr 2021 04:42:19 -0300 Subject: [PATCH 06/10] fix; for issue #5312 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28e53ff3ad..5f8a08967c 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "supertest": "^3.1.0", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1.1.7", + "topcoder-react-lib": "1000.27.11", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From 1ea27dda7101d6064a5aad7175a11219cf08db5b Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Fri, 2 Apr 2021 04:48:05 -0300 Subject: [PATCH 07/10] ci: Deploy bug-bash to QA and BETA env --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d107a6dc6..dedb319811 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -290,14 +290,14 @@ workflows: filters: branches: only: - - free + - bug-bash # This is beta env for production soft releases - "build-prod-beta": context : org-global filters: branches: only: - - develop + - bug-bash # This is stage env for production QA releases - "build-prod-staging": context : org-global From b70de3a5a8f6b92a2fe527d1ba0ad8e8abe9701a Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Fri, 2 Apr 2021 05:33:58 -0300 Subject: [PATCH 08/10] hotfix; for issue #5312 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5f8a08967c..36934e78d6 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "supertest": "^3.1.0", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1000.27.11", + "topcoder-react-lib": "1000.27.12", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From b8b9bb20cfdc54acdb2fde0ce098d6ab460e304b Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Fri, 2 Apr 2021 06:23:39 -0300 Subject: [PATCH 09/10] Revert "hotfix; for issue #5312" This reverts commit b70de3a5a8f6b92a2fe527d1ba0ad8e8abe9701a. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 36934e78d6..5f8a08967c 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "supertest": "^3.1.0", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1000.27.12", + "topcoder-react-lib": "1000.27.11", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From ab13059a95404efaefa852cb67d708f01928a181 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Fri, 2 Apr 2021 06:23:54 -0300 Subject: [PATCH 10/10] Revert "fix; for issue #5312" This reverts commit 9a05cb13e8827dafa24bfd6fc7755b6b2ef85109. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5f8a08967c..28e53ff3ad 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "supertest": "^3.1.0", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1000.27.11", + "topcoder-react-lib": "1.1.7", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2",