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

Merge pull request #494 from atmire/Changes-to-relationship-type-fix

Browse Source 
Small bug-fix due to changes to relationship-type
This commit is contained in:
Tim Donohue
2019-10-03 19:18:29 +02:00
committed by GitHub
parent b85c76f40e 556475318d
commit 262b33261e
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
View File

@@ -38,8 +38,8 @@ describe('EditRelationshipListComponent', () => {
relationshipType = Object.assign(new RelationshipType(), { relationshipType = Object.assign(new RelationshipType(), {
id: '1', id: '1',
uuid: '1', uuid: '1',
leftLabel: 'isAuthorOfPublication', leftwardType: 'isAuthorOfPublication',
rightLabel: 'isPublicationOfAuthor' rightwardType: 'isPublicationOfAuthor'
}); });
relationships = [ relationships = [
@@ -119,7 +119,7 @@ describe('EditRelationshipListComponent', () => {
de = fixture.debugElement; de = fixture.debugElement;
comp.item = item; comp.item = item;
comp.url = url; comp.url = url;
comp.relationshipLabel = relationshipType.leftLabel; comp.relationshipLabel = relationshipType.leftwardType;
fixture.detectChanges(); fixture.detectChanges();
}); });

4
src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
View File

@@ -34,8 +34,8 @@ describe('EditRelationshipComponent', () => {
relationshipType = Object.assign(new RelationshipType(), { relationshipType = Object.assign(new RelationshipType(), {
id: '1', id: '1',
uuid: '1', uuid: '1',
leftLabel: 'isAuthorOfPublication', leftwardType: 'isAuthorOfPublication',
rightLabel: 'isPublicationOfAuthor' rightwardType: 'isPublicationOfAuthor'
}); });
relationships = [ relationships = [

4
src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
View File

@@ -68,8 +68,8 @@ describe('ItemRelationshipsComponent', () => {
relationshipType = Object.assign(new RelationshipType(), { relationshipType = Object.assign(new RelationshipType(), {
id: '1', id: '1',
uuid: '1', uuid: '1',
leftLabel: 'isAuthorOfPublication', leftwardType: 'isAuthorOfPublication',
rightLabel: 'isPublicationOfAuthor' rightwardType: 'isPublicationOfAuthor'
}); });
relationships = [ relationships = [

9
src/app/core/data/relationship.service.spec.ts
View File

@@ -5,7 +5,6 @@ import { getMockRemoteDataBuildService } from '../../shared/mocks/mock-remote-da
import { of as observableOf } from 'rxjs/internal/observable/of'; import { of as observableOf } from 'rxjs/internal/observable/of';
import { RequestEntry } from './request.reducer'; import { RequestEntry } from './request.reducer';
import { RelationshipType } from '../shared/item-relationships/relationship-type.model'; import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
import { ResourceType } from '../shared/resource-type';
import { Relationship } from '../shared/item-relationships/relationship.model'; import { Relationship } from '../shared/item-relationships/relationship.model';
import { RemoteData } from './remote-data'; import { RemoteData } from './remote-data';
import { getMockRequestService } from '../../shared/mocks/mock-request.service'; import { getMockRequestService } from '../../shared/mocks/mock-request.service';
@@ -33,8 +32,8 @@ describe('RelationshipService', () => {
const relationshipType = Object.assign(new RelationshipType(), { const relationshipType = Object.assign(new RelationshipType(), {
id: '1', id: '1',
uuid: '1', uuid: '1',
leftLabel: 'isAuthorOfPublication', leftwardType: 'isAuthorOfPublication',
rightLabel: 'isPublicationOfAuthor' rightwardType: 'isPublicationOfAuthor'
}); });
const relationship1 = Object.assign(new Relationship(), { const relationship1 = Object.assign(new Relationship(), {
@@ -129,7 +128,7 @@ describe('RelationshipService', () => {
describe('getItemRelationshipLabels', () => { describe('getItemRelationshipLabels', () => {
it('should return the correct labels', () => { it('should return the correct labels', () => {
service.getItemRelationshipLabels(item).subscribe((result) => { service.getItemRelationshipLabels(item).subscribe((result) => {
expect(result).toEqual([relationshipType.rightLabel]); expect(result).toEqual([relationshipType.rightwardType]);
}); });
}); });
}); });
@@ -144,7 +143,7 @@ describe('RelationshipService', () => {
describe('getRelatedItemsByLabel', () => { describe('getRelatedItemsByLabel', () => {
it('should return the related items by label', () => { it('should return the related items by label', () => {
service.getRelatedItemsByLabel(item, relationshipType.rightLabel).subscribe((result) => { service.getRelatedItemsByLabel(item, relationshipType.rightwardType).subscribe((result) => {
expect(result).toEqual(relatedItems); expect(result).toEqual(relatedItems);
}); });
}); });

4
src/app/core/data/relationship.service.ts
View File

@@ -182,9 +182,9 @@ export class RelationshipService {
map(([leftItems, rightItems, relTypesCurrentPage]) => { map(([leftItems, rightItems, relTypesCurrentPage]) => {
return relTypesCurrentPage.map((type, index) => { return relTypesCurrentPage.map((type, index) => {
if (leftItems[index].uuid === item.uuid) { if (leftItems[index].uuid === item.uuid) {
return type.leftLabel; return type.leftwardType;
} else { } else {
return type.rightLabel; return type.rightwardType;
} }
}); });
}), }),