Skip to content

Commit ac2922e

Browse files
committed
no recent submissions should be displayed if pageSize is 0 and changing the configuration structure
1 parent 0840bfd commit ac2922e

7 files changed

Lines changed: 30 additions & 22 deletions

File tree

config/config.example.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ info:
260260
enablePrivacyStatement: true
261261
# Home Page
262262
homePage:
263+
recentSubmissions:
263264
# The number of item showing in recent submission components
264-
recentSubmissionsRpp: 5
265+
pageSize: 5
265266
# Sort record of recent submission
266-
recentSubmissionsSortField: 'dc.date.accessioned'
267+
sortField: 'dc.date.accessioned'

src/app/home-page/home-page.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
</ng-container>
66
<ds-search-form [inPlaceSearch]="false" [searchPlaceholder]="'home.search-form.placeholder' | translate"></ds-search-form>
77
<ds-top-level-community-list></ds-top-level-community-list>
8-
<ds-recent-item-list></ds-recent-item-list>
8+
<ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list>
99
</div>

src/app/home-page/home-page.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { map } from 'rxjs/operators';
33
import { ActivatedRoute } from '@angular/router';
44
import { Observable } from 'rxjs';
55
import { Site } from '../core/shared/site.model';
6-
6+
import { environment } from '../../environments/environment';
77
@Component({
88
selector: 'ds-home-page',
99
styleUrls: ['./home-page.component.scss'],
@@ -12,10 +12,11 @@ import { Site } from '../core/shared/site.model';
1212
export class HomePageComponent implements OnInit {
1313

1414
site$: Observable<Site>;
15-
15+
recentSubmissionspageSize: number;
1616
constructor(
1717
private route: ActivatedRoute,
1818
) {
19+
this.recentSubmissionspageSize = environment.homePage.recentSubmissions.pageSize;
1920
}
2021

2122
ngOnInit(): void {

src/app/home-page/recent-item-list/recent-item-list.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ export class RecentItemListComponent implements OnInit {
4343

4444
this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
4545
id: 'hp',
46-
pageSize: environment.homePage.recentSubmissionsRpp,
46+
pageSize: environment.homePage.recentSubmissions.pageSize,
4747
currentPage: 1,
4848
maxSize: 1
4949
});
50-
this.sortConfig = new SortOptions(environment.homePage.recentSubmissionsSortField, SortDirection.DESC);
50+
this.sortConfig = new SortOptions(environment.homePage.recentSubmissions.sortField, SortDirection.DESC);
5151
}
5252
ngOnInit(): void {
5353
this.itemRD$ = this.searchService.search(
@@ -62,7 +62,7 @@ export class RecentItemListComponent implements OnInit {
6262
}
6363
onLoadMore(): void {
6464
this.paginationService.updateRouteWithUrl(this.searchConfigurationService.paginationID, ['search'], {
65-
sortField: environment.homePage.recentSubmissionsSortField,
65+
sortField: environment.homePage.recentSubmissions.sortField,
6666
sortDirection: 'DESC' as SortDirection,
6767
page: 1
6868
});

src/config/default-app-config.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,11 @@ export class DefaultAppConfig implements AppConfig {
340340
};
341341
// Home Pages
342342
homePage: HomeConfig = {
343-
//The number of item showing in recent submission components
344-
recentSubmissionsRpp: 5,
345-
//sort record of recent submission
346-
recentSubmissionsSortField: 'dc.date.accessioned',
343+
recentSubmissions: {
344+
//The number of item showing in recent submission components
345+
pageSize: 5,
346+
//sort record of recent submission
347+
sortField: 'dc.date.accessioned',
348+
}
347349
};
348350
}

src/config/homepage-config.interface.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ import { Config } from './config.interface';
44
* Config that determines how the dropdown list of years are created for browse-by-date components
55
*/
66
export interface HomeConfig extends Config {
7-
/**
7+
recentSubmissions: {
8+
/**
89
* The number of item showing in recent submission components
910
*/
10-
recentSubmissionsRpp: number;
11+
pageSize: number;
12+
13+
/**
14+
* sort record of recent submission
15+
*/
16+
sortField: string;
17+
}
1118

12-
/**
13-
* sort record of recent submission
14-
*/
15-
recentSubmissionsSortField: string;
1619

1720
}

src/environments/environment.test.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,10 @@ export const environment: BuildConfig = {
250250
},
251251
//Home Page
252252
homePage: {
253-
//The number of item showing in recent submission components
254-
recentSubmissionsRpp: 5,
255-
//sort record of recent submission
256-
recentSubmissionsSortField: 'dc.date.accessioned',
253+
recentSubmissions: {
254+
pageSize: 5,
255+
//sort record of recent submission
256+
sortField: 'dc.date.accessioned',
257+
}
257258
}
258259
};

0 commit comments

Comments
 (0)