Skip to content

Commit 3f92249

Browse files
alexandrevryghemalexandrevryghem
committed
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
2 parents ac40726 + 7000035 commit 3f92249

34 files changed

Lines changed: 110 additions & 110 deletions

File tree

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
44
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
55
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
6-
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
7-
</ds-thumbnail>
6+
<ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
7+
</ds-themed-thumbnail>
88
</a>
99
<span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
10-
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
11-
</ds-thumbnail>
10+
<ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
11+
</ds-themed-thumbnail>
1212
</span>
1313
</div>
1414
<div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { TruncatableComponent } from '../../../../../shared/truncatable/truncata
2626
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
2727
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
2828
import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
29-
import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
29+
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
3030
import { JournalIssueSearchResultListElementComponent } from './journal-issue-search-result-list-element.component';
3131

3232
let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent;
@@ -108,7 +108,7 @@ describe('JournalIssueSearchResultListElementComponent', () => {
108108
}).overrideComponent(JournalIssueSearchResultListElementComponent, {
109109
add: { changeDetection: ChangeDetectionStrategy.Default } ,
110110
remove: {
111-
imports: [ThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent],
111+
imports: [ThemedThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent],
112112
} },
113113
).compileComponents();
114114
}));
@@ -129,7 +129,7 @@ describe('JournalIssueSearchResultListElementComponent', () => {
129129
});
130130

131131
it('should add thumbnail element', () => {
132-
const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
132+
const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail'));
133133
expect(thumbnailElement).toBeTruthy();
134134
});
135135
});
@@ -215,7 +215,7 @@ describe('JournalIssueSearchResultListElementComponent', () => {
215215
});
216216

217217
it('should not add thumbnail element', () => {
218-
const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
218+
const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail'));
219219
expect(thumbnailElement).toBeFalsy();
220220
});
221221
});

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
1313
import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
1414
import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
1515
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
16-
import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
16+
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
1717

