freshness default

This commit is contained in:
jessop 2020-02-27 17:15:17 -05:00 committed by Sean Yesmunt
parent 9dc9d50e19
commit 8b261b57ff
2 changed files with 12 additions and 5 deletions

View file

@ -76,7 +76,7 @@ function ClaimListDiscover(props: Props) {
streamType,
defaultStreamType,
freshness,
defaultFreshness,
defaultFreshness = CS.FRESH_WEEK,
renderProperties,
includeSupportAction,
noCustom,
@ -91,7 +91,7 @@ function ClaimListDiscover(props: Props) {
const urlParams = new URLSearchParams(search);
const tagsParam = tags || urlParams.get(CS.TAGS_KEY) || null;
const orderParam = orderBy || urlParams.get(CS.ORDER_BY_KEY) || defaultOrderBy || CS.ORDER_BY_TRENDING;
const freshnessParam = freshness || urlParams.get(CS.FRESH_KEY) || defaultFreshness || CS.FRESH_WEEK;
const freshnessParam = freshness || urlParams.get(CS.FRESH_KEY) || defaultFreshness;
const contentTypeParam = urlParams.get(CS.CONTENT_KEY);
const claimTypeParam =
claimType || (CS.CLAIM_TYPES.includes(contentTypeParam) && contentTypeParam) || defaultClaimType || null;
@ -264,7 +264,11 @@ function ClaimListDiscover(props: Props) {
newUrlParams.set(CS.ORDER_BY_KEY, delta.value);
break;
case CS.FRESH_KEY:
newUrlParams.set(CS.FRESH_KEY, delta.value);
if (delta.value === defaultFreshness || delta.value === CS.FRESH_DEFAULT) {
newUrlParams.delete(CS.FRESH_KEY);
} else {
newUrlParams.set(CS.FRESH_KEY, delta.value);
}
break;
case CS.CONTENT_KEY:
if (delta.value === CS.CLAIM_CHANNEL || delta.value === CS.CLAIM_REPOST) {
@ -345,7 +349,9 @@ function ClaimListDiscover(props: Props) {
{orderParam === CS.ORDER_BY_TOP && (
<div className={'claim-search__input-container'}>
<FormField
className="claim-search__dropdown"
className={classnames('claim-search__dropdown', {
'claim-search__dropdown--selected': freshnessParam !== defaultFreshness,
})}
type="select"
name="trending_time"
label={__('How Fresh')}

View file

@ -11,7 +11,8 @@ export const FRESH_WEEK = 'week';
export const FRESH_MONTH = 'month';
export const FRESH_YEAR = 'year';
export const FRESH_ALL = 'all';
export const FRESH_TYPES = [FRESH_DAY, FRESH_WEEK, FRESH_MONTH, FRESH_YEAR, FRESH_ALL];
export const FRESH_DEFAULT = 'default';
export const FRESH_TYPES = [FRESH_DEFAULT, FRESH_DAY, FRESH_WEEK, FRESH_MONTH, FRESH_YEAR, FRESH_ALL];
export const ORDER_BY_TRENDING = 'trending';
export const ORDER_BY_TRENDING_VALUE = ['trending_group', 'trending_mixed'];