diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index bcafcd6e5d..b1aae17f7c 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -35,7 +35,6 @@
{{'collection.page.browse.recent.head' | translate}}
+ [objects]="itemData" [hideGear]="false">
diff --git a/src/app/search/search.service.ts b/src/app/search/search.service.ts
index da9d6c0a1c..420f100538 100644
--- a/src/app/search/search.service.ts
+++ b/src/app/search/search.service.ts
@@ -53,6 +53,15 @@ export class SearchService {
if (isNotEmpty(searchOptions) && hasValue(searchOptions.pagination.currentPage)) {
self += `&page=${searchOptions.pagination.currentPage}`;
}
+ if (isNotEmpty(searchOptions) && hasValue(searchOptions.pagination.pageSize)) {
+ self += `&pageSize=${searchOptions.pagination.pageSize}`;
+ }
+ if (isNotEmpty(searchOptions) && hasValue(searchOptions.sort.direction)) {
+ self += `&sortDirection=${searchOptions.sort.direction}`;
+ }
+ if (isNotEmpty(searchOptions) && hasValue(searchOptions.sort.field)) {
+ self += `&sortField=${searchOptions.sort.field}`;
+ }
const requestPending = Observable.of(false);
const responsePending = Observable.of(false);
const errorMessage = Observable.of(undefined);
@@ -66,22 +75,26 @@ export class SearchService {
returningPageInfo.elementsPerPage = 10;
returningPageInfo.currentPage = 1;
}
- returningPageInfo.totalPages = this.totalPages;
- returningPageInfo.totalElements = returningPageInfo.elementsPerPage * returningPageInfo.totalPages;
- const pageInfo = Observable.of(returningPageInfo);
- const itemsRD = this.itemDataService.findAll({ elementsPerPage: 10 });
+ const itemsRD = this.itemDataService.findAll({
+ scopeID: scopeId,
+ currentPage: returningPageInfo.currentPage,
+ elementsPerPage: returningPageInfo.elementsPerPage
+ });
+
+ const pageInfo = itemsRD.pageInfo;
+
const payload = itemsRD.payload.map((items: Item[]) => {
return shuffle(items)
- .map((item: Item, index: number) => {
- const mockResult: SearchResult = new ItemSearchResult();
- mockResult.dspaceObject = item;
- const highlight = new Metadatum();
- highlight.key = 'dc.description.abstract';
- highlight.value = this.mockedHighlights[index % this.mockedHighlights.length];
- mockResult.hitHighlights = new Array(highlight);
- return mockResult;
- });
+ .map((item: Item, index: number) => {
+ const mockResult: SearchResult = new ItemSearchResult();
+ mockResult.dspaceObject = item;
+ const highlight = new Metadatum();
+ highlight.key = 'dc.description.abstract';
+ highlight.value = this.mockedHighlights[index % this.mockedHighlights.length];
+ mockResult.hitHighlights = new Array(highlight);
+ return mockResult;
+ });
});
return new RemoteData(
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index c3018b957c..8b196f5d6c 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -69,6 +69,7 @@ export class ObjectListComponent implements OnChanges, OnInit {
ngOnInit(): void {
this.pageInfo = this.objects.pageInfo;
+ this.pageInfo.subscribe((info) => console.log(info));
}
/**
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 91a6c07929..8e797c8dcc 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -3,7 +3,7 @@
-
+