Skip to content
Snippets Groups Projects
Verified Commit cce5962d authored by Sebastian Bergandy's avatar Sebastian Bergandy :keyboard:
Browse files

Merge branch 'release-administration'

# Conflicts:
#	alfa-client/apps/admin/package.json
parents bd3b5b66 6c13d99c
No related branches found
No related tags found
No related merge requests found
...@@ -21,11 +21,13 @@ ...@@ -21,11 +21,13 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen * Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { StateResource, createStateResource } from '@alfa-client/tech-shared'; import { ConfigurationLinkRel } from '@admin-client/configuration-shared';
import { StateResource, createStateResource, notHasLink } from '@alfa-client/tech-shared';
import { Mock, mock } from '@alfa-client/test-utils'; import { Mock, mock } from '@alfa-client/test-utils';
import { TestBed } from '@angular/core/testing'; import { TestBed } from '@angular/core/testing';
import { expect } from '@jest/globals';
import { singleCold, singleHot } from 'libs/tech-shared/test/marbles'; import { singleCold, singleHot } from 'libs/tech-shared/test/marbles';
import { Observable } from 'rxjs'; import { Observable, of } from 'rxjs';
import { createConfigurationResource } from '../../test/configuration'; import { createConfigurationResource } from '../../test/configuration';
import { ConfigurationResourceService } from './configuration-resource.service'; import { ConfigurationResourceService } from './configuration-resource.service';
import { ConfigurationResource } from './configuration.model'; import { ConfigurationResource } from './configuration.model';
...@@ -57,8 +59,6 @@ describe('ConfigurationService', () => { ...@@ -57,8 +59,6 @@ describe('ConfigurationService', () => {
configurationResourceService.get = jest.fn().mockReturnValue(singleHot(configurationStateResource)); configurationResourceService.get = jest.fn().mockReturnValue(singleHot(configurationStateResource));
}); });
it('should call resourceService', () => { it('should call resourceService', () => {
configurationResourceService.get = jest.fn();
service.get(); service.get();
expect(configurationResourceService.get).toHaveBeenCalled(); expect(configurationResourceService.get).toHaveBeenCalled();
...@@ -69,5 +69,19 @@ describe('ConfigurationService', () => { ...@@ -69,5 +69,19 @@ describe('ConfigurationService', () => {
expect(loadedConfigurationResource).toBeObservable(singleCold(configurationStateResource)); expect(loadedConfigurationResource).toBeObservable(singleCold(configurationStateResource));
}); });
it('should remove aggregation mappings link', (done) => {
const configurationStateResource: StateResource<ConfigurationResource> = createStateResource(
createConfigurationResource([ConfigurationLinkRel.AGGREGATION_MAPPINGS]),
);
configurationResourceService.get = jest.fn().mockReturnValue(of(configurationStateResource));
const result$: Observable<StateResource<ConfigurationResource>> = service.get();
result$.subscribe((stateResource: StateResource<ConfigurationResource>) => {
expect(notHasLink(stateResource.resource, ConfigurationLinkRel.AGGREGATION_MAPPINGS)).toBe(true);
done();
});
});
}); });
}); });
...@@ -23,8 +23,10 @@ ...@@ -23,8 +23,10 @@
*/ */
import { StateResource } from '@alfa-client/tech-shared'; import { StateResource } from '@alfa-client/tech-shared';
import { inject, Injectable } from '@angular/core'; import { inject, Injectable } from '@angular/core';
import { Observable } from 'rxjs'; import { omit } from 'lodash-es';
import { map, Observable } from 'rxjs';
import { ConfigurationResourceService } from './configuration-resource.service'; import { ConfigurationResourceService } from './configuration-resource.service';
import { ConfigurationLinkRel } from './configuration.linkrel';
import { ConfigurationResource } from './configuration.model'; import { ConfigurationResource } from './configuration.model';
@Injectable() @Injectable()
...@@ -32,6 +34,12 @@ export class ConfigurationService { ...@@ -32,6 +34,12 @@ export class ConfigurationService {
private configurationResourceService = inject(ConfigurationResourceService); private configurationResourceService = inject(ConfigurationResourceService);
public get(): Observable<StateResource<ConfigurationResource>> { public get(): Observable<StateResource<ConfigurationResource>> {
return this.configurationResourceService.get(); return this.configurationResourceService
.get()
.pipe(
map((stateResource: StateResource<ConfigurationResource>) =>
omit(stateResource, `resource._links.${ConfigurationLinkRel.AGGREGATION_MAPPINGS}`),
),
);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment