From 20fc0148fe299c8f4b07839a202dafccb870ccf7 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Fri, 17 Feb 2023 12:24:21 -0300 Subject: [PATCH 01/17] fix: for PROD-4120 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2aa91325e6..f1d40ccb5e 100644 --- a/package.json +++ b/package.json @@ -164,7 +164,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.2.10", + "topcoder-react-lib": "1000.29.14", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From 591d9caddc20d96fcaa305e614234c5864b719be Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Fri, 17 Feb 2023 12:37:06 -0300 Subject: [PATCH 02/17] ci: deploy PROD-4120 branch to Dev env --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6edc20235..6feee15bb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -349,7 +349,7 @@ workflows: filters: branches: only: - - sprig-lib + - PROD-4120 # This is alternate dev env for parallel testing - "build-test": context : org-global From b945afe640c8436d8328b59c95e2d09130f1f968 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 2 Mar 2023 06:52:58 -0300 Subject: [PATCH 03/17] ci: deploy PROD-4120 branch to Test env --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6feee15bb9..042200634b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -349,14 +349,14 @@ workflows: filters: branches: only: - - PROD-4120 + - free # This is alternate dev env for parallel testing - "build-test": context : org-global filters: branches: only: - - PROD-3199 + - PROD-4120 # This is alternate dev env for parallel testing - "build-qa": context : org-global From 4a2aeeb9b749bde6d9e5ff425ba1c6e148f1710d Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 2 Mar 2023 07:11:38 -0300 Subject: [PATCH 04/17] ci: deploy PROD-4120 branch to Beta env --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 042200634b..0de230c159 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -372,7 +372,7 @@ workflows: filters: branches: only: - - feat/GAME-224 + - PROD-4120 # This is stage env for production QA releases - "build-prod-staging": context : org-global From 63edc2868abf92f761994cb64a7d126afd842e8c Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 2 Mar 2023 08:14:49 -0300 Subject: [PATCH 05/17] ci: deploy PROD-4120 branch to Stag env --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0de230c159..efae9609cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -356,7 +356,7 @@ workflows: filters: branches: only: - - PROD-4120 + - free # This is alternate dev env for parallel testing - "build-qa": context : org-global @@ -372,7 +372,7 @@ workflows: filters: branches: only: - - PROD-4120 + - free # This is stage env for production QA releases - "build-prod-staging": context : org-global @@ -380,6 +380,7 @@ workflows: branches: only: - develop + - PROD-4120 # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration From ad428678821e1b85fc9715d1982da0032c57c657 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 2 Mar 2023 08:51:58 -0300 Subject: [PATCH 06/17] Add authorizedGroupIds to Wipro --- src/server/tc-communities/wipro/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/tc-communities/wipro/metadata.json b/src/server/tc-communities/wipro/metadata.json index 4ba1897f95..945941f12a 100644 --- a/src/server/tc-communities/wipro/metadata.json +++ b/src/server/tc-communities/wipro/metadata.json @@ -1,6 +1,6 @@ { "authorizedGroupIds": [ - "20000000", "20000005", "20000011", "20000016" + "20000000", "20000005", "20000011", "20000016", "b7f7c0f8-8ee8-409e-9e5c-33404983b635" ], "challengeFilter": { "groupIds": ["20000000"] From 9e725a164260aa89c4fa7e8868b8989f35cb2a70 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 2 Mar 2023 08:53:01 -0300 Subject: [PATCH 07/17] ci: deploy PROD-4120 branch to Beta env --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index efae9609cc..f9a6d96175 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -372,7 +372,7 @@ workflows: filters: branches: only: - - free + - PROD-4120 # This is stage env for production QA releases - "build-prod-staging": context : org-global @@ -380,7 +380,6 @@ workflows: branches: only: - develop - - PROD-4120 # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration From e994ce8acc216425b9e63ff0b4d47d9207f67df2 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 2 Mar 2023 13:36:38 -0300 Subject: [PATCH 08/17] fix: for PROD-4120 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f1d40ccb5e..23b82fec53 100644 --- a/package.json +++ b/package.json @@ -164,7 +164,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.29.14", + "topcoder-react-lib": "1000.29.15", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From 9fbdca7b25b020defcd855e587b3934f5a701881 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 2 Mar 2023 14:39:55 -0300 Subject: [PATCH 09/17] ci: deploy PROD-4120 branch to Test env --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f9a6d96175..0de230c159 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -356,7 +356,7 @@ workflows: filters: branches: only: - - free + - PROD-4120 # This is alternate dev env for parallel testing - "build-qa": context : org-global From c4ab3aed3060c758adb376a2d4b972751b1e8e29 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Sat, 4 Mar 2023 07:51:50 +1100 Subject: [PATCH 10/17] Revert "Revert "RDM submission download support"" This reverts commit ca81f7df18a702e095e219400b3482dfe4824e9a. --- .../SubmissionRow/SubmissionHistoryRow/index.jsx | 4 +++- .../Submissions/SubmissionRow/index.jsx | 7 +++++-- .../components/challenge-detail/Submissions/index.jsx | 6 ++++-- .../challenge-detail/Winners/Winner/index.jsx | 4 +++- .../components/challenge-detail/Winners/index.jsx | 6 +++++- src/shared/containers/challenge-detail/index.jsx | 4 +++- src/shared/utils/challenge.js | 10 ++++++++++ 7 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx b/src/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx index 750458887b..5510ef4741 100644 --- a/src/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx +++ b/src/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx @@ -21,6 +21,7 @@ const { getService } = services.submissions; export default function SubmissionHistoryRow({ isMM, + isRDM, submission, finalScore, provisionalScore, @@ -81,7 +82,7 @@ export default function SubmissionHistoryRow({ { - isLoggedIn && isMM + isLoggedIn && (isMM || isRDM) && (numWinners > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED) && (
Action
@@ -121,6 +122,7 @@ SubmissionHistoryRow.defaultProps = { SubmissionHistoryRow.propTypes = { isMM: PT.bool.isRequired, + isRDM: PT.bool.isRequired, submission: PT.number.isRequired, finalScore: PT.oneOfType([ PT.number, diff --git a/src/shared/components/challenge-detail/Submissions/SubmissionRow/index.jsx b/src/shared/components/challenge-detail/Submissions/SubmissionRow/index.jsx index f4a61b11bb..b2fc9cca9b 100644 --- a/src/shared/components/challenge-detail/Submissions/SubmissionRow/index.jsx +++ b/src/shared/components/challenge-detail/Submissions/SubmissionRow/index.jsx @@ -19,7 +19,7 @@ import SubmissionHistoryRow from './SubmissionHistoryRow'; import style from './style.scss'; export default function SubmissionRow({ - isMM, openHistory, member, submissions, score, toggleHistory, challengeStatus, + isMM, isRDM, openHistory, member, submissions, score, toggleHistory, challengeStatus, isReviewPhaseComplete, finalRank, provisionalRank, onShowPopup, rating, viewAsTable, numWinners, auth, isLoggedIn, }) { @@ -166,7 +166,8 @@ export default function SubmissionRow({ Time
{ - isMM && (numWinners > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED) && ( + (isMM || isRDM) + && (numWinners > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED) && (
Action
@@ -185,6 +186,7 @@ export default function SubmissionRow({ 0 || challenge.status === CHALLENGE_STATUS.COMPLETED) - && isMM && isLoggedIn) && ( + && (isMM || isRDM) && isLoggedIn) && (