generator-jhipster 8.5.0 → 8.6.0

package/README.md

@@ -18,10 +18,9 @@ We are honored by any contributions you may have small or large. Please refer to
 
 The following Java and Node combinations are tested and verified by GitHub Actions:
 
-| Java | Node | Status |
-| ---- | ---- | ------ |
-| 21   | 20   | ✅     |
-| 17   | 18   | ✅     |
+| Java     | Node  | Status |
+| -------- | ----- | ------ |
+| 17/21/22 | 18/20 | ✅     |
 
 ## Sponsors
 

package/dist/cli/commands.mjs

@@ -25,6 +25,7 @@ If you are interested in maintaining this sub-generator fill a feature request o
 const defaultCommands = {
     add: {
         desc: 'Add a feature to current project',
+        removed: removedV8,
     },
     app: {
         desc: '[Default] Create a new JHipster application based on the selected options',
@@ -134,6 +135,7 @@ const defaultCommands = {
     },
     page: {
         desc: 'Create a new page. (Supports vue clients)',
+        removed: removedV8,
     },
     'project-name': {
         desc: 'Configure project name (alpha)',

package/dist/cli/environment-builder.mjs

@@ -86,6 +86,11 @@ export default class EnvironmentBuilder {
     static async createDefaultBuilder(...args) {
         return EnvironmentBuilder.create(...args).prepare();
     }
+    static async run(args, generatorOptions = {}, envOptions = {}) {
+        const envBuilder = await EnvironmentBuilder.createDefaultBuilder(envOptions);
+        const env = envBuilder.getEnvironment();
+        await env.run(args, generatorOptions);
+    }
     /**
      * Class to manipulate yeoman environment for jhipster needs.
      * - Registers jhipster generators.

package/dist/cli/program.mjs

@@ -32,6 +32,7 @@ import { packageJson } from '../lib/index.js';
 import { packageNameToNamespace } from '../generators/base/support/index.js';
 import command from '../generators/base/command.js';
 import { GENERATOR_APP, GENERATOR_BOOTSTRAP, GENERATOR_JDL } from '../generators/generator-list.js';
+import { extractArgumentsFromConfigs } from '../generators/base/internal/command.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const { version: JHIPSTER_VERSION } = packageJson;
@@ -85,8 +86,13 @@ const buildAllDependencies = async (generatorNames, { env, blueprintNamespaces }
 const addCommandGeneratorOptions = async (command, generatorMeta, { root, blueprintOptionDescription, info } = {}) => {
     const generatorModule = await generatorMeta.importModule();
     if (generatorModule.command) {
-        command.addJHipsterOptions(generatorModule.command.options, blueprintOptionDescription);
-        command.addJHipsterConfigs(generatorModule.command.configs, blueprintOptionDescription);
+        const { options, configs } = generatorModule.command;
+        if (options) {
+            command.addJHipsterOptions(options, blueprintOptionDescription);
+        }
+        if (configs) {
+            command.addJHipsterConfigs(configs, blueprintOptionDescription);
+        }
     }
     try {
         if (root || !generatorModule.command || generatorModule.command.loadGeneratorOptions) {
@@ -105,7 +111,7 @@ const addCommandGeneratorOptions = async (command, generatorMeta, { root, bluepr
 const addCommandRootGeneratorOptions = async (command, generatorMeta, { usage = true } = {}) => {
     const generatorModule = await generatorMeta.importModule();
     if (generatorModule.command) {
-        command.addJHipsterArguments(generatorModule.command.arguments);
+        command.addJHipsterArguments(generatorModule.command.arguments ?? extractArgumentsFromConfigs(generatorModule.command.configs));
     }
     else {
         const generator = await generatorMeta.instantiateHelp();
@@ -158,7 +164,7 @@ export const buildCommands = async ({ program, commands = {}, envBuilder, env, l
     Object.entries(commands).forEach(([cmdName, opts]) => {
         const { desc, blueprint, argument, options: commandOptions, alias, help: commandHelp, cliOnly, removed, useOptions = {} } = opts;
         program
-            .command(cmdName, '', { isDefault: cmdName === defaultCommand })
+            .command(cmdName, '', { isDefault: cmdName === defaultCommand, hidden: Boolean(removed) })
             .description(desc + (blueprint ? chalk.yellow(` (blueprint: ${blueprint})`) : ''))
             .addCommandArguments(argument)
             .addCommandOptions(commandOptions)

package/dist/generators/angular/entity-files-angular.js

@@ -1,6 +1,5 @@
 import { clientApplicationTemplatesBlock } from '../client/support/files.js';
 import { asWritingEntitiesTask } from '../base-application/support/task-type-inference.js';
-import { filterEntitiesAndPropertiesForClient, filterEntitiesForClient } from '../client/support/index.js';
 const entityModelFiles = clientApplicationTemplatesBlock({
     templates: ['entities/_entityFolder_/_entityFile_.model.ts', 'entities/_entityFolder_/_entityFile_.test-samples.ts'],
 });
@@ -69,8 +68,8 @@ export const userManagementFiles = {
         }),
     ],
 };
-export const writeEntitiesFiles = asWritingEntitiesTask(async function ({ application, entities }) {
-    for (const entity of filterEntitiesAndPropertiesForClient(entities)) {
+export const writeEntitiesFiles = asWritingEntitiesTask(async function ({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesAndPropertiesForClient ?? (entities => entities))(entities)) {
         if (entity.builtInUser) {
             await this.writeFiles({
                 sections: builtInFiles,
@@ -103,12 +102,12 @@ export const writeEntitiesFiles = asWritingEntitiesTask(async function ({ applic
     }
 });
 export async function postWriteEntitiesFiles(taskParam) {
-    const { source, application } = taskParam;
-    const entities = filterEntitiesForClient(taskParam.entities).filter(entity => !entity.builtInUser && !entity.embedded && !entity.entityClientModelOnly);
+    const { control, source, application } = taskParam;
+    const entities = (control.filterEntitiesForClient ?? (entities => entities))(taskParam.entities).filter(entity => !entity.builtInUser && !entity.embedded && !entity.entityClientModelOnly);
     source.addEntitiesToClient({ application, entities });
 }
-export function cleanupEntitiesFiles({ application, entities }) {
-    for (const entity of filterEntitiesForClient(entities).filter(entity => !entity.builtIn)) {
+export function cleanupEntitiesFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesForClient ?? (entities => entities))(entities).filter(entity => !entity.builtIn)) {
         const { entityFolderName, entityFileName, name: entityName } = entity;
         if (this.isJhipsterVersionLessThan('5.0.0')) {
             this.removeFile(`${application.clientSrcDir}app/entities/${entityName}/${entityName}.model.ts`);

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

@@ -1,34 +1,34 @@
 {
   "dependencies": {
-    "@angular/common": "17.3.9",
-    "@fortawesome/angular-fontawesome": "0.14.1",
+    "@angular/common": "18.0.4",
+    "@fortawesome/angular-fontawesome": "0.15.0",
     "@fortawesome/fontawesome-svg-core": "6.5.2",
     "@fortawesome/free-solid-svg-icons": "6.5.2",
-    "@ng-bootstrap/ng-bootstrap": "16.0.0",
+    "@ng-bootstrap/ng-bootstrap": "17.0.0",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@popperjs/core": "2.11.8",
     "@stomp/rx-stomp": "2.0.0",
     "bootstrap": "5.3.3",
     "bootswatch": "5.3.3",
-    "ngx-cookie-service": "17.1.0",
-    "ngx-infinite-scroll": "17.0.0",
+    "ngx-cookie-service": "18.0.0",
+    "ngx-infinite-scroll": "18.0.0",
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
-    "tslib": "2.6.2",
-    "zone.js": "0.14.6"
+    "tslib": "2.6.3",
+    "zone.js": "0.14.7"
   },
   "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.5.2",
-    "@angular/cli": "17.3.7",
+    "@angular-architects/module-federation": "18.0.4",
+    "@angular-architects/module-federation-runtime": "18.0.4",
+    "@angular-builders/custom-webpack": "18.0.0",
+    "@angular-builders/jest": "18.0.0",
+    "@angular-eslint/eslint-plugin": "18.0.1",
+    "@angular/cli": "18.0.5",
     "@types/jest": "29.5.12",
     "@types/node": "20.11.25",
     "@types/sockjs-client": "1.5.4",
-    "@typescript-eslint/eslint-plugin": "7.11.0",
+    "@typescript-eslint/eslint-plugin": "7.13.1",
     "browser-sync": "3.0.2",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
@@ -40,14 +40,14 @@
     "jest": "29.7.0",
     "jest-date-mock": "1.0.10",
     "jest-junit": "16.0.0",
-    "jest-preset-angular": "14.1.0",
+    "jest-preset-angular": "14.1.1",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
     "postcss-rtlcss": "5.3.0",
     "rimraf": "5.0.7",
-    "ts-jest": "29.1.4",
+    "ts-jest": "29.1.5",
     "typescript": "5.4.5",
-    "webpack": "5.91.0",
+    "webpack": "5.92.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/activate/activate.component.spec.ts.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { TestBed, waitForAsync, tick, fakeAsync, inject } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { ActivatedRoute } from '@angular/router';
 import { of, throwError } from 'rxjs';
 
@@ -30,8 +30,9 @@ describe('ActivateComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, ActivateComponent],
+        imports: [ActivateComponent],
         providers: [
+          provideHttpClient(),
           {
             provide: ActivatedRoute,
             useValue: { queryParams: of({ key: 'ABC123' }) },
@@ -76,7 +77,7 @@ describe('ActivateComponent', () => {
   it('should set set error to true upon activation failure', inject(
     [ActivateService],
     fakeAsync((service: ActivateService) => {
-      jest.spyOn(service, 'get').mockReturnValue(throwError('ERROR'));
+      jest.spyOn(service, 'get').mockReturnValue(throwError(() => {}));
 
       comp.ngOnInit();
       tick();

package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs

@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { ActivateService } from './activate.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -29,7 +30,7 @@ describe('ActivateService Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(ActivateService);

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

@@ -19,8 +19,7 @@
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpResponse } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { HttpResponse, provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { of, throwError } from 'rxjs';
 
@@ -37,8 +36,8 @@ describe('PasswordComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, PasswordComponent],
-        providers: [FormBuilder, AccountService],
+        imports: [PasswordComponent],
+        providers: [FormBuilder, AccountService, provideHttpClient()],
       })
         .overrideTemplate(PasswordComponent, '')
         .compileComponents();
@@ -106,7 +105,7 @@ describe('PasswordComponent', () => {
 
   it('should notify of error if change password fails', () => {
     // GIVEN
-    jest.spyOn(service, 'save').mockReturnValue(throwError('ERROR'));
+    jest.spyOn(service, 'save').mockReturnValue(throwError(() => {}));
     comp.passwordForm.patchValue({
       newPassword: 'myPassword',
       confirmPassword: 'myPassword',

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs

@@ -1,5 +1,6 @@
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { PasswordService } from './password.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -11,7 +12,7 @@ describe('Password Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(PasswordService);

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

@@ -18,7 +18,7 @@
 -%>
 import { ElementRef, signal } from '@angular/core';
 import { ComponentFixture, TestBed, inject, tick, fakeAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { of, throwError } from 'rxjs';
@@ -32,8 +32,9 @@ describe('PasswordResetFinishComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, PasswordResetFinishComponent],
+      imports: [PasswordResetFinishComponent],
       providers: [
+        provideHttpClient(),
         FormBuilder,
         {
           provide: ActivatedRoute,
@@ -98,7 +99,7 @@ describe('PasswordResetFinishComponent', () => {
   it('should notify of generic error', inject(
     [PasswordResetFinishService],
     fakeAsync((service: PasswordResetFinishService) => {
-      jest.spyOn(service, 'save').mockReturnValue(throwError('ERROR'));
+      jest.spyOn(service, 'save').mockReturnValue(throwError(() => {}));
       comp.passwordForm.patchValue({
         newPassword: 'password',
         confirmPassword: 'password',

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

@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { PasswordResetFinishService } from './password-reset-finish.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -29,7 +30,7 @@ describe('PasswordResetFinish Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(PasswordResetFinishService);

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

@@ -18,7 +18,7 @@
 -%>
 import { ElementRef, signal } from '@angular/core';
 import { ComponentFixture, TestBed, inject } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { of, throwError } from 'rxjs';
 
@@ -31,8 +31,8 @@ describe('PasswordResetInitComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, PasswordResetInitComponent],
-      providers: [FormBuilder],
+      imports: [PasswordResetInitComponent],
+      providers: [provideHttpClient(), FormBuilder],
     })
       .overrideTemplate(PasswordResetInitComponent, '')
       .createComponent(PasswordResetInitComponent);

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

@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { PasswordResetInitService } from './password-reset-init.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -29,7 +30,7 @@ describe('PasswordResetInit Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(PasswordResetInitService);

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync, inject, tick, fakeAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { of, throwError } from 'rxjs';
 <%_ if (enableTranslation) { _%>
@@ -40,10 +40,9 @@ describe('RegisterComponent', () => {
 <%_ if (enableTranslation) { _%>
           TranslateModule.forRoot(),
 <%_ } _%>
-          HttpClientTestingModule,
           RegisterComponent,
         ],
-        providers: [FormBuilder],
+        providers: [provideHttpClient(), FormBuilder],
       })
         .overrideTemplate(RegisterComponent, '')
         .compileComponents();

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

@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { RegisterService } from './register.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -30,7 +31,7 @@ describe('RegisterService Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(RegisterService);

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

@@ -19,7 +19,7 @@
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, inject, tick, fakeAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { of, throwError } from 'rxjs';
 
 import { AccountService } from 'app/core/auth/account.service';
@@ -46,8 +46,8 @@ describe('SessionsComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, SessionsComponent],
-      providers: [AccountService],
+      imports: [SessionsComponent],
+      providers: [provideHttpClient(), AccountService],
     })
       .overrideTemplate(SessionsComponent, '')
       .createComponent(SessionsComponent);

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

@@ -19,7 +19,7 @@
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { throwError, of } from 'rxjs';
 <%_ if (enableTranslation) { _%>
@@ -53,10 +53,9 @@ describe('SettingsComponent', () => {
 <%_ if (enableTranslation) { _%>
           TranslateModule.forRoot(),
 <%_ } _%>
-          HttpClientTestingModule,
           SettingsComponent,
         ],
-        providers: [FormBuilder, AccountService],
+        providers: [provideHttpClient(), FormBuilder, AccountService],
       })
         .overrideTemplate(SettingsComponent, '')
         .compileComponents();
@@ -108,7 +107,7 @@ describe('SettingsComponent', () => {
 
   it('should notify of error upon failed save', () => {
     // GIVEN
-    mockAccountService.save = jest.fn(() => throwError('ERROR'));
+    mockAccountService.save = jest.fn(() => throwError(() => {}));
 
     // WHEN
     comp.ngOnInit();

package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { of } from 'rxjs';
 
 import ConfigurationComponent from './configuration.component';
@@ -32,8 +32,8 @@ describe('ConfigurationComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, ConfigurationComponent],
-        providers: [ConfigurationService],
+        imports: [ConfigurationComponent],
+        providers: [provideHttpClient(), ConfigurationService],
       })
         .overrideTemplate(ConfigurationComponent, '')
         .compileComponents();

package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs

@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { ConfigurationService } from './configuration.service';
 import { Bean, ConfigProps, Env, PropertySource } from './configuration.model';
@@ -29,7 +30,7 @@ describe('Logs Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     expectedResult = null;

package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs

@@ -17,8 +17,7 @@
  limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpErrorResponse } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, HttpErrorResponse } from '@angular/common/http';
 import { of, throwError } from 'rxjs';
 
 import HealthComponent from './health.component';
@@ -33,7 +32,8 @@ describe('HealthComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, HealthComponent],
+        imports: [HealthComponent],
+        providers: [provideHttpClient()],
       })
         .overrideTemplate(HealthComponent, '')
         .compileComponents();
@@ -72,7 +72,7 @@ describe('HealthComponent', () => {
     it('should handle a 503 on refreshing health data', () => {
       // GIVEN
       const health: Health = { status: 'DOWN', components: { mail: { status: 'DOWN' } } };
-      jest.spyOn(service, 'checkHealth').mockReturnValue(throwError(new HttpErrorResponse({ status: 503, error: health })));
+      jest.spyOn(service, 'checkHealth').mockReturnValue(throwError(() => new HttpErrorResponse({ status: 503, error: health })));
 
       // WHEN
       comp.refresh();

package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs

@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { HealthService } from './health.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -29,7 +30,7 @@ describe('HealthService Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(HealthService);

package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs

@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 import HealthModalComponent from './health-modal.component';
@@ -12,8 +12,8 @@ describe('HealthModalComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, HealthModalComponent],
-        providers: [NgbActiveModal],
+        imports: [HealthModalComponent],
+        providers: [provideHttpClient(), NgbActiveModal],
       })
         .overrideTemplate(HealthModalComponent, '')
         .compileComponents();

package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs

@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { of } from 'rxjs';
 
 import LogsComponent from './logs.component';
@@ -35,8 +36,8 @@ describe('LogsComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, LogsComponent],
-        providers: [LogsService<%= applicationTypeGateway && serviceDiscoveryAny ? ', GatewayRoutesService' : '' %>],
+        imports: [LogsComponent],
+        providers: [provideHttpClient(), provideHttpClientTesting(), LogsService<%= applicationTypeGateway && serviceDiscoveryAny ? ', GatewayRoutesService' : '' %>],
       })
         .overrideTemplate(LogsComponent, '')
         .compileComponents();

package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs

@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { LogsService } from './logs.service';
 
@@ -27,7 +28,7 @@ describe('Logs Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(LogsService);

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

@@ -67,7 +67,7 @@ export class JvmThreadsComponent {
 
   private _threads: Thread[] | undefined;
 
-  private modalService = inject(NgbModal);
+  private readonly modalService = inject(NgbModal);
 
   open(): void {
     const modalRef = this.modalService.open(MetricsModalThreadsComponent);