From 08582d4956259ca26811c8fea052cbb3dc455581 Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Wed, 16 Apr 2025 08:51:58 +0200
Subject: [PATCH] merge hot fix into main and revert change
Revert hot fix in main. On dev should work the version without this
change. The correct implementation will be done on backend later on.
---
.../src/lib/configuration.service.spec.ts | 19 ++-----------------
.../src/lib/configuration.service.ts | 12 ++----------
2 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/alfa-client/libs/admin/configuration-shared/src/lib/configuration.service.spec.ts b/alfa-client/libs/admin/configuration-shared/src/lib/configuration.service.spec.ts
index 74a49865e3..f80fb1636d 100644
--- a/alfa-client/libs/admin/configuration-shared/src/lib/configuration.service.spec.ts
+++ b/alfa-client/libs/admin/configuration-shared/src/lib/configuration.service.spec.ts
@@ -21,13 +21,12 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ConfigurationLinkRel } from '@admin-client/configuration-shared';
-import { StateResource, createStateResource, notHasLink } from '@alfa-client/tech-shared';
+import { StateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock } from '@alfa-client/test-utils';
import { TestBed } from '@angular/core/testing';
import { expect } from '@jest/globals';
import { singleCold, singleHot } from 'libs/tech-shared/test/marbles';
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs';
import { createConfigurationResource } from '../../test/configuration';
import { ConfigurationResourceService } from './configuration-resource.service';
import { ConfigurationResource } from './configuration.model';
@@ -69,19 +68,5 @@ describe('ConfigurationService', () => {
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();
- });
- });
});
});
diff --git a/alfa-client/libs/admin/configuration-shared/src/lib/configuration.service.ts b/alfa-client/libs/admin/configuration-shared/src/lib/configuration.service.ts
index 5a180123d6..1a1b763736 100644
--- a/alfa-client/libs/admin/configuration-shared/src/lib/configuration.service.ts
+++ b/alfa-client/libs/admin/configuration-shared/src/lib/configuration.service.ts
@@ -23,10 +23,8 @@
*/
import { StateResource } from '@alfa-client/tech-shared';
import { inject, Injectable } from '@angular/core';
-import { omit } from 'lodash-es';
-import { map, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
import { ConfigurationResourceService } from './configuration-resource.service';
-import { ConfigurationLinkRel } from './configuration.linkrel';
import { ConfigurationResource } from './configuration.model';
@Injectable()
@@ -34,12 +32,6 @@ export class ConfigurationService {
private configurationResourceService = inject(ConfigurationResourceService);
public get(): Observable<StateResource<ConfigurationResource>> {
- return this.configurationResourceService
- .get()
- .pipe(
- map((stateResource: StateResource<ConfigurationResource>) =>
- omit(stateResource, `resource._links.${ConfigurationLinkRel.AGGREGATION_MAPPINGS}`),
- ),
- );
+ return this.configurationResourceService.get();
}
}
--
GitLab