diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index 906adbe4de50ee5216a8b908af46f6cf40b27a54..05098bc162d6dc85dea6ed29bf72c71bdfd75616 100644 --- a/alfa-client/apps/alfa-e2e/Jenkinsfile +++ b/alfa-client/apps/alfa-e2e/Jenkinsfile @@ -759,8 +759,12 @@ Map createUserFromFixture(Map userFixture) { String getKeycloakAccessToken(String realm) { def userManagerApiUserCredentials = getUserManagerApiUserCredentials(realm) + echo "Keycloak ApiUser Credentials: " + userManagerApiUserCredentials + def token = readJSON text: sh (script: "set +x && curl -d \"client_id=admin-cli\" -d \"username=${userManagerApiUserCredentials.user}\" -d \"password=${userManagerApiUserCredentials.password}\" -d \"grant_type=password\" https://$SSO_URL/realms/$realm/protocol/openid-connect/token", returnStdout: true) + echo "Keycloak Access Token: " + token + return token.access_token } diff --git a/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html b/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html index e388209e45c11042ef2e4440a6fc77438c1dac01..ceefda1d6518547a8bfa71029b54a97835a028c6 100644 --- a/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html +++ b/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html @@ -23,7 +23,7 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<mat-form-field class="compact-input" appearance="{{appearance}}" [floatLabel]="readOnly || autoFocus ? 'always' : 'auto'"> +<mat-form-field [subscriptSizing]="subscriptSizing" class="compact-input" appearance="{{appearance}}" [floatLabel]="readOnly || autoFocus ? 'always' : 'auto'"> <mat-label>{{ label }}</mat-label> <div class="wrapper"> <input #inputElement @@ -34,7 +34,8 @@ [readonly]="readOnly" (blur)="touch()" [attr.data-test-id]="(label | convertForDataTest) + '-text-input'" - [class.with-clear-button]="showClearButton$ | async"/> + [class.with-clear-button]="showClearButton$ | async" + /> <button *ngIf="showClearButton$ | async" data-test-id="clear-button" class="clear-button" diff --git a/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts index 310f29a6c72c14d9e8dbcac23a9e91c63856c504..615d7c06fa01f92bb5a5d4f55e58046ce186b5ec 100644 --- a/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts +++ b/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts @@ -75,4 +75,8 @@ describe('TextEditorComponent', () => { expect(element).toBeInstanceOf(HTMLElement); }) + + it('should use fixed subscription sizing by default', () => { + expect(component.subscriptSizing).toBe('fixed'); + }) }); diff --git a/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts b/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts index cb875a8cc96b268a2e6af8c92ba2b46eaf37b395..c122ccd41cd214b7f1ef71951cd754de4284b8e0 100644 --- a/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts +++ b/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts @@ -24,7 +24,8 @@ import { AfterViewInit, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component'; import { map, Observable, startWith } from 'rxjs'; -import { hasContent, isNotEmpty } from '@alfa-client/tech-shared'; +import { hasContent } from '@alfa-client/tech-shared'; +import { SubscriptSizing } from '@angular/material/form-field'; @Component({ selector: 'ozgcloud-text-editor', @@ -43,6 +44,7 @@ export class TextEditorComponent extends FormControlEditorAbstractComponent impl @Input() readOnly: boolean; @Input() autoFocus: boolean; @Input() clearable = false; + @Input() subscriptSizing: SubscriptSizing = 'fixed'; showClearButton$: Observable<boolean>; diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.html b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.html index 04b5d3b4d8a9937a86f6aeabdc6d337ddd102941..7b4d7ee0b95c53eda80ee0857dbee378a3496067 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.html +++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.html @@ -11,6 +11,7 @@ [autoFocus]="true" [clearable]="true" appearance="outline" + subscriptSizing="dynamic" [formControlName]="AktenzeichenEditDialogFormservice.AKTENZEICHEN_FIELD"> </ozgcloud-text-editor> <ozgcloud-paste-text-button diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.scss b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.scss index 3b176140eb99b79b51c4f56011c62915fe36ef43..f67885ca50275fbb4a3688b94aaa492489c0a092 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.scss +++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.scss @@ -6,10 +6,6 @@ ::ng-deep mat-form-field { width: 100%; } - - ::ng-deep .mat-mdc-form-field-subscript-wrapper { - display: none; - } } .content { @@ -17,7 +13,7 @@ grid-template-columns: min-content auto min-content; grid-column-gap: 0.5rem; grid-row-gap: 0.25rem; - align-items: center; + align-items: flex-start; grid-template-areas: 'az_icon az_text paste_icon' '. hinweis .'; @@ -26,6 +22,7 @@ .az_icon { grid-area: az_icon; color: #c2c2c2; + margin-top: 12px; &--active { color: black; diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts index 805a7000f8fe83343363df5b8b1251ace28d3094..ec7e7523996fd573684ca23be443e92bd5685150 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts @@ -4,11 +4,10 @@ import { AktenzeichenEditDialogData } from './aktenzeichen-edit-dialog.data'; import { AktenzeichenEditDialogFormservice } from './aktenzeichen-edit-dialog.formservice'; import { VorgangService, VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; import { COMMAND_ERROR_MESSAGES, CommandResource, hasError, isSuccessfulDone } from '@alfa-client/command-shared'; -import { createEmptyStateResource, hasContent, isClipboardReadSupported, isNotNull, StateResource } from '@alfa-client/tech-shared'; -import { filter, map, Observable, of, startWith, tap } from 'rxjs'; +import { createEmptyStateResource, hasContent, isClipboardReadSupported, StateResource } from '@alfa-client/tech-shared'; +import { map, Observable, of, startWith, tap } from 'rxjs'; import { SnackBarService } from '@alfa-client/ui'; import { AktenzeichenEditDialogMessages } from './aktenzeichen-edit-dialog.message'; -import { trim } from 'lodash-es'; @Component({ selector: 'alfa-aktenzeichen-edit-dialog',