diff --git a/Jenkinsfile b/Jenkinsfile
index 188ba7e807fb9de9bdfd85559ee2148de507f587..44c34113a1aebaf8ba252f30bf6bd3b9068c9b0a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
pipeline {
agent {
node {
- label 'ozgcloud-jenkins-build-agent'
+ label 'ozgcloud-jenkins-build-agent-jdk21'
}
}
diff --git a/alfa-client/apps/alfa/src/index.html b/alfa-client/apps/alfa/src/index.html
index d7173d85eabb61e97dee0175289b9a1d829e002c..16aee06887f34bb45d1e96bb205cb0e6569314ea 100644
--- a/alfa-client/apps/alfa/src/index.html
+++ b/alfa-client/apps/alfa/src/index.html
@@ -37,7 +37,7 @@
<meta name="msapplication-TileColor" content="#ffffff" />
<meta name="theme-color" content="#ffffff" />
</head>
- <body class="mat-typography mat-app-background">
+ <body class="mat-app-background">
<alfa-root></alfa-root>
</body>
</html>
diff --git a/alfa-client/libs/postfach-shared/src/lib/+state/postfach.facade.ts b/alfa-client/libs/postfach-shared/src/lib/+state/postfach.facade.ts
index 423bbc52e53864dd9638e3eefa0de63edc984476..56950c2a7e0a3ea85cee1f71151156a13f72d3de 100644
--- a/alfa-client/libs/postfach-shared/src/lib/+state/postfach.facade.ts
+++ b/alfa-client/libs/postfach-shared/src/lib/+state/postfach.facade.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Injectable } from '@angular/core';
import {
BinaryFileListResource,
DownloadBinaryFileAsPdfAction,
@@ -33,6 +32,7 @@ import {
formatFullDateWithoutSeperator,
} from '@alfa-client/tech-shared';
import { VorgangHeaderLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store';
import { TypedAction } from '@ngrx/store/src/models';
import { getUrl } from '@ngxp/rest';
diff --git a/alfa-client/libs/postfach-shared/src/lib/postfach-shared.module.ts b/alfa-client/libs/postfach-shared/src/lib/postfach-shared.module.ts
index 696d8e73eb29d91eda23cc828b950f0f2a615508..d8f2355dde1b6ab424dbb3c22b412578acb0916d 100644
--- a/alfa-client/libs/postfach-shared/src/lib/postfach-shared.module.ts
+++ b/alfa-client/libs/postfach-shared/src/lib/postfach-shared.module.ts
@@ -21,14 +21,15 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { CommandSharedModule } from '@alfa-client/command-shared';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-import { CommandSharedModule } from '@alfa-client/command-shared';
import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { PostfachEffects } from './+state/postfach.effects';
import { PostfachFacade } from './+state/postfach.facade';
import * as fromPostfach from './+state/postfach.reducer';
+import { PostfachService } from './postfach.service';
@NgModule({
imports: [
@@ -37,6 +38,6 @@ import * as fromPostfach from './+state/postfach.reducer';
StoreModule.forFeature(fromPostfach.POSTFACH_FEATURE_KEY, fromPostfach.postfachReducer),
EffectsModule.forFeature([PostfachEffects]),
],
- providers: [PostfachFacade],
+ providers: [PostfachFacade, PostfachService],
})
export class PostfachSharedModule {}
diff --git a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
index 11fbbb1192c2ce1dc78f5dab641bcd950c83c521..2ac92221cab36de52d7ea812a75a5a965f9346a1 100644
--- a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
+++ b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
@@ -21,9 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { Params } from '@angular/router';
import {
BinaryFileListResource,
BinaryFileResource,
@@ -49,6 +46,9 @@ import {
} from '@alfa-client/tech-shared';
import { SnackBarService } from '@alfa-client/ui';
import { VorgangResource, VorgangService } from '@alfa-client/vorgang-shared';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { Params } from '@angular/router';
import { Resource, hasLink } from '@ngxp/rest';
import { isNil, isNull } from 'lodash-es';
import { BehaviorSubject, Observable, Subscription, combineLatest } from 'rxjs';
@@ -66,7 +66,7 @@ import {
import { PostfachRepository } from './postfach.repository';
import { createResendPostfachMailCommand, createSendPostfachMailCommand } from './postfach.util';
-@Injectable({ providedIn: 'root' })
+@Injectable()
export class PostfachService {
private readonly isPollSendPostachMail: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(
false,
diff --git a/alfa-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page.component.html b/alfa-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page.component.html
index 4d848b64c1635755aaab25f123bb5c3b0635c56a..8c220b59d27e750b5a1256abdfd85aaae346a9d6 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page.component.html
+++ b/alfa-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page.component.html
@@ -23,7 +23,7 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<ozgcloud-subnavigation class="mat-app-background">
+<ozgcloud-subnavigation class="mat-typography mat-app-background">
<ozgcloud-back-button linkTo="../" label="zurück zur Detailseite"></ozgcloud-back-button>
</ozgcloud-subnavigation>
diff --git a/alfa-client/libs/postfach/src/lib/postfach.module.ts b/alfa-client/libs/postfach/src/lib/postfach.module.ts
index 1b0f9765cb98a7faa8149301820e1841ae20ac4b..9717e23709dbf15d6db239f6695f2c0d372219a1 100644
--- a/alfa-client/libs/postfach/src/lib/postfach.module.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach.module.ts
@@ -21,15 +21,14 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
import { BinaryFileModule } from '@alfa-client/binary-file';
import { ON_PAGE, PostfachSharedModule } from '@alfa-client/postfach-shared';
import { UiModule } from '@alfa-client/ui';
import { UserProfileModule } from '@alfa-client/user-profile';
-import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
import { VorgangSharedUiModule } from '@alfa-client/vorgang-shared-ui';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
import { PostfachMailButtonContainerComponent } from './postfach-mail-button-container/postfach-mail-button-container.component';
import { PostfachMailButtonComponent } from './postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component';
import { PostfachMailFormComponent } from './postfach-mail-form/postfach-mail-form.component';
@@ -66,7 +65,6 @@ const routes: Routes = [
UiModule,
PostfachSharedModule,
UserProfileModule,
- VorgangSharedModule,
VorgangSharedUiModule,
BinaryFileModule,
],
diff --git a/alfa-client/libs/ui/src/lib/ui/expansion-panel/_expansion-panel.theme.scss b/alfa-client/libs/ui/src/lib/ui/expansion-panel/_expansion-panel.theme.scss
index b95454800cbbf5eb92398084d7be20d6ca75019a..6847720e6a809da6652b2ae2a87c87f9ccf04a48 100644
--- a/alfa-client/libs/ui/src/lib/ui/expansion-panel/_expansion-panel.theme.scss
+++ b/alfa-client/libs/ui/src/lib/ui/expansion-panel/_expansion-panel.theme.scss
@@ -33,7 +33,7 @@
}
}
-body.mat-typography ozgcloud-expansion-panel {
+ozgcloud-expansion-panel {
.mat-expansion-panel-header {
padding: 0 !important;
height: 44px !important;
@@ -49,31 +49,9 @@ body.mat-typography ozgcloud-expansion-panel {
.mat-expansion-panel-body {
padding: 0 0 16px 56px;
}
-
- ozgcloud-expansion-panel {
- .mat-expansion-panel-header {
- height: 40px !important;
- }
-
- h3 {
- color: inherit;
- font-size: 14px !important;
- font-weight: 500 !important;
- margin-left: 0;
- }
-
- .mat-expansion-panel-header-title {
- flex-direction: row-reverse;
- justify-content: flex-end;
- }
-
- .mat-expansion-panel-body {
- padding: 0 0 0 16px;
- }
- }
}
-body.mat-typography alfa-expansion-panel-with-user {
+alfa-expansion-panel-with-user {
.mat-expansion-panel-body {
padding: 0 0 0 32px;
}
diff --git a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog-data.model.ts b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog-data.model.ts
index b755995e474367de8a0577a906ab513f138f19f5..ccf3c423b1017e6826a87fa78689baa6422bc2c4 100644
--- a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog-data.model.ts
+++ b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog-data.model.ts
@@ -22,10 +22,8 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { ComponentType } from '@angular/cdk/overlay';
-import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
export interface FixedDialogData {
title: string;
component: ComponentType<any>;
- vorgang?: VorgangWithEingangResource;
}
diff --git a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
index 6d9eec3a38b16fa8e90bd04175723a58d22e1523..0ff50af07391474da47596ab15c768a47986cea4 100644
--- a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
+++ b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
@@ -21,9 +21,8 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Component, Inject, Injectable, Injector } from '@angular/core';
+import { Component, Inject, Injector } from '@angular/core';
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { FixedDialogData } from './fixed-dialog-data.model';
@Component({
@@ -40,12 +39,7 @@ export class FixedDialogComponent {
injector: Injector,
) {
this.componentInjector = Injector.create({
- providers: [
- {
- provide: InjectedVorgangInDialog,
- useValue: new InjectedVorgangInDialog(this.data.vorgang),
- },
- ],
+ providers: [],
parent: injector,
});
}
@@ -54,8 +48,3 @@ export class FixedDialogComponent {
this.isMinimized = !this.isMinimized;
}
}
-
-@Injectable()
-export class InjectedVorgangInDialog {
- constructor(public vorgang: VorgangWithEingangResource) {}
-}
diff --git a/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings-container.component.html b/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings-container.component.html
index c970ebd39aad35cca530c1ea2bf79d1930522b89..9d321332c8895df4b94c7d2b8cc199a5a0bbbfe2 100644
--- a/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings-container.component.html
+++ b/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings-container.component.html
@@ -23,4 +23,4 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<alfa-user-settings [apiRoot]="apiRoot$ | async"></alfa-user-settings>
+<alfa-user-settings [apiRoot]="apiRoot$ | async" class="mat-typography"></alfa-user-settings>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
index 3c820672488e582afcb3d2cd8712563e4fe4d9c3..72bfd21b396ee6aa3c84a13a7c2da8a649c0d448 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
@@ -29,6 +29,7 @@
<div class="container">
<alfa-vorgang-detail-header
[vorgangWithEingang]="vorgangResource"
+ class="mat-typography"
data-test-id="vorgang-detail-header"
></alfa-vorgang-detail-header>
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-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.html 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-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.html
index 5d788111718efb024b7d0b2f3009ac6775878a11..89bf93f75125bcf5c2b11e8c7c629e1c115b75f7 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-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.html
+++ 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-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.html
@@ -1,3 +1,3 @@
-<button (click)="onClick()" class="select-none text-left text-primary hover:underline">
+<button (click)="onClick()" class="mt-6 select-none text-left text-primary hover:underline">
Bescheiderstellung überspringen<br />und abschließen
</button>
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-ueberspringen-dialog/vorgang-detail-bescheiden-ueberspringen-dialog.component.html 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-ueberspringen-dialog/vorgang-detail-bescheiden-ueberspringen-dialog.component.html
index 44ed66ec4fb5b61351fd96a932edab83973d7eda..139987fb5a4e780c246223705e18399108b6c264 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-ueberspringen-dialog/vorgang-detail-bescheiden-ueberspringen-dialog.component.html
+++ 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-ueberspringen-dialog/vorgang-detail-bescheiden-ueberspringen-dialog.component.html
@@ -1,25 +1,40 @@
-<div class="bg-background-200">
- <button (click)="onClose()">
+<div class="relative m-6 max-w-2xl rounded-lg bg-white p-6 shadow-xl">
+ <button
+ class="absolute right-4 top-4 flex size-12 items-center justify-center rounded-full hover:bg-background-100"
+ (click)="onClose()"
+ >
<mat-icon>close</mat-icon>
</button>
- <h1>Bescheiderstellung überspringen</h1>
- <p>
- Soll die Bescheiderstellung übersprungen und der Vorgang direkt in den Status Abgeschlossen
- gesetzt werden?
- </p>
- <ozgcloud-stroked-button-with-spinner
- (click)="onConfirm()"
- data-test-id="bescheiderstellung-ueberspringen-und-vorgang-abschliessen-dialog"
- text="Überspringen und abschließen"
- type="submit"
- [stateResource]="bescheiderstellungUeberspringen$ | async"
- >
- </ozgcloud-stroked-button-with-spinner>
- <ozgcloud-stroked-button-with-spinner
- (click)="onCancel()"
- data-test-id="bescheiderstellung-ueberspringen-und-vorgang-abschliessen-dialog"
- text="Abbrechen"
- type="submit"
- >
- </ozgcloud-stroked-button-with-spinner>
+
+ <div class="flex flex-col gap-6">
+ <div>
+ <h4 class="text-lg font-medium text-primary">Bescheiderstellung überspringen</h4>
+ </div>
+ <div class="grow">
+ <p class="text-base">
+ Soll die Bescheiderstellung übersprungen und der Vorgang direkt in den Status Abgeschlossen
+ gesetzt werden?
+ </p>
+ </div>
+ <div class="flex gap-4">
+ <ozgcloud-stroked-button-with-spinner
+ (click)="onConfirm()"
+ data-test-id="bescheiderstellung-ueberspringen-und-vorgang-abschliessen-dialog"
+ text="Überspringen und abschließen"
+ type="submit"
+ icon="check"
+ [stateResource]="bescheiderstellungUeberspringen$ | async"
+ >
+ </ozgcloud-stroked-button-with-spinner>
+ <ozgcloud-stroked-button-with-spinner
+ (click)="onCancel()"
+ data-test-id="bescheiderstellung-ueberspringen-und-vorgang-abschliessen-dialog"
+ text="Abbrechen"
+ color=""
+ icon="clear"
+ type="submit"
+ >
+ </ozgcloud-stroked-button-with-spinner>
+ </div>
+ </div>
</div>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html
index 73a496083b822f8f6debca5fc54711cd9066032b..1e513746896629e14bbfaca4d97b8dc0d4e3834f 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-page.component.html
@@ -24,7 +24,7 @@
-->
<ng-container *ngIf="vorgangStateResource$ | async as vorgangStateResource">
- <ozgcloud-subnavigation class="mat-app-background">
+ <ozgcloud-subnavigation class="mat-typography mat-app-background">
<alfa-vorgang-detail-back-button-container></alfa-vorgang-detail-back-button-container>
<alfa-vorgang-detail-action-buttons
[vorgangWithEingang]="vorgangStateResource.resource"
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-status-text/vorgang-status-text.component.html b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-status-text/vorgang-status-text.component.html
index 49696ce3d838c9e0190c52e1a2e380e12864af4d..696169f3474d0aacf9feb45c554a25d291b979fd 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-status-text/vorgang-status-text.component.html
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-status-text/vorgang-status-text.component.html
@@ -23,6 +23,6 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<div class="status-name" data-test-id="vorgang-status-text">
+<div class="status-name text-sm" data-test-id="vorgang-status-text">
{{ status | enumToLabel: vorgangStatusLabel }}
</div>
diff --git a/alfa-client/libs/vorgang-shared/src/lib/vorgang-shared.module.ts b/alfa-client/libs/vorgang-shared/src/lib/vorgang-shared.module.ts
index bd174181a92a6f388285f69b90633265699066e5..6864db1c3577759b52a27f8df8d12ea58d57c8f5 100644
--- a/alfa-client/libs/vorgang-shared/src/lib/vorgang-shared.module.ts
+++ b/alfa-client/libs/vorgang-shared/src/lib/vorgang-shared.module.ts
@@ -21,14 +21,13 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
import { BinaryFileSharedModule } from '@alfa-client/binary-file-shared';
import { CommandSharedModule } from '@alfa-client/command-shared';
import { NavigationSharedModule } from '@alfa-client/navigation-shared';
-import { PostfachSharedModule } from '@alfa-client/postfach-shared';
import { TechSharedModule } from '@alfa-client/tech-shared';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { RestModule } from '@ngxp/rest';
@@ -45,7 +44,6 @@ import * as fromVorgang from './+state/vorgang.reducer';
TechSharedModule,
CommandSharedModule,
BinaryFileSharedModule,
- PostfachSharedModule,
RouterModule,
StoreModule.forFeature(fromVorgang.VORGANG_FEATURE_KEY, fromVorgang.reducer),
EffectsModule.forFeature([VorgangEffects]),
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.scss b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.scss
index d39ab32c6e605324286c3b4dae3c994647abb8cb..6c7fa289dd4c2ad29c245a1ed62fcb2fcde2f91d 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.scss
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.scss
@@ -35,6 +35,7 @@
gap: 8px;
align-items: center;
padding: 16px 24px;
+ font-size: 14px;
.status {
grid-area: status;
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/_vorgang-filter-item.theme.scss b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/_vorgang-filter-item.theme.scss
index 48ef0d6830ef721386845fc09f7143e3648123f4..b30526d2948a0fcf1e0ddfa018ae3e1f7469eae7 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/_vorgang-filter-item.theme.scss
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/_vorgang-filter-item.theme.scss
@@ -30,6 +30,7 @@ alfa-vorgang-filter-menu {
justify-content: space-between;
gap: 0.5rem;
height: 2rem;
+ font-size: 14px;
mat-icon {
display: none;
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-page.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-page.component.html
index 446fa38d1702e33b0714444d9c4c63c0082a297e..612c4524067db2d4d7d4d0f312029a33e79603ed 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-page.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-page.component.html
@@ -24,7 +24,10 @@
-->
<ozgcloud-spinner [stateResource]="wiedervorlageStateResource">
- <ozgcloud-subnavigation data-test-id="subnavigation-wiedervorlage" class="mat-app-background">
+ <ozgcloud-subnavigation
+ data-test-id="subnavigation-wiedervorlage"
+ class="mat-typography mat-app-background"
+ >
<alfa-wiedervorlage-action-buttons [wiedervorlage]="wiedervorlageStateResource.resource">
</alfa-wiedervorlage-action-buttons>
</ozgcloud-subnavigation>
diff --git a/alfa-server/pom.xml b/alfa-server/pom.xml
index eda3946052b903b1166816beb5cfba4c3aedc3e4..dedd615e42812369f504d31c950a724870fa2e59 100644
--- a/alfa-server/pom.xml
+++ b/alfa-server/pom.xml
@@ -62,10 +62,6 @@
<profile>local</profile>
<profile>remotekc</profile>
</profiles>
- <!-- remove it when using spring-boot 3.2 -->
- <image>
- <builder>paketobuildpacks/builder-jammy-base</builder>
- </image>
<docker>
<publishRegistry>
<username>${docker-username}</username>
@@ -89,8 +85,8 @@
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
+ <groupId>io.github.git-commit-id</groupId>
+ <artifactId>git-commit-id-maven-plugin</artifactId>
</plugin>
<plugin>
diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index 8e0ba5597280596e8136d67133bd29f5a984e00a..a80ce1ad1dc25d5da13094959cae6191fb4ed239 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -66,6 +66,10 @@
<groupId>net.devh</groupId>
<artifactId>grpc-client-spring-boot-starter</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-inprocess</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
@@ -193,8 +197,8 @@
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
+ <groupId>io.github.git-commit-id</groupId>
+ <artifactId>git-commit-id-maven-plugin</artifactId>
</plugin>
<plugin>
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResource.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResource.java
index a21c59cc4c11eaf4abe3d1d38ebd7873e41e62db..08615fe9043884dd030a5951c3806e2230c9c7b9 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResource.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedResource.java
@@ -29,6 +29,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.springframework.core.annotation.AliasFor;
+
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -46,5 +48,6 @@ public @interface LinkedResource {
Class<? extends IdExtractor<Object>> extractor() default ToStringExtractor.class;
+ @AliasFor(annotation = JsonDeserialize.class, attribute = "builder")
Class<? extends ObjectBuilder<Object>> builder() default IdBuilder.class;
}
\ No newline at end of file
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResource.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResource.java
index 7e89890f0d9011774b5360c2059efd83740c2f88..8fb44821adea17398a89f6be15ffea31549dc490 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResource.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/LinkedUserProfileResource.java
@@ -29,6 +29,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.springframework.core.annotation.AliasFor;
+
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -44,5 +46,6 @@ public @interface LinkedUserProfileResource {
Class<? extends IdExtractor<Object>> extractor() default ToStringExtractor.class;
+ @AliasFor(annotation = JsonDeserialize.class, attribute = "builder")
Class<? extends ObjectBuilder<Object>> builder() default IdBuilder.class;
}
diff --git a/pom.xml b/pom.xml
index abe84bef639fda890da5c7a371243f6ab58e73bb..dfddfa5256d2280e00dba0f4534565269fb3e37f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>de.ozgcloud.alfa</groupId>