From ccb4c0794c8215d8384581ee5b9cdf0a9f55e7d0 Mon Sep 17 00:00:00 2001 From: Michael Spalti Date: Fri, 9 Sep 2022 10:34:17 -0700 Subject: [PATCH] Updated configuration. --- config/config.example.yml | 5 ++--- .../browse-by-metadata-page.component.ts | 2 +- .../journal-issue-search-result-list-element.component.ts | 2 +- .../journal-volume-search-result-list-element.component.ts | 2 +- .../journal-search-result-list-element.component.ts | 2 +- .../org-unit-search-result-list-element.component.ts | 2 +- .../person/person-search-result-list-element.component.ts | 2 +- .../project-search-result-list-element.component.ts | 2 +- .../collection-search-result-list-element.component.ts | 2 +- .../community-search-result-list-element.component.ts | 2 +- .../item/item-search-result-list-element.component.ts | 2 +- src/config/app-config.interface.ts | 1 - src/config/browse-by-config.interface.ts | 5 +++++ src/config/default-app-config.ts | 7 +++---- src/environments/environment.test.ts | 4 +++- 15 files changed, 23 insertions(+), 19 deletions(-) diff --git a/config/config.example.yml b/config/config.example.yml index 825a0f5bfa..50da56a475 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -168,9 +168,8 @@ browseBy: fiveYearLimit: 30 # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items) defaultLowerLimit: 1900 - -# If true, thumbnail images for items will be added to search and browse result lists. -showItemThumbnails: false + # If true, thumbnail images for items will be added to search and browse result lists. + showItemThumbnails: true # Item Config item: diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts index bf7bf88a5e..0bcd6115a6 100644 --- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts +++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts @@ -123,7 +123,7 @@ export class BrowseByMetadataPageComponent implements OnInit { protected dsoService: DSpaceObjectDataService, protected paginationService: PaginationService, protected router: Router) { - this.embedThumbnail = environment.showItemThumbnails; + this.embedThumbnail = environment.browseBy.showItemThumbnails; } ngOnInit(): void { diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts index 01f8c73ffc..bff374f064 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts @@ -22,7 +22,7 @@ export class JournalIssueSearchResultListElementComponent extends ItemSearchResu ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = environment.showItemThumbnails; + this.showThumbnails = environment.browseBy.showItemThumbnails; } } diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts index c88a5dccfe..46ab0ac20c 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts @@ -22,7 +22,7 @@ export class JournalVolumeSearchResultListElementComponent extends ItemSearchRes ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = environment.showItemThumbnails; + this.showThumbnails = environment.browseBy.showItemThumbnails; } } diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts index dc3a592ee0..073e22b177 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts @@ -22,7 +22,7 @@ export class JournalSearchResultListElementComponent extends ItemSearchResultLis ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = environment.showItemThumbnails; + this.showThumbnails = environment.browseBy.showItemThumbnails; } } diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts index 8aa536baff..ade0534d8d 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts @@ -22,7 +22,7 @@ export class OrgUnitSearchResultListElementComponent extends ItemSearchResultLis ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = environment.showItemThumbnails; + this.showThumbnails = environment.browseBy.showItemThumbnails; } } diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts index 28383ba72b..32ab1e6695 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts @@ -32,7 +32,7 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = environment.showItemThumbnails; + this.showThumbnails = environment.browseBy.showItemThumbnails; } /** diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts index b0b727a8bf..ff88570c1d 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts @@ -22,7 +22,7 @@ export class ProjectSearchResultListElementComponent extends ItemSearchResultLis ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = environment.showItemThumbnails; + this.showThumbnails = environment.browseBy.showItemThumbnails; } } diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts index cf955308ed..fdc6c4dfdc 100644 --- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts @@ -24,7 +24,7 @@ export class CollectionSearchResultListElementComponent extends SearchResultList ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = environment.showItemThumbnails; + this.showThumbnails = environment.browseBy.showItemThumbnails; } } diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts index e7613fdeae..32ea14aa43 100644 --- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts @@ -24,6 +24,6 @@ export class CommunitySearchResultListElementComponent extends SearchResultListE ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = environment.showItemThumbnails; + this.showThumbnails = environment.browseBy.showItemThumbnails; } } diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index 46c3efd126..4d2ea05e6c 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -30,7 +30,7 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = environment.showItemThumbnails; + this.showThumbnails = environment.browseBy.showItemThumbnails; this.itemPageRoute = getItemPageRoute(this.dso); } } diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts index 515de9613f..cd9ef103ae 100644 --- a/src/config/app-config.interface.ts +++ b/src/config/app-config.interface.ts @@ -31,7 +31,6 @@ interface AppConfig extends Config { defaultLanguage: string; languages: LangConfig[]; browseBy: BrowseByConfig; - showItemThumbnails: boolean; item: ItemConfig; collection: CollectionPageConfig; themes: ThemeConfig[]; diff --git a/src/config/browse-by-config.interface.ts b/src/config/browse-by-config.interface.ts index 6adba66b92..3ce12f3c50 100644 --- a/src/config/browse-by-config.interface.ts +++ b/src/config/browse-by-config.interface.ts @@ -18,4 +18,9 @@ export interface BrowseByConfig extends Config { * The absolute lowest year to display in the dropdown when no lowest date can be found for all items */ defaultLowerLimit: number; + + /** + * If true, thumbnail images for items will be added to search and browse result lists. + */ + showItemThumbnails: boolean; } diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index 8c4731d3b2..356094c9bf 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -205,12 +205,11 @@ export class DefaultAppConfig implements AppConfig { // Limit for years to display using jumps of five years (current year - fiveYearLimit) fiveYearLimit: 30, // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items) - defaultLowerLimit: 1900 + defaultLowerLimit: 1900, + // Whether to add item thumbnail images to browse and search result lists. + showItemThumbnails: true }; - // Whether to add item thumbnail images to browse and search result lists. - showItemThumbnails: false; - // Item Config item: ItemConfig = { edit: { diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index edf986b88f..44b4af5380 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -199,8 +199,10 @@ export const environment: BuildConfig = { fiveYearLimit: 30, // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items) defaultLowerLimit: 1900, + // Whether to add item thumbnail images to browse and search result lists. + showItemThumbnails: true }, - showItemThumbnails: false, + item: { edit: { undoTimeout: 10000 // 10 seconds