Skip to content

Commit 2513f91

Browse files
alexandrevryghemalexandrevryghem
committed
Use DSONameService to display DSpaceObjects names
1 parent ca86437 commit 2513f91

160 files changed

Lines changed: 608 additions & 288 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/access-control/epeople-registry/epeople-registry.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | trans
6868
<tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
6969
[ngClass]="{'table-primary' : isActive(epersonDto.eperson) | async}">
7070
<td>{{epersonDto.eperson.id}}</td>
71-
<td>{{epersonDto.eperson.name}}</td>
71+
<td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
7272
<td>{{epersonDto.eperson.email}}</td>
7373
<td>
7474
<div class="btn-group edit-field">
7575
<button class="delete-button" (click)="toggleEditEPerson(epersonDto.eperson)"
7676
class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
77-
title="{{labelPrefix + 'table.edit.buttons.edit' | translate: {name: epersonDto.eperson.name} }}">
77+
title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
7878
<i class="fas fa-edit fa-fw"></i>
7979
</button>
8080
<button [disabled]="!epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
8181
class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
82-
title="{{labelPrefix + 'table.edit.buttons.remove' | translate: {name: epersonDto.eperson.name} }}">
82+
title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
8383
<i class="fas fa-trash-alt fa-fw"></i>
8484
</button>
8585
</div>

‎src/app/access-control/epeople-registry/epeople-registry.component.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { RequestService } from '../../core/data/request.service';
2121
import { PageInfo } from '../../core/shared/page-info.model';
2222
import { NoContent } from '../../core/shared/NoContent.model';
2323
import { PaginationService } from '../../core/pagination/pagination.service';
24+
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
2425

2526
@Component({
2627
selector: 'ds-epeople-registry',
@@ -93,7 +94,9 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
9394
private router: Router,
9495
private modalService: NgbModal,
9596
private paginationService: PaginationService,
96-
public requestService: RequestService) {
97+
public requestService: RequestService,
98+
public dsoNameService: DSONameService,
99+
) {
97100
this.currentSearchQuery = '';
98101
this.currentSearchScope = 'metadata';
99102
this.searchForm = this.formBuilder.group(({
@@ -121,7 +124,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
121124
this.subs.push(this.ePeople$.pipe(
122125
switchMap((epeople: PaginatedList<EPerson>) => {
123126
if (epeople.pageInfo.totalElements > 0) {
124-
return combineLatest(...epeople.page.map((eperson) => {
127+
return combineLatest([...epeople.page.map((eperson: EPerson) => {
125128
return this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined).pipe(
126129
map((authorized) => {
127130
const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
@@ -130,7 +133,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
130133
return epersonDtoModel;
131134
})
132135
);
133-
})).pipe(map((dtos: EpersonDtoModel[]) => {
136+
})]).pipe(map((dtos: EpersonDtoModel[]) => {
134137
return buildPaginatedList(epeople.pageInfo, dtos);
135138
}));
136139
} else {
@@ -237,7 +240,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
237240
if (hasValue(ePerson.id)) {
238241
this.epersonService.deleteEPerson(ePerson).pipe(getFirstCompletedRemoteData()).subscribe((restResponse: RemoteData<NoContent>) => {
239242
if (restResponse.hasSucceeded) {
240-
this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', {name: ePerson.name}));
243+
this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', {name: this.dsoNameService.getName(ePerson)}));
241244
} else {
242245
this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + ePerson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.errorMessage);
243246
}

‎src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,13 @@ <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
6464
<tbody>
6565
<tr *ngFor="let group of (groups | async)?.payload?.page">
6666
<td class="align-middle">{{group.id}}</td>
67-
<td class="align-middle"><a (click)="groupsDataService.startEditingNewGroup(group)"
68-
[routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
69-
<td class="align-middle">{{(group.object | async)?.payload?.name}}</td>
67+
<td class="align-middle">
68+
<a (click)="groupsDataService.startEditingNewGroup(group)"
69+
[routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
70+
{{ dsoNameService.getName(group) }}
71+
</a>
72+
</td>
73+
<td class="align-middle">{{ dsoNameService.getName(undefined) }}</td>
7074
</tr>
7175
</tbody>
7276
</table>

‎src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
3636
import { ValidateEmailNotTaken } from './validators/email-taken.validator';
3737
import { Registration } from '../../../core/shared/registration.model';
3838
import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
39+
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
3940

4041
@Component({
4142
selector: 'ds-eperson-form',
@@ -182,6 +183,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
182183
private paginationService: PaginationService,
183184
public requestService: RequestService,
184185
private epersonRegistrationService: EpersonRegistrationService,
186+
public dsoNameService: DSONameService,
185187
) {
186188
this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
187189
this.epersonInitial = eperson;
@@ -200,14 +202,14 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
200202
*/
201203
initialisePage() {
202204

203-
observableCombineLatest(
205+
observableCombineLatest([
204206
this.translateService.get(`${this.messagePrefix}.firstName`),
205207
this.translateService.get(`${this.messagePrefix}.lastName`),
206208
this.translateService.get(`${this.messagePrefix}.email`),
207209
this.translateService.get(`${this.messagePrefix}.canLogIn`),
208210
this.translateService.get(`${this.messagePrefix}.requireCertificate`),
209211
this.translateService.get(`${this.messagePrefix}.emailHint`),
210-
).subscribe(([firstName, lastName, email, canLogIn, requireCertificate, emailHint]) => {
212+
]).subscribe(([firstName, lastName, email, canLogIn, requireCertificate, emailHint]) => {
211213
this.firstName = new DynamicInputModel({
212214
id: 'firstName',
213215
label: firstName,
@@ -374,10 +376,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
374376
getFirstCompletedRemoteData()
375377
).subscribe((rd: RemoteData<EPerson>) => {
376378
if (rd.hasSucceeded) {
377-
this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', { name: ePersonToCreate.name }));
379+
this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', { name: this.dsoNameService.getName(ePersonToCreate) }));
378380
this.submitForm.emit(ePersonToCreate);
379381
} else {
380-
this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.created.failure', { name: ePersonToCreate.name }));
382+
this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.created.failure', { name: this.dsoNameService.getName(ePersonToCreate) }));
381383
this.cancelForm.emit();
382384
}
383385
});
@@ -413,10 +415,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
413415
const response = this.epersonService.updateEPerson(editedEperson);
414416
response.pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<EPerson>) => {
415417
if (rd.hasSucceeded) {
416-
this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', { name: editedEperson.name }));
418+
this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', { name: this.dsoNameService.getName(editedEperson) }));
417419
this.submitForm.emit(editedEperson);
418420
} else {
419-
this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.edited.failure', { name: editedEperson.name }));
421+
this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.edited.failure', { name: this.dsoNameService.getName(editedEperson) }));
420422
this.cancelForm.emit();
421423
}
422424
});
@@ -464,7 +466,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
464466
if (hasValue(eperson.id)) {
465467
this.epersonService.deleteEPerson(eperson).pipe(getFirstCompletedRemoteData()).subscribe((restResponse: RemoteData<NoContent>) => {
466468
if (restResponse.hasSucceeded) {
467-
this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: eperson.name }));
469+
this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: this.dsoNameService.getName(eperson) }));
468470
this.submitForm.emit();
469471
} else {
470472
this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + eperson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.errorMessage);
@@ -542,7 +544,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
542544
.subscribe((list: PaginatedList<EPerson>) => {
543545
if (list.totalElements > 0) {
544546
this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.' + notificationSection + '.failure.emailInUse', {
545-
name: ePerson.name,
547+
name: this.dsoNameService.getName(ePerson),
546548
email: ePerson.email
547549
}));
548550
}

‎src/app/access-control/group-registry/group-form/group-form.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2 class="border-bottom pb-2">{{messagePrefix + '.head.edit' | translate}}</h2>
1515
<ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertTypeEnum.Warning"
1616
[content]="messagePrefix + '.alert.permanent'"></ds-alert>
1717
<ds-alert *ngIf="!(canEdit$ | async) && (groupDataService.getActiveGroup() | async)" [type]="AlertTypeEnum.Warning"
18-
[content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: (getLinkedDSO(groupBeingEdited) | async)?.payload?.name, comcol: (getLinkedDSO(groupBeingEdited) | async)?.payload?.type, comcolEditRolesRoute: (getLinkedEditRolesRoute(groupBeingEdited) | async) })">
18+
[content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName((getLinkedDSO(groupBeingEdited) | async)?.payload), comcol: (getLinkedDSO(groupBeingEdited) | async)?.payload?.type, comcolEditRolesRoute: (getLinkedEditRolesRoute(groupBeingEdited) | async) })">
1919
</ds-alert>
2020

2121
<ds-form [formId]="formId"

‎src/app/access-control/group-registry/group-form/group-form.component.spec.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ import { NotificationsServiceStub } from '../../../shared/testing/notifications-
3636
import { Operation } from 'fast-json-patch';
3737
import { ValidateGroupExists } from './validators/group-exists.validator';
3838
import { NoContent } from '../../../core/shared/NoContent.model';
39+
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
40+
import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
3941

4042
describe('GroupFormComponent', () => {
4143
let component: GroupFormComponent;
@@ -188,7 +190,7 @@ describe('GroupFormComponent', () => {
188190
translateService = getMockTranslateService();
189191
router = new RouterMock();
190192
notificationService = new NotificationsServiceStub();
191-
TestBed.configureTestingModule({
193+
return TestBed.configureTestingModule({
192194
imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
193195
TranslateModule.forRoot({
194196
loader: {
@@ -198,7 +200,8 @@ describe('GroupFormComponent', () => {
198200
}),
199201
],
200202
declarations: [GroupFormComponent],
201-
providers: [GroupFormComponent,
203+
providers: [
204+
{ provide: DSONameService, useValue: new DSONameServiceMock() },
202205
{ provide: EPersonDataService, useValue: ePersonDataServiceStub },
203206
{ provide: GroupDataService, useValue: groupsDataServiceStub },
204207
{ provide: DSpaceObjectDataService, useValue: dsoDataServiceStub },
@@ -240,8 +243,8 @@ describe('GroupFormComponent', () => {
240243
fixture.detectChanges();
241244
});
242245

243-
it('should emit a new group using the correct values', waitForAsync(() => {
244-
fixture.whenStable().then(() => {
246+
it('should emit a new group using the correct values', (async () => {
247+
await fixture.whenStable().then(() => {
245248
expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
246249
});
247250
}));
@@ -266,8 +269,8 @@ describe('GroupFormComponent', () => {
266269
fixture.detectChanges();
267270
});
268271

269-
it('should emit the existing group using the correct new values', waitForAsync(() => {
270-
fixture.whenStable().then(() => {
272+
it('should emit the existing group using the correct new values', (async () => {
273+
await fixture.whenStable().then(() => {
271274
expect(component.submitForm.emit).toHaveBeenCalledWith(expected2);
272275
});
273276
}));

‎src/app/access-control/group-registry/group-form/group-form.component.ts‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
4646
import { NoContent } from '../../../core/shared/NoContent.model';
4747
import { Operation } from 'fast-json-patch';
4848
import { ValidateGroupExists } from './validators/group-exists.validator';
49+
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
4950

5051
@Component({
5152
selector: 'ds-group-form',
@@ -133,7 +134,8 @@ export class GroupFormComponent implements OnInit, OnDestroy {
133134
groupNameValueChangeSubscribe: Subscription;
134135

135136

136-
constructor(public groupDataService: GroupDataService,
137+
constructor(
138+
public groupDataService: GroupDataService,
137139
private ePersonDataService: EPersonDataService,
138140
private dSpaceObjectDataService: DSpaceObjectDataService,
139141
private formBuilderService: FormBuilderService,
@@ -144,7 +146,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
144146
private authorizationService: AuthorizationDataService,
145147
private modalService: NgbModal,
146148
public requestService: RequestService,
147-
protected changeDetectorRef: ChangeDetectorRef) {
149+
protected changeDetectorRef: ChangeDetectorRef,
150+
public dsoNameService: DSONameService,
151+
) {
148152
}
149153

150154
ngOnInit() {
@@ -329,7 +333,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
329333
.subscribe((list: PaginatedList<Group>) => {
330334
if (list.totalElements > 0) {
331335
this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.' + notificationSection + '.failure.groupNameInUse', {
332-
name: group.name
336+
name: this.dsoNameService.getName(group),
333337
}));
334338
}
335339
}));
@@ -362,10 +366,10 @@ export class GroupFormComponent implements OnInit, OnDestroy {
362366
getFirstCompletedRemoteData()
363367
).subscribe((rd: RemoteData<Group>) => {
364368
if (rd.hasSucceeded) {
365-
this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.edited.success', { name: rd.payload.name }));
369+
this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.edited.success', { name: this.dsoNameService.getName(rd.payload) }));
366370
this.submitForm.emit(rd.payload);
367371
} else {
368-
this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.edited.failure', { name: group.name }));
372+
this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.edited.failure', { name: this.dsoNameService.getName(group) }));
369373
this.cancelForm.emit();
370374
}
371375
});
@@ -425,11 +429,11 @@ export class GroupFormComponent implements OnInit, OnDestroy {
425429
this.groupDataService.delete(group.id).pipe(getFirstCompletedRemoteData())
426430
.subscribe((rd: RemoteData<NoContent>) => {
427431
if (rd.hasSucceeded) {
428-
this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.deleted.success', { name: group.name }));
432+
this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.deleted.success', { name: this.dsoNameService.getName(group) }));
429433
this.onCancel();
430434
} else {
431435
this.notificationsService.error(
432-
this.translateService.get(this.messagePrefix + '.notification.deleted.failure.title', { name: group.name }),
436+
this.translateService.get(this.messagePrefix + '.notification.deleted.failure.title', { name: this.dsoNameService.getName(group) }),
433437
this.translateService.get(this.messagePrefix + '.notification.deleted.failure.content', { cause: rd.errorMessage }));
434438
}
435439
});

0 commit comments

Comments
 (0)