Merge branch 'minor-themed-component-fixes_contribute-7.6' into minor…

…-themed-component-fixes_contribute-main # Conflicts: # src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html # src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html # src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html # src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html # src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html # src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html # src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html # src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html # src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
alexandrevryghem · Apr 22, 2024 · 3f92249 · 3f92249
2 parents ac40726 + 7000035
commit 3f92249
Show file tree

Hide file tree

Showing 34 changed files with 110 additions and 110 deletions.
diff --git a/...esult-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/...esult-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -3,12 +3,12 @@
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+      </ds-themed-thumbnail>
     </a>
       <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+      </ds-themed-thumbnail>
     </span>
   </div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">

diff --git a/...lt-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/...lt-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
@@ -26,7 +26,7 @@ import { TruncatableComponent } from '../../../../../shared/truncatable/truncata
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
+import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
 import { JournalIssueSearchResultListElementComponent } from './journal-issue-search-result-list-element.component';
 
 let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent;
@@ -108,7 +108,7 @@ describe('JournalIssueSearchResultListElementComponent', () => {
     }).overrideComponent(JournalIssueSearchResultListElementComponent, {
       add: { changeDetection: ChangeDetectionStrategy.Default } ,
       remove: {
-        imports: [ThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent],
+        imports: [ThemedThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent],
       } },
     ).compileComponents();
   }));
@@ -129,7 +129,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();
     });
   });
@@ -215,7 +215,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/...-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/...-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -13,15 +13,15 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
 import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
-import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
+import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-issue-search-result-list-element',
   styleUrls: ['./journal-issue-search-result-list-element.component.scss'],
   templateUrl: './journal-issue-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Issue

diff --git a/...ult-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/...ult-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -3,12 +3,12 @@
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+      </ds-themed-thumbnail>
     </a>
       <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+      </ds-themed-thumbnail>
     </span>
   </div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">

diff --git a/...-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/...-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
@@ -26,7 +26,7 @@ import { TruncatableComponent } from '../../../../../shared/truncatable/truncata
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
+import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
 import { JournalVolumeSearchResultListElementComponent } from './journal-volume-search-result-list-element.component';
 
 let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent;
@@ -103,7 +103,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
       add: { changeDetection: ChangeDetectionStrategy.Default },
       remove: {
         imports: [
-          ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent,
+          ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent,
         ],
       },
     }).compileComponents();
@@ -125,7 +125,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();
     });
   });
@@ -196,7 +196,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
       add: { changeDetection: ChangeDetectionStrategy.Default },
       remove: {
         imports: [
-          ThumbnailComponent,
+          ThemedThumbnailComponent,
           ThemedBadgesComponent,
           TruncatableComponent,
           TruncatablePartComponent,
@@ -217,7 +217,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/...esult-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/...esult-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -13,15 +13,15 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
 import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
-import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
+import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-volume-search-result-list-element',
   styleUrls: ['./journal-volume-search-result-list-element.component.scss'],
   templateUrl: './journal-volume-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Volume

diff --git a/...nts/search-result-list-elements/journal/journal-search-result-list-element.component.html b/...nts/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -2,12 +2,12 @@
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+      </ds-themed-thumbnail>
     </a>
       <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+      </ds-themed-thumbnail>
     </span>
   </div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">

diff --git a/.../search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/.../search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
@@ -26,7 +26,7 @@ import { TruncatableComponent } from '../../../../../shared/truncatable/truncata
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
+import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
 import { JournalSearchResultListElementComponent } from './journal-search-result-list-element.component';
 
 let journalListElementComponent: JournalSearchResultListElementComponent;
@@ -99,7 +99,7 @@ describe('JournalSearchResultListElementComponent', () => {
       add: { changeDetection: ChangeDetectionStrategy.Default },
       remove: {
         imports: [
-          ThumbnailComponent,
+          ThemedThumbnailComponent,
           ThemedBadgesComponent,
           TruncatableComponent,
           TruncatablePartComponent,
@@ -124,7 +124,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();
     });
   });
@@ -185,7 +185,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/...ments/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/...ments/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -13,15 +13,15 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
 import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
-import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
+import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-search-result-list-element',
   styleUrls: ['./journal-search-result-list-element.component.scss'],
   templateUrl: './journal-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal

diff --git a/...s/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/...s/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -3,18 +3,18 @@
         <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
            [routerLink]="[itemPageRoute]" class="dont-break-out">
-            <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                          [defaultImage]="'assets/images/orgunit-placeholder.svg'"
-                          [alt]="'thumbnail.orgunit.alt'"
-                          [placeholder]="'thumbnail.orgunit.placeholder'">
-            </ds-thumbnail>
+            <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async"
+                                 [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+                                 [alt]="'thumbnail.orgunit.alt'"
+                                 [placeholder]="'thumbnail.orgunit.placeholder'">
+            </ds-themed-thumbnail>
         </a>
         <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-            <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async"
                           [defaultImage]="'assets/images/orgunit-placeholder.svg'"
                           [alt]="'thumbnail.orgunit.alt'"
                           [placeholder]="'thumbnail.orgunit.placeholder'">
-            </ds-thumbnail>
+            </ds-themed-thumbnail>
         </span>
     </div>
     <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">

diff --git a/...earch-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/...earch-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
@@ -124,7 +124,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();
     });
   });
@@ -190,7 +190,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/...nts/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/...nts/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -13,15 +13,15 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
 import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
-import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
+import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-org-unit-search-result-list-element',
   styleUrls: ['./org-unit-search-result-list-element.component.scss'],
   templateUrl: './org-unit-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for an item search result of the type Organisation Unit

diff --git a/...ments/search-result-list-elements/person/person-search-result-list-element.component.html b/...ments/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -3,18 +3,18 @@
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
        [routerLink]="[itemPageRoute]" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                    [defaultImage]="'assets/images/person-placeholder.svg'"
-                    [alt]="'thumbnail.person.alt'"
-                    [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async"
+                           [defaultImage]="'assets/images/person-placeholder.svg'"
+                           [alt]="'thumbnail.person.alt'"
+                           [placeholder]="'thumbnail.person.placeholder'">
+      </ds-themed-thumbnail>
     </a>
     <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+      <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
                     [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
+      </ds-themed-thumbnail>
     </span>
   </div>
   <div [ngClass]="showThumbnails ? 'col-9 col-md-10' : 'col-12'">

diff --git a/...ts/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/...ts/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
@@ -124,7 +124,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();
     });
   });
@@ -192,7 +192,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();
     });
   });