Merge branch 'main' into chore/semantic-interactive-elements

Author: Cathy0123456789

src/main/java/de/tum/cit/aet/core/util/PDFBuilder.java

@@ -16,6 +16,7 @@
 import com.itextpdf.layout.Canvas;
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.borders.Border;
+import com.itextpdf.layout.element.AbstractElement;
 import com.itextpdf.layout.element.Cell;
 import com.itextpdf.layout.element.Div;
 import com.itextpdf.layout.element.IBlockElement;
@@ -26,7 +27,10 @@
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Table;
 import com.itextpdf.layout.element.Text;
+import com.itextpdf.layout.font.FontProvider;
+import com.itextpdf.layout.font.FontSet;
 import com.itextpdf.layout.properties.HorizontalAlignment;
+import com.itextpdf.layout.properties.Property;
 import com.itextpdf.layout.properties.TextAlignment;
 import com.itextpdf.layout.properties.UnitValue;
 import de.tum.cit.aet.core.exception.PDFGenerationException;
@@ -58,6 +62,9 @@ public class PDFBuilder {
     private static final DeviceRgb PRIMARY_COLOR = new DeviceRgb(0x18, 0x72, 0xDD);
     private static final DeviceRgb METADATA_COLOR = new DeviceRgb(0x8d, 0x8d, 0x8f);
 
+    // Reused across exports so converted HTML uses the same Helvetica font as the rest of the document.
+    private static final FontProvider HTML_FONT_PROVIDER = createHelveticaFontProvider();
+
     // ----------------- Font Sizes -----------------
     private static final float FONT_SIZE_MAIN_HEADING = 18f;
 
@@ -517,18 +524,52 @@ private void addMetadata(PdfDocument pdfDoc, PdfFont normalFont) {
         }
     }
 
