diff --git a/alfa-client/libs/collaboration-shared/src/lib/collaboration.linkrel.ts b/alfa-client/libs/collaboration-shared/src/lib/collaboration.linkrel.ts index 7dff5e47fc7ae1798c826bbaa6a1bd009f261d13..967a0a0a1990749d02d9153c1e2d1a4d88869936 100644 --- a/alfa-client/libs/collaboration-shared/src/lib/collaboration.linkrel.ts +++ b/alfa-client/libs/collaboration-shared/src/lib/collaboration.linkrel.ts @@ -1,6 +1,4 @@ export enum CollaborationListLinkRel { COLLABORATION_LIST = 'collaborationList', - //todo: temporary wrong link -> change if backend works - ORGANISATIONS_EINHEIT_COLLABORATION_LIST = 'organisationsEinheitCollaborationList', CREATE_COLLABORATION_REQUEST = 'createCollaborationRequest', } diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list/collaboration-list.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list/collaboration-list.component.spec.ts index a62b266a1f608196812fd614715bb79778f038c3..ea87bb45b50a9be36a1a67048f31ee0816308d80 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list/collaboration-list.component.spec.ts +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list/collaboration-list.component.spec.ts @@ -1,6 +1,8 @@ -import { createEmptyStateResource } from '@alfa-client/tech-shared'; +import { CollaborationListLinkRel, CollaborationListResource } from '@alfa-client/collaboration-shared'; +import { createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MockComponent } from 'ng-mocks'; +import { createCollaborationListResource } from '../../../../../collaboration-shared/test/collaboration'; import { CollaborationListItemComponent } from './collaboration-list-item/collaboration-list-item.component'; import { CollaborationListComponent } from './collaboration-list.component'; @@ -35,14 +37,13 @@ describe('CollaborationListComponent', () => { expect(component.getCollaborations()).toEqual([]); }); - // todo: wieder einbauen - // it('should return embedded resource', () => { - // const collaborationListResource: CollaborationListResource = createCollaborationListResource(); - // component.collaborationStateListResource = createStateResource(collaborationListResource); - // - // expect(component.getCollaborations()).toEqual( - // collaborationListResource._embedded[CollaborationListLinkRel.COLLABORATION_LIST], - // ); - // }); + it('should return embedded resource', () => { + const collaborationListResource: CollaborationListResource = createCollaborationListResource(); + component.collaborationStateListResource = createStateResource(collaborationListResource); + + expect(component.getCollaborations()).toEqual( + collaborationListResource._embedded[CollaborationListLinkRel.COLLABORATION_LIST], + ); + }); }); }); diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list/collaboration-list.component.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list/collaboration-list.component.ts index 60792aaf2944c4406c92b5b41268098cad83501a..7a0005125bf37800fa007a3b1e510efe6ce14ae4 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list/collaboration-list.component.ts +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list/collaboration-list.component.ts @@ -18,9 +18,6 @@ export class CollaborationListComponent implements OnChanges { } getCollaborations(): CollaborationResource[] { - return getEmbeddedResources( - this.collaborationStateListResource, - CollaborationListLinkRel.ORGANISATIONS_EINHEIT_COLLABORATION_LIST, - ); + return getEmbeddedResources(this.collaborationStateListResource, CollaborationListLinkRel.COLLABORATION_LIST); } }