From 7bf098332899368b8152d31aafddd91cd1cd0c20 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Fri, 19 Jan 2024 09:13:35 +0100 Subject: [PATCH 1/2] Fixed component still using the old ds-thumbnail --- ...-search-result-list-element.component.html | 8 ++++---- ...arch-result-list-element.component.spec.ts | 4 ++-- ...-search-result-list-element.component.html | 8 ++++---- ...arch-result-list-element.component.spec.ts | 4 ++-- ...-search-result-list-element.component.html | 8 ++++---- ...arch-result-list-element.component.spec.ts | 4 ++-- ...-search-result-list-element.component.html | 20 +++++++++---------- ...arch-result-list-element.component.spec.ts | 4 ++-- ...-search-result-list-element.component.html | 20 +++++++++---------- ...arch-result-list-element.component.spec.ts | 4 ++-- ...-search-result-list-element.component.html | 20 +++++++++---------- ...arch-result-list-element.component.spec.ts | 4 ++-- ...ult-list-submission-element.component.html | 20 +++++++++---------- ...-list-submission-element.component.spec.ts | 8 ++++---- .../media-viewer/media-viewer.component.html | 6 +++--- .../item-list-preview.component.html | 4 ++-- .../item-list-preview.component.spec.ts | 8 ++++---- ...-search-result-list-element.component.html | 8 ++++---- ...arch-result-list-element.component.spec.ts | 8 ++++---- 19 files changed, 85 insertions(+), 85 deletions(-) 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 e3293be3a0..8f208c4a15 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 @@ -3,12 +3,12 @@ - - + + - - + +
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.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts index 178ed86c40..243e3b898b 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts @@ -102,7 +102,7 @@ describe('JournalIssueSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -187,7 +187,7 @@ describe('JournalIssueSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); 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 8d7fbda4af..dbee45223c 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 @@ -3,12 +3,12 @@ - - + + - - + +
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.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts index 71fa83a3b1..1f3882d642 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts @@ -101,7 +101,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -184,7 +184,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); 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 6d7f9293ec..77e137597e 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 @@ -2,12 +2,12 @@
- - + + - - + +
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts index 07970d7128..4a1c46d252 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts @@ -97,7 +97,7 @@ describe('JournalSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -157,7 +157,7 @@ describe('JournalSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); 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 07c7c5bb89..0bb48432ee 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 @@ -3,18 +3,18 @@ - - + + - - + +
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.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts index 9609a9582a..88109b26d3 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts @@ -104,7 +104,7 @@ describe('OrgUnitSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -171,7 +171,7 @@ describe('OrgUnitSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeNull(); }); }); 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 f3f892bc98..8eea99f606 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 @@ -3,18 +3,18 @@ - - + + - - + +
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts index 31018520f6..3e13aa665c 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts @@ -104,7 +104,7 @@ describe('PersonSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -171,7 +171,7 @@ describe('PersonSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); 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 93289aa525..77ae47f69d 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 @@ -3,18 +3,18 @@ - - + + - - + +
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts index 0cb3e63e87..3186aa6067 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts @@ -96,7 +96,7 @@ describe('ProjectSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -157,7 +157,7 @@ describe('ProjectSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); 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 dd2589c726..32a85062bb 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 @@ -2,18 +2,18 @@
- - + + - - + +
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts index 9e4d347150..c596f49f1e 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts @@ -167,8 +167,8 @@ describe('PersonSearchResultListElementSubmissionComponent', () => { fixture.detectChanges(); }); - it('should add the ds-thumbnail element', () => { - const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should add the thumbnail element', () => { + const thumbnail = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnail).toBeTruthy(); }); }); @@ -223,8 +223,8 @@ describe('PersonSearchResultListElementSubmissionComponent', () => { fixture.detectChanges(); }); - it('should not add the ds-thumbnail element', () => { - const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should not add the thumbnail element', () => { + const thumbnail = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnail).toBeNull(); }); }); diff --git a/src/app/item-page/media-viewer/media-viewer.component.html b/src/app/item-page/media-viewer/media-viewer.component.html index c8a02e039c..cbc78605ca 100644 --- a/src/app/item-page/media-viewer/media-viewer.component.html +++ b/src/app/item-page/media-viewer/media-viewer.component.html @@ -20,8 +20,8 @@ [image]="(thumbnailsRD$ | async)?.payload?.page[0]?._links.content.href || thumbnailPlaceholder" [preview]="false" > - - + + diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html index c8ef730faf..ac599adfba 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html @@ -1,7 +1,7 @@
- - + +
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts index aa618add35..926d74c27a 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts @@ -118,8 +118,8 @@ describe('ItemListPreviewComponent', () => { component.item = mockItemWithAuthorAndDate; fixture.detectChanges(); }); - it('should add the ds-thumbnail element', () => { - const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should add the thumbnail element', () => { + const thumbnail = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnail).toBeTruthy(); }); }); @@ -223,8 +223,8 @@ describe('ItemListPreviewComponent', () => { component.item = mockItemWithAuthorAndDate; fixture.detectChanges(); }); - it('should add the ds-thumbnail element', () => { - const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should add the thumbnail element', () => { + const thumbnail = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnail).toBeFalsy(); }); }); 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 f7a687048a..db10cbee52 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 @@ -2,12 +2,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 7665b7d64e..224e98c981 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 @@ -215,8 +215,8 @@ describe('ItemSearchResultListElementComponent', () => { expect(publicationListElementComponent.showThumbnails).toBeTrue(); }); - it('should add ds-thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should add thumbnail element', () => { + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -395,8 +395,8 @@ describe('ItemSearchResultListElementComponent', () => { fixture.detectChanges(); }); - it('should not add ds-thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should not add thumbnail element', () => { + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); From 70000353030bee598305300fd1639659cc258036 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Mon, 22 Apr 2024 22:41:02 +0200 Subject: [PATCH 2/2] Fixed duplicate selectors throwing warnings --- .../export-batch-selector/export-batch-selector.component.ts | 2 +- .../community-sidebar-search-list-element.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts index 0645e09029..4486b4463d 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts @@ -26,7 +26,7 @@ import { FeatureID } from '../../../../core/data/feature-authorization/feature-i * Used to choose a dso from to export metadata of */ @Component({ - selector: 'ds-export-metadata-selector', + selector: 'ds-export-batch-selector', templateUrl: '../dso-selector-modal-wrapper.component.html', }) export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts index 14c8ec09cd..fb0f69f9a9 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts @@ -9,7 +9,7 @@ import { Community } from '../../../../core/shared/community.model'; @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal) @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ - selector: 'ds-collection-sidebar-search-list-element', + selector: 'ds-community-sidebar-search-list-element', templateUrl: '../sidebar-search-list-element.component.html' }) /**