1818
@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement)
1919
@Component({
2020
selector: 'ds-journal-issue-search-result-list-element',
2121
styleUrls: ['./journal-issue-search-result-list-element.component.scss'],
2222
templateUrl: './journal-issue-search-result-list-element.component.html',
2323
standalone: true,
24-
imports: [NgIf, RouterLink, ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
24+
imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
2525
})
2626
/**
2727
* The component for displaying a list element for an item search result of the type Journal Issue

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
44
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
55
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
6-
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
7-
</ds-thumbnail>
6+
<ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
7+
</ds-themed-thumbnail>
88
</a>
99
<span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
10-
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
11-
</ds-thumbnail>
10+
<ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
11+
</ds-themed-thumbnail>
1212
</span>
1313
</div>
1414
<div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { TruncatableComponent } from '../../../../../shared/truncatable/truncata
2626
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
2727
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
2828
import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
29-
import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
29+
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
3030
import { JournalVolumeSearchResultListElementComponent } from './journal-volume-search-result-list-element.component';
3131

3232
let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent;
@@ -103,7 +103,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
103103
add: { changeDetection: ChangeDetectionStrategy.Default },
104104
remove: {
105105
imports: [
106-
ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent,
106+
ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent,
107107
],
108108
},
109109
}).compileComponents();
@@ -125,7 +125,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
125125
});
126126

127127
it('should add thumbnail element', () => {
128-
const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
128+
const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail'));
129129
expect(thumbnailElement).toBeTruthy();
130130
});
131131
});
@@ -196,7 +196,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
196196
add: { changeDetection: ChangeDetectionStrategy.Default },
197197
remove: {
198198
imports: [
199-
ThumbnailComponent,
199+
ThemedThumbnailComponent,
200200
ThemedBadgesComponent,
201201
TruncatableComponent,
202202
TruncatablePartComponent,
@@ -217,7 +217,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
217217
});
218218

219219
it('should not add thumbnail element', () => {
220-
const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
220+
const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail'));
221221
expect(thumbnailElement).toBeFalsy();
222222
});
223223
});

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
1313
import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
1414
import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
1515
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
16-
import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
16+
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
1717

1818
@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement)
1919
@Component({
2020
selector: 'ds-journal-volume-search-result-list-element',
2121
styleUrls: ['./journal-volume-search-result-list-element.component.scss'],
2222
templateUrl: './journal-volume-search-result-list-element.component.html',
2323
standalone: true,
24-
imports: [NgIf, RouterLink, ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
24+
imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
2525
})
2626
/**
2727
* The component for displaying a list element for an item search result of the type Journal Volume

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<div *ngIf="showThumbnails" class="col-3 col-md-2">
33
<a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
44
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
5-
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
6-
</ds-thumbnail>
5+
<ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
6+
</ds-themed-thumbnail>
77
</a>
88
<span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
9-
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
10-
</ds-thumbnail>
9+
<ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
10+
</ds-themed-thumbnail>
1111
</span>
1212
</div>
1313
<div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { TruncatableComponent } from '../../../../../shared/truncatable/truncata
2626
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
2727
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
2828
import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
29-
import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
29+
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
3030
import { JournalSearchResultListElementComponent } from './journal-search-result-list-element.component';
3131

3232
let journalListElementComponent: JournalSearchResultListElementComponent;
@@ -99,7 +99,7 @@ describe('JournalSearchResultListElementComponent', () => {
9999
add: { changeDetection: ChangeDetectionStrategy.Default },
100100
remove: {
101101
imports: [
102-
ThumbnailComponent,
102+
ThemedThumbnailComponent,
103103
ThemedBadgesComponent,
104104
TruncatableComponent,
105105
TruncatablePartComponent,
@@ -124,7 +124,7 @@ describe('JournalSearchResultListElementComponent', () => {
124124
});
125125

126126
it('should add thumbnail element', () => {
127-
const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
127+
const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail'));
128128
expect(thumbnailElement).toBeTruthy();
129129
});
130130
});
@@ -185,7 +185,7 @@ describe('JournalSearchResultListElementComponent', () => {
185185
});
186186

187187
it('should not add thumbnail element', () => {
188-
const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
188+
const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail'));
189189
expect(thumbnailElement).toBeFalsy();
190190
});
191191
});

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
1313
import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
1414
import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
1515
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
16-
import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
16+
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
1717

1818
@listableObjectComponent('JournalSearchResult', ViewMode.ListElement)
1919
@Component({
2020
selector: 'ds-journal-search-result-list-element',
2121
styleUrls: ['./journal-search-result-list-element.component.scss'],
2222
templateUrl: './journal-search-result-list-element.component.html',
2323
standalone: true,
24-
imports: [NgIf, RouterLink, ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
24+
imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
2525
})
2626
/**
2727
* The component for displaying a list element for an item search result of the type Journal

‎src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
44
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
55
[routerLink]="[itemPageRoute]" class="dont-break-out">
6-
<ds-thumbnail [thumbnail]="dso?.thumbnail | async"
7-
[defaultImage]="'assets/images/orgunit-placeholder.svg'"
8-
[alt]="'thumbnail.orgunit.alt'"
9-
[placeholder]="'thumbnail.orgunit.placeholder'">
10-
</ds-thumbnail>
6+
<ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async"
7+
[defaultImage]="'assets/images/orgunit-placeholder.svg'"
8+
[alt]="'thumbnail.orgunit.alt'"
9+
[placeholder]="'thumbnail.orgunit.placeholder'">
10+
</ds-themed-thumbnail>
1111
</a>
1212
<span *ngIf="linkType === linkTypes.None" class="dont-break-out">
13-
<ds-thumbnail [thumbnail]="dso?.thumbnail | async"
13+
<ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async"
1414
[defaultImage]="'assets/images/orgunit-placeholder.svg'"
1515
[alt]="'thumbnail.orgunit.alt'"
1616
[placeholder]="'thumbnail.orgunit.placeholder'">
17-
</ds-thumbnail>
17+
</ds-themed-thumbnail>
1818
</span>
1919
</div>
2020
<div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">

0 commit comments

Comments
 (0)