Skip to content
Snippets Groups Projects
Commit 1f1db299 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5009 refactor for PR

parent db210f44
Branches
Tags
No related merge requests found
......@@ -30,9 +30,9 @@ import {
VorgangWithEingangLinkRel,
VorgangWithEingangResource,
} from '@alfa-client/vorgang-shared';
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { hasLink } from '@ngxp/rest';
import { filter, first, map, Observable, of, Subscription } from 'rxjs';
import { filter, first, map, Observable, of } from 'rxjs';
import { BescheidenDialogData } from '../../vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.model';
import { VorgangDetailBescheidenComponent } from '../../vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component';
......@@ -41,7 +41,7 @@ import { VorgangDetailBescheidenComponent } from '../../vorgang-detail-page/vorg
templateUrl: './bescheiden-button.component.html',
styleUrls: ['./bescheiden-button.component.scss'],
})
export class BescheidenButtonComponent implements OnInit, OnDestroy {
export class BescheidenButtonComponent implements OnInit {
@Input() vorgang: VorgangWithEingangResource;
@Input() showAsIconButton: boolean = false;
......@@ -51,8 +51,6 @@ export class BescheidenButtonComponent implements OnInit, OnDestroy {
readonly linkRel = VorgangWithEingangLinkRel;
private subscription: Subscription;
constructor(
private vorgangCommandService: VorgangCommandService,
private ozgcloudDialogService: OzgcloudDialogService,
......@@ -63,12 +61,6 @@ export class BescheidenButtonComponent implements OnInit, OnDestroy {
this.commandStateResource$ = this.vorgangCommandService.getBeschiedenCommand();
}
ngOnDestroy(): void {
if (this.subscription && !this.subscription.closed) {
this.subscription.unsubscribe();
}
}
public onClickHandler(): void {
if (hasLink(this.vorgang, VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT)) {
this.openBescheidenWizard();
......
......@@ -5,10 +5,10 @@ import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import { UntypedFormBuilder } from '@angular/forms';
import { cold } from 'jest-marbles';
import { of } from 'rxjs';
import { createBescheid } from '../../../../../bescheid-shared/src/test/bescheid';
import { BescheidenFormService } from './bescheiden.formservice';
import { createVorgangWithEingangResource } from '../../../../../vorgang-shared/test/vorgang';
import { of } from 'rxjs';
import { BescheidenFormService } from './bescheiden.formservice';
registerLocaleData(localeDe);
......@@ -128,4 +128,14 @@ describe('BescheidenFormServiceService', () => {
expect(bescheidCommand$).toBeObservable(cold('(a|)', { a: bescheidCommandStateResource }));
});
});
describe('setVorgangWithEingangResource', () => {
it('should set vorgangWithEingangResource', () => {
const vorgangWithEingangResource = createVorgangWithEingangResource();
service.setVorgangWithEingangResource(vorgangWithEingangResource);
expect(service.vorgangWithEingangResource).toBe(vorgangWithEingangResource);
});
});
});
import { Bescheid, BescheidService } from '@alfa-client/bescheid-shared';
import {
AbstractFormService,
StateResource,
asBoolean,
formatForDatabase,
StateResource,
} from '@alfa-client/tech-shared';
import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { Injectable } from '@angular/core';
import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { isNil } from 'lodash-es';
import { BehaviorSubject, map, Observable, startWith } from 'rxjs';
import { BehaviorSubject, Observable, map, startWith } from 'rxjs';
@Injectable()
export class BescheidenFormService extends AbstractFormService {
......@@ -19,7 +19,7 @@ export class BescheidenFormService extends AbstractFormService {
public readonly bescheidChanges$: BehaviorSubject<Bescheid>;
private vorgangWithEingangResource: VorgangWithEingangResource;
vorgangWithEingangResource: VorgangWithEingangResource;
constructor(
formBuilder: UntypedFormBuilder,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment