Skip to content
Snippets Groups Projects
Commit 62767967 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3574 rename apiRoot linkRel

parent e5c7c536
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,7 @@ export enum ApiRootLinkRel { ...@@ -28,7 +28,7 @@ export enum ApiRootLinkRel {
SEARCH_ALLE = 'search_all', SEARCH_ALLE = 'search_all',
SEARCH_MEINE = 'search_my', SEARCH_MEINE = 'search_my',
ALLE_VORGAENGE = 'vorgaenge_all', ALLE_VORGAENGE = 'vorgaenge_all',
MY_VORGAENGE = 'vorgaenge_my', MEINE_VORGAENGE = 'vorgaenge_my',
ALLE_VORGAENGE_NEU = 'vorgaenge_neu_all', ALLE_VORGAENGE_NEU = 'vorgaenge_neu_all',
MEINE_VORGAENGE_NEU = 'vorgaenge_neu_meine', MEINE_VORGAENGE_NEU = 'vorgaenge_neu_meine',
ALLE_VORGAENGE_ANGENOMMEN = 'vorgaenge_angenommen_all', ALLE_VORGAENGE_ANGENOMMEN = 'vorgaenge_angenommen_all',
......
...@@ -233,7 +233,7 @@ describe('VorgangRepository', () => { ...@@ -233,7 +233,7 @@ describe('VorgangRepository', () => {
describe('loadMeineVorgaengeList', () => { describe('loadMeineVorgaengeList', () => {
const vorgangListResource: VorgangListResource = createVorgangListResource(); const vorgangListResource: VorgangListResource = createVorgangListResource();
const apiRootResource: ApiRootResource = createApiRootResource([ApiRootLinkRel.MY_VORGAENGE]); const apiRootResource: ApiRootResource = createApiRootResource([ApiRootLinkRel.MEINE_VORGAENGE]);
beforeEach(() => { beforeEach(() => {
resourceWrapper.get.mockReturnValue(hot('a', { a: vorgangListResource })); resourceWrapper.get.mockReturnValue(hot('a', { a: vorgangListResource }));
...@@ -242,7 +242,7 @@ describe('VorgangRepository', () => { ...@@ -242,7 +242,7 @@ describe('VorgangRepository', () => {
it('should call resourceFactory with uri', () => { it('should call resourceFactory with uri', () => {
repository.loadMeineVorgaengeList(apiRootResource); repository.loadMeineVorgaengeList(apiRootResource);
const urlWithoutParameter: URL = repository.getUrlWithoutParameter(apiRootResource, ApiRootLinkRel.MY_VORGAENGE); const urlWithoutParameter: URL = repository.getUrlWithoutParameter(apiRootResource, ApiRootLinkRel.MEINE_VORGAENGE);
expect(resourceFactory.fromId).toHaveBeenCalledWith(urlWithoutParameter.href); expect(resourceFactory.fromId).toHaveBeenCalledWith(urlWithoutParameter.href);
}) })
......
...@@ -49,7 +49,7 @@ export class VorgangRepository { ...@@ -49,7 +49,7 @@ export class VorgangRepository {
} }
public loadMeineVorgaengeList(apiRootResource: ApiRootResource): Observable<VorgangListResource> { public loadMeineVorgaengeList(apiRootResource: ApiRootResource): Observable<VorgangListResource> {
const url: URL = this.getUrlWithoutParameter(apiRootResource, ApiRootLinkRel.MY_VORGAENGE); const url: URL = this.getUrlWithoutParameter(apiRootResource, ApiRootLinkRel.MEINE_VORGAENGE);
return this.resourceFactory.fromId(url.href).get(); return this.resourceFactory.fromId(url.href).get();
} }
......
...@@ -137,7 +137,7 @@ describe.skip('FIXME: VorgangFilterMenuComponent', () => { ...@@ -137,7 +137,7 @@ describe.skip('FIXME: VorgangFilterMenuComponent', () => {
describe('meine vorgaenge filter item', () => { describe('meine vorgaenge filter item', () => {
it('should show on existing link', () => { it('should show on existing link', () => {
component.apiRootStateResource = createStateResource(createApiRootResource([ApiRootLinkRel.MY_VORGAENGE])); component.apiRootStateResource = createStateResource(createApiRootResource([ApiRootLinkRel.MEINE_VORGAENGE]));
fixture.detectChanges(); fixture.detectChanges();
const element = getElementFromFixture(fixture, meineVorgaengeFilterToggleButton); const element = getElementFromFixture(fixture, meineVorgaengeFilterToggleButton);
......
...@@ -48,6 +48,6 @@ export class VorgangFilterMenuComponent implements OnInit { ...@@ -48,6 +48,6 @@ export class VorgangFilterMenuComponent implements OnInit {
//TODO Test //TODO Test
oneFilterAvailableOnly(): boolean { oneFilterAvailableOnly(): boolean {
return hasLink(this.apiRootStateResource.resource, ApiRootLinkRel.ALLE_VORGAENGE) && hasLink(this.apiRootStateResource.resource, ApiRootLinkRel.MY_VORGAENGE); return hasLink(this.apiRootStateResource.resource, ApiRootLinkRel.ALLE_VORGAENGE) && hasLink(this.apiRootStateResource.resource, ApiRootLinkRel.MEINE_VORGAENGE);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment