diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts index 94a1a9bf3c43d2cee972dda608148c2a32e3e6e2..05cdb49a11759ff27dfb90f6754a5285d19e8be2 100644 --- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts +++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts @@ -1,5 +1,14 @@ -import {BinaryFileListResource, BinaryFileResource, BinaryFileService,} from '@alfa-client/binary-file-shared'; -import {CommandOrder, CommandResource, CommandService, CreateCommandProps,} from '@alfa-client/command-shared'; +import { + BinaryFileListResource, + BinaryFileResource, + BinaryFileService, +} from '@alfa-client/binary-file-shared'; +import { + CommandOrder, + CommandResource, + CommandService, + CreateCommandProps, +} from '@alfa-client/command-shared'; import { ApiError, createEmptyStateResource, @@ -9,31 +18,34 @@ import { HttpError, StateResource, } from '@alfa-client/tech-shared'; -import {Mock, mock, useFromMock} from '@alfa-client/test-utils'; +import { Mock, mock, useFromMock } from '@alfa-client/test-utils'; import { VorgangCommandService, VorgangService, VorgangWithEingangLinkRel, VorgangWithEingangResource, } from '@alfa-client/vorgang-shared'; -import {fakeAsync, tick} from '@angular/core/testing'; +import { fakeAsync, tick } from '@angular/core/testing'; import faker from '@faker-js/faker'; -import {getUrl, ResourceUri} from '@ngxp/rest'; -import {cold} from 'jest-marbles'; -import {CommandLinkRel} from 'libs/command-shared/src/lib/command.linkrel'; -import {createApiError} from 'libs/tech-shared/test/error'; -import {createVorgangWithEingangResource} from 'libs/vorgang-shared/test/vorgang'; -import {first, Observable, of} from 'rxjs'; -import {createBinaryFileListResource, createBinaryFileResource,} from '../../../binary-file-shared/test/binary-file'; +import { getUrl, ResourceUri } from '@ngxp/rest'; +import { cold } from 'jest-marbles'; +import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel'; +import { createApiError } from 'libs/tech-shared/test/error'; +import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; +import { first, Observable, of } from 'rxjs'; +import { + createBinaryFileListResource, + createBinaryFileResource, +} from '../../../binary-file-shared/test/binary-file'; import { createCommandErrorResource, createCommandResource, createCommandStateResource, createCreateCommandProps, } from '../../../command-shared/test/command'; -import {ResourceRepository} from '../../../tech-shared/src/lib/resource/resource.repository'; -import {createFile} from '../../../tech-shared/test/file'; -import {singleCold, singleColdCompleted} from '../../../tech-shared/test/marbles'; +import { ResourceRepository } from '../../../tech-shared/src/lib/resource/resource.repository'; +import { createFile } from '../../../tech-shared/test/file'; +import { singleCold, singleColdCompleted } from '../../../tech-shared/test/marbles'; import { createBescheid, createBescheidListResource, @@ -41,9 +53,9 @@ import { createBescheidStateResource, createUploadFileInProgress, } from '../test/bescheid'; -import {createDocumentResource} from '../test/document'; -import {BescheidFacade} from './+state/bescheid.facade'; -import {BescheidLinkRel} from './bescheid.linkrel'; +import { createDocumentResource } from '../test/document'; +import { BescheidFacade } from './+state/bescheid.facade'; +import { BescheidLinkRel } from './bescheid.linkrel'; import { Bescheid, BescheidListResource, @@ -51,9 +63,9 @@ import { BescheidStatus, UploadFileInProgress, } from './bescheid.model'; -import {BescheidService} from './bescheid.service'; -import {DocumentLinkRel} from './document.linkrel'; -import {DocumentResource} from './document.model'; +import { BescheidService } from './bescheid.service'; +import { DocumentLinkRel } from './document.linkrel'; +import { DocumentResource } from './document.model'; import * as DateUtil from '../../../tech-shared/src/lib/date.util'; import * as BescheidUtil from './bescheid.util'; diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts index 196fcb618859aa5d98bd44df93d43383026681b5..38ce18854c95cf7ba67c93836f10d9d02f0d52a7 100644 --- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts +++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts @@ -1,4 +1,8 @@ -import {BinaryFileListLinkRel, BinaryFileResource, BinaryFileService,} from '@alfa-client/binary-file-shared'; +import { + BinaryFileListLinkRel, + BinaryFileResource, + BinaryFileService, +} from '@alfa-client/binary-file-shared'; import { CommandOrder, CommandResource, @@ -27,15 +31,28 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource, } from '@alfa-client/vorgang-shared'; -import {getEmpfaenger} from '@alfa-client/vorgang-shared-ui'; -import {Injectable} from '@angular/core'; -import {getUrl, hasLink, ResourceUri} from '@ngxp/rest'; -import {BehaviorSubject, filter, first, map, Observable, startWith, Subscription, switchMap, tap,} from 'rxjs'; -import {ListResourceServiceConfig, ResourceServiceConfig,} from '../../../tech-shared/src/lib/resource/resource.model'; -import {ResourceRepository} from '../../../tech-shared/src/lib/resource/resource.repository'; -import {ResourceService} from '../../../tech-shared/src/lib/resource/resource.service'; -import {BescheidFacade} from './+state/bescheid.facade'; -import {BescheidLinkRel, BescheidListLinkRel} from './bescheid.linkrel'; +import { getEmpfaenger } from '@alfa-client/vorgang-shared-ui'; +import { Injectable } from '@angular/core'; +import { getUrl, hasLink, ResourceUri } from '@ngxp/rest'; +import { + BehaviorSubject, + filter, + first, + map, + Observable, + startWith, + Subscription, + switchMap, + tap, +} from 'rxjs'; +import { + ListResourceServiceConfig, + ResourceServiceConfig, +} from '../../../tech-shared/src/lib/resource/resource.model'; +import { ResourceRepository } from '../../../tech-shared/src/lib/resource/resource.repository'; +import { ResourceService } from '../../../tech-shared/src/lib/resource/resource.service'; +import { BescheidFacade } from './+state/bescheid.facade'; +import { BescheidLinkRel, BescheidListLinkRel } from './bescheid.linkrel'; import { Bescheid, BescheidListResource, @@ -51,8 +68,8 @@ import { buildSendBescheidCommandProps, buildUpdateBescheidCommandProps, } from './bescheid.util'; -import {DocumentLinkRel} from './document.linkrel'; -import {DocumentResource} from './document.model'; +import { DocumentLinkRel } from './document.linkrel'; +import { DocumentResource } from './document.model'; @Injectable({ providedIn: 'root' }) export class BescheidService { diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts index fab22f1754d3123cafdcf6cadac22f2896de6058..40d01209220acdecb2c4ea14694091f9c1819baf 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts @@ -1,39 +1,32 @@ -import {BescheidService} from '@alfa-client/bescheid-shared'; -import {createEmptyStateResource, createErrorStateResource, createStateResource,} from '@alfa-client/tech-shared'; -import {getElementFromFixture, Mock, mock} from '@alfa-client/test-utils'; -import {VorgangService, VorgangWithEingangLinkRel} from '@alfa-client/vorgang-shared'; -import {EventEmitter} from '@angular/core'; -import {ComponentFixture, TestBed} from '@angular/core/testing'; -import {createApiError} from 'libs/tech-shared/test/error'; -import {MockComponent} from 'ng-mocks'; -import {EMPTY, of} from 'rxjs'; -import {createCommandResource, createCommandStateResource,} from '../../../../../../../command-shared/test/command'; -import {getDataTestIdOf} from '../../../../../../../tech-shared/test/data-test'; -import {singleCold} from '../../../../../../../tech-shared/test/marbles'; -import {createVorgangWithEingangResource} from '../../../../../../../vorgang-shared/test/vorgang'; -import {BescheidenFormService} from '../../bescheiden.formservice'; +import { BescheidService } from '@alfa-client/bescheid-shared'; import { - VorgangDetailBescheidenStepTitleComponent -} from '../vorgang-detail-bescheiden-step-title/vorgang-detail-bescheiden-step-title.component'; + createEmptyStateResource, + createErrorStateResource, + createStateResource, +} from '@alfa-client/tech-shared'; +import { Mock, getElementFromFixture, mock } from '@alfa-client/test-utils'; +import { VorgangService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared'; +import { EventEmitter } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createApiError } from 'libs/tech-shared/test/error'; +import { MockComponent } from 'ng-mocks'; +import { EMPTY, of } from 'rxjs'; import { - VorgangDetailBescheidenWeiterButtonComponent -} from '../vorgang-detail-bescheiden-weiter-button/vorgang-detail-bescheiden-weiter-button.component'; -import { - VorgangDetailBescheidenAntragBescheidenComponent -} from './vorgang-detail-bescheiden-antrag-bescheiden/vorgang-detail-bescheiden-antrag-bescheiden.component'; -import { - VorgangDetailBescheidenBescheidVersendenComponent -} from './vorgang-detail-bescheiden-bescheid-versenden/vorgang-detail-bescheiden-bescheid-versenden.component'; -import { - VorgangDetailBescheidenDokumenteHinzufuegenComponent -} from './vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokumente-hinzufuegen.component'; -import { - VorgangDetailBescheidenStepContentComponent -} from './vorgang-detail-bescheiden-step-content/vorgang-detail-bescheiden-step-content.component'; -import {VorgangDetailBescheidenStepsContentComponent} from './vorgang-detail-bescheiden-steps-content.component'; -import { - VorgangDetailBescheidenUeberspringenButtonComponent -} from './vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component'; + createCommandResource, + createCommandStateResource, +} from '../../../../../../../command-shared/test/command'; +import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test'; +import { singleCold } from '../../../../../../../tech-shared/test/marbles'; +import { createVorgangWithEingangResource } from '../../../../../../../vorgang-shared/test/vorgang'; +import { BescheidenFormService } from '../../bescheiden.formservice'; +import { VorgangDetailBescheidenStepTitleComponent } from '../vorgang-detail-bescheiden-step-title/vorgang-detail-bescheiden-step-title.component'; +import { VorgangDetailBescheidenWeiterButtonComponent } from '../vorgang-detail-bescheiden-weiter-button/vorgang-detail-bescheiden-weiter-button.component'; +import { VorgangDetailBescheidenAntragBescheidenComponent } from './vorgang-detail-bescheiden-antrag-bescheiden/vorgang-detail-bescheiden-antrag-bescheiden.component'; +import { VorgangDetailBescheidenBescheidVersendenComponent } from './vorgang-detail-bescheiden-bescheid-versenden/vorgang-detail-bescheiden-bescheid-versenden.component'; +import { VorgangDetailBescheidenDokumenteHinzufuegenComponent } from './vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokumente-hinzufuegen.component'; +import { VorgangDetailBescheidenStepContentComponent } from './vorgang-detail-bescheiden-step-content/vorgang-detail-bescheiden-step-content.component'; +import { VorgangDetailBescheidenStepsContentComponent } from './vorgang-detail-bescheiden-steps-content.component'; +import { VorgangDetailBescheidenUeberspringenButtonComponent } from './vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component'; describe('VorgangDetailBescheidenStepsContentComponent', () => { let component: VorgangDetailBescheidenStepsContentComponent; diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts index 238618bdcaf0f33603e7a4ac11b446a2d39494e8..b975a59d34756aae9cdff5ab295653ee6dcbe669 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts @@ -1,9 +1,13 @@ -import {hasStateResourceError, HttpError, isLoaded, StateResource} from '@alfa-client/tech-shared'; -import {VorgangService, VorgangWithEingangLinkRel, VorgangWithEingangResource,} from '@alfa-client/vorgang-shared'; -import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {hasLink, Resource} from '@ngxp/rest'; -import {BehaviorSubject, combineLatest, filter, first, map, Observable} from 'rxjs'; -import {BescheidenFormService} from '../../bescheiden.formservice'; +import { HttpError, StateResource, hasStateResourceError, isLoaded } from '@alfa-client/tech-shared'; +import { + VorgangService, + VorgangWithEingangLinkRel, + VorgangWithEingangResource, +} from '@alfa-client/vorgang-shared'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Resource, hasLink } from '@ngxp/rest'; +import { BehaviorSubject, Observable, combineLatest, filter, first, map } from 'rxjs'; +import { BescheidenFormService } from '../../bescheiden.formservice'; @Component({ selector: 'alfa-vorgang-detail-bescheiden-steps-content', diff --git a/alfa-client/libs/vorgang-shared/src/lib/vorgang-command.service.spec.ts b/alfa-client/libs/vorgang-shared/src/lib/vorgang-command.service.spec.ts index 74b14e5bcc9ab95b136a4056811577ead3de303b..448d839c295d4ff6510a02201f7042c4b1adebcb 100644 --- a/alfa-client/libs/vorgang-shared/src/lib/vorgang-command.service.spec.ts +++ b/alfa-client/libs/vorgang-shared/src/lib/vorgang-command.service.spec.ts @@ -21,18 +21,18 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import {CommandOrder, CommandResource} from '@alfa-client/command-shared'; -import {createStateResource, StateResource} from '@alfa-client/tech-shared'; -import {Mock, mock, useFromMock} from '@alfa-client/test-utils'; -import {cold} from 'jest-marbles'; -import {CommandLinkRel} from 'libs/command-shared/src/lib/command.linkrel'; -import {createCommandResource, createCreateCommand} from 'libs/command-shared/test/command'; -import {createVorgangWithEingangResource} from 'libs/vorgang-shared/test/vorgang'; -import {Observable, of} from 'rxjs'; -import {VorgangFacade} from './+state/vorgang.facade'; -import {VorgangCommandService} from './vorgang-command.service'; -import {VorgangWithEingangResource} from './vorgang.model'; -import {VorgangService} from './vorgang.service'; +import { CommandOrder, CommandResource } from '@alfa-client/command-shared'; +import { StateResource, createStateResource } from '@alfa-client/tech-shared'; +import { Mock, mock, useFromMock } from '@alfa-client/test-utils'; +import { cold } from 'jest-marbles'; +import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel'; +import { createCommandResource, createCreateCommand } from 'libs/command-shared/test/command'; +import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; +import { Observable, of } from 'rxjs'; +import { VorgangFacade } from './+state/vorgang.facade'; +import { VorgangCommandService } from './vorgang-command.service'; +import { VorgangWithEingangResource } from './vorgang.model'; +import { VorgangService } from './vorgang.service'; describe('VorgangCommandService', () => { let service: VorgangCommandService; diff --git a/alfa-client/libs/vorgang-shared/src/lib/vorgang-command.service.ts b/alfa-client/libs/vorgang-shared/src/lib/vorgang-command.service.ts index 9c9b08fce6f3878c0d697fc0a410a9bd28adc8bd..d05248034e8bf718d832bb301e99de0f02229cd6 100644 --- a/alfa-client/libs/vorgang-shared/src/lib/vorgang-command.service.ts +++ b/alfa-client/libs/vorgang-shared/src/lib/vorgang-command.service.ts @@ -21,13 +21,17 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import {CommandOrder, CommandResource, tapOnCommandSuccessfullyDone,} from '@alfa-client/command-shared'; -import {isNotNil, StateResource} from '@alfa-client/tech-shared'; -import {Injectable} from '@angular/core'; -import {filter, Observable} from 'rxjs'; -import {VorgangFacade} from './+state/vorgang.facade'; -import {VorgangWithEingangResource} from './vorgang.model'; -import {VorgangService} from './vorgang.service'; +import { + CommandOrder, + CommandResource, + tapOnCommandSuccessfullyDone, +} from '@alfa-client/command-shared'; +import { StateResource, isNotNil } from '@alfa-client/tech-shared'; +import { Injectable } from '@angular/core'; +import { Observable, filter } from 'rxjs'; +import { VorgangFacade } from './+state/vorgang.facade'; +import { VorgangWithEingangResource } from './vorgang.model'; +import { VorgangService } from './vorgang.service'; import { createAbschliessenCommand, createAnnehmenCommand,