generator-jhipster 8.3.0 → 8.5.0

package/dist/generators/angular/generator.js

@@ -113,6 +113,40 @@ export default class AngularGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING_EACH_ENTITY]() {
         return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
     }
+    get preparingEachEntityField() {
+        return this.asPreparingEachEntityFieldTaskGroup({
+            prepareField({ field }) {
+                mutateData(field, {
+                    fieldTsDefaultValue: ({ fieldTsDefaultValue, defaultValue, fieldTypeCharSequence, fieldTypeTimed }) => {
+                        let returnValue;
+                        if (fieldTsDefaultValue !== undefined || defaultValue !== undefined) {
+                            let fieldDefaultValue;
+                            if (fieldTsDefaultValue !== undefined) {
+                                fieldDefaultValue = fieldTsDefaultValue;
+                            }
+                            else {
+                                fieldDefaultValue = defaultValue;
+                            }
+                            fieldDefaultValue = String(fieldDefaultValue).replace(/'/g, "\\'");
+                            if (fieldTypeCharSequence) {
+                                returnValue = `'${fieldDefaultValue}'`;
+                            }
+                            else if (fieldTypeTimed) {
+                                returnValue = `dayjs('${fieldDefaultValue}')`;
+                            }
+                            else {
+                                returnValue = fieldDefaultValue;
+                            }
+                        }
+                        return returnValue;
+                    },
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING_EACH_ENTITY_FIELD]() {
+        return this.delegateTasksToBlueprint(() => this.preparingEachEntityField);
+    }
     get default() {
         return this.asDefaultTaskGroup({
             loadEntities() {

package/dist/generators/angular/resources/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@angular/common": "17.3.3",
+    "@angular/common": "17.3.9",
     "@fortawesome/angular-fontawesome": "0.14.1",
     "@fortawesome/fontawesome-svg-core": "6.5.2",
     "@fortawesome/free-solid-svg-icons": "6.5.2",
@@ -16,39 +16,39 @@
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
     "tslib": "2.6.2",
-    "zone.js": "0.14.4"
+    "zone.js": "0.14.6"
   },
   "devDependencies": {
     "@angular-architects/module-federation": "17.0.8",
     "@angular-architects/module-federation-runtime": "17.0.8",
     "@angular-builders/custom-webpack": "17.0.2",
     "@angular-builders/jest": "17.0.3",
-    "@angular-eslint/eslint-plugin": "17.3.0",
-    "@angular/cli": "17.3.3",
+    "@angular-eslint/eslint-plugin": "17.5.2",
+    "@angular/cli": "17.3.7",
     "@types/jest": "29.5.12",
     "@types/node": "20.11.25",
     "@types/sockjs-client": "1.5.4",
-    "@typescript-eslint/eslint-plugin": "7.6.0",
+    "@typescript-eslint/eslint-plugin": "7.11.0",
     "browser-sync": "3.0.2",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
     "copy-webpack-plugin": "12.0.2",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-webpack-plugin": "4.1.0",
+    "eslint-webpack-plugin": "4.2.0",
     "folder-hash": "4.0.4",
     "jest": "29.7.0",
-    "jest-date-mock": "1.0.9",
+    "jest-date-mock": "1.0.10",
     "jest-junit": "16.0.0",
-    "jest-preset-angular": "14.0.3",
+    "jest-preset-angular": "14.1.0",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "postcss-rtlcss": "5.1.0",
-    "rimraf": "5.0.5",
-    "ts-jest": "29.1.2",
-    "typescript": "5.4.4",
+    "postcss-rtlcss": "5.3.0",
+    "rimraf": "5.0.7",
+    "ts-jest": "29.1.4",
+    "typescript": "5.4.5",
     "webpack": "5.91.0",
-    "webpack-bundle-analyzer": "4.10.1",
+    "webpack-bundle-analyzer": "4.10.2",
     "webpack-merge": "5.10.0",
     "webpack-notifier": "1.15.0"
   }

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs

@@ -32,7 +32,7 @@
       <div class="alert alert-danger">__jhiTranslateTag__('global.messages.error.dontmatch')</div>
     }
 
-      <form name="form" role="form" (ngSubmit)="changePassword()" [formGroup]="passwordForm">
+      <form name="form" (ngSubmit)="changePassword()" [formGroup]="passwordForm">
         <div class="mb-3">
           <label class="form-label" for="currentPassword">__jhiTranslateTag__('global.form.currentpassword.label')</label>
           <input

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs

@@ -50,7 +50,7 @@
 
     @if (key() && !success()) {
       <div>
-        <form name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
+        <form name="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
           <div class="mb-3">
             <label class="form-label" for="newPassword">__jhiTranslateTag__('global.form.newpassword.label')</label>
             <input

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { ElementRef } from '@angular/core';
+import { ElementRef, signal } from '@angular/core';
 import { ComponentFixture, TestBed, inject, tick, fakeAsync } from '@angular/core/testing';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormBuilder } from '@angular/forms';
@@ -60,7 +60,7 @@ describe('PasswordResetFinishComponent', () => {
     const node = {
       focus: jest.fn(),
     };
-    comp.newPassword = new ElementRef(node);
+    comp.newPassword = signal<ElementRef>(new ElementRef(node));
 
     comp.ngAfterViewInit();
 

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, inject, OnInit, AfterViewInit, ElementRef, ViewChild, signal } from '@angular/core';
+import { Component, inject, OnInit, AfterViewInit, ElementRef, signal, viewChild } from '@angular/core';
 import { FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { ActivatedRoute, RouterModule } from '@angular/router';
 import PasswordStrengthBarComponent from 'app/account/password/password-strength-bar/password-strength-bar.component';
@@ -31,8 +31,7 @@ import { PasswordResetFinishService } from './password-reset-finish.service';
   templateUrl: './password-reset-finish.component.html',
 })
 export default class PasswordResetFinishComponent implements OnInit, AfterViewInit {
-  @ViewChild('newPassword', { static: false })
-  newPassword?: ElementRef;
+  newPassword = viewChild.required<ElementRef>('newPassword');
 
   initialized = signal(false);
   doNotMatch = signal(false);
@@ -64,9 +63,7 @@ export default class PasswordResetFinishComponent implements OnInit, AfterViewIn
   }
 
   ngAfterViewInit(): void {
-    if (this.newPassword) {
-      this.newPassword.nativeElement.focus();
-    }
+    this.newPassword().nativeElement.focus();
   }
 
   finishReset(): void {

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs

@@ -27,7 +27,7 @@
       <div class="alert alert-warning">
         <span>__jhiTranslateTag__('reset.request.messages.info')</span>
       </div>
-      <form name="form" role="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
+      <form name="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
         <div class="mb-3">
           <label class="form-label" for="email">__jhiTranslateTag__('global.form.email.label')</label>
           <input

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { ElementRef } from '@angular/core';
+import { ElementRef, signal } from '@angular/core';
 import { ComponentFixture, TestBed, inject } from '@angular/core/testing';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormBuilder } from '@angular/forms';
@@ -43,7 +43,7 @@ describe('PasswordResetInitComponent', () => {
     const node = {
       focus: jest.fn(),
     };
-    comp.email = new ElementRef(node);
+    comp.email = signal<ElementRef>(new ElementRef(node));
 
     comp.ngAfterViewInit();
 

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, AfterViewInit, ElementRef, inject, ViewChild, signal } from '@angular/core';
+import { Component, AfterViewInit, ElementRef, inject, signal, viewChild } from '@angular/core';
 import { FormBuilder, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import SharedModule from 'app/shared/shared.module';
 
@@ -29,8 +29,7 @@ import { PasswordResetInitService } from './password-reset-init.service';
   templateUrl: './password-reset-init.component.html',
 })
 export default class PasswordResetInitComponent implements AfterViewInit {
-  @ViewChild('email', { static: false })
-  email?: ElementRef;
+  email = viewChild.required<ElementRef>('email');
 
   success = signal(false);
   resetRequestForm;
@@ -45,9 +44,7 @@ export default class PasswordResetInitComponent implements AfterViewInit {
   }
 
   ngAfterViewInit(): void {
-    if (this.email) {
-      this.email.nativeElement.focus();
-    }
+    this.email().nativeElement.focus();
   }
 
   requestReset(): void {

package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs

@@ -46,7 +46,7 @@
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
     @if (!success()) {
-      <form name="form" role="form" (ngSubmit)="register()" [formGroup]="registerForm">
+      <form name="form" (ngSubmit)="register()" [formGroup]="registerForm">
         <div class="mb-3">
           <label class="form-label" for="login">__jhiTranslateTag__('global.form.username.label')</label>
           <input

package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, AfterViewInit, ElementRef, inject, ViewChild, signal } from '@angular/core';
+import { Component, AfterViewInit, ElementRef, inject, signal, viewChild } from '@angular/core';
 import { HttpErrorResponse } from '@angular/common/http';
 import { RouterModule } from '@angular/router';
 import { FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -36,8 +36,7 @@ import PasswordStrengthBarComponent from '../password/password-strength-bar/pass
   templateUrl: './register.component.html',
 })
 export default class RegisterComponent implements AfterViewInit {
-  @ViewChild('login', { static: false })
-  login?: ElementRef;
+  login = viewChild.required<ElementRef>('login');
 
   doNotMatch = signal(false);
   error = signal(false);
@@ -73,9 +72,7 @@ export default class RegisterComponent implements AfterViewInit {
   private registerService = inject(RegisterService);
 
   ngAfterViewInit(): void {
-    if (this.login) {
-      this.login.nativeElement.focus();
-    }
+    this.login().nativeElement.focus();
   }
 
   register(): void {

package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs

@@ -30,7 +30,7 @@
       <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
 
     @if (settingsForm.value.login) {
-      <form name="form" role="form" (ngSubmit)="save()" [formGroup]="settingsForm" novalidate>
+      <form name="form" (ngSubmit)="save()" [formGroup]="settingsForm" novalidate>
         <div class="mb-3">
           <label class="form-label" for="firstName">__jhiTranslateTag__('settings.form.firstname')</label>
           <input

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs

@@ -19,45 +19,45 @@
 <div class="modal-header">
   <h4 class="modal-title">__jhiTranslateTag__('metrics.jvm.threads.dump.title')</h4>
 
-  <button type="button" class="btn-close" (click)="dismiss()">&times;</button>
+  <button type="button" class="btn-close" (click)="dismiss()">&nbsp;</button>
 </div>
 
 <div class="modal-body">
   <div class="mb-3">
-    <span class="badge bg-primary hand" (click)="threadStateFilter = undefined">
+    <button class="badge bg-primary hand" (click)="threadStateFilter = undefined" (keydown.enter)="threadStateFilter = undefined">
     @if (threadStateFilter === undefined) {
       <fa-icon icon="check"></fa-icon>
     }
       All&nbsp;<span class="badge rounded-pill bg-default">{{ threadDumpAll }}</span>
-    </span>
+    </button>
 
-    <span class="badge bg-success hand" (click)="threadStateFilter = ThreadState.Runnable">
+    <button class="badge bg-success hand" (click)="threadStateFilter = ThreadState.Runnable" (keydown.enter)="threadStateFilter = ThreadState.Runnable">
     @if (threadStateFilter === ThreadState.Runnable) {
       <fa-icon icon="check"></fa-icon>
     }
       Runnable&nbsp;<span class="badge rounded-pill bg-default">{{ threadDumpRunnable }}</span>
-    </span>
+    </button>
 
-    <span class="badge bg-info hand" (click)="threadStateFilter = ThreadState.Waiting">
+    <button class="badge bg-info hand" (click)="threadStateFilter = ThreadState.Waiting" (keydown.enter)="threadStateFilter = ThreadState.Waiting">
     @if (threadStateFilter === ThreadState.Waiting) {
       <fa-icon icon="check"></fa-icon>
     }
       Waiting&nbsp;<span class="badge rounded-pill bg-default">{{ threadDumpWaiting }}</span>
-    </span>
+    </button>
 
-    <span class="badge bg-warning hand" (click)="threadStateFilter = ThreadState.TimedWaiting">
+    <button class="badge bg-warning hand" (click)="threadStateFilter = ThreadState.TimedWaiting" (keydown.enter)="threadStateFilter = ThreadState.TimedWaiting">
     @if (threadStateFilter === ThreadState.TimedWaiting) {
       <fa-icon icon="check"></fa-icon>
     }
       Timed Waiting&nbsp;<span class="badge rounded-pill bg-default">{{ threadDumpTimedWaiting }}</span>
-    </span>
+    </button>
 
-    <span class="badge bg-danger hand" (click)="threadStateFilter = ThreadState.Blocked">
+    <button class="badge bg-danger hand" (click)="threadStateFilter = ThreadState.Blocked" (keydown.enter)="threadStateFilter = ThreadState.Blocked">
     @if (threadStateFilter === ThreadState.Blocked) {
       <fa-icon icon="check"></fa-icon>
     }
       Blocked&nbsp;<span class="badge rounded-pill bg-default">{{ threadDumpBlocked }}</span>
-    </span>
+    </button>
   </div>
 
 @for (thread of getThreads(); track $index) {

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs

@@ -20,8 +20,6 @@
 <form name="deleteForm" (ngSubmit)="confirmDelete(user.login!)">
   <div class="modal-header">
     <h4 class="modal-title">__jhiTranslateTag__('entity.delete.title')</h4>
-
-    <span class="btn btn-close" data-dismiss="modal" aria-hidden="true" (click)="cancel()"></span>
   </div>
 
   <div class="modal-body">

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs

@@ -18,7 +18,7 @@
 -%>
 <div class="d-flex justify-content-center">
   <div class="col-8">
-    <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
+    <form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
       <h2 id="myUserLabel">__jhiTranslateTag__('userManagement.home.createOrEditLabel')</h2>
 
       <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>

package/dist/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs

@@ -43,7 +43,7 @@ export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapsh
         }
 
         if (isDevMode()) {
-          console.error('User has not any of required authorities: ', authorities);
+          console.error('User does not have any of the required authorities:', authorities);
         }
         router.navigate(['accessdenied']);
         return false;

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs

@@ -20,9 +20,6 @@
 <form name="deleteForm" (ngSubmit)="confirmDelete(<%= entityInstance %>.<%= primaryKey.name %>!)">
     <div class="modal-header">
         <h4 class="modal-title" data-cy="<%= entityInstance %>DeleteDialogHeading">__jhiTranslateTag__('entity.delete.title')</h4>
-
-        <span class="btn btn-close" data-dismiss="modal" aria-hidden="true"
-                (click)="cancel()"></span>
     </div>
 
     <div class="modal-body">

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs

@@ -96,7 +96,7 @@ describe('<%= entityAngularName %> Management Detail Component', () => {
       comp.byteSize(fakeBase64);
 
       // THEN
-      expect(dataUtils.byteSize).toBeCalledWith(fakeBase64);
+      expect(dataUtils.byteSize).toHaveBeenCalledWith(fakeBase64);
     });
   });
 
@@ -116,7 +116,7 @@ describe('<%= entityAngularName %> Management Detail Component', () => {
       comp.openFile(fakeBase64, fakeContentType);
 
       // THEN
-      expect(dataUtils.openFile).toBeCalledWith(fakeBase64, fakeContentType);
+      expect(dataUtils.openFile).toHaveBeenCalledWith(fakeBase64, fakeContentType);
     });
   });
 <%_ } _%>

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs

@@ -73,7 +73,7 @@ describe('<%= entityAngularName %> routing resolve service', () => {
       });
 
       // THEN
-      expect(service.find).toBeCalledWith(<%- tsKeyId %>);
+      expect(service.find).toHaveBeenCalledWith(<%- tsKeyId %>);
       expect(result<%= entityAngularName %>).toEqual({ <%= primaryKey.name %>: <%- tsKeyId %> });
     });
 
@@ -111,7 +111,7 @@ describe('<%= entityAngularName %> routing resolve service', () => {
       });
 
       // THEN
-      expect(service.find).toBeCalledWith(<%- tsKeyId %>);
+      expect(service.find).toHaveBeenCalledWith(<%- tsKeyId %>);
       expect(result<%= entityAngularName %>).toEqual(undefined);
       expect(mockRouter.navigate).toHaveBeenCalledWith(['404']);
     });

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.ts.ejs

@@ -200,12 +200,16 @@ _%>
   <%_ for (field of fields) {
         const { fieldName, fieldTypeBoolean, fieldTypeTimed, fieldTypeLocalDate } = field;
   _%>
-    <%_ if (field.id) { _%>
-      <%= fieldName %>: null,
-    <%_ } else if (fieldTypeBoolean) { _%>
-      <%= fieldName %>: false,
-    <%_ } else if (fieldTypeTimed) { _%>
-      <%= fieldName %>: currentTime,
+    <%_ if (field.fieldTsDefaultValue) { _%>
+        <%= fieldName %>: <%- field.fieldTsDefaultValue %>,
+    <%_ } else { _%>
+      <%_ if (field.id) { _%>
+        <%= fieldName %>: null,
+      <%_ } else if (fieldTypeBoolean) { _%>
+        <%= fieldName %>: false,
+      <%_ } else if (fieldTypeTimed) { _%>
+        <%= fieldName %>: currentTime,
+      <%_ } _%>
     <%_ } _%>
   <%_ } _%>
   <%_ for (const relationship of relationships.filter(({ persistableRelationship }) => persistableRelationship)) {

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs

@@ -18,7 +18,7 @@
 -%>
 <div class="d-flex justify-content-center">
     <div class="col-8">
-        <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
+        <form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
             <h2 id="<%= jhiPrefixDashed %>-<%= entityFileName %>-heading" data-cy="<%= entityClass %>CreateUpdateHeading">__jhiTranslateTag__('<%- i18nKeyPrefix %>.home.createOrEditLabel')</h2>
 
             <div>

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs

@@ -19,8 +19,8 @@
 <%_
 const tsKeyId = this.generateTestEntityId(primaryKey.type);
 const allRelationshipsByEntityNeedingOptions = Object
-  .values(differentRelationships)
-  .map(relationships => relationships.filter(rel => rel.persistableRelationship))
+  .values(relationshipsByOtherEntity)
+  .map(relationships => relationships.filter(rel => rel.persistableRelationship && !rel.otherEntity.embedded))
   .filter(relationships => relationships.length > 0);
 const testEntityPrimaryKey0 = this.generateTestEntityPrimaryKey(primaryKey, 0);
 const testEntityPrimaryKey1 = this.generateTestEntityPrimaryKey(primaryKey, 1);
@@ -245,7 +245,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
 <%_ } _%>
     });
 
-<%_ const trackedRelationships = Object.values(differentRelationships).filter(arr => arr.some(rel => rel.persistableRelationship && rel.otherEntity.primaryKey));
+<%_ const trackedRelationships = Object.values(relationshipsByOtherEntity).filter(arr => arr.some(rel => rel.persistableRelationship && !rel.otherEntity.embedded));
     if (trackedRelationships.length > 0) {
 _%>
 

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.ts.ejs

@@ -18,8 +18,8 @@
 -%>
 <%_
   const allRelationshipsByEntityNeedingOptions = Object
-    .values(differentRelationships)
-    .map(relationships => relationships.filter(rel => rel.persistableRelationship))
+    .values(relationshipsByOtherEntity)
+    .map(relationships => relationships.filter(rel => rel.persistableRelationship && !rel.otherEntity.embedded))
     .filter(relationships => relationships.length > 0);
 _%>
 import { Component, inject, OnInit<% if (anyFieldHasImageContentType) { %>, ElementRef<% } %> } from '@angular/core';
@@ -39,10 +39,8 @@ import { AlertError } from 'app/shared/alert/alert-error.model';
 import { EventManager, EventWithContent } from 'app/core/util/event-manager.service';
 import { DataUtils, FileLoadError } from 'app/core/util/data-util.service';
 <%_ } _%>
-<%_
-Object.keys(differentRelationships).forEach(key => {
-  if (differentRelationships[key].some(rel => rel.persistableRelationship)) {
-    const uniqueRel = differentRelationships[key][0];
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) {
+    const uniqueRel = relationshipsByEntityNeedingOptions[0];
     if (uniqueRel.otherEntityAngularName !== entityAngularName) {
 _%>
 import { I<%= uniqueRel.otherEntityAngularName %> } from 'app/entities/<%= uniqueRel.otherEntityPath %>/<%= uniqueRel.otherEntityFileName %>.model';
@@ -50,7 +48,6 @@ import { <%= uniqueRel.otherEntityAngularName %>Service } from 'app/entities/<%=
 <%_
     }
   }
-});
 _%>
 <%_ const enumImports = this.generateEntityClientEnumImports(fields); _%>
 <%_ enumImports.forEach( (importedPath, importedType) => { _%>
@@ -70,7 +67,7 @@ export class <%= entityAngularName %>UpdateComponent implements OnInit {
     <%- this._.lowerFirst(importedType) %>Values = Object.keys(<%- importedType %>);
 <%_ }); _%>
 
-<%_ for (const relationshipsByEntityNeedingOptions of Object.values(differentRelationships).map(relationships => relationships.filter(rel => rel.persistableRelationship)).filter(relationships => relationships.length > 0)) { _%>
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
   <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && rel.otherRelationship); _%>
   <%_ if (relationshipsByEntityNeedingOptions.length > relationshipsWithCustomUniqueOptions.length) { _%>
     <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity _%>
@@ -87,17 +84,14 @@ export class <%= entityAngularName %>UpdateComponent implements OnInit {
 <%_ } _%>
     protected <%= entityInstance %>Service = inject(<%= entityAngularName %>Service);
     protected <%= entityInstance %>FormService = inject(<%= entityAngularName %>FormService);
-<%_
-Object.keys(differentRelationships).forEach(key => {
-  if (differentRelationships[key].some(rel => rel.persistableRelationship)) {
-    const uniqueRel = differentRelationships[key][0];
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) {
+    const uniqueRel = relationshipsByEntityNeedingOptions[0];
     if (uniqueRel.otherEntityAngularName !== entityAngularName) {
 _%>
     protected <%= uniqueRel.otherEntity.entityInstance %>Service = inject(<%= uniqueRel.otherEntityAngularName %>Service);
 <%_
     }
   }
-});
 _%>
 <%_ if (anyFieldHasImageContentType) { _%>
     protected elementRef = inject(ElementRef);
@@ -107,8 +101,8 @@ _%>
     // eslint-disable-next-line @typescript-eslint/member-ordering
     editForm: <%= entityAngularName %>FormGroup = this.<%= entityInstance %>FormService.create<%= entityAngularName %>FormGroup();
 
-<%_ for (const relationshipsByEntity of Object.values(differentRelationships).filter(arr => arr.some(rel => rel.persistableRelationship && rel.otherEntity.primaryKey))) {
-      const { otherEntity } = relationshipsByEntity[0];
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) {
+      const { otherEntity } = relationshipsByEntityNeedingOptions[0];
 _%>
 
     compare<%= otherEntity.entityAngularName %> = (o1: I<%= otherEntity.entityAngularName %> | null, o2: I<%= otherEntity.entityAngularName %> | null): boolean =>
@@ -122,7 +116,7 @@ _%>
                 this.updateForm(<%= entityInstance %>);
             }
 
-<%_ if (relationships.filter(rel => rel.persistableRelationship && !rel.otherEntityIsEmbedded).length > 0) { _%>
+<%_ if (relationships.filter(rel => rel.persistableRelationship && !rel.otherEntity.embedded).length > 0) { _%>
             this.loadRelationshipsOptions();
 <%_ } _%>
         });
@@ -225,7 +219,7 @@ _%>
 
 <%_ if (relationships.filter(rel => rel.persistableRelationship && !rel.otherEntityIsEmbedded).length > 0) { _%>
     protected loadRelationshipsOptions(): void {
-  <%_ for (const relationshipsByEntityNeedingOptions of Object.values(differentRelationships).map(relationships => relationships.filter(rel => rel.persistableRelationship)).filter(relationships => relationships.length > 0)) { _%>
+  <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
     <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && rel.otherRelationship); %>
     <%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); %>
     <%_ const { otherEntity } = relationshipsByEntityNeedingOptions[0] _%>

package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs

@@ -51,15 +51,15 @@
     <p>__jhiTranslateTag__('home.question')</p>
 
     <ul>
-      <li><a href="https://www.jhipster.tech/" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.homepage')</a></li>
-      <li><a href="https://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.stackoverflow')</a></li>
-      <li><a href="https://github.com/jhipster/generator-jhipster/issues?state=open" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.bugtracker')</a></li>
-      <li><a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.chat')</a></li>
-      <li><a href="https://twitter.com/jhipster" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.follow')</a></li>
+      <li><a href="<%- hipsterDocumentationLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.homepage')</a></li>
+      <li><a href="<%- hipsterStackoverflowLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.stackoverflow')</a></li>
+      <li><a href="<%- hipsterBugTrackerLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.bugtracker')</a></li>
+      <li><a href="<%- hipsterChatLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.chat')</a></li>
+      <li><a href="<%- hipsterTwitterLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.follow')</a></li>
     </ul>
 
     <p>
-      <span>__jhiTranslateTag__('home.like')</span> <a href="https://github.com/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.github')</a>!
+      <span>__jhiTranslateTag__('home.like')</span> <a href="<%- hipsterProjectLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.github')</a>!
     </p>
   </div>
 </div>

package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Directive, OnInit, ElementRef, Renderer2, inject, Input } from '@angular/core';
+import { Directive, OnInit, ElementRef, Renderer2, inject, input } from '@angular/core';
 import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
 
 @Directive({
@@ -24,7 +24,7 @@ import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
   selector: '[<%= jhiPrefix %>ActiveMenu]',
 })
 export default class ActiveMenuDirective implements OnInit {
-  @Input() <%= jhiPrefix %>ActiveMenu?: string;
+  <%= jhiPrefix %>ActiveMenu = input();
 
   private el = inject(ElementRef);
   private renderer = inject(Renderer2);
@@ -39,7 +39,7 @@ export default class ActiveMenuDirective implements OnInit {
   }
 
   updateActiveFlag(selectedLanguage: string): void {
-    if (this.<%= jhiPrefix %>ActiveMenu === selectedLanguage) {
+    if (this.<%= jhiPrefix %>ActiveMenu() === selectedLanguage) {
       this.renderer.addClass(this.el.nativeElement, 'active');
     } else {
       this.renderer.removeClass(this.el.nativeElement, 'active');

package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs

@@ -25,7 +25,7 @@
         data-cy="loginError"
       >__jhiTranslateTag__('login.messages.error.authentication')</div>
     }
-      <form class="form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
+      <form class="form" (ngSubmit)="login()" [formGroup]="loginForm">
         <div class="mb-3">
           <label class="username-label" for="username">__jhiTranslateTag__('global.form.username.label')</label>
           <input