From 1b75dd0541736f1498cfafc93623738954838350 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Fri, 22 Jul 2022 08:36:02 +1000 Subject: [PATCH 1/4] Update toggle name for TCO challenges https://topcoder.atlassian.net/browse/PROD-2543 --- .../components/challenge-listing/Filters/FiltersPanel/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx index 69b8e823f8..11a757ba60 100644 --- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx +++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx @@ -678,7 +678,7 @@ export default function FiltersPanel({ > From 749dd011e8a383e6bed449e34d19e0a5bd0dac7f Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Fri, 22 Jul 2022 12:14:26 +1000 Subject: [PATCH 2/4] Fix test --- .../Filters/__snapshots__/FiltersPanel.jsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap index a0067e1fd5..3e08a0f553 100644 --- a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap +++ b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap @@ -224,7 +224,7 @@ exports[`Matches shallow shapshot 2`] = ` composeAdhocTheme="deeply" composeContextTheme="softly" enabled={false} - labelAfter="TCO Eligible Challenges" + labelAfter="Only Show TCO Eligible Challenges" labelBefore="" mapThemrProps={[Function]} onSwitch={[Function]} From f3f775d8913c96c8c4e21b0f52aa9120a4e7a11f Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Fri, 22 Jul 2022 12:27:19 +1000 Subject: [PATCH 3/4] Deploy develop branch to dev environment for validation purposes --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1fd67a395d..f010e06e82 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -349,6 +349,7 @@ workflows: filters: branches: only: + - develop - free # This is alternate dev env for parallel testing - "build-test": From 207111fb12510c9cf0bb2ead7e0d4a68fb17aa85 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Sat, 23 Jul 2022 10:38:00 +1000 Subject: [PATCH 4/4] Test fix for TCO Eligible Challenges text --- .circleci/config.yml | 1 + .../Filters/FiltersPanel/index.jsx | 8 ++++---- .../Filters/FiltersPanel/style.scss | 13 +++---------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f010e06e82..fe0d237748 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -351,6 +351,7 @@ workflows: only: - develop - free + - justin-fixes # This is alternate dev env for parallel testing - "build-test": context : org-global diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx index 11a757ba60..9506f868d6 100644 --- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx +++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx @@ -666,8 +666,9 @@ export default function FiltersPanel({ ) } - {isTcoChallengesVisible - && ( + { + isTcoChallengesVisible + && (
- ) + ) } - { diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss index c6fe1708e6..9dfcc95352 100644 --- a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss +++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss @@ -120,10 +120,8 @@ hr.hr { .recommended-select-label, .tco-select-label { - width: 45%; margin-bottom: 16px; display: flex; - white-space: nowrap; line-height: 30px; justify-content: flex-start; margin-top: 15px; @@ -133,8 +131,6 @@ hr.hr { } @include sm-to-md { - width: 50%; - > div { display: inline-flex; flex-direction: row-reverse; @@ -623,16 +619,13 @@ hr.hr { .recommended-challenge-tooltip, .tco-challenge-tooltip { - position: absolute; - left: 210px; + position: relative; + left: 7px; + top: 18px; display: flex; flex-direction: column; justify-content: center; height: 100%; - - @include xs-to-md { - left: 210px; - } } } }