Skip to content

Add browse definition handling in BrowseByDateComponent #5121

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

Open
xvThomas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add browse definition handling in BrowseByDateComponent #5121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/app/browse-by/browse-by-date/browse-by-date.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import {
BrowseByMetadataComponent,
browseParamsToOptions,
} from '../browse-by-metadata/browse-by-metadata.component';
import { BrowseDefinition } from 'src/app/core/shared/browse-definition.model';

@Component({
selector: 'ds-browse-by-date',
Expand Down Expand Up @@ -100,6 +101,13 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
this.startsWithType = StartsWithType.date;
this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
const browseDefinition$: Observable<BrowseDefinition | undefined> = observableCombineLatest([
this.route.data,
this.route.parent ? this.route.parent.data : of({} as Record<string, any>),
]).pipe(
map(([data, parentData]) => (data?.browseDefinition ?? parentData?.browseDefinition) as BrowseDefinition | undefined),
distinctUntilChanged((prev, curr) => prev?.id === curr?.id),
);
const routeParams$: Observable<Params> = observableCombineLatest([
this.route.params,
this.route.queryParams,
Expand All @@ -113,8 +121,9 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
this.scope$,
this.currentPagination$,
this.currentSort$,
]).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
browseDefinition$,
]).subscribe(([params, scope, currentPage, currentSort, browseDefinition]: [Params, string, PaginationComponentOptions, SortOptions, BrowseDefinition | undefined]) => {
const metadataKeys = browseDefinition?.metadataKeys ?? this.defaultMetadataKeys;
this.browseId = params.id || this.defaultBrowseId;
this.startsWith = +params.startsWith || params.startsWith;
const searchOptions = browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails);
Expand Down