Skip to content

Commit 0824fff

Browse files
samuelcambiensamuelcambien
committed
Merge branch 'main' into w2p-93963-Add_support_for_line_breaks_markdown_and_mathjax_in_metadata
# Conflicts: # src/app/shared/shared.module.ts
2 parents d46ab3b + 064dae2 commit 0824fff

54 files changed

Lines changed: 599 additions & 2122 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ import { By } from '@angular/platform-browser';
1414
import { RouterTestingModule } from '@angular/router/testing';
1515
import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
1616
import { LinkService } from '../../../../../core/cache/builders/link.service';
17+
import { AuthService } from '../../../../../core/auth/auth.service';
18+
import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
19+
import { FileService } from '../../../../../core/shared/file.service';
20+
import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
21+
import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
22+
import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
23+
import { ThemeService } from '../../../../../shared/theme-support/theme.service';
24+
import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
1725

1826
describe('CollectionAdminSearchResultGridElementComponent', () => {
1927
let component: CollectionAdminSearchResultGridElementComponent;
@@ -45,7 +53,11 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
4553
providers: [
4654
{ provide: TruncatableService, useValue: mockTruncatableService },
4755
{ provide: BitstreamDataService, useValue: {} },
48-
{ provide: LinkService, useValue: linkService }
56+
{ provide: LinkService, useValue: linkService },
57+
{ provide: AuthService, useClass: AuthServiceStub },
58+
{ provide: FileService, useClass: FileServiceStub },
59+
{ provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
60+
{ provide: ThemeService, useValue: getMockThemeService() },
4961
]
5062
})
5163
.compileComponents();

‎src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ import { CommunitySearchResult } from '../../../../../shared/object-collection/s
1616
import { Community } from '../../../../../core/shared/community.model';
1717
import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
1818
import { LinkService } from '../../../../../core/cache/builders/link.service';
19+
import { AuthService } from '../../../../../core/auth/auth.service';
20+
import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
21+
import { FileService } from '../../../../../core/shared/file.service';
22+
import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
23+
import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
24+
import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
25+
import { ThemeService } from '../../../../../shared/theme-support/theme.service';
26+
import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
1927

2028
describe('CommunityAdminSearchResultGridElementComponent', () => {
2129
let component: CommunityAdminSearchResultGridElementComponent;
@@ -47,7 +55,11 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
4755
providers: [
4856
{ provide: TruncatableService, useValue: mockTruncatableService },
4957
{ provide: BitstreamDataService, useValue: {} },
50-
{ provide: LinkService, useValue: linkService }
58+
{ provide: LinkService, useValue: linkService },
59+
{ provide: AuthService, useClass: AuthServiceStub },
60+
{ provide: FileService, useClass: FileServiceStub },
61+
{ provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
62+
{ provide: ThemeService, useValue: getMockThemeService() },
5163
],
5264
schemas: [NO_ERRORS_SCHEMA]
5365
})

‎src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ import { getMockThemeService } from '../../../../../shared/mocks/theme-service.m
2020
import { ThemeService } from '../../../../../shared/theme-support/theme.service';
2121
import { AccessStatusDataService } from '../../../../../core/data/access-status-data.service';
2222
import { AccessStatusObject } from '../../../../../shared/object-list/access-status-badge/access-status.model';
23+
import { AuthService } from '../../../../../core/auth/auth.service';
24+
import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
25+
import { FileService } from '../../../../../core/shared/file.service';
26+
import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
27+
import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
28+
import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
2329

2430
describe('ItemAdminSearchResultGridElementComponent', () => {
2531
let component: ItemAdminSearchResultGridElementComponent;
@@ -64,6 +70,9 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
6470
{ provide: BitstreamDataService, useValue: mockBitstreamDataService },
6571
{ provide: ThemeService, useValue: mockThemeService },
6672
{ provide: AccessStatusDataService, useValue: mockAccessStatusDataService },
73+
{ provide: AuthService, useClass: AuthServiceStub },
74+
{ provide: FileService, useClass: FileServiceStub },
75+
{ provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
6776
],
6877
schemas: [NO_ERRORS_SCHEMA]
6978
})

‎src/app/core/breadcrumbs/dso-name.service.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export class DSONameService {
3131
const givenName = dso.firstMetadataValue('person.givenName');
3232
if (isEmpty(familyName) && isEmpty(givenName)) {
3333
return dso.firstMetadataValue('dc.title') || dso.name;
34+
} else if (isEmpty(familyName) || isEmpty(givenName)) {
35+
return familyName || givenName;
3436
} else {
3537
return `${familyName}, ${givenName}`;
3638
}
@@ -55,11 +57,14 @@ export class DSONameService {
5557
.filter((type) => typeof type === 'string')
5658
.find((type: string) => Object.keys(this.factories).includes(type)) as string;
5759

60+
let name;
5861
if (hasValue(match)) {
59-
return this.factories[match](dso);
60-
} else {
61-
return this.factories.Default(dso);
62+
name = this.factories[match](dso);
6263
}
64+
if (isEmpty(name)) {
65+
name = this.factories.Default(dso);
66+
}
67+
return name;
6368
}
6469

6570
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<div class="card-body">
2222
<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
2323
<ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
24-
<h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
24+
<h4 class="card-title" [innerHTML]="dsoTitle"></h4>
2525
</ds-truncatable-part>
2626
<p *ngIf="dso.hasMetadata('creativework.datePublished')"
2727
class="item-date card-text text-muted">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<div class="card-body">
2222
<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
2323
<ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
24-
<h4 class="card-title" [innerHTML]="dso.firstMetadataValue('dc.title')"></h4>
24+
<h4 class="card-title" [innerHTML]="dsoTitle"></h4>
2525
</ds-truncatable-part>
2626
<p *ngIf="dso.hasMetadata('creativework.datePublished')"
2727
class="item-date card-text text-muted">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<div class="card-body">
2222
<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
2323
<ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
24-
<h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
24+
<h4 class="card-title" [innerHTML]="dsoTitle"></h4>
2525
</ds-truncatable-part>
2626
<p *ngIf="dso.hasMetadata('creativework.editor')"
2727
class="item-publisher card-text text-muted">

‎src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div class="d-flex flex-row">
2-
<h2 class="item-page-title-field mr-auto">
3-
{{'journalissue.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
4-
</h2>
2+
<ds-item-page-title-field [item]="object" class="mr-auto">
3+
</ds-item-page-title-field>
54
<div class="pl-2 space-children-mr">
65
<ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
76
[tooltipMsgCreate]="'item.page.version.create'"

‎src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div class="d-flex flex-row">
2-
<h2 class="item-page-title-field mr-auto">
3-
{{'journalvolume.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
4-
</h2>
2+
<ds-item-page-title-field [item]="object" class="mr-auto">
3+
</ds-item-page-title-field>
54
<div class="pl-2 space-children-mr">
65
<ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
76
[tooltipMsgCreate]="'item.page.version.create'"

‎src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div class="d-flex flex-row">
2-
<h2 class="item-page-title-field mr-auto">
3-
{{'journal.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
4-
</h2>
2+
<ds-item-page-title-field [item]="object" class="mr-auto">
3+
</ds-item-page-title-field>
54
<div class="pl-2 space-children-mr">
65
<ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
76
[tooltipMsgCreate]="'item.page.version.create'"

0 commit comments

Comments
 (0)