diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html index 8f000a67618..1ec410df8e3 100644 --- a/src/app/home-page/home-page.component.html +++ b/src/app/home-page/home-page.component.html @@ -91,7 +91,7 @@
{{'home-page.carousel.deposit.cite' |
{{'home-page.whats-new.message' | translate}}
+ [object]="newItem"> @@ -102,7 +102,7 @@
{{'home-page.carousel.deposit.cite' |
{{'home-page.new-items.message' | translate}}
+ [object]="topItem"> diff --git a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html index 9ef263468bd..162406cce0b 100644 --- a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html +++ b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html @@ -1,5 +1,5 @@ -
-
+
+
{{ itemType }} diff --git a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.ts b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.ts index 353545a3d2b..f8670de6711 100644 --- a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.ts +++ b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.ts @@ -25,6 +25,8 @@ import { BundleDataService } from '../../core/data/bundle-data.service'; import { Bundle } from '../../core/shared/bundle.model'; import { Bitstream } from '../../core/shared/bitstream.model'; import { LicenseType } from '../../item-page/clarin-license-info/clarin-license-info.component'; +import { ListableObject } from '../object-collection/shared/listable-object.model'; +import { ItemSearchResult } from '../object-collection/shared/item-search-result.model'; /** * Show item on the Home/Search page in the customized box with Item's information. @@ -39,7 +41,9 @@ export class ClarinItemBoxViewComponent implements OnInit { /** * Show information of this item. */ - @Input() item$: Item = null; + @Input() object: Item|ListableObject = null; + + item: Item = null; /** * UI URL loaded from the server. @@ -110,11 +114,19 @@ export class ClarinItemBoxViewComponent implements OnInit { private sanitizer: DomSanitizer) { } async ngOnInit(): Promise { + if (this.object instanceof Item) { + this.item = this.object; + } else if (this.object instanceof ItemSearchResult) { + this.item = this.object.indexableObject; + } else { + return; + } + // Load Items metadata - this.itemType = this.item$?.metadata?.['dc.type']?.[0]?.value; - this.itemName = this.item$?.metadata?.['dc.title']?.[0]?.value; - this.itemUri = this.item$?.metadata?.['dc.identifier.uri']?.[0]?.value; - this.itemDescription = this.item$?.metadata?.['dc.description']?.[0]?.value; + this.itemType = this.item?.metadata?.['dc.type']?.[0]?.value; + this.itemName = this.item?.metadata?.['dc.title']?.[0]?.value; + this.itemUri = this.item?.metadata?.['dc.identifier.uri']?.[0]?.value; + this.itemDescription = this.item?.metadata?.['dc.description']?.[0]?.value; await this.assignBaseUrl(); this.getItemCommunity(); @@ -124,14 +136,14 @@ export class ClarinItemBoxViewComponent implements OnInit { } private loadItemAuthors() { - if (isNull(this.item$)) { + if (isNull(this.item)) { return; } - let authorsMV: MetadataValue[] = this.item$?.metadata?.['dc.contributor.author']; + let authorsMV: MetadataValue[] = this.item?.metadata?.['dc.contributor.author']; // Harvested Items has authors in the metadata field `dc.creator`. if (isUndefined(authorsMV)) { - authorsMV = this.item$?.metadata?.['dc.creator']; + authorsMV = this.item?.metadata?.['dc.creator']; } if (isUndefined(authorsMV)) { @@ -150,10 +162,10 @@ export class ClarinItemBoxViewComponent implements OnInit { } private getItemFilesSize() { - if (isNull(this.item$)) { + if (isNull(this.item)) { return; } - this.bundleService.findByItemAndName(this.item$, 'ORIGINAL', true, true, followLink('bitstreams')) + this.bundleService.findByItemAndName(this.item, 'ORIGINAL', true, true, followLink('bitstreams')) .pipe(getFirstSucceededRemoteDataPayload()) .subscribe((bundle: Bundle) => { bundle.bitstreams @@ -170,10 +182,10 @@ export class ClarinItemBoxViewComponent implements OnInit { } private getItemCommunity() { - if (isNull(this.item$)) { + if (isNull(this.item)) { return; } - this.collectionService.findByHref(this.item$?._links?.owningCollection?.href, true, true, followLink('parentCommunity')) + this.collectionService.findByHref(this.item?._links?.owningCollection?.href, true, true, followLink('parentCommunity')) .pipe(getFirstSucceededRemoteDataPayload()) .subscribe((collection: Collection) => { collection.parentCommunity @@ -201,8 +213,8 @@ export class ClarinItemBoxViewComponent implements OnInit { private loadItemLicense() { // load license info from item attributes - this.licenseLabel = this.item$?.metadata?.['dc.rights.label']?.[0]?.value; - this.license = this.item$?.metadata?.['dc.rights']?.[0]?.value; + this.licenseLabel = this.item?.metadata?.['dc.rights.label']?.[0]?.value; + this.license = this.item?.metadata?.['dc.rights']?.[0]?.value; switch (this.licenseLabel) { case LicenseType.public: this.licenseType = 'Publicly Available'; diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html index 331ff1cb288..d4493530ea6 100644 --- a/src/app/shared/object-list/object-list.component.html +++ b/src/app/shared/object-list/object-list.component.html @@ -12,6 +12,13 @@ (sortFieldChange)="onSortFieldChange($event)" (paginationChange)="onPaginationChange($event)">
    +
    + + +
    +
    • +
diff --git a/src/app/shared/search/clarin-search/clarin-search.component.html b/src/app/shared/search/clarin-search/clarin-search.component.html deleted file mode 100644 index b69f6ee59da..00000000000 --- a/src/app/shared/search/clarin-search/clarin-search.component.html +++ /dev/null @@ -1,84 +0,0 @@ -
-
-
- -
-
-
- -
- -
- - - - - - -
-
- - -
-
-
- - -
- - -
-
- - - - - - - - - - - -
-
- -
-
- diff --git a/src/app/shared/search/clarin-search/clarin-search.component.ts b/src/app/shared/search/clarin-search/clarin-search.component.ts index 785a23758e1..1efee695e5c 100644 --- a/src/app/shared/search/clarin-search/clarin-search.component.ts +++ b/src/app/shared/search/clarin-search/clarin-search.component.ts @@ -8,14 +8,22 @@ import { SearchConfigurationService } from '../../../core/shared/search/search-c import { RouteService } from '../../../core/services/route.service'; import { Router } from '@angular/router'; import { pushInOut } from '../../animations/push'; +import { PaginatedSearchOptions } from '../models/paginated-search-options.model'; +import { uniqueId } from 'lodash'; +import { hasValue } from '../../empty.util'; +import { combineLatest, Observable } from 'rxjs'; +import { debounceTime, distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators'; +import { SortOptions } from '../../../core/cache/models/sort-options.model'; +import { SearchConfig } from '../../../core/shared/search/search-filters/search-config.model'; +import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; /** * This component was created because we customized search item boxes and they was used in the `/mydspace` as well. */ @Component({ selector: 'ds-clarin-search', - templateUrl: './clarin-search.component.html', - styleUrls: ['./clarin-search.component.scss'], + templateUrl: '../search.component.html', + styleUrls: ['../search.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, animations: [pushInOut], }) @@ -30,8 +38,82 @@ export class ClarinSearchComponent extends SearchComponent implements OnInit { super(service, sidebarService, windowService, searchConfigService, routeService, router); } + /** + * Listening to changes in the paginated search options + * If something changes, update the search results + * + * Listen to changes in the scope + * If something changes, update the list of scopes for the dropdown + * + * CLARIN UPDATE - search only items + */ ngOnInit(): void { - super.ngOnInit(); - } + if (this.useUniquePageId) { + // Create an unique pagination id related to the instance of the SearchComponent + this.paginationId = uniqueId(this.paginationId); + } + + this.searchConfigService.setPaginationId(this.paginationId); + + if (hasValue(this.configuration)) { + this.routeService.setParameter('configuration', this.configuration); + } + if (hasValue(this.fixedFilterQuery)) { + this.routeService.setParameter('fixedFilterQuery', this.fixedFilterQuery); + } + this.isSidebarCollapsed$ = this.isSidebarCollapsed(); + this.searchLink = this.getSearchLink(); + this.currentContext$.next(this.context); + + // Determinate PaginatedSearchOptions and listen to any update on it + const configuration$: Observable = this.searchConfigService + .getCurrentConfiguration(this.configuration).pipe(distinctUntilChanged()); + const searchSortOptions$: Observable = configuration$.pipe( + switchMap((configuration: string) => this.searchConfigService + .getConfigurationSearchConfig(configuration, this.service)), + map((searchConfig: SearchConfig) => this.searchConfigService.getConfigurationSortOptions(searchConfig)), + distinctUntilChanged() + ); + const sortOption$: Observable = searchSortOptions$.pipe( + switchMap((searchSortOptions: SortOptions[]) => { + const defaultSort: SortOptions = searchSortOptions[0]; + return this.searchConfigService.getCurrentSort(this.paginationId, defaultSort); + }), + distinctUntilChanged() + ); + const searchOptions$: Observable = this.getSearchOptions().pipe(distinctUntilChanged()); + + this.sub = combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$]).pipe( + filter(([configuration, searchSortOptions, searchOptions, sortOption]: [string, SortOptions[], PaginatedSearchOptions, SortOptions]) => { + // filter for search options related to instanced paginated id + return searchOptions.pagination.id === this.paginationId; + }), + debounceTime(100) + ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption]: [string, SortOptions[], PaginatedSearchOptions, SortOptions]) => { + // CLARIN update - search only items in the search page + searchOptions.dsoTypes = [DSpaceObjectType.ITEM]; + // Build the PaginatedSearchOptions object + const combinedOptions = Object.assign({}, searchOptions, + { + configuration: searchOptions.configuration || configuration, + sort: sortOption || searchOptions.sort, + filters: searchOptions.filters + }); + const newSearchOptions = new PaginatedSearchOptions(combinedOptions); + // check if search options are changed + // if so retrieve new related results otherwise skip it + if (JSON.stringify(newSearchOptions) !== JSON.stringify(this.searchOptions$.value)) { + // Initialize variables + this.currentConfiguration$.next(configuration); + this.currentSortOptions$.next(newSearchOptions.sort); + this.currentScope$.next(newSearchOptions.scope); + this.sortOptionsList$.next(searchSortOptions); + this.searchOptions$.next(newSearchOptions); + this.initialized$.next(true); + // retrieve results + this.retrieveSearchResults(newSearchOptions); + } + }); + } } diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts index c87c10c43e2..765ba72f14c 100644 --- a/src/app/shared/search/search.component.ts +++ b/src/app/shared/search/search.component.ts @@ -195,11 +195,6 @@ export class SearchComponent implements OnInit { */ sub: Subscription; - /** - * Items which will be showed in the Clarin Item Box. - */ - items4ClarinBox: BehaviorSubject = new BehaviorSubject([]); - /** * Emits an event with the current search result entries */ @@ -318,7 +313,6 @@ export class SearchComponent implements OnInit { */ public changeViewMode() { this.resultsRD$.next(null); - this.items4ClarinBox.next([]); } /** @@ -348,11 +342,10 @@ export class SearchComponent implements OnInit { /** * Retrieve search result by the given search options * @param searchOptions - * @private + * @protected */ - private retrieveSearchResults(searchOptions: PaginatedSearchOptions) { + protected retrieveSearchResults(searchOptions: PaginatedSearchOptions) { this.resultsRD$.next(null); - this.items4ClarinBox.next([]); this.service.search( searchOptions, undefined, @@ -365,7 +358,6 @@ export class SearchComponent implements OnInit { this.resultFound.emit(results.payload); } this.resultsRD$.next(results); - this.processResultsForClarinItemBox(results); }); } @@ -373,24 +365,18 @@ export class SearchComponent implements OnInit { * Check if the sidebar is collapsed * @returns {Observable} emits true if the sidebar is currently collapsed, false if it is expanded */ - private isSidebarCollapsed(): Observable { + protected isSidebarCollapsed(): Observable { return this.sidebarService.isCollapsed; } /** * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true */ - private getSearchLink(): string { + protected getSearchLink(): string { if (this.inPlaceSearch) { return currentPath(this.router); } return this.service.getSearchLink(); } - processResultsForClarinItemBox(results: RemoteData>) { - results?.payload?.page?.forEach((itemSearchResults: ItemSearchResult) => { - this.items4ClarinBox.value.push(itemSearchResults?.indexableObject); - }); - } - }