From 6ccedba47cb8a044e2c833a5e3dde099c819f1a5 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Fri, 28 Apr 2023 15:25:46 +1000 Subject: [PATCH 1/5] Hide winner download buttons for now --- .../SubmissionRow/SubmissionHistoryRow/index.jsx | 4 +++- .../components/challenge-detail/Submissions/index.jsx | 5 ++++- .../components/challenge-detail/Winners/Winner/index.jsx | 6 +++++- src/shared/components/challenge-detail/Winners/index.jsx | 5 ++++- 4 files changed, 16 insertions(+), 4 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 5510ef4741..45d244cac8 100644 --- a/src/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx +++ b/src/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx @@ -34,6 +34,8 @@ export default function SubmissionHistoryRow({ submissionId, isLoggedIn, }) { + // todo: hide download button until update submissions API + const hideDownloadForMMRDM = true; const getInitialReviewResult = () => { if (provisionalScore && provisionalScore < 0) return ; switch (status) { @@ -82,7 +84,7 @@ export default function SubmissionHistoryRow({ { - isLoggedIn && (isMM || isRDM) + !hideDownloadForMMRDM && isLoggedIn && (isMM || isRDM) && (numWinners > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED) && (
Action
diff --git a/src/shared/components/challenge-detail/Submissions/index.jsx b/src/shared/components/challenge-detail/Submissions/index.jsx index 46148a6685..111d3da1d6 100644 --- a/src/shared/components/challenge-detail/Submissions/index.jsx +++ b/src/shared/components/challenge-detail/Submissions/index.jsx @@ -307,6 +307,8 @@ class SubmissionsComponent extends React.Component { type, tags, } = challenge; + // todo: hide download button until update submissions API + const hideDownloadForMMRDM = true; const isMM = this.isMM(); const isRDM = checkIsRDM(challenge); @@ -479,7 +481,8 @@ class SubmissionsComponent extends React.Component { }
{ - ((numWinners > 0 || challenge.status === CHALLENGE_STATUS.COMPLETED) + (!hideDownloadForMMRDM + && (numWinners > 0 || challenge.status === CHALLENGE_STATUS.COMPLETED) && (isMM || isRDM) && isLoggedIn) && (
{ - ((!winner.submissionDownloadLink || !viewable) && (isMM || isRDM) && isLoggedIn) && ( + (!hideDownloadForMMRDM + && (!winner.submissionDownloadLink || !viewable) + && (isMM || isRDM) && isLoggedIn) && (
-
-
- Action -
- -
`; diff --git a/__tests__/shared/components/challenge-detail/Winners/Winner/__snapshots__/index.jsx.snap b/__tests__/shared/components/challenge-detail/Winners/Winner/__snapshots__/index.jsx.snap index 5994402871..e7781e6bc2 100644 --- a/__tests__/shared/components/challenge-detail/Winners/Winner/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/challenge-detail/Winners/Winner/__snapshots__/index.jsx.snap @@ -55,19 +55,6 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
- -
+ /> `; From f7ff6904aa289ba9167ae3f9ad27975898756bcd Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Fri, 28 Apr 2023 16:03:13 +1000 Subject: [PATCH 3/5] Additional tests disabled for deployment --- .../Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx | 3 ++- .../components/challenge-detail/Winners/Winner/index.jsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx b/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx index cf92205746..1ad1758a30 100755 --- a/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx +++ b/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx @@ -39,7 +39,7 @@ class Wrapper extends React.Component { return ; } } - +/* describe('render properly', () => { test('click', () => { const instance = TU.renderIntoDocument(()); @@ -48,3 +48,4 @@ describe('render properly', () => { TU.Simulate.click(matches[0]); }); }); +*/ \ No newline at end of file diff --git a/__tests__/shared/components/challenge-detail/Winners/Winner/index.jsx b/__tests__/shared/components/challenge-detail/Winners/Winner/index.jsx index 3dd2be5b9d..59ff983953 100755 --- a/__tests__/shared/components/challenge-detail/Winners/Winner/index.jsx +++ b/__tests__/shared/components/challenge-detail/Winners/Winner/index.jsx @@ -60,7 +60,7 @@ class Wrapper extends React.Component { return ; } } - +/* describe('render properly', () => { test('click', () => { const instance = TU.renderIntoDocument(()); @@ -69,3 +69,4 @@ describe('render properly', () => { TU.Simulate.click(matches[0]); }); }); +*/ \ No newline at end of file From 00f3ea90ebeec745a9dea0d86b128cd64db37976 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Fri, 28 Apr 2023 16:18:35 +1000 Subject: [PATCH 4/5] Further test fixes --- .../SubmissionRow/SubmissionHistoryRow/index.jsx | 6 +++--- .../components/challenge-detail/Winners/Winner/index.jsx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx b/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx index 1ad1758a30..ed577ffac9 100755 --- a/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx +++ b/__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/index.jsx @@ -1,7 +1,7 @@ import React from 'react'; // import ReactDOM from 'react-dom'; import Renderer from 'react-test-renderer/shallow'; -import TU from 'react-dom/test-utils'; +// import TU from 'react-dom/test-utils'; import SubmissionHistoryRow from 'components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow'; const mockData = { @@ -32,6 +32,7 @@ describe('Matches shallow shapshot', () => { }); }); +/* class Wrapper extends React.Component { componentDidMount() {} @@ -39,7 +40,6 @@ class Wrapper extends React.Component { return ; } } -/* describe('render properly', () => { test('click', () => { const instance = TU.renderIntoDocument(()); @@ -48,4 +48,4 @@ describe('render properly', () => { TU.Simulate.click(matches[0]); }); }); -*/ \ No newline at end of file +*/ diff --git a/__tests__/shared/components/challenge-detail/Winners/Winner/index.jsx b/__tests__/shared/components/challenge-detail/Winners/Winner/index.jsx index 59ff983953..eb4d858314 100755 --- a/__tests__/shared/components/challenge-detail/Winners/Winner/index.jsx +++ b/__tests__/shared/components/challenge-detail/Winners/Winner/index.jsx @@ -1,7 +1,7 @@ import React from 'react'; // import ReactDOM from 'react-dom'; import Renderer from 'react-test-renderer/shallow'; -import TU from 'react-dom/test-utils'; +// import TU from 'react-dom/test-utils'; import Winner from 'components/challenge-detail/Winners/Winner'; const mockData = { @@ -53,6 +53,7 @@ describe('Matches shallow shapshot', () => { }); }); +/* class Wrapper extends React.Component { componentDidMount() {} @@ -60,7 +61,6 @@ class Wrapper extends React.Component { return ; } } -/* describe('render properly', () => { test('click', () => { const instance = TU.renderIntoDocument(()); @@ -69,4 +69,4 @@ describe('render properly', () => { TU.Simulate.click(matches[0]); }); }); -*/ \ No newline at end of file +*/ From 96138b523687b21ffb15f89cf82b5721506318a9 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Fri, 28 Apr 2023 16:41:26 +1000 Subject: [PATCH 5/5] Deploy hotfix to dev for testing --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b2a639826..6c67564968 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -350,6 +350,7 @@ workflows: branches: only: - PROD-4183 + - M2MHotfix # This is alternate dev env for parallel testing - "build-test": context : org-global