Skip to content

Issue#4718 : Open for review bucket : Impact of Track/Subtrack updates #4738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 11, 2020
Merged

Issue#4718 : Open for review bucket : Impact of Track/Subtrack updates #4738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b6f349d
Fix ReviewOpportunityCard issue with TrackAbbreviationTooltip
luizrrodrigues Aug 11, 2020
921a83e
Disabled TrackAbbreviationTooltip until upgrade ReviewOpportunity to v5
luizrrodrigues Aug 11, 2020
8888bf9
Disable filter Type if isReviewOpportunitiesBucket
luizrrodrigues Aug 11, 2020
531b413
Fix filter Review Type width
luizrrodrigues Aug 11, 2020
8181fac
Hide values from filter Type if isReviewOpportunitiesBucket
luizrrodrigues Aug 11, 2020
7443a8d
Fix snapshot
luizrrodrigues Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions __tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ exports[`Matches shallow shapshot 1`] = `
/>
</label>
<Select
disabled={false}
id="type-select"
multi={true}
onChange={[Function]}
Expand Down Expand Up @@ -312,6 +313,7 @@ exports[`Matches shallow shapshot 2`] = `
/>
</label>
<Select
disabled={false}
id="type-select"
multi={true}
onChange={[Function]}
Expand Down
3 changes: 2 additions & 1 deletion src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,9 @@ 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}
/>
</div>
{/* Only shown when the Review Opportunity bucket is selected */}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/challenge-listing/Listing/ReviewOpportunityBucket/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default function ReviewOpportunityBucket({
const cards = filteredOpportunities.map(item => (
<ReviewOpportunityCard
challengesUrl={challengesUrl}
challengeType={_.find(challengeTypes, { name: item.type })}
challengeType={_.find(challengeTypes, { name: item.challenge.type }) || []}
expandedTags={expandedTags}
expandTag={expandTag}
onTechTagClicked={tag => setFilterState({ tags: [tag] })}
Expand Down
4 changes: 4 additions & 0 deletions src/shared/components/challenge-listing/ReviewOpportunityCard/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ function ReviewOpportunityCard({
return (
<div styleName="reviewOpportunityCard">
<div styleName="left-panel">
{ /* START - DISABLED UNTIL REVIEW OPPORTUNITY RECEIVE UPDATE TO API V5 */
false
&& (
<div styleName="challenge-track">
<TrackAbbreviationTooltip
track={track}
Expand All @@ -69,6 +72,7 @@ function ReviewOpportunityCard({
</span>
</TrackAbbreviationTooltip>
</div>
) /* END - DISABLED UNTIL REVIEW OPPORTUNITY RECEIVE UPDATE TO API V5 */ }
<div styleName="challenge-details">
<Link
to={`${challengesUrl}/${challenge.id}`}
Expand Down