From 8d7901bf4d739014d2ad3be52194ec2179c247e5 Mon Sep 17 00:00:00 2001 From: M Fikri A Date: Mon, 24 Aug 2020 17:13:41 +0700 Subject: [PATCH 01/20] Fix Missing Styles --- .../Specification/styles.scss | 202 ++++++++++++++---- 1 file changed, 158 insertions(+), 44 deletions(-) diff --git a/src/shared/components/challenge-detail/Specification/styles.scss b/src/shared/components/challenge-detail/Specification/styles.scss index 04b3f00171..80adf28096 100644 --- a/src/shared/components/challenge-detail/Specification/styles.scss +++ b/src/shared/components/challenge-detail/Specification/styles.scss @@ -113,67 +113,181 @@ $tc-link-visited: #0c4e98; padding-left: 17px; } } + } - img { - max-width: 100%; - } + h1 { + @include roboto-bold; + + font-size: 28px; + color: #151516; + letter-spacing: -0.78px; + line-height: 40px; + margin: (10 * $base-unit) 0 (2 * $base-unit); } -} -h2 { - @include roboto-bold; + h2 { + @include roboto-bold; - font-size: 20px; - color: $tc-black; - line-height: 30px; - margin: (6 * $base-unit) 0 (2 * $base-unit); -} + font-size: 20px; + color: $tc-black; + line-height: 30px; + margin: (6 * $base-unit) 0 (2 * $base-unit); + } -h3 { - @include roboto-bold; + h3 { + @include roboto-bold; - font-size: 15px; - color: $tc-black; - line-height: 25px; - margin: (5 * $base-unit) 0 0; - text-transform: uppercase; -} + font-size: 15px; + color: $tc-black; + line-height: 25px; + margin: (5 * $base-unit) 0 0; + text-transform: uppercase; + } -p, -em, -strong { - @include roboto-regular; + h4 { + @include roboto-bold; - font-size: 15px; - color: $tc-gray-90; - line-height: 25px; -} + margin: (4 * $base-unit) 0 (2 * $base-unit); + font-size: 15px; + line-height: 25px; + color: $tc-gray-90; + } -p { - @include roboto-regular; + h5, h6 { + margin: (4 * $base-unit) 0 (2 * $base-unit); + } - font-size: 15px; - color: $tc-gray-90; - line-height: 25px; + p, + em, + strong { + @include roboto-regular; - @include linkStyle; + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + } - margin: (2 * $base-unit) 0 (3 * $base-unit); -} + p { + @include roboto-regular; -ul { - @include roboto-regular; + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; - margin: 0 0 5px 20px; - font-size: 15px; - color: $tc-gray-90; - line-height: 25px; - list-style: disc outside none; + @include linkStyle; + + margin: (2 * $base-unit) 0 (3 * $base-unit); + } + + ul { + @include roboto-regular; - li { + margin: 0 0 5px 20px; + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + list-style: disc outside none; + + li { + font-weight: 400; + + @include linkStyle; + } + } + + em { + @include roboto-regular; + + font-style: italic; font-weight: 400; + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + } - @include linkStyle; + ol { + @include roboto-regular; + + color: $tc-gray-80; + font-size: 15px; + line-height: 25px; + padding-left: 20px; + list-style-type: decimal; + margin: 0 0 5px; + counter-reset: item; + display: table; + + li { + list-style-type: none; + font-weight: 400; + counter-increment: item; + display: table-row; + white-space: normal; + + &::before { + display: table-cell; + font-weight: 700; + text-align: right; + content: counter(item) "."; + padding: 0 10px 0 0; + } + } + } + + td, + th { + @include roboto-regular; + + color: $tc-gray-80; + font-size: 15px; + line-height: 25px; + } + + img { + max-width: 100%; + } + + code { + white-space: pre; + margin: 10px 0 15px; + background: $tc-gray-neutral-light; + border: 1px solid silver; + border-radius: 6px; + font-family: Roboto Mono, monospace; + font-weight: 400; + font-size: 13px; + color: $tc-black; + line-height: 20px; + padding: 15px; + display: block; + } + + sub { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; + bottom: -0.25em; + } + + sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; + top: -.5em; + } + + strong { + @include roboto-bold; + + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + } + + pre { + overflow-x: scroll; } } From 30bb211370e2d8eec558261e660c55d422c8210a Mon Sep 17 00:00:00 2001 From: M Fikri A Date: Mon, 24 Aug 2020 17:30:48 +0700 Subject: [PATCH 02/20] Fix Lint --- .../components/challenge-detail/Specification/styles.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/shared/components/challenge-detail/Specification/styles.scss b/src/shared/components/challenge-detail/Specification/styles.scss index 80adf28096..90068d42d4 100644 --- a/src/shared/components/challenge-detail/Specification/styles.scss +++ b/src/shared/components/challenge-detail/Specification/styles.scss @@ -153,7 +153,8 @@ $tc-link-visited: #0c4e98; color: $tc-gray-90; } - h5, h6 { + h5, + h6 { margin: (4 * $base-unit) 0 (2 * $base-unit); } @@ -275,7 +276,7 @@ $tc-link-visited: #0c4e98; line-height: 0; position: relative; vertical-align: baseline; - top: -.5em; + top: -0.5em; } strong { From 136f997e1dea597db9dcdb646a7cca538338b5b5 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 17 Sep 2020 03:57:49 -0300 Subject: [PATCH 03/20] ci: Deploy milestone-20200917 to Dev and Stag Issue: #4802 --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a590c1e08..b115284c8b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,6 +230,7 @@ workflows: filters: branches: only: + - milestone-20200917 - develop # This is alternate dev env for parallel testing - "build-test": @@ -259,6 +260,7 @@ workflows: filters: branches: only: + - milestone-20200917 - develop # Production builds are exectuted # when PR is merged to the master From 1f47d91d40bd45194cce575b53af5be1538e7475 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Fri, 18 Sep 2020 15:17:04 +0530 Subject: [PATCH 04/20] ci: deploy on stage and qa --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac5bb66a4b..ff01c09e72 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ workflows: filters: branches: only: - - develop + - hot-fix # This is alternate dev env for parallel testing - "build-test": context : org-global @@ -246,6 +246,7 @@ workflows: branches: only: - community-app-tests-poc + - develop # This is beta env for production soft releases - "build-prod-beta": context : org-global From 0d0b9acc1d351168fd99f7736d825f3a254da9a8 Mon Sep 17 00:00:00 2001 From: M Fikri A Date: Mon, 21 Sep 2020 09:07:12 +0700 Subject: [PATCH 05/20] Fix indentation and font size --- .../Specification/styles.scss | 447 +++++++++--------- 1 file changed, 223 insertions(+), 224 deletions(-) diff --git a/src/shared/components/challenge-detail/Specification/styles.scss b/src/shared/components/challenge-detail/Specification/styles.scss index 90068d42d4..2605a43efe 100644 --- a/src/shared/components/challenge-detail/Specification/styles.scss +++ b/src/shared/components/challenge-detail/Specification/styles.scss @@ -68,230 +68,6 @@ $tc-link-visited: #0c4e98; max-width: 10px !important; } -.challenge-details-view { - white-space: normal; - display: flex; - flex-wrap: wrap; - justify-content: center; - overflow: hidden; - position: relative; - align-items: baseline; - word-break: break-word; - - @include linkStyle; - - @include xs-to-sm { - flex-direction: column; - } - - .challenge-specifications { - @include roboto-regular; - - flex: 4; - text-align: left; - display: flex; - flex-direction: column; - margin: 5px 0 50px; - - .challenge-specs-develop { - blockquote { - border-left: 3px solid $tc-green; - padding-left: 17px; - } - } - - .challenge-specs-datasci { - blockquote { - border-left: 3px solid $tc-orange; - padding-left: 17px; - } - } - - .challenge-specs-design { - blockquote { - border-left: 3px solid $tc-light-blue; - padding-left: 17px; - } - } - } - - h1 { - @include roboto-bold; - - font-size: 28px; - color: #151516; - letter-spacing: -0.78px; - line-height: 40px; - margin: (10 * $base-unit) 0 (2 * $base-unit); - } - - h2 { - @include roboto-bold; - - font-size: 20px; - color: $tc-black; - line-height: 30px; - margin: (6 * $base-unit) 0 (2 * $base-unit); - } - - h3 { - @include roboto-bold; - - font-size: 15px; - color: $tc-black; - line-height: 25px; - margin: (5 * $base-unit) 0 0; - text-transform: uppercase; - } - - h4 { - @include roboto-bold; - - margin: (4 * $base-unit) 0 (2 * $base-unit); - font-size: 15px; - line-height: 25px; - color: $tc-gray-90; - } - - h5, - h6 { - margin: (4 * $base-unit) 0 (2 * $base-unit); - } - - p, - em, - strong { - @include roboto-regular; - - font-size: 15px; - color: $tc-gray-90; - line-height: 25px; - } - - p { - @include roboto-regular; - - font-size: 15px; - color: $tc-gray-90; - line-height: 25px; - - @include linkStyle; - - margin: (2 * $base-unit) 0 (3 * $base-unit); - } - - ul { - @include roboto-regular; - - margin: 0 0 5px 20px; - font-size: 15px; - color: $tc-gray-90; - line-height: 25px; - list-style: disc outside none; - - li { - font-weight: 400; - - @include linkStyle; - } - } - - em { - @include roboto-regular; - - font-style: italic; - font-weight: 400; - font-size: 15px; - color: $tc-gray-90; - line-height: 25px; - } - - ol { - @include roboto-regular; - - color: $tc-gray-80; - font-size: 15px; - line-height: 25px; - padding-left: 20px; - list-style-type: decimal; - margin: 0 0 5px; - counter-reset: item; - display: table; - - li { - list-style-type: none; - font-weight: 400; - counter-increment: item; - display: table-row; - white-space: normal; - - &::before { - display: table-cell; - font-weight: 700; - text-align: right; - content: counter(item) "."; - padding: 0 10px 0 0; - } - } - } - - td, - th { - @include roboto-regular; - - color: $tc-gray-80; - font-size: 15px; - line-height: 25px; - } - - img { - max-width: 100%; - } - - code { - white-space: pre; - margin: 10px 0 15px; - background: $tc-gray-neutral-light; - border: 1px solid silver; - border-radius: 6px; - font-family: Roboto Mono, monospace; - font-weight: 400; - font-size: 13px; - color: $tc-black; - line-height: 20px; - padding: 15px; - display: block; - } - - sub { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; - bottom: -0.25em; - } - - sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; - top: -0.5em; - } - - strong { - @include roboto-bold; - - font-size: 15px; - color: $tc-gray-90; - line-height: 25px; - } - - pre { - overflow-x: scroll; - } -} - .rawHtml { @include tc-typography; @@ -419,6 +195,229 @@ $tc-link-visited: #0c4e98; @include linkStyle; } +.challenge-details-view { + white-space: normal; + display: flex; + flex-wrap: wrap; + justify-content: center; + overflow: hidden; + position: relative; + align-items: baseline; + word-break: break-word; + + @include linkStyle; + + @include xs-to-sm { + flex-direction: column; + } + + .challenge-specifications { + @include roboto-regular; + + flex: 4; + text-align: left; + display: flex; + flex-direction: column; + margin: 5px 0 50px; + + .challenge-specs-develop { + blockquote { + border-left: 3px solid $tc-green; + padding-left: 17px; + } + } + + .challenge-specs-datasci { + blockquote { + border-left: 3px solid $tc-orange; + padding-left: 17px; + } + } + + .challenge-specs-design { + blockquote { + border-left: 3px solid $tc-light-blue; + padding-left: 17px; + } + } + + h1 { + @include roboto-bold; + + font-size: 28px; + color: #151516; + letter-spacing: -0.78px; + line-height: 40px; + margin: (10 * $base-unit) 0 (2 * $base-unit); + } + + h2 { + @include roboto-bold; + + font-size: 20px; + color: $tc-black; + line-height: 30px; + margin: (6 * $base-unit) 0 (2 * $base-unit); + } + + h3 { + @include roboto-bold; + + font-size: 15px; + color: $tc-black; + line-height: 25px; + margin: (5 * $base-unit) 0 0; + text-transform: uppercase; + } + + h4 { + @include roboto-bold; + + margin: (4 * $base-unit) 0 (2 * $base-unit); + font-size: 15px; + line-height: 25px; + color: $tc-gray-90; + } + + h5, + h6 { + margin: (4 * $base-unit) 0 (2 * $base-unit); + } + + p, + em, + strong { + @include roboto-regular; + + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + } + + p { + @include roboto-regular; + + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + + @include linkStyle; + + margin: (2 * $base-unit) 0 (3 * $base-unit); + } + + ul { + @include roboto-regular; + + margin: 0 0 5px 20px; + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + list-style: disc outside none; + + li { + font-weight: 400; + + @include linkStyle; + } + } + + em { + @include roboto-regular; + + font-style: italic; + font-weight: 400; + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + } + + ol { + @include roboto-regular; + + color: $tc-gray-80; + font-size: 15px; + line-height: 25px; + list-style-type: decimal; + margin: 0 0 5px; + counter-reset: item; + display: table; + + li { + list-style-type: none; + font-weight: 400; + counter-increment: item; + display: table-row; + white-space: normal; + + &::before { + display: table-cell; + font-weight: 700; + text-align: right; + content: counter(item) "."; + padding: 0 10px 0 0; + } + } + } + + td, + th { + @include roboto-regular; + + color: $tc-gray-80; + font-size: 15px; + line-height: 25px; + } + + img { + max-width: 100%; + } + + code { + white-space: pre; + margin: 10px 0 15px; + background: $tc-gray-neutral-light; + border: 1px solid silver; + border-radius: 6px; + font-family: Roboto Mono, monospace; + font-weight: 400; + font-size: 13px; + color: $tc-black; + line-height: 20px; + padding: 15px; + display: block; + } + + sub { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; + bottom: -0.25em; + } + + sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; + top: -0.5em; + } + + strong { + @include roboto-bold; + + font-size: 15px; + color: $tc-gray-90; + line-height: 25px; + } + + pre { + overflow-x: scroll; + } + } +} + .challenge-specs-main { @include roboto-regular; From 2f890d67e7a0502d4d7bda737554b61a2fea884c Mon Sep 17 00:00:00 2001 From: narekcat Date: Wed, 23 Sep 2020 14:00:39 +0400 Subject: [PATCH 06/20] fix: for issue #4784 --- src/shared/containers/terms-detail/index.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/shared/containers/terms-detail/index.jsx b/src/shared/containers/terms-detail/index.jsx index 0f79a1a904..f6b4cd93c5 100644 --- a/src/shared/containers/terms-detail/index.jsx +++ b/src/shared/containers/terms-detail/index.jsx @@ -70,9 +70,15 @@ class TermsDetailPageContainer extends React.Component { agreeingTerm, agreeTermFailure, theme, + history, } = this.props; const { termsAccepted, showModal } = this.state; + if (details && details.isLegacyTerm && !history.location.pathname.includes(details.id)) { + history.location.pathname = `/challenges/terms/detail/${details.id}`; // eslint-disable-line no-param-reassign + history.push(history.location.pathname, history.state); + } + return (
{ @@ -196,6 +202,7 @@ TermsDetailPageContainer.propTypes = { 'terms-title': PT.string.isRequired, modalMsg: PT.any, }).isRequired, + history: PT.shape().isRequired, }; function mapStateToProps(state, props) { From 904be2390daccb1d2da7fafcc279179ff4b61782 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 23 Sep 2020 21:34:43 -0300 Subject: [PATCH 07/20] Terms: removed unnecessary reassign --- src/shared/containers/terms-detail/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/containers/terms-detail/index.jsx b/src/shared/containers/terms-detail/index.jsx index f6b4cd93c5..3bc8897294 100644 --- a/src/shared/containers/terms-detail/index.jsx +++ b/src/shared/containers/terms-detail/index.jsx @@ -75,8 +75,8 @@ class TermsDetailPageContainer extends React.Component { const { termsAccepted, showModal } = this.state; if (details && details.isLegacyTerm && !history.location.pathname.includes(details.id)) { - history.location.pathname = `/challenges/terms/detail/${details.id}`; // eslint-disable-line no-param-reassign - history.push(history.location.pathname, history.state); + const path = `/challenges/terms/detail/${details.id}`; + history.push(path, history.state); } return ( From 1245e7c6a8b153934119e21f6700dec75098a7c9 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 23 Sep 2020 22:07:54 -0300 Subject: [PATCH 08/20] fix: for issue #4784 Issue: #4784 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 049a57b7e7..203cc3c06c 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1000.22.6", + "topcoder-react-lib": "1000.22.9", "topcoder-react-ui-kit": "2.0.0", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From a206913418e0d6e0d9bcef89795a688016e33732 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 02:13:50 -0300 Subject: [PATCH 09/20] ci: Deploy milestone-20200917 to QA env Issues: #4802 #4784 --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b115284c8b..a6dc2b051d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,6 @@ workflows: filters: branches: only: - - milestone-20200917 - develop # This is alternate dev env for parallel testing - "build-test": @@ -245,7 +244,7 @@ workflows: filters: branches: only: - - community-app-tests-poc + - milestone-20200917 # This is beta env for production soft releases - "build-prod-beta": context : org-global @@ -260,7 +259,6 @@ workflows: filters: branches: only: - - milestone-20200917 - develop # Production builds are exectuted # when PR is merged to the master From 79d70ee96aa5046b29fe3dde8d2daa71a899ea75 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:15:59 -0300 Subject: [PATCH 10/20] Sync milestone-20200917 with develop --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6dc2b051d..a49996f2ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -244,7 +244,8 @@ workflows: filters: branches: only: - - milestone-20200917 + - community-app-tests-poc + - develo # This is beta env for production soft releases - "build-prod-beta": context : org-global From edd95c93348c12b6b3f397b121d4d0406760467a Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:17:27 -0300 Subject: [PATCH 11/20] Sync milestone-20200917 with develop --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 203cc3c06c..17d01d001b 100644 --- a/package.json +++ b/package.json @@ -137,8 +137,8 @@ "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1000.22.9", - "topcoder-react-ui-kit": "2.0.0", + "topcoder-react-lib": "1.0.5", + "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", "url-parse": "^1.4.1", From 3e74a953ead359f73d61401f46014b6414cb7c69 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:22:49 -0300 Subject: [PATCH 12/20] fix: for issue #4784 Issue: #4784 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17d01d001b..0b7eb0c864 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1.0.5", + "topcoder-react-lib": "1000.22.10", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From 41057c74b80faca691100cc356031a4aef315572 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:24:14 -0300 Subject: [PATCH 13/20] ci: Deploy milestone-20200917 to QA env Issues: #4784 #4802 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a49996f2ad..15d453a41a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -244,7 +244,7 @@ workflows: filters: branches: only: - - community-app-tests-poc + - milestone-20200917 - develo # This is beta env for production soft releases - "build-prod-beta": From 548c4fc30c6de37d936b4a9eb6e86e4206d136d2 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:44:05 -0300 Subject: [PATCH 14/20] Merge develop into milestone-20200917 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 15d453a41a..acd03caa2a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -244,8 +244,8 @@ workflows: filters: branches: only: - - milestone-20200917 - - develo + - community-app-tests-poc + - develop # This is beta env for production soft releases - "build-prod-beta": context : org-global From 58f8e20f3ffac856181158f1be29369b939e0a49 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:45:12 -0300 Subject: [PATCH 15/20] Merge develop into milestone-20200917 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b7eb0c864..17d01d001b 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1000.22.10", + "topcoder-react-lib": "1.0.5", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From 0943754fcb91d874d1f4d9371e23fa66ecdd9be1 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:47:47 -0300 Subject: [PATCH 16/20] fix: for issue #4784 issue #4784 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17d01d001b..0b7eb0c864 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1.0.5", + "topcoder-react-lib": "1000.22.10", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From 6c6df9ebced834ea2b82d7cf908242ea0acc4768 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:49:11 -0300 Subject: [PATCH 17/20] ci: Deploy milestone-20200917 to QA env Issues #4784 #4802 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ff01c09e72..539c227375 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -245,7 +245,7 @@ workflows: filters: branches: only: - - community-app-tests-poc + - milestone-20200917 - develop # This is beta env for production soft releases - "build-prod-beta": From 6ed893f271e9379bc07be1b0a347c53e0663fdfd Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 05:48:46 -0300 Subject: [PATCH 18/20] fix: for issue #4784 Issue #4784 Dependency: https://github.com/topcoder-platform/topcoder-react-lib/pull/257 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b7eb0c864..ea02f57a07 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1000.22.10", + "topcoder-react-lib": "1000.22.11", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", From 7b8da365f8ac665911aff4e36915272e671570c2 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Thu, 24 Sep 2020 08:18:22 -0300 Subject: [PATCH 19/20] Terms: Hotfix show details before redirect --- src/shared/containers/terms-detail/index.jsx | 25 +++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/shared/containers/terms-detail/index.jsx b/src/shared/containers/terms-detail/index.jsx index 3bc8897294..af5efa5ab0 100644 --- a/src/shared/containers/terms-detail/index.jsx +++ b/src/shared/containers/terms-detail/index.jsx @@ -37,10 +37,25 @@ class TermsDetailPageContainer extends React.Component { } componentWillReceiveProps(nextProps) { - const { loadTermDetails, authTokens, termId } = this.props; + const { + loadTermDetails, + authTokens, + termId, + } = this.props; + + const { + details, + history, + } = nextProps; + if (!_.isEqual(nextProps.termId, termId)) { loadTermDetails(authTokens, nextProps.termId); } + + if (details && details.isLegacyTerm && !history.location.pathname.includes(details.id)) { + const path = `/challenges/terms/detail/${details.id}`; + history.push(path, history.state); + } } switchHandler() { @@ -70,15 +85,9 @@ class TermsDetailPageContainer extends React.Component { agreeingTerm, agreeTermFailure, theme, - history, } = this.props; const { termsAccepted, showModal } = this.state; - if (details && details.isLegacyTerm && !history.location.pathname.includes(details.id)) { - const path = `/challenges/terms/detail/${details.id}`; - history.push(path, history.state); - } - return (
{ @@ -96,7 +105,7 @@ class TermsDetailPageContainer extends React.Component { ) : null } { - details + (details && details.text) ? (
From c865c7c1d983b7cb21a6a7683934a7c981defbba Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 24 Sep 2020 17:59:35 +0530 Subject: [PATCH 20/20] fix: for release v1.2.3 Issues: #4784 #4802 PR: https://github.com/topcoder-platform/community-app/pull/5000 DEPENDENCY: topcoder-react-lib - Issue: #4784 - PR: https://github.com/topcoder-platform/topcoder-react-lib/pull/258 MS - https://github.com/topcoder-platform/community-app/milestone/70 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea02f57a07..e9dbff8f52 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1000.22.11", + "topcoder-react-lib": "1.0.6", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2",