diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html index 3a7806a2312..e3a8e2c590f 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.html +++ b/src/app/access-control/epeople-registry/epeople-registry.component.html @@ -68,18 +68,18 @@
{{dso.name}} +
{{ dsoNameService.getName(dso) }}
{{ 'subscriptions.table.not-available' | translate }}
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts index 4c6c5c6d21f..072b8d78281 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts @@ -12,6 +12,7 @@ import { getCommunityModuleRoute } from '../../../community-page/community-page- import { getCollectionModuleRoute } from '../../../collection-page/collection-page-routing-paths'; import { getItemModuleRoute } from '../../../item-page/item-page-routing-paths'; import { SubscriptionModalComponent } from '../subscription-modal/subscription-modal.component'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; @Component({ // eslint-disable-next-line @angular-eslint/component-selector @@ -52,6 +53,7 @@ export class SubscriptionViewComponent { constructor( private modalService: NgbModal, private subscriptionService: SubscriptionsDataService, + public dsoNameService: DSONameService, ) { } /** diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts index 5b9946e1a45..c4ac4eff762 100644 --- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts +++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts @@ -23,6 +23,8 @@ import { CollectionDataService } from '../../../core/data/collection-data.servic import { SectionsService } from '../../sections/sections.service'; import { Collection } from '../../../core/shared/collection.model'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; +import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock'; describe('SubmissionFormCollectionComponent Component', () => { @@ -136,6 +138,7 @@ describe('SubmissionFormCollectionComponent Component', () => { TestComponent ], providers: [ + { provide: DSONameService, useValue: new DSONameServiceMock() }, { provide: CollectionDataService, useValue: collectionDataService }, { provide: SubmissionJsonPatchOperationsService, useClass: SubmissionJsonPatchOperationsServiceStub }, { provide: SubmissionService, useClass: SubmissionServiceStub }, diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts index 4eac4c506a2..b985a1c73b9 100644 --- a/src/app/submission/form/collection/submission-form-collection.component.ts +++ b/src/app/submission/form/collection/submission-form-collection.component.ts @@ -29,6 +29,7 @@ import { CollectionDropdownComponent } from '../../../shared/collection-dropdown import { SectionsService } from '../../sections/sections.service'; import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; import { SectionsType } from '../../sections/sections-type'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; /** * This component allows to show the current collection the submission belonging to and to change it. @@ -111,22 +112,14 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit { */ available$: Observable