Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 28 additions & 2 deletions src/collection-browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ import {
tvFacetDisplayOrder,
TvClipFilterType,
TileBlurOverrideState,
defaultSortAvailability,
favoritesSortAvailability,
tvSortAvailability,
} from './models';
import {
RestorationStateHandlerInterface,
Expand Down Expand Up @@ -788,14 +791,37 @@ export class CollectionBrowser
private get sortFilterBarTemplate(): TemplateResult | typeof nothing {
if (this.suppressSortBar) return nothing;

// Determine the set of sortable fields that should be shown in the sort bar
let defaultViewSort = SortField.weeklyview;
let defaultDateSort = SortField.date;
let sortFieldAvailability = defaultSortAvailability;

// We adjust the sort options for a couple of special cases...
if (this.withinCollection?.startsWith('fav-')) {
// When viewing a fav- collection, we include the Date Favorited option and show
// it as the default in the date dropdown.
defaultDateSort = SortField.datefavorited;
sortFieldAvailability = favoritesSortAvailability;
} else if (!this.withinCollection && this.searchType === SearchType.TV) {
// When viewing TV search results, we default the views dropdown to All-time Views
// and exclude several of the usual date sort options.
defaultViewSort = SortField.alltimeview;
defaultDateSort = SortField.datearchived;
sortFieldAvailability = tvSortAvailability;
}

// We only show relevance sort if a search query is currently defined
sortFieldAvailability.relevance = this.isRelevanceSortAvailable;

return html`
<sort-filter-bar
.defaultSortField=${this.defaultSortField}
.defaultSortDirection=${this.defaultSortDirection}
.defaultViewSort=${defaultViewSort}
.defaultDateSort=${defaultDateSort}
.selectedSort=${this.selectedSort}
.sortDirection=${this.sortDirection}
.showRelevance=${this.isRelevanceSortAvailable}
.showDateFavorited=${this.withinCollection?.startsWith('fav-')}
.sortFieldAvailability=${sortFieldAvailability}
.displayMode=${this.displayMode}
.selectedTitleFilter=${this.selectedTitleFilter}
.selectedCreatorFilter=${this.selectedCreatorFilter}
Expand Down
48 changes: 48 additions & 0 deletions src/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,27 @@ export enum SortField {
'creator' = 'creator',
}

/**
* Views-related sort fields
*/
export const ALL_VIEWS_SORT_FIELDS = [
SortField.weeklyview,
SortField.alltimeview,
] as const;
export type ViewsSortField = (typeof ALL_VIEWS_SORT_FIELDS)[number];

/**
* Date-related sort fields
*/
export const ALL_DATE_SORT_FIELDS = [
SortField.datefavorited,
SortField.date,
SortField.datearchived,
SortField.datereviewed,
SortField.dateadded,
] as const;
export type DateSortField = (typeof ALL_DATE_SORT_FIELDS)[number];

export interface SortOption {
/**
* The SortField enum member corresponding to this option.
Expand Down Expand Up @@ -532,6 +553,33 @@ export function sortOptionFromAPIString(sortName?: string | null): SortOption {
);
}

export const defaultSortAvailability: Record<SortField, boolean> = {
[SortField.relevance]: true,
[SortField.weeklyview]: true,
[SortField.alltimeview]: true,
[SortField.title]: true,
[SortField.datefavorited]: false,
[SortField.date]: true,
[SortField.datearchived]: true,
[SortField.datereviewed]: true,
[SortField.dateadded]: true,
[SortField.creator]: true,
[SortField.default]: false,
[SortField.unrecognized]: false,
};

export const favoritesSortAvailability: Record<SortField, boolean> = {
...defaultSortAvailability,
[SortField.datefavorited]: true,
};

export const tvSortAvailability: Record<SortField, boolean> = {
...defaultSortAvailability,
[SortField.date]: false,
[SortField.datereviewed]: false,
[SortField.dateadded]: false,
};

export const defaultProfileElementSorts: Record<
string,
Exclude<SortField, SortField.default>
Expand Down
Loading
Loading