Skip to content
Snippets Groups Projects
Commit d45d0e34 authored by Martin's avatar Martin
Browse files

OZG-6185 remove dead code

parent 942653db
Branches
Tags
1 merge request!71Ozg 6185 adjust styling
...@@ -22,13 +22,22 @@ ...@@ -22,13 +22,22 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { BescheidWizardContainerComponent } from '@alfa-client/bescheid'; import { BescheidWizardContainerComponent } from '@alfa-client/bescheid';
import { BescheidResource, BescheidService, BescheidWizardDialogResult } from '@alfa-client/bescheid-shared'; import { BescheidWizardDialogResult } from '@alfa-client/bescheid-shared';
import { CommandResource } from '@alfa-client/command-shared'; import { CommandResource } from '@alfa-client/command-shared';
import { createEmptyStateResource, createStateResource, HasLinkPipe, StateResource } from '@alfa-client/tech-shared'; import { createEmptyStateResource, createStateResource, HasLinkPipe, StateResource } from '@alfa-client/tech-shared';
import { createDialogRefMock, DialogRefMock, getElementComponentFromFixtureByCss, getMockComponent, Mock, mock, notExistsAsHtmlElement, tooltipExistsWithText, triggerEvent, } from '@alfa-client/test-utils'; import {
createDialogRefMock,
DialogRefMock,
getElementComponentFromFixtureByCss,
getMockComponent,
Mock,
mock,
notExistsAsHtmlElement,
tooltipExistsWithText,
triggerEvent,
} from '@alfa-client/test-utils';
import { OzgcloudDialogService } from '@alfa-client/ui'; import { OzgcloudDialogService } from '@alfa-client/ui';
import { BescheidenDialogData } from '@alfa-client/vorgang-detail'; import { VorgangCommandService, VorgangService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { VorgangCommandService, VorgangService, VorgangWithEingangLinkRel, VorgangWithEingangResource, } from '@alfa-client/vorgang-shared';
import { DialogRef } from '@angular/cdk/dialog'; import { DialogRef } from '@angular/cdk/dialog';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component'; import { ButtonWithSpinnerComponent } from '@ods/component';
...@@ -38,7 +47,6 @@ import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; ...@@ -38,7 +47,6 @@ import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { Observable, of } from 'rxjs'; import { Observable, of } from 'rxjs';
import { createBescheidResource } from '../../../../../bescheid-shared/src/test/bescheid';
import { VorgangDetailBescheidenComponent } from '../../vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component'; import { VorgangDetailBescheidenComponent } from '../../vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component';
import { BescheidenButtonComponent } from './bescheiden-button.component'; import { BescheidenButtonComponent } from './bescheiden-button.component';
...@@ -51,7 +59,6 @@ describe('BescheidenButtonComponent', () => { ...@@ -51,7 +59,6 @@ describe('BescheidenButtonComponent', () => {
let vorgangCommandService: Mock<VorgangCommandService>; let vorgangCommandService: Mock<VorgangCommandService>;
let ozgcloudDialogService: Mock<OzgcloudDialogService>; let ozgcloudDialogService: Mock<OzgcloudDialogService>;
let bescheidService: Mock<BescheidService>;
let vorgangService: Mock<VorgangService>; let vorgangService: Mock<VorgangService>;
const dialogRef = <DialogRef<VorgangDetailBescheidenComponent>>{}; const dialogRef = <DialogRef<VorgangDetailBescheidenComponent>>{};
...@@ -59,7 +66,6 @@ describe('BescheidenButtonComponent', () => { ...@@ -59,7 +66,6 @@ describe('BescheidenButtonComponent', () => {
beforeEach(() => { beforeEach(() => {
vorgangCommandService = mock(VorgangCommandService); vorgangCommandService = mock(VorgangCommandService);
ozgcloudDialogService = mock(OzgcloudDialogService); ozgcloudDialogService = mock(OzgcloudDialogService);
bescheidService = mock(BescheidService);
vorgangService = mock(VorgangService); vorgangService = mock(VorgangService);
}); });
...@@ -81,10 +87,6 @@ describe('BescheidenButtonComponent', () => { ...@@ -81,10 +87,6 @@ describe('BescheidenButtonComponent', () => {
provide: OzgcloudDialogService, provide: OzgcloudDialogService,
useValue: ozgcloudDialogService, useValue: ozgcloudDialogService,
}, },
{
provide: BescheidService,
useValue: bescheidService,
},
{ {
provide: VorgangService, provide: VorgangService,
useValue: vorgangService, useValue: vorgangService,
...@@ -210,84 +212,6 @@ describe('BescheidenButtonComponent', () => { ...@@ -210,84 +212,6 @@ describe('BescheidenButtonComponent', () => {
}); });
}); });
describe('openBescheidDialogWithNewDraft', () => {
it('should open wizard', () => {
component.vorgang = createVorgangWithEingangResource();
component.openDialog = jest.fn();
component.openBescheidDialogWithNewDraft();
expect(component.openDialog).toHaveBeenCalledWith({
vorgangWithEingangResource: component.vorgang,
bescheidDraftResource: null,
});
});
});
describe('openBescheidenDialogWithExistingDraft', () => {
const bescheidDraftResource: BescheidResource = createBescheidResource();
const bescheidDraftStateResource: StateResource<BescheidResource> = createStateResource(bescheidDraftResource);
const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource([
VorgangWithEingangLinkRel.BESCHEID_DRAFT,
]);
beforeEach(() => {
component.vorgang = vorgangWithEingangResource;
bescheidService.getBescheidDraftIfExists.mockReturnValue(of(bescheidDraftStateResource));
});
it('should open wizard if bescheid draft loaded', () => {
component.openBescheidenDialogWithExistingDraft();
expect(ozgcloudDialogService.openWizard).toHaveBeenCalledWith(VorgangDetailBescheidenComponent, {
bescheidDraftResource,
vorgangWithEingangResource,
});
});
it('should not open wizard if bescheid draft not loaded', () => {
bescheidService.getBescheidDraftIfExists.mockReturnValue(of(createEmptyStateResource()));
component.openBescheidenDialogWithExistingDraft();
expect(ozgcloudDialogService.openWizard).not.toHaveBeenCalled();
});
it('should not open wizard on loading bescheid draft', () => {
bescheidService.getBescheidDraftIfExists.mockReturnValue(
of({ ...createStateResource(createBescheidResource()), loading: true }),
);
component.openBescheidenDialogWithExistingDraft();
expect(ozgcloudDialogService.openWizard).not.toHaveBeenCalled();
});
});
describe('openDialog', () => {
const bescheidDraftResource: BescheidResource = createBescheidResource();
const bescheidDraftStateResource: StateResource<BescheidResource> = createStateResource(bescheidDraftResource);
const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource([
VorgangWithEingangLinkRel.BESCHEID_DRAFT,
]);
const dialogData: BescheidenDialogData = {
bescheidDraftResource: bescheidDraftResource,
vorgangWithEingangResource: vorgangWithEingangResource,
};
beforeEach(() => {
component.vorgang = vorgangWithEingangResource;
bescheidService.getBescheidDraftIfExists.mockReturnValue(of(bescheidDraftStateResource));
});
it('should call ozgcloudDialogService.openWizard', () => {
component.openDialog(dialogData);
expect(ozgcloudDialogService.openWizard).toHaveBeenCalledWith(VorgangDetailBescheidenComponent, dialogData);
});
});
describe('handleBescheidWizardClosed', () => { describe('handleBescheidWizardClosed', () => {
it('should reload current vorgang', () => { it('should reload current vorgang', () => {
component.handleBescheidWizardClosed({ reloadVorgang: true }); component.handleBescheidWizardClosed({ reloadVorgang: true });
......
...@@ -22,17 +22,21 @@ ...@@ -22,17 +22,21 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { BescheidWizardContainerComponent } from '@alfa-client/bescheid'; import { BescheidWizardContainerComponent } from '@alfa-client/bescheid';
import { BescheidResource, BescheidService, BescheidWizardDialogResult } from '@alfa-client/bescheid-shared'; import { BescheidWizardDialogResult } from '@alfa-client/bescheid-shared';
import { CommandResource } from '@alfa-client/command-shared'; import { CommandResource } from '@alfa-client/command-shared';
import { createEmptyStateResource, isLoaded, isNotNil, StateResource } from '@alfa-client/tech-shared'; import { createEmptyStateResource, isNotNil, StateResource } from '@alfa-client/tech-shared';
import { OzgcloudDialogService } from '@alfa-client/ui'; import { OzgcloudDialogService } from '@alfa-client/ui';
import { VorgangCommandService, VorgangService, VorgangWithEingangLinkRel, VorgangWithEingangResource, } from '@alfa-client/vorgang-shared'; import {
VorgangCommandService,
VorgangService,
VorgangWithEingangLinkRel,
VorgangWithEingangResource,
} from '@alfa-client/vorgang-shared';
import { DialogRef } from '@angular/cdk/dialog'; import { DialogRef } from '@angular/cdk/dialog';
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { hasLink } from '@ngxp/rest'; import { hasLink } from '@ngxp/rest';
import { filter, first, map, Observable, of } from 'rxjs'; import { Observable, of } from 'rxjs';
import { BescheidenDialogData } from '../../vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.model'; import { BescheidenDialogData } from '../../vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.model';
import { VorgangDetailBescheidenComponent } from '../../vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component';
@Component({ @Component({
selector: 'alfa-bescheiden-button', selector: 'alfa-bescheiden-button',
...@@ -61,7 +65,6 @@ export class BescheidenButtonComponent implements OnInit { ...@@ -61,7 +65,6 @@ export class BescheidenButtonComponent implements OnInit {
private vorgangCommandService: VorgangCommandService, private vorgangCommandService: VorgangCommandService,
private vorgangService: VorgangService, private vorgangService: VorgangService,
private ozgcloudDialogService: OzgcloudDialogService, private ozgcloudDialogService: OzgcloudDialogService,
private bescheidService: BescheidService,
) {} ) {}
ngOnInit(): void { ngOnInit(): void {
...@@ -98,38 +101,4 @@ export class BescheidenButtonComponent implements OnInit { ...@@ -98,38 +101,4 @@ export class BescheidenButtonComponent implements OnInit {
this.vorgangService.reloadCurrentVorgang(); this.vorgangService.reloadCurrentVorgang();
} }
} }
openBescheidenDialogWithExistingDraft(): void {
this.bescheidService
.getBescheidDraftIfExists()
.pipe(
filter(isLoaded),
first(),
map((stateResource: StateResource<BescheidResource>) => stateResource.resource),
)
.subscribe((bescheidDraftResource: BescheidResource) => {
const dialogData: BescheidenDialogData = {
bescheidDraftResource,
vorgangWithEingangResource: this.vorgang,
};
this.openDialog(dialogData);
});
}
openBescheidDialogWithNewDraft(): void {
const dialogData: BescheidenDialogData = {
bescheidDraftResource: null,
vorgangWithEingangResource: this.vorgang,
};
this.openDialog(dialogData);
}
openDialog(dialogData: BescheidenDialogData): void {
this.ozgcloudDialogService.openWizard<VorgangDetailBescheidenComponent, BescheidenDialogData>(
VorgangDetailBescheidenComponent,
dialogData,
);
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment