hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

add support for multiple metadata fields to the MetadataRepresentationListComponent - fix bug when unauthorized for related item

Browse Source
This commit is contained in:
Samuel
2021-05-28 11:41:55 +02:00
parent 21686c86df
commit bcfecc53a1
2 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
View File

@@ -5,7 +5,7 @@ import { MetadataRepresentationListComponent } from './metadata-representation-l
import { RelationshipService } from '../../../core/data/relationship.service'; import { RelationshipService } from '../../../core/data/relationship.service';
import { Item } from '../../../core/shared/item.model'; import { Item } from '../../../core/shared/item.model';
import { Relationship } from '../../../core/shared/item-relationships/relationship.model'; import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../../../shared/remote-data.utils';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { VarDirective } from '../../../shared/utils/var.directive'; import { VarDirective } from '../../../shared/utils/var.directive';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
@@ -35,6 +35,12 @@ const parentItem: Item = Object.assign(new Item(), {
authority: 'virtual::related-creator', authority: 'virtual::related-creator',
place: 3, place: 3,
}, },
{
language: null,
value: 'Related Creator with authority - unauthorized',
authority: 'virtual::related-creator-unauthorized',
place: 4,
},
], ],
'dc.title': [ 'dc.title': [
{ {
@@ -55,21 +61,49 @@ const relatedAuthor: Item = Object.assign(new Item(), {
] ]
} }
}); });
const relation: Relationship = Object.assign(new Relationship(), { const relatedCreator: Item = Object.assign(new Item(), {
id: 'related-creator',
metadata: {
'dc.title': [
{
language: null,
value: 'Related Creator'
}
],
'dspace.entity.type': 'Person',
}
});
const authorRelation: Relationship = Object.assign(new Relationship(), {
leftItem: createSuccessfulRemoteDataObject$(parentItem), leftItem: createSuccessfulRemoteDataObject$(parentItem),
rightItem: createSuccessfulRemoteDataObject$(relatedAuthor) rightItem: createSuccessfulRemoteDataObject$(relatedAuthor)
}); });
let relationshipService: RelationshipService; const creatorRelation: Relationship = Object.assign(new Relationship(), {
leftItem: createSuccessfulRemoteDataObject$(parentItem),
rightItem: createSuccessfulRemoteDataObject$(relatedCreator),
});
const creatorRelationUnauthorized: Relationship = Object.assign(new Relationship(), {
leftItem: createSuccessfulRemoteDataObject$(parentItem),
rightItem: createFailedRemoteDataObject$('Unauthorized', 401),
});
let relationshipService;
describe('MetadataRepresentationListComponent', () => { describe('MetadataRepresentationListComponent', () => {
let comp: MetadataRepresentationListComponent; let comp: MetadataRepresentationListComponent;
let fixture: ComponentFixture<MetadataRepresentationListComponent>; let fixture: ComponentFixture<MetadataRepresentationListComponent>;
relationshipService = jasmine.createSpyObj('relationshipService', relationshipService = {
{ findById: (id: string) => {
findById: createSuccessfulRemoteDataObject$(relation) if (id === 'related-author') {
} return createSuccessfulRemoteDataObject$(authorRelation);
); }
if (id === 'related-creator') {
return createSuccessfulRemoteDataObject$(creatorRelation);
}
if (id === 'related-creator-unauthorized') {
return createSuccessfulRemoteDataObject$(creatorRelationUnauthorized);
}
},
};
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
@@ -93,9 +127,9 @@ describe('MetadataRepresentationListComponent', () => {
fixture.detectChanges(); fixture.detectChanges();
})); }));
it('should load 3 ds-metadata-representation-loader components', () => { it('should load 4 ds-metadata-representation-loader components', () => {
const fields = fixture.debugElement.queryAll(By.css('ds-metadata-representation-loader')); const fields = fixture.debugElement.queryAll(By.css('ds-metadata-representation-loader'));
expect(fields.length).toBe(3); expect(fields.length).toBe(4);
}); });
it('should contain one page of items', () => { it('should contain one page of items', () => {

6
src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
View File

@@ -91,9 +91,11 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
getFirstSucceededRemoteData(), getFirstSucceededRemoteData(),
switchMap((relRD: RemoteData<Relationship>) => switchMap((relRD: RemoteData<Relationship>) =>
observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe( observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe(
filter(([leftItem, rightItem]) => leftItem.hasSucceeded && rightItem.hasSucceeded), filter(([leftItem, rightItem]) => leftItem.hasCompleted && rightItem.hasCompleted),
map(([leftItem, rightItem]) => { map(([leftItem, rightItem]) => {
if (leftItem.payload.id === this.parentItem.id) { if (!leftItem.hasSucceeded || !rightItem.hasSucceeded) {
return observableOf(Object.assign(new MetadatumRepresentation(this.itemType), metadatum));
} else if (rightItem.hasSucceeded && leftItem.payload.id === this.parentItem.id) {
return rightItem.payload; return rightItem.payload;
} else if (rightItem.payload.id === this.parentItem.id) { } else if (rightItem.payload.id === this.parentItem.id) {
return leftItem.payload; return leftItem.payload;