Merge pull request 'OZG-6497-Postfach-Signatur-speichern' (#755) from...

Merge pull request 'OZG-6497-Postfach-Signatur-speichern' (#755) from OZG-6497-Postfach-Signatur-speichern into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/755


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

alfa-client/libs/admin-settings/src/lib/user/user.service.spec.ts → alfa-client/libs/admin/settings/src/lib/user/user.service.spec.ts

 import { mock, Mock, useFromMock } from '@alfa-client/test-utils';
 import { fakeAsync, tick } from '@angular/core/testing';
 import { cold } from 'jest-marbles';
+import { singleCold } from 'libs/tech-shared/test/marbles';
 import { firstValueFrom, lastValueFrom, Observable, of } from 'rxjs';
-import { singleCold } from '../../../../tech-shared/test/marbles';
 import {
   createOrganisationseinheit,
   createOrganisationseinheitState,

alfa-client/libs/admin-settings/test/admin-settings.ts → alfa-client/libs/admin/settings/test/admin-settings.ts

 import { Resource } from '@ngxp/rest';
-import { toResource } from '../../tech-shared/test/resource';
+import { toResource } from '../../../tech-shared/test/resource';
 import { SettingListLinkRel } from '../src/lib/admin-settings.linkrel';
 import { SettingItemResource, SettingListResource } from '../src/lib/admin-settings.model';
 

alfa-client/libs/admin-settings/test/configuration/configuration.ts → alfa-client/libs/admin/settings/test/configuration/configuration.ts

-import { toResource } from '../../../tech-shared/test/resource';
+import { toResource } from 'libs/tech-shared/test/resource';
 import { ConfigurationLinkRel } from '../../src/lib/configuration/configuration.linkrel';
 import { ConfigurationResource } from '../../src/lib/configuration/configuration.model';
 

alfa-client/libs/admin-settings/test/postfach/postfach.ts → alfa-client/libs/admin/settings/test/postfach/postfach.ts

 import faker from '@faker-js/faker';
-import { toResource } from '../../../tech-shared/test/resource';
+import { toResource } from 'libs/tech-shared/test/resource';
 import { SettingItemResource, SettingName } from '../../src/lib/admin-settings.model';
 import {
   Postfach,

alfa-client/libs/admin-settings/tsconfig.json → alfa-client/libs/admin/settings/tsconfig.json

 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "files": [],
   "include": [],
   "references": [

alfa-client/libs/admin-settings/tsconfig.lib.json → alfa-client/libs/admin/settings/tsconfig.lib.json

 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "declaration": true,
     "declarationMap": true,
     "inlineSources": true,

alfa-client/libs/admin-settings/tsconfig.spec.json → alfa-client/libs/admin/settings/tsconfig.spec.json

 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "module": "commonjs",
     "types": ["jest", "node"],
     "target": "ES2022",

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.ts

 import { Collaboration, CollaborationListResource } from '@alfa-client/collaboration-shared';
 import { CommandResource, tapOnCommandSuccessfullyDone } from '@alfa-client/command-shared';
-import { HttpError, StateResource, createEmptyStateResource } from '@alfa-client/tech-shared';
+import { StateResource, createEmptyStateResource } from '@alfa-client/tech-shared';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { Observable, of } from 'rxjs';
 import { CollaborationRequestFormService } from './collaboration.request.formservice';
@@ -20,7 +20,7 @@ export class CollaborationRequestFormComponent {
     this.formService.setListResource(collaborationListResource);
   }
 
-  public submitInProgress$: Observable<StateResource<CommandResource | HttpError>> = of(
+  public submitInProgress$: Observable<StateResource<CommandResource>> = of(
     createEmptyStateResource<CommandResource>(),
   );
 

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts

 import { CollaborationListResource } from '@alfa-client/collaboration-shared';
 import { CommandResource } from '@alfa-client/command-shared';
-import { HttpError, StateResource, createStateResource } from '@alfa-client/tech-shared';
+import { StateResource, createStateResource } from '@alfa-client/tech-shared';
 import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
 import { UntypedFormBuilder } from '@angular/forms';
 import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service';
@@ -48,8 +48,7 @@ describe('CollaborationRequestFormService', () => {
     });
 
     it('should return stateCommandResource', () => {
-      const response$: Observable<StateResource<CommandResource | HttpError>> =
-        formService.submit();
+      const response$: Observable<StateResource<CommandResource>> = formService.submit();
 
       expect(response$).toBeObservable(singleColdCompleted(stateCommandResource));
     });