+    /**
+     * Creates a font provider exposing only the Helvetica family (regular, bold, italic and
+     * bold-italic) with Helvetica as the default family, so HTML conversion stays on a single font.
+     *
+     * @return a font provider limited to the Helvetica family
+     */
+    private static FontProvider createHelveticaFontProvider() {
+        FontSet fontSet = new FontSet();
+        fontSet.addFont(StandardFonts.HELVETICA);
+        fontSet.addFont(StandardFonts.HELVETICA_BOLD);
+        fontSet.addFont(StandardFonts.HELVETICA_OBLIQUE);
+        fontSet.addFont(StandardFonts.HELVETICA_BOLDOBLIQUE);
+        return new FontProvider(fontSet, StandardFonts.HELVETICA);
+    }
+
+    /**
+     * Drops the font sizes the HTML converter resolved onto nested elements so that they inherit the
+     * size set on the surrounding block instead. Converted bold and italic runs carry their own font
+     * size, which would otherwise take precedence and render them larger than the text around them.
+     * Their font is deliberately kept, since that is what selects the bold or italic Helvetica variant.
+     *
+     * @param element the converted element whose descendants should inherit the block font size
+     */
+    private static void clearNestedFontSizes(IElement element) {
+        if (element instanceof AbstractElement<?> abstractElement) {
+            for (IElement child : abstractElement.getChildren()) {
+                child.deleteOwnProperty(Property.FONT_SIZE);
+                clearNestedFontSizes(child);
+            }
+        }
+    }
+
     private List<IBlockElement> parseHtmlContent(String html, PdfFont normalFont) {
         List<IBlockElement> elements = new ArrayList<>();
 
         try {
             String processedHtml = html.replaceAll("<ol>", "<ul>").replaceAll("</ol>", "</ul>");
 
             ConverterProperties props = new ConverterProperties();
+            props.setFontProvider(HTML_FONT_PROVIDER);
 
             List<IElement> pdfElements = HtmlConverter.convertToElements(processedHtml, props);
 
             for (IElement element : pdfElements) {
                 if (element instanceof IBlockElement blockElement) {
+                    clearNestedFontSizes(blockElement);
                     if (blockElement instanceof Paragraph) {
                         ((Paragraph) blockElement).setFont(normalFont)
                             .setFontSize(FONT_SIZE_TEXT)

src/main/webapp/app/app.config.ts

@@ -61,6 +61,9 @@ export const appConfig: ApplicationConfig = {
     provideAppInitializer(initializePrimeNgI18n),
     provideZonelessChangeDetection(),
     provideRouter(routes, withRouterConfig({ onSameUrlNavigation: 'reload' })),
+    // PrimeNG still drives its overlay and dialog animations through this provider, so it cannot be
+    // dropped for animate.enter/animate.leave until PrimeNG stops depending on it.
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
     provideAnimations(),
     providePrimeNG({
       theme: {

src/main/webapp/app/application/all-applications/all-applications-page.component.ts

@@ -1,3 +1,4 @@
+import { hasText } from 'app/shared/util/text.util';
 import { Component, TemplateRef, computed, inject, signal, viewChild } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
 import { TableLazyLoadEvent } from 'primeng/table';
@@ -295,15 +296,15 @@ export class AllApplicationsPageComponent {
   /** Confirms the delete dialog and dispatches the delete request. */
   async onConfirmDelete(): Promise<void> {
     const id = this.currentApplicationId();
-    if (id !== undefined && id !== '') {
+    if (hasText(id)) {
       await this.onDeleteApplication(id);
     }
   }
 
   /** Confirms the withdraw dialog and dispatches the withdraw request. */
   async onConfirmWithdraw(): Promise<void> {
     const id = this.currentApplicationId();
-    if (id !== undefined && id !== '') {
+    if (hasText(id)) {
       await this.onWithdrawApplication(id);
     }
   }
@@ -336,7 +337,7 @@ export class AllApplicationsPageComponent {
         list
           .map(u => ({
             id: u.userId ?? '',
-            name: [u.firstName, u.lastName].filter(p => p !== undefined && p !== '').join(' '),
+            name: [u.firstName, u.lastName].filter(p => hasText(p)).join(' '),
           }))
           .filter(o => o.id !== '' && o.name !== ''),
       );

src/main/webapp/app/application/application-creation/application-creation-form/application-creation-form.component.ts

@@ -1,3 +1,4 @@
+import { hasText } from 'app/shared/util/text.util';
 import { Component, TemplateRef, computed, effect, inject, signal, untracked, viewChild } from '@angular/core';
 import { ProgressStepperComponent, StepData } from 'app/shared/components/molecules/progress-stepper/progress-stepper.component';
 import { Location } from '@angular/common';
@@ -448,7 +449,7 @@ export default class ApplicationCreationFormComponent {
       } catch (error) {
         const httpError = error as HttpErrorResponse;
         this.showInitErrorMessage(`${applyflow}.loadFailed`);
-        throw new Error(`Init failed with HTTP ${httpError.status} ${httpError.statusText}: ${httpError.message}`);
+        throw new Error(`Init failed with HTTP ${httpError.status}: ${httpError.message}`);
       }
     }
   }
@@ -637,7 +638,7 @@ export default class ApplicationCreationFormComponent {
     // Bail here too so we don't try to create or migrate an application against
     // an unauthenticated session (which would fire "Session expired" toasts).
     const userId = this.accountService.loadedUser()?.id;
-    if (!userId) {
+    if (!hasText(userId)) {
       return;
     }
 

src/main/webapp/app/application/application-creation/application-creation-page1/application-creation-page1.component.ts

@@ -1,3 +1,4 @@
+import { hasText } from 'app/shared/util/text.util';
 import { Component, computed, effect, inject, input, model, output, signal } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -264,19 +265,19 @@ export default class ApplicationCreationPage1Component {
 
     form.patchValue(patch);
 
-    if (!this.data().gender && extractedData.gender) {
+    if (!this.data().gender && hasText(extractedData.gender)) {
       const match = selectGender.find(g => g.value === extractedData.gender);
       if (match) this.updateSelect('gender', match);
     }
-    if (!this.data().nationality && extractedData.nationality) {
+    if (!this.data().nationality && hasText(extractedData.nationality)) {
       const match = selectNationality.find(n => n.value === extractedData.nationality);
       if (match) this.updateSelect('nationality', match);
     }
-    if (!this.data().country && extractedData.country) {
+    if (!this.data().country && hasText(extractedData.country)) {
       const match = selectCountries.find(c => c.value === extractedData.country);
       if (match) this.updateSelect('country', match);
     }
-    if (!this.data().dateOfBirth && extractedData.dateOfBirth) {
+    if (!hasText(this.data().dateOfBirth) && hasText(extractedData.dateOfBirth)) {
       this.setDateOfBirth(extractedData.dateOfBirth);
     }
 

src/main/webapp/app/application/application-creation/application-creation-references/application-creation-references.component.ts

@@ -1,3 +1,4 @@
+import { hasText } from 'app/shared/util/text.util';
 import { Component, computed, effect, inject, input, output, signal } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -123,7 +124,7 @@ export default class ApplicationCreationReferencesComponent {
    */
   async onSubmit(): Promise<void> {
     const currentId = this.editingId();
-    if (currentId !== undefined && currentId !== '') {
+    if (hasText(currentId)) {
       await this.onUpdate();
     } else {
       await this.onAdd();
@@ -161,7 +162,7 @@ export default class ApplicationCreationReferencesComponent {
    */
   async onUpdate(): Promise<void> {
     const id = this.editingId();
-    if (id === undefined || id === '') return;
+    if (!hasText(id)) return;
     if (this.addForm.invalid) {
       this.addForm.markAllAsTouched();
       return;
@@ -185,7 +186,7 @@ export default class ApplicationCreationReferencesComponent {
    * @param reference the referee entry to edit
    */
   onEdit(reference: ReferenceRequestDTO): void {
-    if (reference.referenceRequestId === undefined || reference.referenceRequestId === '') return;
+    if (!hasText(reference.referenceRequestId)) return;
     this.selectedTitleOption.set(this.titleOptions.find(option => option.value === reference.title));
     this.addForm.reset({
       title: reference.title ?? '',
@@ -210,7 +211,7 @@ export default class ApplicationCreationReferencesComponent {
    * @param reference the referee entry to remove
    */
   async onRemove(reference: ReferenceRequestDTO): Promise<void> {
-    if (reference.referenceRequestId === undefined || reference.referenceRequestId === '') return;
+    if (!hasText(reference.referenceRequestId)) return;
     this.loading.set(true);
     try {
       await firstValueFrom(this.referenceApi.remove(this.applicationId(), reference.referenceRequestId));

src/main/webapp/app/application/application-detail-for-applicant/application-detail-for-applicant.component.ts

@@ -26,6 +26,7 @@ import { ReferenceRequestDTO } from 'app/generated/model/reference-request-dto';
 import { ReferenceAssessmentSectionComponent } from 'app/shared/components/molecules/reference-assessment-section/reference-assessment-section.component';
 import LocalizedDatePipe from 'app/shared/pipes/localized-date.pipe';
 import { TagComponent } from 'app/shared/components/atoms/tag/tag.component';
+import { hasText } from 'app/shared/util/text.util';
 
 import ApplicationCreationReferencesComponent from '../application-creation/application-creation-references/application-creation-references.component';
 import { ApplicationStateForApplicantsComponent } from '../application-state-for-applicants/application-state-for-applicants.component';
@@ -114,7 +115,7 @@ export default class ApplicationDetailForApplicantComponent {
     if (this.previewDetailData()) return false;
     const app = this.application();
     if (!app || (app.referenceLettersRequired ?? 0) <= 0) return false;
-    if (app.jobEndDate) {
+    if (hasText(app.jobEndDate)) {
       const endDate = new Date(app.jobEndDate);
       endDate.setHours(23, 59, 59, 999);
       if (endDate < new Date()) {
@@ -145,10 +146,10 @@ export default class ApplicationDetailForApplicantComponent {
    */
   submittedReferenceLetters = computed(() =>
     this.references()
-      .filter(reference => !!reference.documentId)
+      .filter(reference => hasText(reference.documentId))
       .map(reference => ({
         documentId: reference.documentId,
-        refereeName: [reference.firstName, reference.lastName].filter(part => !!part).join(' '),
+        refereeName: [reference.firstName, reference.lastName].filter(part => hasText(part)).join(' '),
         viewerInput: {
           id: reference.documentId as string,
           name: `${reference.firstName ?? ''} ${reference.lastName ?? ''}`.trim(),
@@ -238,10 +239,10 @@ export default class ApplicationDetailForApplicantComponent {
     this.currentLang();
     const applicant = this.application()?.applicant;
     const grade = applicant?.bachelorGrade;
-    if (!grade) return '-';
+    if (applicant === undefined || !hasText(grade)) return '-';
 
     const limits = { upperLimit: applicant.bachelorGradeUpperLimit, lowerLimit: applicant.bachelorGradeLowerLimit };
-    if (!limits.upperLimit || !limits.lowerLimit) return grade;
+    if (!hasText(limits.upperLimit) || !hasText(limits.lowerLimit)) return grade;
 
     const scale =
       '(' +
@@ -258,10 +259,10 @@ export default class ApplicationDetailForApplicantComponent {
     this.currentLang();
     const applicant = this.application()?.applicant;
     const grade = applicant?.masterGrade;
-    if (!grade) return '-';
+    if (applicant === undefined || !hasText(grade)) return '-';
 
     const limits = { upperLimit: applicant.masterGradeUpperLimit, lowerLimit: applicant.masterGradeLowerLimit };
-    if (!limits.upperLimit || !limits.lowerLimit) return grade;
+    if (!hasText(limits.upperLimit) || !hasText(limits.lowerLimit)) return grade;
 
     const scale =
       '(' +
@@ -393,7 +394,7 @@ export default class ApplicationDetailForApplicantComponent {
 
   onViewJobDetails(): void {
     const jobIdValue = this.application()?.jobId;
-    if (jobIdValue !== undefined && jobIdValue !== '') {
+    if (hasText(jobIdValue)) {
       void this.router.navigate(['/job/detail', jobIdValue]);
     } else {
       this.toastService.showErrorKey(`${this.translationKey}.jobIdNotAvailable`);

src/main/webapp/app/config/language.helper.ts

@@ -21,7 +21,7 @@ export class JhiLanguageHelper {
   constructor() {
     const rootRenderer = inject(RendererFactory2);
 
-    this._language = new BehaviorSubject<string>(this.translateService.currentLang);
+    this._language = new BehaviorSubject<string>(this.translateService.getCurrentLang());
     this.renderer = rootRenderer.createRenderer(document.querySelector('html'), null);
     this.init();
   }
@@ -46,8 +46,8 @@ export class JhiLanguageHelper {
   updateTitle(titleKey?: string): void {
     titleKey ??= this.getPageTitle(this.router.routerState.snapshot.root);
 
-    this.translateService.get(titleKey).subscribe(title => {
-      if (title) {
+    this.translateService.get(titleKey).subscribe((title: unknown) => {
+      if (typeof title === 'string' && title !== '') {
         this.titleService.setTitle(title);
       }
     });
@@ -88,11 +88,11 @@ export class JhiLanguageHelper {
 
   private init(): void {
     this.translateService.onLangChange.subscribe(() => {
-      const languageKey = this.translateService.currentLang;
+      const languageKey = this.translateService.getCurrentLang();
       this._language.next(languageKey);
       this.localeConversionService.locale = languageKey;
       sessionStorage.setItem('locale', languageKey);
-      this.renderer.setAttribute(document.querySelector('html'), 'lang', this.translateService.currentLang);
+      this.renderer.setAttribute(document.querySelector('html'), 'lang', this.translateService.getCurrentLang());
       this.updateTitle();
     });
   }

src/main/webapp/app/core/auth/auth-orchestrator.service.ts

@@ -141,7 +141,7 @@ export class AuthOrchestratorService {
       this.setIfPresent(prefill.firstName, value => this.firstName.set(value));
       this.setIfPresent(prefill.lastName, value => this.lastName.set(value));
     }
-    if (opts?.redirectUri) this.redirectUri.set(opts.redirectUri);
+    if (opts?.redirectUri !== undefined && opts.redirectUri !== '') this.redirectUri.set(opts.redirectUri);
 
     // choose sensible starting substates
     if (this.mode() === 'login') {
@@ -167,7 +167,7 @@ export class AuthOrchestratorService {
 
     try {
       this.onSuccessCb?.();
-      if (targetUrl) {
+      if (targetUrl !== null && targetUrl !== '') {
         const path = targetUrl.startsWith(window.location.origin) ? targetUrl.slice(window.location.origin.length) : targetUrl;
         void this.router.navigateByUrl(path);
       }

src/main/webapp/app/core/auth/has-any-authority.directive.ts

@@ -19,7 +19,7 @@ import { AccountService } from 'app/core/auth/account.service';
 export default class HasAnyAuthorityDirective {
   public roles = input<string | string[]>([], { alias: 'jhiHasAnyAuthority' });
 
-  private readonly templateRef = inject(TemplateRef<any>);
+  private readonly templateRef = inject(TemplateRef<unknown>);
   private readonly viewContainerRef = inject(ViewContainerRef);
 
   private embeddedViewCreated = false;