From 78358a4067fd63e6dd835febc729c55939b41f56 Mon Sep 17 00:00:00 2001 From: Michael Spalti Date: Tue, 13 Sep 2022 14:26:37 -0700 Subject: [PATCH] Multiple updates. --- config/config.example.yml | 2 +- .../browse-by-date-page.component.spec.ts | 8 ++++---- .../browse-by-date-page.component.ts | 10 ++++++---- .../browse-by-metadata-page.component.spec.ts | 8 +++++--- .../browse-by-metadata-page.component.ts | 11 ++++++----- .../browse-by-title-page.component.spec.ts | 8 ++++---- .../browse-by-title-page.component.ts | 11 +++++++---- .../collection-page.component.ts | 8 +++++--- src/app/community-page.tar.gz | Bin 16872 -> 0 bytes src/app/core/browse/browse.service.ts | 9 +++------ ...ue-search-result-list-element.component.html | 4 ++-- ...search-result-list-element.component.spec.ts | 8 ++++---- ...ssue-search-result-list-element.component.ts | 2 +- ...me-search-result-list-element.component.html | 4 ++-- ...search-result-list-element.component.spec.ts | 8 ++++---- ...lume-search-result-list-element.component.ts | 2 +- ...al-search-result-list-element.component.html | 4 ++-- ...search-result-list-element.component.spec.ts | 8 ++++---- ...rnal-search-result-list-element.component.ts | 2 +- ...it-search-result-list-element.component.html | 4 ++-- ...search-result-list-element.component.spec.ts | 8 ++++---- ...unit-search-result-list-element.component.ts | 2 +- ...on-search-result-list-element.component.html | 4 ++-- ...search-result-list-element.component.spec.ts | 8 ++++---- ...rson-search-result-list-element.component.ts | 2 +- ...ct-search-result-list-element.component.html | 4 ++-- ...search-result-list-element.component.spec.ts | 8 ++++---- ...ject-search-result-list-element.component.ts | 2 +- ...-result-list-submission-element.component.ts | 2 +- ...esult-list-submission-element.component.html | 4 ++-- ...-result-list-submission-element.component.ts | 2 +- .../item-list-preview.component.html | 4 ++-- .../item-list-preview.component.ts | 2 +- ...esult-list-element-submission.component.html | 2 +- ...-result-list-element-submission.component.ts | 2 +- ...ol-search-result-list-element.component.html | 2 +- ...pool-search-result-list-element.component.ts | 2 +- ...em-search-result-list-element.component.html | 2 +- ...item-search-result-list-element.component.ts | 2 +- ...em-search-result-list-element.component.html | 2 +- ...item-search-result-list-element.component.ts | 2 +- ...on-search-result-list-element.component.html | 4 ++-- ...tion-search-result-list-element.component.ts | 2 +- ...ty-search-result-list-element.component.html | 2 +- ...nity-search-result-list-element.component.ts | 2 +- ...em-search-result-list-element.component.html | 4 ++-- ...search-result-list-element.component.spec.ts | 8 ++++---- ...item-search-result-list-element.component.ts | 2 +- src/config/browse-by-config.interface.ts | 2 +- src/config/default-app-config.ts | 2 +- src/environments/environment.test.ts | 2 +- src/styles/_custom_variables.scss | 2 +- src/styles/_global-styles.scss | 4 ++-- 53 files changed, 116 insertions(+), 109 deletions(-) delete mode 100644 src/app/community-page.tar.gz diff --git a/config/config.example.yml b/config/config.example.yml index 37d8a97a68..c46e193c6e 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -169,7 +169,7 @@ browseBy: # 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 BOTH search and browse result lists. - showItemThumbnails: true + showThumbnails: true # Item Config item: diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts index 15ec9d78db..5c2a6d820e 100644 --- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts +++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts @@ -18,11 +18,10 @@ import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search- import { toRemoteData } from '../browse-by-metadata-page/browse-by-metadata-page.component.spec'; import { VarDirective } from '../../shared/utils/var.directive'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { PaginationService } from '../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub'; -import { FindListOptions } from '../../core/data/find-list-options.model'; +import { APP_CONFIG } from '../../../config/app-config.interface'; +import { environment } from '../../../environments/environment'; describe('BrowseByDatePageComponent', () => { let comp: BrowseByDatePageComponent; @@ -83,7 +82,8 @@ describe('BrowseByDatePageComponent', () => { { provide: DSpaceObjectDataService, useValue: mockDsoService }, { provide: Router, useValue: new RouterMock() }, { provide: PaginationService, useValue: paginationService }, - { provide: ChangeDetectorRef, useValue: mockCdRef } + { provide: ChangeDetectorRef, useValue: mockCdRef }, + { provide: APP_CONFIG, useValue: environment } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts index caa7891861..ca13637556 100644 --- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts +++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component } from '@angular/core'; +import { ChangeDetectorRef, Component, Inject } from '@angular/core'; import { BrowseByMetadataPageComponent, browseParamsToOptions @@ -19,6 +19,7 @@ import { map } from 'rxjs/operators'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { isValidDate } from '../../shared/date.util'; +import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface'; @Component({ selector: 'ds-browse-by-date-page', @@ -43,15 +44,16 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent { protected dsoService: DSpaceObjectDataService, protected router: Router, protected paginationService: PaginationService, - protected cdRef: ChangeDetectorRef) { - super(route, browseService, dsoService, paginationService, router); + protected cdRef: ChangeDetectorRef, + @Inject(APP_CONFIG) protected appConfig: AppConfig) { + super(route, browseService, dsoService, paginationService, router, appConfig); } ngOnInit(): void { const sortConfig = new SortOptions('default', SortDirection.ASC); this.startsWithType = StartsWithType.date; this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null, - null, this.embedThumbnail)); + null)); this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig); this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig); this.subs.push( diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts index 623537484b..ac3aa3cd02 100644 --- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts +++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts @@ -14,7 +14,7 @@ import { RemoteData } from '../../core/data/remote-data'; import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model'; import { PageInfo } from '../../core/shared/page-info.model'; import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model'; -import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; +import { SortDirection } from '../../core/cache/models/sort-options.model'; import { Item } from '../../core/shared/item.model'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { Community } from '../../core/shared/community.model'; @@ -26,6 +26,7 @@ import { PaginationService } from '../../core/pagination/pagination.service'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub'; import { environment } from '../../../environments/environment'; +import { APP_CONFIG } from '../../../config/app-config.interface'; describe('BrowseByMetadataPageComponent', () => { let comp: BrowseByMetadataPageComponent; @@ -98,14 +99,15 @@ describe('BrowseByMetadataPageComponent', () => { { provide: BrowseService, useValue: mockBrowseService }, { provide: DSpaceObjectDataService, useValue: mockDsoService }, { provide: PaginationService, useValue: paginationService }, - { provide: Router, useValue: new RouterMock() } + { provide: Router, useValue: new RouterMock() }, + { provide: APP_CONFIG, useValue: environment } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); })); beforeEach(() => { - environment.browseBy.showItemThumbnails = true; + environment.browseBy.showThumbnails = true; fixture = TestBed.createComponent(BrowseByMetadataPageComponent); comp = fixture.componentInstance; fixture.detectChanges(); 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 0bcd6115a6..2c0e05302c 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 @@ -1,5 +1,5 @@ import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs'; -import { Component, OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { RemoteData } from '../../core/data/remote-data'; import { PaginatedList } from '../../core/data/paginated-list.model'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; @@ -17,8 +17,7 @@ import { StartsWithType } from '../../shared/starts-with/starts-with-decorator'; import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator'; import { PaginationService } from '../../core/pagination/pagination.service'; import { map } from 'rxjs/operators'; -import { environment } from '../../../environments/environment'; - +import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface'; export const BBM_PAGINATION_ID = 'bbm'; @@ -122,8 +121,9 @@ export class BrowseByMetadataPageComponent implements OnInit { protected browseService: BrowseService, protected dsoService: DSpaceObjectDataService, protected paginationService: PaginationService, - protected router: Router) { - this.embedThumbnail = environment.browseBy.showItemThumbnails; + protected router: Router, + @Inject(APP_CONFIG) protected appConfig: AppConfig) { + this.embedThumbnail = this.appConfig.browseBy.showThumbnails; } ngOnInit(): void { @@ -172,6 +172,7 @@ export class BrowseByMetadataPageComponent implements OnInit { * scope: string } */ updatePage(searchOptions: BrowseEntrySearchOptions) { + searchOptions.embedThumbnail = this.embedThumbnail; this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions); this.items$ = undefined; } diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts index 554b059ac5..dcee77a12b 100644 --- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts +++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts @@ -18,11 +18,10 @@ import { BrowseService } from '../../core/browse/browse.service'; import { RouterMock } from '../../shared/mocks/router.mock'; import { VarDirective } from '../../shared/utils/var.directive'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { PaginationService } from '../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub'; -import { FindListOptions } from '../../core/data/find-list-options.model'; +import { APP_CONFIG } from '../../../config/app-config.interface'; +import { environment } from '../../../environments/environment'; describe('BrowseByTitlePageComponent', () => { let comp: BrowseByTitlePageComponent; @@ -77,7 +76,8 @@ describe('BrowseByTitlePageComponent', () => { { provide: BrowseService, useValue: mockBrowseService }, { provide: DSpaceObjectDataService, useValue: mockDsoService }, { provide: PaginationService, useValue: paginationService }, - { provide: Router, useValue: new RouterMock() } + { provide: Router, useValue: new RouterMock() }, + { provide: APP_CONFIG, useValue: environment } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts index d0782b38e5..4fd7087019 100644 --- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts +++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts @@ -1,5 +1,5 @@ import { combineLatest as observableCombineLatest } from 'rxjs'; -import { Component } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { hasValue } from '../../shared/empty.util'; import { @@ -14,6 +14,8 @@ import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse- import { PaginationService } from '../../core/pagination/pagination.service'; import { map } from 'rxjs/operators'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; +import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface'; +import { environment } from '../../../environments/environment'; @Component({ selector: 'ds-browse-by-title-page', @@ -30,14 +32,15 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent { protected browseService: BrowseService, protected dsoService: DSpaceObjectDataService, protected paginationService: PaginationService, - protected router: Router) { - super(route, browseService, dsoService, paginationService, router); + protected router: Router, + @Inject(APP_CONFIG) protected appConfig: AppConfig) { + super(route, browseService, dsoService, paginationService, router, appConfig); } ngOnInit(): void { const sortConfig = new SortOptions('dc.title', SortDirection.ASC); this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null, - null, this.embedThumbnail)); + null)); this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig); this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig); this.subs.push( diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts index 1f30824877..2171942ef2 100644 --- a/src/app/collection-page/collection-page.component.ts +++ b/src/app/collection-page/collection-page.component.ts @@ -28,7 +28,9 @@ import { AuthorizationDataService } from '../core/data/feature-authorization/aut import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { getCollectionPageRoute } from './collection-page-routing-paths'; import { redirectOn4xx } from '../core/shared/authorized.operators'; -import { BROWSE_ITEM_LINKS_TO_FOLLOW } from '../core/browse/browse.service'; +import { BROWSE_LINKS_TO_FOLLOW } from '../core/browse/browse.service'; +import { DSpaceObject } from '../core/shared/dspace-object.model'; +import { FollowLinkConfig } from '../shared/utils/follow-link-config.model'; @Component({ selector: 'ds-collection-page', @@ -104,13 +106,13 @@ export class CollectionPageComponent implements OnInit { getFirstSucceededRemoteData(), map((rd) => rd.payload.id), switchMap((id: string) => { - return this.searchService.search( + return this.searchService.search( new PaginatedSearchOptions({ scope: id, pagination: currentPagination, sort: currentSort, dsoTypes: [DSpaceObjectType.ITEM] - }), null, true, true, ...BROWSE_ITEM_LINKS_TO_FOLLOW) + }), null, true, true, ...BROWSE_LINKS_TO_FOLLOW) .pipe(toDSpaceObjectListRD()) as Observable>>; }), startWith(undefined) // Make sure switching pages shows loading component diff --git a/src/app/community-page.tar.gz b/src/app/community-page.tar.gz deleted file mode 100644 index 33169aa5094ba1a326e2a50b3842f4b46000008d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16872 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 np0L~u`As*!Du[] = [ - followLink('thumbnail') -]; -export const BROWSE_ITEM_LINKS_TO_FOLLOW: FollowLinkConfig[] = [ +export const BROWSE_LINKS_TO_FOLLOW: FollowLinkConfig[] = [ followLink('thumbnail') ]; @@ -106,7 +103,7 @@ export class BrowseService { }) ); if (options.embedThumbnail) { - return this.hrefOnlyDataService.findAllByHref(href$, {}, null, null, ...BROWSE_ENTRY_LINKS_TO_FOLLOW); + return this.hrefOnlyDataService.findAllByHref(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW); } return this.hrefOnlyDataService.findAllByHref(href$); } @@ -154,7 +151,7 @@ export class BrowseService { }), ); if (options.embedThumbnail) { - return this.hrefOnlyDataService.findAllByHref(href$, {}, null, null, ...BROWSE_ITEM_LINKS_TO_FOLLOW); + return this.hrefOnlyDataService.findAllByHref(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW); } return this.hrefOnlyDataService.findAllByHref(href$); } 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.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html index 9b47a7fb7a..d93639a5d9 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html @@ -1,5 +1,5 @@
-
+
@@ -7,7 +7,7 @@
-
+
{ })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = true; + environment.browseBy.showThumbnails = true; fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent); journalIssueListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to true', () => { + describe('with environment.browseBy.showThumbnails set to true', () => { beforeEach(() => { journalIssueListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); @@ -165,12 +165,12 @@ describe('JournalIssueSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = false; + environment.browseBy.showThumbnails = false; fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent); journalIssueListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to false', () => { + describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { journalIssueListElementComponent.object = mockItemWithMetadata; 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 ce017a5712..88f93d9d85 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 @@ -21,7 +21,7 @@ export class JournalIssueSearchResultListElementComponent extends ItemSearchResu ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } 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.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html index 04991cb6f0..2226d03649 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html @@ -1,5 +1,5 @@
-
+
@@ -7,7 +7,7 @@
-
+
{ })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = true; + environment.browseBy.showThumbnails = true; fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent); journalVolumeListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to true', () => { + describe('with environment.browseBy.showThumbnails set to true', () => { beforeEach(() => { journalVolumeListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); @@ -163,12 +163,12 @@ describe('JournalVolumeSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = false; + environment.browseBy.showThumbnails = false; fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent); journalVolumeListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to false', () => { + describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { journalVolumeListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); 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 fa01a54fa4..ec98946937 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 @@ -21,7 +21,7 @@ export class JournalVolumeSearchResultListElementComponent extends ItemSearchRes ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html index 58ad5ab364..3cafccf0b9 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html @@ -1,12 +1,12 @@
-
+
-
+
{ })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = true; + environment.browseBy.showThumbnails = true; fixture = TestBed.createComponent(JournalSearchResultListElementComponent); journalListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to true', () => { + describe('with environment.browseBy.showThumbnails set to true', () => { beforeEach(() => { journalListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); @@ -135,12 +135,12 @@ describe('JournalSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = false; + environment.browseBy.showThumbnails = false; fixture = TestBed.createComponent(JournalSearchResultListElementComponent); journalListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to false', () => { + describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { journalListElementComponent.object = mockItemWithMetadata; 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 0c94e084c7..199bd3a748 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 @@ -21,7 +21,7 @@ export class JournalSearchResultListElementComponent extends ItemSearchResultLis ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } 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.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html index 4d40b3450a..f3f5099211 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html @@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,7 @@
-
+
{ })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = true; + environment.browseBy.showThumbnails = true; fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent); orgUnitListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to true', () => { + describe('with environment.browseBy.showThumbnails set to true', () => { beforeEach(() => { orgUnitListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); @@ -133,12 +133,12 @@ describe('OrgUnitSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = false; + environment.browseBy.showThumbnails = false; fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent); orgUnitListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to false', () => { + describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { orgUnitListElementComponent.object = mockItemWithMetadata; 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 e3d6ab171b..baa27cdf0c 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 @@ -21,7 +21,7 @@ export class OrgUnitSearchResultListElementComponent extends ItemSearchResultLis ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html index 55aec9854d..e3c7767802 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html @@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,7 @@
-
+
{ })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = true; + environment.browseBy.showThumbnails = true; fixture = TestBed.createComponent(PersonSearchResultListElementComponent); personListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to true', () => { + describe('with environment.browseBy.showThumbnails set to true', () => { beforeEach(() => { personListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); @@ -133,12 +133,12 @@ describe('PersonSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = false; + environment.browseBy.showThumbnails = false; fixture = TestBed.createComponent(PersonSearchResultListElementComponent); personListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to false', () => { + describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { personListElementComponent.object = mockItemWithMetadata; 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 d78149c6b0..186c79eab9 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 @@ -34,7 +34,7 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } /** diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html index b63841eccb..3cfc6eaeb4 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html @@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,7 @@
-
+
{ })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = true; + environment.browseBy.showThumbnails = true; fixture = TestBed.createComponent(ProjectSearchResultListElementComponent); projectListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to true', () => { + describe('with environment.browseBy.showThumbnails set to true', () => { beforeEach(() => { projectListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); @@ -135,12 +135,12 @@ describe('ProjectSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = false; + environment.browseBy.showThumbnails = false; fixture = TestBed.createComponent(ProjectSearchResultListElementComponent); projectListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to false', () => { + describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { projectListElementComponent.object = mockItemWithMetadata; 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 e5d4c04c75..88e95528ac 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 @@ -21,7 +21,7 @@ export class ProjectSearchResultListElementComponent extends ItemSearchResultLis ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts index e550e9fc8a..8113c4c54b 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts @@ -72,7 +72,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes } ); } - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } select(value) { diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html index 6f9773678a..7d1ab508b7 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html @@ -1,5 +1,5 @@
-
+
-
+
-
+
-
+
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts index 08415db308..3b52e0b879 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts @@ -47,6 +47,6 @@ export class ItemListPreviewComponent implements OnInit{ } ngOnInit(): void { - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html index 64579682cb..b5e9155b81 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html @@ -3,7 +3,7 @@ [status]="status">
-
+
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts index d81a68de74..26cbafc102 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts @@ -32,6 +32,6 @@ export class ItemSearchResultListElementSubmissionComponent extends SearchResult ngOnInit() { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html index 32ecd04315..cf5d54564c 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html @@ -5,7 +5,7 @@ [showSubmitter]="showSubmitter" [status]="status">
-
+
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts index 8a6fbffa8b..71feeb6bdd 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts @@ -71,7 +71,7 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen followLink('item'), followLink('submitter') ), followLink('action')); this.workflowitemRD$ = this.dso.workflowitem as Observable>; - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html index aceb235eaa..74a2433ba3 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html @@ -4,7 +4,7 @@ [object]="object" [status]="status">
-
+
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts index b6e641acd5..f123caf1ac 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts @@ -61,7 +61,7 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi super.ngOnInit(); this.linkService.resolveLink(this.dso, followLink('item')); this.initItem(this.dso.item as Observable> ); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } /** diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html index 6cdd6bd226..4781b87f01 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html @@ -5,7 +5,7 @@ [status]="status">
-
+
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts index c52dc08085..675cdef975 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts @@ -61,7 +61,7 @@ export class WorkspaceItemSearchResultListElementComponent extends SearchResultL super.ngOnInit(); this.linkService.resolveLink(this.dso, followLink('item')); this.initItem(this.dso.item as Observable>); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } /** diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html index 55c377b749..83a8f4fdfa 100644 --- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html @@ -1,6 +1,6 @@
-
-
+
+
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 e7f695001f..60415f649e 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 @@ -23,7 +23,7 @@ export class CollectionSearchResultListElementComponent extends SearchResultList ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html index ba5d5ebc23..22be357a53 100644 --- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html @@ -1,6 +1,6 @@
-
+
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 e12a94f0ea..4cc25b8b76 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 @@ -23,6 +23,6 @@ export class CommunitySearchResultListElementComponent extends SearchResultListE ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; } } diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html index c2dbb4b3df..90a6633980 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html @@ -1,12 +1,12 @@
-
+
-
+
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index 33fb914b3c..80dd80658b 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -79,13 +79,13 @@ describe('ItemSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = true; + environment.browseBy.showThumbnails = true; fixture = TestBed.createComponent(ItemSearchResultListElementComponent); publicationListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to true', () => { + describe('with environment.browseBy.showThumbnails set to true', () => { beforeEach(() => { publicationListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); @@ -227,12 +227,12 @@ describe('ItemSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - environment.browseBy.showItemThumbnails = false; + environment.browseBy.showThumbnails = false; fixture = TestBed.createComponent(ItemSearchResultListElementComponent); publicationListElementComponent = fixture.componentInstance; })); - describe('with environment.browseBy.showItemThumbnails set to false', () => { + describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { publicationListElementComponent.object = mockItemWithMetadata; 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 bce78bd67f..f84ae642ad 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 @@ -29,7 +29,7 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen ngOnInit(): void { super.ngOnInit(); - this.showThumbnails = this.appConfig.browseBy.showItemThumbnails; + this.showThumbnails = this.appConfig.browseBy.showThumbnails; this.itemPageRoute = getItemPageRoute(this.dso); } } diff --git a/src/config/browse-by-config.interface.ts b/src/config/browse-by-config.interface.ts index 86f4d7ea9f..b029482edc 100644 --- a/src/config/browse-by-config.interface.ts +++ b/src/config/browse-by-config.interface.ts @@ -22,5 +22,5 @@ export interface BrowseByConfig extends Config { /** * If true, thumbnail images for items will be added to BOTH search and browse result lists. */ - showItemThumbnails: boolean; + showThumbnails: boolean; } diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index b80b0aa73a..f3bd189102 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -207,7 +207,7 @@ export class DefaultAppConfig implements AppConfig { // 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 BOTH browse and search result lists. - showItemThumbnails: true + showThumbnails: true }; // Item Config diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 6cbe55cea0..806652a2fa 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -200,7 +200,7 @@ export const environment: BuildConfig = { // 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 BOTH browse and search result lists. - showItemThumbnails: true + showThumbnails: true }, item: { diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index 40180d8342..2000e007a0 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -45,7 +45,7 @@ --ds-edit-item-metadata-field-width: 190px; --ds-edit-item-language-field-width: 43px; - --ds-thumbnail-max-width: 175px; + --ds-thumbnail-max-width: 125px; --ds-thumbnail-placeholder-background: #{$gray-100}; --ds-thumbnail-placeholder-border: 1px solid #{$gray-300}; --ds-thumbnail-placeholder-color: #{lighten($gray-800, 7%)}; diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss index 8d2d19ad9f..df6652a02d 100644 --- a/src/styles/_global-styles.scss +++ b/src/styles/_global-styles.scss @@ -144,8 +144,8 @@ ds-dynamic-form-control-container.d-none { font-size: 0.7rem !important; padding: 0.125rem; @media screen and (max-width: map-get($grid-breakpoints, sm)) { - font-size: 1.1rem !important; - padding: 0.5rem; + font-size: 0.5rem !important; + padding: 0.1rem; } visibility: inherit; }