diff --git a/config/config.example.yml b/config/config.example.yml index b48b509a4d..4814c826f1 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -260,7 +260,8 @@ info: enablePrivacyStatement: true # Home Page homePage: + recentSubmissions: # The number of item showing in recent submission components - recentSubmissionsRpp: 5 + pageSize: 5 # Sort record of recent submission - recentSubmissionsSortField: 'dc.date.accessioned' + sortField: 'dc.date.accessioned' diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html index f8073f4571..1000dbe9a4 100644 --- a/src/app/home-page/home-page.component.html +++ b/src/app/home-page/home-page.component.html @@ -5,5 +5,5 @@ - + diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts index 65caa01430..c151cbbb16 100644 --- a/src/app/home-page/home-page.component.ts +++ b/src/app/home-page/home-page.component.ts @@ -3,7 +3,7 @@ import { map } from 'rxjs/operators'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs'; import { Site } from '../core/shared/site.model'; - +import { environment } from '../../environments/environment'; @Component({ selector: 'ds-home-page', styleUrls: ['./home-page.component.scss'], @@ -12,10 +12,11 @@ import { Site } from '../core/shared/site.model'; export class HomePageComponent implements OnInit { site$: Observable; - + recentSubmissionspageSize: number; constructor( private route: ActivatedRoute, ) { + this.recentSubmissionspageSize = environment.homePage.recentSubmissions.pageSize; } ngOnInit(): void { diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts index 294dac3954..df5359386a 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.ts +++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts @@ -43,11 +43,11 @@ export class RecentItemListComponent implements OnInit { this.paginationConfig = Object.assign(new PaginationComponentOptions(), { id: 'hp', - pageSize: environment.homePage.recentSubmissionsRpp, + pageSize: environment.homePage.recentSubmissions.pageSize, currentPage: 1, maxSize: 1 }); - this.sortConfig = new SortOptions(environment.homePage.recentSubmissionsSortField, SortDirection.DESC); + this.sortConfig = new SortOptions(environment.homePage.recentSubmissions.sortField, SortDirection.DESC); } ngOnInit(): void { this.itemRD$ = this.searchService.search( @@ -62,7 +62,7 @@ export class RecentItemListComponent implements OnInit { } onLoadMore(): void { this.paginationService.updateRouteWithUrl(this.searchConfigurationService.paginationID, ['search'], { - sortField: environment.homePage.recentSubmissionsSortField, + sortField: environment.homePage.recentSubmissions.sortField, sortDirection: 'DESC' as SortDirection, page: 1 }); diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index f57425a79a..b1b64d1c87 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -340,9 +340,11 @@ export class DefaultAppConfig implements AppConfig { }; // Home Pages homePage: HomeConfig = { - //The number of item showing in recent submission components - recentSubmissionsRpp: 5, - //sort record of recent submission - recentSubmissionsSortField: 'dc.date.accessioned', + recentSubmissions: { + //The number of item showing in recent submission components + pageSize: 5, + //sort record of recent submission + sortField: 'dc.date.accessioned', + } }; } diff --git a/src/config/homepage-config.interface.ts b/src/config/homepage-config.interface.ts index 564cd7f9fb..1f955358e0 100644 --- a/src/config/homepage-config.interface.ts +++ b/src/config/homepage-config.interface.ts @@ -4,14 +4,17 @@ import { Config } from './config.interface'; * Config that determines how the dropdown list of years are created for browse-by-date components */ export interface HomeConfig extends Config { - /** + recentSubmissions: { + /** * The number of item showing in recent submission components */ - recentSubmissionsRpp: number; + pageSize: number; + + /** + * sort record of recent submission + */ + sortField: string; + } - /** - * sort record of recent submission - */ - recentSubmissionsSortField: string; } diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index bb7f8a2962..6fe4dd6516 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -250,9 +250,10 @@ export const environment: BuildConfig = { }, //Home Page homePage: { - //The number of item showing in recent submission components - recentSubmissionsRpp: 5, - //sort record of recent submission - recentSubmissionsSortField: 'dc.date.accessioned', + recentSubmissions: { + pageSize: 5, + //sort record of recent submission + sortField: 'dc.date.accessioned', + } } };