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

Merge branch 'master' into OZG-5789-fix-required

parents 8aa6e5a9 5991d1c5
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<alfa-vorgang-detail-bescheiden-antrag-bescheiden></alfa-vorgang-detail-bescheiden-antrag-bescheiden> <alfa-vorgang-detail-bescheiden-antrag-bescheiden></alfa-vorgang-detail-bescheiden-antrag-bescheiden>
<alfa-vorgang-detail-bescheiden-weiter-button <alfa-vorgang-detail-bescheiden-weiter-button
(clickEmitter)="changeActiveStep(2)" (clickEmitter)="changeActiveStep(2)"
[submitResource]="submitResource"
></alfa-vorgang-detail-bescheiden-weiter-button> ></alfa-vorgang-detail-bescheiden-weiter-button>
</alfa-vorgang-detail-bescheiden-step-content> </alfa-vorgang-detail-bescheiden-step-content>
...@@ -22,6 +23,7 @@ ...@@ -22,6 +23,7 @@
></alfa-vorgang-detail-bescheiden-dokumente-hinzufuegen> ></alfa-vorgang-detail-bescheiden-dokumente-hinzufuegen>
<alfa-vorgang-detail-bescheiden-weiter-button <alfa-vorgang-detail-bescheiden-weiter-button
(clickEmitter)="changeActiveStep(3)" (clickEmitter)="changeActiveStep(3)"
[submitResource]="submitResource"
></alfa-vorgang-detail-bescheiden-weiter-button> ></alfa-vorgang-detail-bescheiden-weiter-button>
</alfa-vorgang-detail-bescheiden-step-content> </alfa-vorgang-detail-bescheiden-step-content>
......
import { HttpError, StateResource, hasStateResourceError, isLoaded } from '@alfa-client/tech-shared'; import {
HttpError,
StateResource,
createEmptyStateResource,
hasStateResourceError,
isLoaded,
} from '@alfa-client/tech-shared';
import { import {
VorgangService, VorgangService,
VorgangWithEingangLinkRel, VorgangWithEingangLinkRel,
...@@ -6,7 +12,7 @@ import { ...@@ -6,7 +12,7 @@ import {
} from '@alfa-client/vorgang-shared'; } from '@alfa-client/vorgang-shared';
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { Resource, hasLink } from '@ngxp/rest'; import { Resource, hasLink } from '@ngxp/rest';
import { BehaviorSubject, Observable, combineLatest, filter, first, map } from 'rxjs'; import { BehaviorSubject, Observable, combineLatest, filter, first, map, tap } from 'rxjs';
import { BescheidenFormService } from '../../bescheiden.formservice'; import { BescheidenFormService } from '../../bescheiden.formservice';
@Component({ @Component({
...@@ -24,6 +30,8 @@ export class VorgangDetailBescheidenStepsContentComponent implements OnInit { ...@@ -24,6 +30,8 @@ export class VorgangDetailBescheidenStepsContentComponent implements OnInit {
showBescheidErstellungUeberspringen$: Observable<boolean>; showBescheidErstellungUeberspringen$: Observable<boolean>;
submitResource: StateResource<Resource | HttpError> = createEmptyStateResource();
constructor( constructor(
private readonly vorgangService: VorgangService, private readonly vorgangService: VorgangService,
private formService: BescheidenFormService, private formService: BescheidenFormService,
...@@ -45,7 +53,11 @@ export class VorgangDetailBescheidenStepsContentComponent implements OnInit { ...@@ -45,7 +53,11 @@ export class VorgangDetailBescheidenStepsContentComponent implements OnInit {
if (this.canChangeTo(step)) { if (this.canChangeTo(step)) {
this.formService this.formService
.submit() .submit()
.pipe(filter(this.noError), first()) .pipe(
tap((resource: StateResource<Resource | HttpError>) => (this.submitResource = resource)),
filter(this.noError),
first(),
)
.subscribe(() => { .subscribe(() => {
this.formService.setActiveStep(step); this.formService.setActiveStep(step);
this.activeStepChange.emit(step); this.activeStepChange.emit(step);
......
<ods-button <ods-button-with-spinner
*ngIf="showButton$ | async" *ngIf="showButton$ | async"
(clickEmitter)="clickEmitter.emit()" (clickEmitter)="clickEmitter.emit()"
[stateResource]="submitResource"
variant="primary" variant="primary"
size="medium" size="medium"
class="mt-8 flex" class="mt-8 flex"
dataTestId="bescheid-weiter-button" dataTestId="bescheid-weiter-button"
text="Weiter" text="Weiter"
> >
</ods-button> </ods-button-with-spinner>
import { BescheidLinkRel, BescheidService } from '@alfa-client/bescheid-shared'; import { BescheidLinkRel, BescheidService } from '@alfa-client/bescheid-shared';
import { isLoaded } from '@alfa-client/tech-shared'; import {
HttpError,
StateResource,
createEmptyStateResource,
isLoaded,
} from '@alfa-client/tech-shared';
import { VorgangService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared'; import { VorgangService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { hasLink } from '@ngxp/rest'; import { Resource, hasLink } from '@ngxp/rest';
import { Observable, filter, map, merge } from 'rxjs'; import { Observable, filter, map, merge } from 'rxjs';
import { BescheidenFormService } from '../../bescheiden.formservice'; import { BescheidenFormService } from '../../bescheiden.formservice';
...@@ -11,6 +16,7 @@ import { BescheidenFormService } from '../../bescheiden.formservice'; ...@@ -11,6 +16,7 @@ import { BescheidenFormService } from '../../bescheiden.formservice';
templateUrl: './vorgang-detail-bescheiden-weiter-button.component.html', templateUrl: './vorgang-detail-bescheiden-weiter-button.component.html',
}) })
export class VorgangDetailBescheidenWeiterButtonComponent implements OnInit { export class VorgangDetailBescheidenWeiterButtonComponent implements OnInit {
@Input() submitResource: StateResource<Resource | HttpError> = createEmptyStateResource();
@Output() clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>(); @Output() clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>();
showButton$: Observable<boolean>; showButton$: Observable<boolean>;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment