generator-jhipster 7.4.1 → 7.5.0

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/reset-password-page.spec.ts.ejs

@@ -26,16 +26,9 @@ import {
 } from '../../support/commands';
 
 describe('forgot your password', () => {
-  const username = Cypress.env('E2E_USERNAME') ?? 'admin';
+  const username = Cypress.env('E2E_USERNAME') ?? 'user';
 
-  before(() => {
-    cy.window().then((win) => {
-      win.sessionStorage.clear()
-    });
-<%_ if (authenticationTypeSession) { _%>
-    cy.clearCookie('SESSION');
-<%_ } _%>
-    cy.clearCookies();
+  beforeEach(() => {
     cy.visit('');
     cy.clickOnLoginItem();
     cy.get(usernameLoginSelector).type(username);
@@ -57,7 +50,6 @@ describe('forgot your password', () => {
     cy.get(submitInitResetPasswordSelector).click({ force: true });
     <%_ } _%>
     cy.get(emailResetPasswordSelector).should('have.class', classValid);
-    cy.get(emailResetPasswordSelector).clear();
   });
 
   it('should be able to init reset password', () => {

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs

@@ -24,31 +24,31 @@ import {
 } from '../../support/commands';
 
 describe('/account/settings', () => {
-  const username = Cypress.env('E2E_USERNAME') ?? 'admin';
-  const password = Cypress.env('E2E_PASSWORD') ?? 'admin';
+  const adminUsername = Cypress.env('E2E_USERNAME') ?? 'admin';
+  const adminPassword = Cypress.env('E2E_PASSWORD') ?? 'admin';
+  const username = Cypress.env('E2E_USERNAME') ?? 'user';
+  const password = Cypress.env('E2E_PASSWORD') ?? 'user';
 
-  before(() => {
-    cy.window().then((win) => {
-      win.sessionStorage.clear()
-    });
-<%_ if (authenticationTypeSession) { _%>
-    cy.clearCookie('SESSION');
-<%_ } _%>
-    cy.clearCookies();
-    cy.visit('');
-    cy.login('user', 'user');
-    cy.clickOnSettingsItem();
-  })
+  beforeEach(() => {
+    cy.login(username, password);
+    cy.visit('/account/settings');
+  });
 
   beforeEach(() => {
     cy.intercept('POST', '/api/account').as('settingsSave');
   });
 
+  it('should be accessible through menu', () => {
+    cy.visit('');
+    cy.clickOnSettingsItem();
+    cy.url().should('match', /\/account\/settings$/);
+  });
+
   it("should be able to change 'user' firstname settings", () => {
     cy.get(firstNameSettingsSelector).clear().type('jhipster');
     // need to modify email because default email does not match regex in vue
     cy.get(emailSettingsSelector).clear().type('user@localhost.fr');
-    cy.get(submitSettingsSelector).click({force: true});
+    cy.get(submitSettingsSelector).click();
     cy.wait('@settingsSave').then(({ response }) => expect(response.statusCode).to.equal(200));
   });
 
@@ -56,39 +56,30 @@ describe('/account/settings', () => {
     cy.get(lastNameSettingsSelector).clear().type('retspihj');
     // need to modify email because default email does not match regex in vue
     cy.get(emailSettingsSelector).clear().type('user@localhost.fr');
-    cy.get(submitSettingsSelector).click({force: true});
+    cy.get(submitSettingsSelector).click();
     cy.wait('@settingsSave').then(({ response }) => expect(response.statusCode).to.equal(200));
   });
 
   it("should be able to change 'user' email settings", () => {
     cy.get(emailSettingsSelector).clear().type('user@localhost.fr');
-    cy.get(submitSettingsSelector).click({force: true});
+    cy.get(submitSettingsSelector).click();
     cy.wait('@settingsSave').then(({ response }) => expect(response.statusCode).to.equal(200));
   });
 
   it("should not be able to change 'user' settings if email already exists", () => {
-    // add an email for admin account
-    cy.clickOnLogoutItem();
+    cy.login(adminUsername, adminPassword);
     cy.visit('');
-    cy.login(username, password);
     cy.clickOnSettingsItem();
     cy.get(emailSettingsSelector).clear().type('admin@localhost.fr');
-    cy.get(submitSettingsSelector).click({force: true});
-    cy.clickOnLogoutItem();
+    cy.get(submitSettingsSelector).click();
 
-    // try to reuse email used in admin account
-    cy.window().then((win) => {
-      win.sessionStorage.clear()
-    });
+    cy.login(username, password);
     cy.visit('');
-    cy.intercept('POST', '/api/account').as('settingsNotSave');
-    cy.login('user', 'user');
     cy.clickOnSettingsItem();
+
+    cy.intercept('POST', '/api/account').as('settingsNotSave');
     cy.get(emailSettingsSelector).clear().type('admin@localhost.fr');
-    cy.get(submitSettingsSelector).click({force: true});
-    // Fix in future version of cypress
-    // => https://glebbahmutov.com/blog/cypress-intercept-problems/#no-overwriting-interceptors
-    // => https://github.com/cypress-io/cypress/issues/9302
-    // cy.wait('@settingsNotSave').then(({ response }) => expect(response.statusCode).to.equal(400));
+    cy.get(submitSettingsSelector).click();
+    cy.wait('@settingsNotSave').then(({ response }) => expect(response.statusCode).to.equal(400));
   });
-})
+});

package/generators/cypress/templates/src/test/javascript/cypress/integration/administration/administration.spec.ts.ejs

@@ -34,31 +34,10 @@ describe('/admin', () => {
   const username = Cypress.env('E2E_USERNAME') ?? 'admin';
   const password = Cypress.env('E2E_PASSWORD') ?? 'admin';
 
-<%_ if (authenticationTypeOauth2) { _%>
   beforeEach(() => {
-    cy.getOauth2Data();
-    cy.get('@oauth2Data').then(oauth2Data => {
-      cy.oauthLogin(oauth2Data, username, password);
-    });
-  });
-
-  afterEach(() => {
-    cy.oauthLogout();
-    cy.clearCache();
-  });
-<%_ } else { _%>
-  before(() => {
-    cy.window().then((win) => {
-      win.sessionStorage.clear()
-    });
-  <%_ if (authenticationTypeSession) { _%>
-    cy.clearCookie('SESSION');
-  <%_ } _%>
-    cy.clearCookies();
-    cy.visit('');
     cy.login(username, password);
+    cy.visit('');
   });
-<%_ } _%>
 
 <%_ if (!skipUserManagement) { _%>
   describe('/user-management', () => {

package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs

@@ -122,6 +122,7 @@ Cypress.Commands.add('authenticatedRequest', (data: any) => {
     return cy.request({
         ...data,
         headers: {
+          ...data.headers,
           'X-XSRF-TOKEN': csrfCookie?.value,
         },
     });
@@ -129,15 +130,46 @@ Cypress.Commands.add('authenticatedRequest', (data: any) => {
 <%_ } _%>
 });
 
-<%_ if (!authenticationTypeOauth2) { _%>
 Cypress.Commands.add('login', (username: string, password: string) => {
-  cy.clickOnLoginItem();
-  cy.get(usernameLoginSelector).type(username);
-  cy.get(passwordLoginSelector).type(password);
-  cy.get(submitLoginSelector).click();
+  cy.session(
+    [username, password],
+    () => {
+<%_ if (authenticationTypeOauth2) { _%>
+      cy.getOauth2Data();
+      cy.get('@oauth2Data').then(oauth2Data => {
+        cy.oauthLogin(oauth2Data, username, password);
+      });
+<%_ } else { _%>
+      cy.request({
+        method: 'GET',
+        url: '/api/account',
+        failOnStatusCode: false,
+      });
+      cy.authenticatedRequest({
+        method: 'POST',
+        body: { username, password },
+        url: Cypress.env('authenticationUrl'),
+  <%_ if (authenticationTypeSession) { _%>
+        form: true,
+  <%_ } else { _%>
+      }).then(({ body: { id_token } }) => {
+    <%_ if (clientFrameworkVue) { _%>
+        sessionStorage.setItem(Cypress.env('jwtStorageName'), id_token);
+    <%_ } else { _%>
+        sessionStorage.setItem(Cypress.env('jwtStorageName'), JSON.stringify(id_token));
+    <%_ } _%>
+  <%_ } _%>
+      });
+<%_ } _%>
+    },
+    {
+      validate() {
+        cy.authenticatedRequest({ url: '/api/account' }).its('status').should('eq', 200);
+      },
+    }
+  );
 });
 
-<%_ } _%>
 declare global {
   namespace Cypress {
     interface Chainable {

package/generators/cypress/templates/src/test/javascript/cypress/support/index.ts.ejs

@@ -41,12 +41,7 @@ import './management';
 <%_ if (authenticationTypeOauth2) { _%>
 import './oauth2';
 <%_ } _%>
-<%_ if (authenticationTypeSession) { _%>
-Cypress.Cookies.defaults({
-  preserve: ['XSRF-TOKEN','SESSION', 'JSESSIONID']
-})
-<%_ } _%>
-<%_ if (clientFrameworkReact || clientFrameworkVue) { _%>
+<%_ if (clientFrameworkVue && communicationSpringWebsocket) { _%>
 
 // https://docs.cypress.io/api/events/catalog-of-events#Uncaught-Exceptions
 Cypress.on('uncaught:exception', (err, runnable) => {

package/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs

@@ -32,31 +32,31 @@ import {
 } from './commands';
 
 Cypress.Commands.add('clickOnLoginItem', () => {
-  return cy.get(navbarSelector).get(accountMenuSelector).click({force: true}).get(loginItemSelector).click({force: true});
+  return cy.get(navbarSelector).get(accountMenuSelector).click().get(loginItemSelector).click();
 });
 
 Cypress.Commands.add('clickOnLogoutItem', () => {
-  return cy.get(navbarSelector).get(accountMenuSelector).click({force: true}).get(logoutItemSelector).click({force: true});
+  return cy.get(navbarSelector).get(accountMenuSelector).click().get(logoutItemSelector).click();
 });
 
 Cypress.Commands.add('clickOnRegisterItem', () => {
-  return cy.get(navbarSelector).get(accountMenuSelector).click({force: true}).get(registerItemSelector).click({force: true});
+  return cy.get(navbarSelector).get(accountMenuSelector).click().get(registerItemSelector).click();
 });
 
 Cypress.Commands.add('clickOnSettingsItem', () => {
-  return cy.get(navbarSelector).get(accountMenuSelector).click({force: true}).get(settingsItemSelector).click({force: true});
+  return cy.get(navbarSelector).get(accountMenuSelector).click().get(settingsItemSelector).click();
 });
 
 Cypress.Commands.add('clickOnPasswordItem', () => {
-  return cy.get(navbarSelector).get(accountMenuSelector).click({force: true}).get(passwordItemSelector).click({force: true});
+  return cy.get(navbarSelector).get(accountMenuSelector).click().get(passwordItemSelector).click();
 });
 
 Cypress.Commands.add('clickOnAdminMenuItem', (item: string) => {
-  return cy.get(navbarSelector).get(adminMenuSelector).click({force: true}).get(`.dropdown-item[href="/admin/${item}"]`).click({force: true});
+  return cy.get(navbarSelector).get(adminMenuSelector).click().get(`.dropdown-item[href="/admin/${item}"]`).click();
 });
 
 Cypress.Commands.add('clickOnEntityMenuItem', (entityName: string) => {
-  return cy.get(navbarSelector).get(entityItemSelector).click({force: true}).get(`.dropdown-item[href="/${entityName}"]`).click({force: true});
+  return cy.get(navbarSelector).get(entityItemSelector).click().get(`.dropdown-item[href="/${entityName}"]`).click();
 });
 
 declare global {

package/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs

@@ -155,14 +155,6 @@ Cypress.Commands.add('oauthLogout', () => {
     });
 });
 
-Cypress.Commands.add('clearCache', () => {
-  cy.clearCookies();
-  cy.clearLocalStorage();
-  cy.window().then(win => {
-    win.sessionStorage.clear();
-  });
-});
-
 declare global {
   namespace Cypress {
     interface Chainable<Subject> {
@@ -172,7 +164,6 @@ declare global {
       auth0Login(oauth2Data: any, username: string, password: string): Cypress.Chainable;
       oktaLogin(oauth2Data: any, username: string, password: string): Cypress.Chainable;
       oauthLogout(): Cypress.Chainable;
-      clearCache(): Cypress.Chainable;
     }
   }
 }

package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs

@@ -2492,7 +2492,7 @@
     "clientOfflineSessionIdleTimeout": "0",
     "cibaInterval": "5"
   },
-  "keycloakVersion": "15.0.2",
+  "keycloakVersion": "16.1.0",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

package/generators/entity/index.js

@@ -38,6 +38,8 @@ const { prepareFieldForTemplates, fieldIsEnum } = require('../../utils/field');
 const { prepareRelationshipForTemplates } = require('../../utils/relationship');
 const { stringify } = require('../../utils');
 const { GATEWAY, MICROSERVICE } = require('../../jdl/jhipster/application-types');
+const { NO: CLIENT_FRAMEWORK_NO } = require('../../jdl/jhipster/client-framework-types');
+const { NO: SEARCH_ENGINE_NO } = require('../../jdl/jhipster/search-engine-types');
 const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, ORACLE, SQL } = require('../../jdl/jhipster/database-types');
 const {
   GENERATOR_ENTITIES,
@@ -234,7 +236,9 @@ class EntityGenerator extends BaseBlueprintGenerator {
 
           if (this.jhipsterConfig.applications && !this.entityConfig.skipClient) {
             const remoteConfig = this.jhipsterConfig.applications[this.entityConfig.microserviceName];
-            if (remoteConfig.clientFramework === 'vue') {
+            if (remoteConfig && remoteConfig.clientFramework && remoteConfig.clientFramework !== CLIENT_FRAMEWORK_NO) {
+              // Gateway requires entities to discover a microfrontend.
+              // Microfrontends is generated at the microservice side, so skip it at gateway side.
               this.entityConfig.skipClient = true;
             }
           }
@@ -359,8 +363,34 @@ class EntityGenerator extends BaseBlueprintGenerator {
           throw new Error(validation);
         }
 
+        if (this.entityConfig.searchEngine === undefined) {
+          const backendOnlyMicroservice =
+            context.applicationType === MICROSERVICE && (!context.clientFramework || context.clientFramework === CLIENT_FRAMEWORK_NO);
+          if (backendOnlyMicroservice && context.searchEngine && context.searchEngine !== SEARCH_ENGINE_NO && !context.entityExisted) {
+            // Propagate searchEngine to the entity, it's opt-in and should be propagated to gateway
+            this.entityConfig.searchEngine = true;
+          }
+        } else if (
+          (!context.searchEngine || context.searchEngine === SEARCH_ENGINE_NO) &&
+          (context.applicationType !== GATEWAY || !this.entityConfig.microserviceName)
+        ) {
+          if (this.entityConfig.searchEngine === SEARCH_ENGINE_NO) {
+            // Convert to boolean.
+            this.entityConfig.searchEngine = false;
+          }
+          // If search engine is disabled at application, and unless it's a gateway publishing a microservice entity.
+          if (this.entityConfig.searchEngine) {
+            this.warning('Search engine disabled at application, cannot be enabled at entity, disabling');
+            this.entityConfig.searchEngine = false;
+          }
+        }
+
         this.entityConfig.name = this.entityConfig.name || context.name;
-        if (![SQL, MONGODB, COUCHBASE, NEO4J].includes(context.databaseType)) {
+        // disable pagination if there is no database, unless it’s a microservice entity published by a gateway
+        if (
+          ![SQL, MONGODB, COUCHBASE, NEO4J].includes(context.databaseType) &&
+          (context.applicationType !== GATEWAY || !this.entityConfig.microserviceName)
+        ) {
           this.entityConfig.pagination = NO_PAGINATION;
         }
 
@@ -493,13 +523,25 @@ class EntityGenerator extends BaseBlueprintGenerator {
   _loading() {
     return {
       loadEntity() {
+        loadRequiredConfigIntoEntity(this.context, this.jhipsterConfig);
         // Update current context with config from file.
         Object.assign(this.context, this.entityStorage.getAll());
         this.loadDerivedAppConfig(this.context);
+
+        // Entity searchEngine support should opt-in instead of opt-out for gateway/microservice.
+        // The entity definition should take precedence so frontend and backend are in sync.
+        // Doesn't apply to microfrontends.
+        if (
+          this.entityConfig.searchEngine === undefined &&
+          !this.context.microfrontend &&
+          (this.context.applicationTypeMicroservice || (this.entityConfig.microserviceName && this.context.applicationTypeGateway))
+        ) {
+          this.info(`searchEngine is missing in .jhipster/${this.entityConfig.name}.json, should opt-in for gateway/microservice entities`);
+          this.context.searchEngine = false;
+        }
         this.loadDerivedClientConfig(this.context);
         this.loadDerivedServerConfig(this.context);
         this.loadDerivedPlatformConfig(this.context);
-        loadRequiredConfigIntoEntity(this.context, this.jhipsterConfig);
         if (this.context.fields) {
           this.context.fields
             .filter(field => field.options)

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs

@@ -56,7 +56,7 @@ describe('<%= entityAngularName %> Management Delete Component', () => {
             inject([],
                 fakeAsync(() => {
                     // GIVEN
-                    jest.spyOn(service, 'delete').mockReturnValue(of(new HttpResponse({})));
+                    jest.spyOn(service, 'delete').mockReturnValue(of(new HttpResponse({ body: {} })));
 
                     // WHEN
                     comp.confirmDelete(<%- tsKeyId %>);

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs

@@ -107,7 +107,7 @@ _%>
 <%_ if (!readOnly) { _%>
 
             <button type="button"
-                    [routerLink]="['/<%= entityUrl %>', <%= entityInstance %>.<%= primaryKey.name %>, 'edit']"
+                    [routerLink]="['/<%= entityPage %>', <%= entityInstance %>.<%= primaryKey.name %>, 'edit']"
                     class="btn btn-primary">
                 <fa-icon icon="pencil-alt"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.edit">Edit</span>
             </button>

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs

@@ -17,13 +17,6 @@
  limitations under the License.
 -%>
 import { NgModule } from '@angular/core';
-<%_ if (applicationTypeMicroservice && enableTranslation) { _%>
-import { HttpClient } from '@angular/common/http';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { TranslateHttpLoader } from '@ngx-translate/http-loader';
-
-import { ApplicationConfigService } from 'app/core/config/application-config.service';
-<%_ } _%>
 import { SharedModule } from 'app/shared/shared.module';
 import { <%= entityAngularName %>Component } from './list/<%= entityFileName %>.component';
 import { <%= entityAngularName %>DetailComponent } from './detail/<%= entityFileName %>-detail.component';
@@ -33,28 +26,10 @@ import { <%= entityAngularName %>DeleteDialogComponent } from './delete/<%= enti
 <%_ } _%>
 import { <%= entityAngularName %>RoutingModule } from './route/<%= entityFileName %>-routing.module';
 
-<%_ if (applicationTypeMicroservice && enableTranslation) { _%>
-function translatePartialLoader(http: HttpClient, applicationConfigService: ApplicationConfigService): TranslateLoader {
-  const prefix = applicationConfigService.isMicrofrontend() ? 'i18n/' : applicationConfigService.getEndpointFor('i18n/', '<%= microserviceName %>');
-  return new TranslateHttpLoader(http, prefix, `.json?_=${I18N_HASH}`);
-}
-
-<%_ } _%>
 @NgModule({
   imports: [
     SharedModule,
     <%= entityAngularName %>RoutingModule,
-<%_ if (applicationTypeMicroservice && enableTranslation) { _%>
-    TranslateModule.forChild({
-      loader: {
-        provide: TranslateLoader,
-        useFactory: (translatePartialLoader),
-        deps: [HttpClient, ApplicationConfigService]
-      },
-      isolate: false,
-      extend: true,
-    }),
-<%_ } _%>
   ],
   declarations: [
     <%= entityAngularName %>Component,
@@ -70,13 +45,4 @@ function translatePartialLoader(http: HttpClient, applicationConfigService: Appl
   ]
 <%_ } _%>
 })
-export class <%= locals.microserviceName ? upperFirstCamelCase(locals.microserviceName) : '' %><%= entityAngularName %>Module {
-<%_ if (applicationTypeMicroservice && enableTranslation) { _%>
-  constructor(private translateService: TranslateService, private translateLoader: TranslateLoader) {
-    const currentLang = translateService.store.currentLang;
-    this.translateLoader.getTranslation(currentLang).subscribe(translation => {
-      this.translateService.setTranslation(currentLang, translation);
-    });
-  }
-<%_ } _%>
-}
+export class <%= locals.microserviceName ? upperFirstCamelCase(locals.microserviceName) : '' %><%= entityAngularName %>Module {}

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.model.ts.ejs

@@ -23,7 +23,7 @@ const defaultVariablesValues = generateEntityClientFieldDefaultValues(fields);
 const enumImports = generateEntityClientEnumImports(fields);
 %>
 <%_ if (fieldsContainInstant || fieldsContainZonedDateTime || fieldsContainLocalDate) { _%>
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 <%_ } _%>
 <%_ typeImports.forEach((importedPath, importedType) => { _%>
     <%_ if (importedType !== `I${entityAngularName}`) { _%>

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs

@@ -37,7 +37,7 @@ _%>
             </button>
             <%_ if (!readOnly) { _%>
 
-            <button id="jh-create-entity" data-cy="entityCreateButton" class="btn btn-primary jh-create-entity create-<%= entityUrl %>" [routerLink]="['/<%= entityUrl %>/new']">
+            <button id="jh-create-entity" data-cy="entityCreateButton" class="btn btn-primary jh-create-entity create-<%= entityUrl %>" [routerLink]="['/<%= entityPage %>/new']">
                 <fa-icon icon="plus"></fa-icon>
                 <span <% if (searchEngine !== false) { %>class="hidden-sm-down" <% } %> <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.home.createLabel">
                 Create a new <%= entityClassHumanized %>
@@ -97,7 +97,7 @@ _%>
             <tbody<% if (paginationInfiniteScroll) { %> infinite-scroll (scrolled)="loadPage(page + 1)" [infiniteScrollDisabled]="page >= links['last']" [infiniteScrollDistance]="0"<% } %>>
                 <tr *ngFor="let <%= entityInstance %> of <%= entityInstancePlural %>; trackBy: track<%= primaryKey.nameCapitalized %>" data-cy="entityTable">
 <%_
-const routerLink = ` [routerLink]="['/${ entityUrl }', ${entityInstance}.${primaryKey.name}, 'view']"`;
+const routerLink = ` [routerLink]="['/${ entityPage }', ${entityInstance}.${primaryKey.name}, 'view']"`;
 for (field of fields.filter(field => !field.hidden)) {
     const fieldName = field.fieldName;
     const fieldType = field.fieldType;
@@ -163,7 +163,7 @@ _%>
                     <td class="text-right">
                         <div class="btn-group">
                             <button type="submit"
-                                    [routerLink]="['/<%= entityUrl %>', <%= entityInstance %>.<%= primaryKey.name %>, 'view']"
+                                    [routerLink]="['/<%= entityPage %>', <%= entityInstance %>.<%= primaryKey.name %>, 'view']"
                                     class="btn btn-info btn-sm"
                                     data-cy="entityDetailsButton">
                                 <fa-icon icon="eye"></fa-icon>
@@ -172,7 +172,7 @@ _%>
 <%_ if (!readOnly) { _%>
 
                             <button type="submit"
-                                    [routerLink]="['/<%= entityUrl %>', <%= entityInstance %>.<%= primaryKey.name %>, 'edit']"
+                                    [routerLink]="['/<%= entityPage %>', <%= entityInstance %>.<%= primaryKey.name %>, 'edit']"
                                     class="btn btn-primary btn-sm"
                                     data-cy="entityEditButton">
                                 <fa-icon icon="pencil-alt"></fa-icon>

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs

@@ -21,17 +21,13 @@ const entityArrayOptionalChainSymbol = paginationInfiniteScroll ? '' : '?.';
 const order = paginationInfiniteScroll ? 'asc' : 'desc';
 const testEntityPrimaryKey = generateTestEntityPrimaryKey(primaryKey, 0);
 _%>
-<%_ if (paginationPagination || searchEngine) { _%>
-jest.mock('@angular/router');
-<%_ } _%>
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-<%_ if (paginationPagination) { _%>
-import { ActivatedRoute, Router } from '@angular/router';
-<%_ } else if (searchEngine) { _%>
+<%_ if (paginationPagination || searchEngine) { _%>
 import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 <%_ } _%>
 import { of } from 'rxjs';
 
@@ -46,11 +42,15 @@ describe('<%= entityAngularName %> Management Component', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [HttpClientTestingModule],
+            imports: [
+<%_ if (paginationPagination || searchEngine) { _%>
+              RouterTestingModule.withRoutes([{ path: '<%= entityPage %>', component: <%= entityAngularName %>Component }]),
+<%_ } _%>
+              HttpClientTestingModule
+            ],
             declarations: [<%= entityAngularName %>Component],
 <%_ if (paginationPagination) { _%>
             providers: [
-                Router,
                 {
                     provide: ActivatedRoute,
                     useValue: {

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs

@@ -132,7 +132,7 @@ _%>
         this.ngbPaginationPage = this.page;
         <%_ } _%>
         if (navigate) {
-            this.router.navigate(['/<%= entityUrl %>'], {
+            this.router.navigate(['/<%= entityPage %>'], {
                 queryParams: {
                     page: this.page,
                     size: this.itemsPerPage,

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs

@@ -62,15 +62,15 @@
                 page: this.page,
                 size: this.itemsPerPage,
                 sort: this.sort()
-            }).subscribe(
-                (res: HttpResponse<I<%= entityAngularName %>[]>) => {
+            }).subscribe({
+                next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
                     this.isLoading = false;
                     this.paginate<%= entityClassPlural %>(res.body, res.headers);
                 },
-                () => {
+                error: () => {
                     this.isLoading = false;
                 }
-            );
+            });
             return;
         }
 <%_ } _%>
@@ -79,15 +79,15 @@
             page: this.page,
             size: this.itemsPerPage,
             sort: this.sort()
-        }).subscribe(
-            (res: HttpResponse<I<%= entityAngularName %>[]>) => {
+        }).subscribe({
+            next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
                 this.isLoading = false;
                 this.paginate<%= entityClassPlural %>(res.body, res.headers);
             },
-            () => {
+            error: () => {
                 this.isLoading = false;
             }
-        );
+        });
     }
 
     reset(): void {

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs

@@ -45,28 +45,28 @@
         if (this.currentSearch) {
             this.<%= entityInstance %>Service.search({
                 query: this.currentSearch,
-                }).subscribe(
-                    (res: HttpResponse<I<%= entityAngularName %>[]>) => {
+                }).subscribe({
+                    next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
                         this.isLoading = false;
                         this.<%= entityInstancePlural %> = res.body ?? [];
                     },
-                    () => {
+                    error: () => {
                         this.isLoading = false;
                     }
-                );
+                });
             return;
         }
 <%_ } _%>
 
-        this.<%= entityInstance %>Service.query().subscribe(
-            (res: HttpResponse<I<%= entityAngularName %>[]>) => {
+        this.<%= entityInstance %>Service.query().subscribe({
+            next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
                 this.isLoading = false;
                 this.<%= entityInstancePlural %> = res.body ?? [];
             },
-            () => {
+            error: () => {
                 this.isLoading = false;
             }
-        );
+        });
     }
 
 <%_ if (searchEngine) { _%>