From b6f349d808a37b5a3268e9d6cae5e68ab75613a2 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Tue, 11 Aug 2020 05:51:44 -0300 Subject: [PATCH 1/6] Fix ReviewOpportunityCard issue with TrackAbbreviationTooltip --- .../challenge-listing/Listing/ReviewOpportunityBucket/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/challenge-listing/Listing/ReviewOpportunityBucket/index.jsx b/src/shared/components/challenge-listing/Listing/ReviewOpportunityBucket/index.jsx index 40e2dcef1a..b7b47dd371 100644 --- a/src/shared/components/challenge-listing/Listing/ReviewOpportunityBucket/index.jsx +++ b/src/shared/components/challenge-listing/Listing/ReviewOpportunityBucket/index.jsx @@ -54,7 +54,7 @@ export default function ReviewOpportunityBucket({ const cards = filteredOpportunities.map(item => ( setFilterState({ tags: [tag] })} From 921a83ec481474c78eceff90e274e2ddb68e5eb7 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Tue, 11 Aug 2020 06:05:12 -0300 Subject: [PATCH 2/6] Disabled TrackAbbreviationTooltip until upgrade ReviewOpportunity to v5 --- .../challenge-listing/ReviewOpportunityCard/index.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/shared/components/challenge-listing/ReviewOpportunityCard/index.jsx b/src/shared/components/challenge-listing/ReviewOpportunityCard/index.jsx index 7d213380e7..a22ca72ae9 100644 --- a/src/shared/components/challenge-listing/ReviewOpportunityCard/index.jsx +++ b/src/shared/components/challenge-listing/ReviewOpportunityCard/index.jsx @@ -55,6 +55,9 @@ function ReviewOpportunityCard({ return (
+ { /* START - DISABLED UNTIL REVIEW OPPORTUNITY RECEIVE UPDATE TO API V5 */ + false + && (
+ ) /* END - DISABLED UNTIL REVIEW OPPORTUNITY RECEIVE UPDATE TO API V5 */ }
Date: Tue, 11 Aug 2020 06:55:44 -0300 Subject: [PATCH 3/6] Disable filter Type if isReviewOpportunitiesBucket --- .../components/challenge-listing/Filters/FiltersPanel/index.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx index 50d72eb2cc..f05f1ccf05 100644 --- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx +++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx @@ -268,6 +268,7 @@ export default function FiltersPanel({ value={ filterState.types ? filterState.types.join(',') : null } + disabled={isReviewOpportunitiesBucket} />
{/* Only shown when the Review Opportunity bucket is selected */} From 531b413470c0f433ef03ce1166d86d7ad901ea2f Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Tue, 11 Aug 2020 06:56:05 -0300 Subject: [PATCH 4/6] Fix filter Review Type width --- .../challenge-listing/Filters/FiltersPanel/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss index 6c1a1f086c..21c13a907a 100644 --- a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss +++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss @@ -462,7 +462,7 @@ $panel-radius-4: $corner-radius * 2; .filter.review-type { // margin - (.date.input width + .date.text width) * 2 - filters.label width - @include calc(width, '50% - 30px - (14px + 114px) * 2 - 96px'); + @include calc(width, '50% - 45px - (12px + 112px) * 2 - 96px'); order: 3; // Show after Date Picker when in lg screen mode From 8181fac835b3849d123bd2e04a36d6cfd33d3a8f Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Tue, 11 Aug 2020 07:04:35 -0300 Subject: [PATCH 5/6] Hide values from filter Type if isReviewOpportunitiesBucket --- .../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 f05f1ccf05..a3320e0735 100644 --- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx +++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx @@ -266,7 +266,7 @@ export default function FiltersPanel({ options={validTypes.map(mapTypes)} simpleValue value={ - filterState.types ? filterState.types.join(',') : null + (filterState.types && !isReviewOpportunitiesBucket) ? filterState.types.join(',') : null } disabled={isReviewOpportunitiesBucket} /> From 7443a8d11e7838803c1ad4716ca6670cab130635 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Tue, 11 Aug 2020 07:12:35 -0300 Subject: [PATCH 6/6] Fix snapshot --- .../Filters/__snapshots__/FiltersPanel.jsx.snap | 2 ++ 1 file changed, 2 insertions(+) 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 0a5978ac93..27c443df66 100644 --- a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap +++ b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap @@ -117,6 +117,7 @@ exports[`Matches shallow shapshot 1`] = ` />