generator-jhipster 7.3.0 → 7.5.0

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

@@ -31,57 +31,55 @@ import { <%= entityAngularName %>Service } from '../service/<%= entityFileName %
 
 import { <%= entityAngularName %>DeleteDialogComponent } from './<%= entityFileName %>-delete-dialog.component';
 
-describe('Component Tests', () => {
-    describe('<%= entityAngularName %> Management Delete Component', () => {
-        let comp: <%= entityAngularName %>DeleteDialogComponent;
-        let fixture: ComponentFixture<<%= entityAngularName %>DeleteDialogComponent>;
-        let service: <%= entityAngularName %>Service;
-        let mockActiveModal: NgbActiveModal;
+describe('<%= entityAngularName %> Management Delete Component', () => {
+    let comp: <%= entityAngularName %>DeleteDialogComponent;
+    let fixture: ComponentFixture<<%= entityAngularName %>DeleteDialogComponent>;
+    let service: <%= entityAngularName %>Service;
+    let mockActiveModal: NgbActiveModal;
 
-        beforeEach(() => {
-            TestBed.configureTestingModule({
-                imports: [HttpClientTestingModule],
-                declarations: [<%= entityAngularName %>DeleteDialogComponent],
-                providers: [NgbActiveModal]
-            })
-            .overrideTemplate(<%= entityAngularName %>DeleteDialogComponent, '')
-            .compileComponents();
-            fixture = TestBed.createComponent(<%= entityAngularName %>DeleteDialogComponent);
-            comp = fixture.componentInstance;
-            service = TestBed.inject(<%= entityAngularName %>Service);
-            mockActiveModal = TestBed.inject(NgbActiveModal);
-        });
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [HttpClientTestingModule],
+            declarations: [<%= entityAngularName %>DeleteDialogComponent],
+            providers: [NgbActiveModal]
+        })
+        .overrideTemplate(<%= entityAngularName %>DeleteDialogComponent, '')
+        .compileComponents();
+        fixture = TestBed.createComponent(<%= entityAngularName %>DeleteDialogComponent);
+        comp = fixture.componentInstance;
+        service = TestBed.inject(<%= entityAngularName %>Service);
+        mockActiveModal = TestBed.inject(NgbActiveModal);
+    });
 
-        describe('confirmDelete', () => {
-            it('Should call delete service on confirmDelete',
-                inject([],
-                    fakeAsync(() => {
-                        // GIVEN
-                        jest.spyOn(service, 'delete').mockReturnValue(of(new HttpResponse({})));
+    describe('confirmDelete', () => {
+        it('Should call delete service on confirmDelete',
+            inject([],
+                fakeAsync(() => {
+                    // GIVEN
+                    jest.spyOn(service, 'delete').mockReturnValue(of(new HttpResponse({ body: {} })));
 
-                        // WHEN
-                        comp.confirmDelete(<%- tsKeyId %>);
-                        tick();
+                    // WHEN
+                    comp.confirmDelete(<%- tsKeyId %>);
+                    tick();
 
-                        // THEN
-                        expect(service.delete).toHaveBeenCalledWith(<%- tsKeyId %>);
-                        expect(mockActiveModal.close).toHaveBeenCalledWith('deleted');
-                    })
-                )
-            );
+                    // THEN
+                    expect(service.delete).toHaveBeenCalledWith(<%- tsKeyId %>);
+                    expect(mockActiveModal.close).toHaveBeenCalledWith('deleted');
+                })
+            )
+        );
 
-            it('Should not call delete service on clear', () => {
-                // GIVEN
-                jest.spyOn(service, 'delete');
+        it('Should not call delete service on clear', () => {
+            // GIVEN
+            jest.spyOn(service, 'delete');
 
-                // WHEN
-                comp.cancel();
+            // WHEN
+            comp.cancel();
 
-                // THEN
-                expect(service.delete).not.toHaveBeenCalled();
-                expect(mockActiveModal.close).not.toHaveBeenCalled();
-                expect(mockActiveModal.dismiss).toHaveBeenCalled();
-            });
+            // THEN
+            expect(service.delete).not.toHaveBeenCalled();
+            expect(mockActiveModal.close).not.toHaveBeenCalled();
+            expect(mockActiveModal.dismiss).toHaveBeenCalled();
         });
     });
 });

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/detail/entity-management-detail.component.spec.ts.ejs

@@ -30,78 +30,76 @@ import { DataUtils } from 'app/core/util/data-util.service';
 
 import { <%= entityAngularName %>DetailComponent } from './<%= entityFileName %>-detail.component';
 
-describe('Component Tests', () => {
-    describe('<%= entityAngularName %> Management Detail Component', () => {
-        let comp: <%= entityAngularName %>DetailComponent;
-        let fixture: ComponentFixture<<%= entityAngularName %>DetailComponent>;
+describe('<%= entityAngularName %> Management Detail Component', () => {
+    let comp: <%= entityAngularName %>DetailComponent;
+    let fixture: ComponentFixture<<%= entityAngularName %>DetailComponent>;
 <%_ if (fieldsContainBlob) { _%>
-        let dataUtils: DataUtils;
+    let dataUtils: DataUtils;
 <%_ } _%>
 
-        beforeEach(() => {
-            TestBed.configureTestingModule({
-                declarations: [<%= entityAngularName %>DetailComponent],
-                providers: [
-                    {
-                        provide: ActivatedRoute,
-                        useValue: { data: of({ <%= entityInstance %>: <%- testEntity %> }) }
-                    }
-                ]
-            })
-            .overrideTemplate(<%= entityAngularName %>DetailComponent, '')
-            .compileComponents();
-            fixture = TestBed.createComponent(<%= entityAngularName %>DetailComponent);
-            comp = fixture.componentInstance;
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [<%= entityAngularName %>DetailComponent],
+            providers: [
+                {
+                    provide: ActivatedRoute,
+                    useValue: { data: of({ <%= entityInstance %>: <%- testEntity %> }) }
+                }
+            ]
+        })
+        .overrideTemplate(<%= entityAngularName %>DetailComponent, '')
+        .compileComponents();
+        fixture = TestBed.createComponent(<%= entityAngularName %>DetailComponent);
+        comp = fixture.componentInstance;
 <%_ if (fieldsContainBlob) { _%>
-            dataUtils = TestBed.inject(DataUtils);
-            jest.spyOn(window, 'open').mockImplementation(() => null);
+        dataUtils = TestBed.inject(DataUtils);
+        jest.spyOn(window, 'open').mockImplementation(() => null);
 <%_ } _%>
-        });
+    });
 
-        describe('OnInit', () => {
-            it('Should load <%= entityInstance %> on init', () => {
-                // WHEN
-                comp.ngOnInit();
+    describe('OnInit', () => {
+        it('Should load <%= entityInstance %> on init', () => {
+            // WHEN
+            comp.ngOnInit();
 
-                // THEN
-                expect(comp.<%= entityInstance %>).toEqual(expect.objectContaining(<%- testEntity %>));
-            });
+            // THEN
+            expect(comp.<%= entityInstance %>).toEqual(expect.objectContaining(<%- testEntity %>));
         });
+    });
 
 <%_ if (fieldsContainBlob) { _%>
-        describe('byteSize', () => {
-            it('Should call byteSize from DataUtils', () => {
-                // GIVEN
-                jest.spyOn(dataUtils, 'byteSize');
-                const fakeBase64 = 'fake base64';
-
-                // WHEN
-                comp.byteSize(fakeBase64);
-
-                // THEN
-                expect(dataUtils.byteSize).toBeCalledWith(fakeBase64);
-            });
+    describe('byteSize', () => {
+        it('Should call byteSize from DataUtils', () => {
+            // GIVEN
+            jest.spyOn(dataUtils, 'byteSize');
+            const fakeBase64 = 'fake base64';
+
+            // WHEN
+            comp.byteSize(fakeBase64);
+
+            // THEN
+            expect(dataUtils.byteSize).toBeCalledWith(fakeBase64);
         });
+    });
 
-        describe('openFile', () => {
-            it('Should call openFile from DataUtils', () => {
-                const newWindow = { ...window };
-                newWindow.document.write = jest.fn();
-                window.open = jest.fn(() => newWindow);
-                window.onload = jest.fn(() => newWindow);
-                window.URL.createObjectURL = jest.fn();
-                // GIVEN
-                jest.spyOn(dataUtils, 'openFile');
-                const fakeContentType = 'fake content type';
-                const fakeBase64 = 'fake base64';
-
-                // WHEN
-                comp.openFile(fakeBase64, fakeContentType);
-
-                // THEN
-                expect(dataUtils.openFile).toBeCalledWith(fakeBase64, fakeContentType);
-            });
+    describe('openFile', () => {
+        it('Should call openFile from DataUtils', () => {
+            const newWindow = { ...window };
+            newWindow.document.write = jest.fn();
+            window.open = jest.fn(() => newWindow);
+            window.onload = jest.fn(() => newWindow);
+            window.URL.createObjectURL = jest.fn();
+            // GIVEN
+            jest.spyOn(dataUtils, 'openFile');
+            const fakeContentType = 'fake content type';
+            const fakeBase64 = 'fake base64';
+
+            // WHEN
+            comp.openFile(fakeBase64, fakeContentType);
+
+            // THEN
+            expect(dataUtils.openFile).toBeCalledWith(fakeBase64, fakeContentType);
         });
-<%_ } _%>
     });
+<%_ } _%>
 });

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';
 
@@ -39,118 +35,120 @@ import { <%= entityAngularName %>Service } from '../service/<%= entityFileName %
 
 import { <%= entityAngularName %>Component } from './<%= entityFileName %>.component';
 
-describe('Component Tests', () => {
-    describe('<%= entityAngularName %> Management Component', () => {
-        let comp: <%= entityAngularName %>Component;
-        let fixture: ComponentFixture<<%= entityAngularName %>Component>;
-        let service: <%= entityAngularName %>Service;
+describe('<%= entityAngularName %> Management Component', () => {
+    let comp: <%= entityAngularName %>Component;
+    let fixture: ComponentFixture<<%= entityAngularName %>Component>;
+    let service: <%= entityAngularName %>Service;
 
-        beforeEach(() => {
-            TestBed.configureTestingModule({
-                imports: [HttpClientTestingModule],
-                declarations: [<%= entityAngularName %>Component],
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+<%_ if (paginationPagination || searchEngine) { _%>
+              RouterTestingModule.withRoutes([{ path: '<%= entityPage %>', component: <%= entityAngularName %>Component }]),
+<%_ } _%>
+              HttpClientTestingModule
+            ],
+            declarations: [<%= entityAngularName %>Component],
 <%_ if (paginationPagination) { _%>
-                providers: [
-                    Router,
-                    {
-                        provide: ActivatedRoute,
-                        useValue: {
-                            data: of({
-                                defaultSort: '<%- primaryKey.name %>,asc',
-                            }),
-                            queryParamMap: of(
-                                jest.requireActual('@angular/router').convertToParamMap({
-                                    page: '1',
-                                    size: '1',
-                                    sort: '<%- primaryKey.name %>,desc',
-                                })
-                            ),
-    <%_ if (searchEngine) { _%>
-                            snapshot: { queryParams: {} },
-    <%_ } _%>
-                        }
+            providers: [
+                {
+                    provide: ActivatedRoute,
+                    useValue: {
+                        data: of({
+                            defaultSort: '<%- primaryKey.name %>,asc',
+                        }),
+                        queryParamMap: of(
+                            jest.requireActual('@angular/router').convertToParamMap({
+                                page: '1',
+                                size: '1',
+                                sort: '<%- primaryKey.name %>,desc',
+                            })
+                        ),
+  <%_ if (searchEngine) { _%>
+                        snapshot: { queryParams: {} },
+  <%_ } _%>
                     }
-                ]
+                }
+            ]
 <%_ } else if (searchEngine) { _%>
-                providers: [
-                    {
-                        provide: ActivatedRoute,
-                        useValue: { snapshot: { queryParams: {} } }
-                    }
-                ]
+            providers: [
+                {
+                    provide: ActivatedRoute,
+                    useValue: { snapshot: { queryParams: {} } }
+                }
+            ]
 <%_ } _%>
-            })
-            .overrideTemplate(<%= entityAngularName %>Component, '')
-            .compileComponents();
-
-            fixture = TestBed.createComponent(<%= entityAngularName %>Component);
-            comp = fixture.componentInstance;
-            service = TestBed.inject(<%= entityAngularName %>Service);
-
-            const headers = new HttpHeaders().append('link', 'link;link');
-            jest.spyOn(service, 'query').mockReturnValue(
-                of(
-                    new HttpResponse({
-                        body: [<%- testEntityPrimaryKey %>],
-                        headers,
-                    })
-                )
-            );
-        });
-
-        it('Should call load all on init', () => {
-            // WHEN
-            comp.ngOnInit();
-
-            // THEN
-            expect(service.query).toHaveBeenCalled();
-            expect(comp.<%= entityInstancePlural %><%= entityArrayOptionalChainSymbol %>[0]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey %>));
-        });
+        })
+        .overrideTemplate(<%= entityAngularName %>Component, '')
+        .compileComponents();
+
+        fixture = TestBed.createComponent(<%= entityAngularName %>Component);
+        comp = fixture.componentInstance;
+        service = TestBed.inject(<%= entityAngularName %>Service);
+
+        const headers = new HttpHeaders();
+        jest.spyOn(service, 'query').mockReturnValue(
+            of(
+                new HttpResponse({
+                    body: [<%- testEntityPrimaryKey %>],
+                    headers,
+                })
+            )
+        );
+    });
+
+    it('Should call load all on init', () => {
+        // WHEN
+        comp.ngOnInit();
+
+        // THEN
+        expect(service.query).toHaveBeenCalled();
+        expect(comp.<%= entityInstancePlural %><%= entityArrayOptionalChainSymbol %>[0]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey %>));
+    });
 
 <%_ if (!paginationNo) { _%>
-        it('should load a page', () => {
-            // WHEN
-            comp.loadPage(1);
-
-            // THEN
-            expect(service.query).toHaveBeenCalled();
-            expect(comp.<%= entityInstancePlural %><%= entityArrayOptionalChainSymbol %>[0]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey %>));
-        });
-
-        it('should calculate the sort attribute for an id', () => {
-            // WHEN
-            comp.ngOnInit();
-
-            // THEN
-            expect(service.query).toHaveBeenCalledWith(expect.objectContaining({ sort: ['<%- primaryKey.fields.map(field => field.fieldName).join(',') %>,<%= order %>'] }));
-        });
-
-        it('should calculate the sort attribute for a non-id attribute', () => {
-            // INIT
-            comp.ngOnInit();
-
-            // GIVEN
-            comp.predicate = 'name';
-
-            // WHEN
-            comp.loadPage(1);
-
-            // THEN
-            expect(service.query).toHaveBeenLastCalledWith(expect.objectContaining({ sort: ['name,<%= order %>', '<%- primaryKey.fields.map(field => field.fieldName).join(',') %>'] }));
-        });
-
-    <%_ if (paginationInfiniteScroll) { _%>
-        it('should re-initialize the page', () => {
-            // WHEN
-            comp.loadPage(1);
-            comp.reset();
-
-            // THEN
-            expect(comp.page).toEqual(0);
-            expect(service.query).toHaveBeenCalledTimes(2);
-            expect(comp.<%= entityInstancePlural %>[0]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey %>));
-        });
-    <%_ } _%>
-<%_ } _%>
+    it('should load a page', () => {
+        // WHEN
+        comp.loadPage(1);
+
+        // THEN
+        expect(service.query).toHaveBeenCalled();
+        expect(comp.<%= entityInstancePlural %><%= entityArrayOptionalChainSymbol %>[0]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey %>));
+    });
+
+    it('should calculate the sort attribute for an id', () => {
+        // WHEN
+        comp.ngOnInit();
+
+        // THEN
+        expect(service.query).toHaveBeenCalledWith(expect.objectContaining({ sort: ['<%- primaryKey.fields.map(field => field.fieldName).join(',') %>,<%= order %>'] }));
     });
+
+    it('should calculate the sort attribute for a non-id attribute', () => {
+        // INIT
+        comp.ngOnInit();
+
+        // GIVEN
+        comp.predicate = 'name';
+
+        // WHEN
+        comp.loadPage(1);
+
+        // THEN
+        expect(service.query).toHaveBeenLastCalledWith(expect.objectContaining({ sort: ['name,<%= order %>', '<%- primaryKey.fields.map(field => field.fieldName).join(',') %>'] }));
+    });
+
+  <%_ if (paginationInfiniteScroll) { _%>
+    it('should re-initialize the page', () => {
+        // WHEN
+        comp.loadPage(1);
+        comp.reset();
+
+        // THEN
+        expect(comp.page).toEqual(0);
+        expect(service.query).toHaveBeenCalledTimes(2);
+        expect(comp.<%= entityInstancePlural %>[0]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey %>));
+    });
+  <%_ } _%>
+<%_ } _%>
 });

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,
@@ -153,7 +153,14 @@ _%>
 
     <%_ } else if (paginationInfiniteScroll) { _%>
     protected paginate<%= entityClassPlural %>(data: I<%= entityAngularName %>[] | null, headers: HttpHeaders): void {
-        this.links = this.parseLinks.parse(headers.get('link') ?? '');
+        const linkHeader = headers.get('link');
+        if (linkHeader) {
+            this.links = this.parseLinks.parse(linkHeader);
+        } else {
+            this.links = {
+                last: 0,
+            };
+        }
         if (data) {
             for (const d of data) {
                 this.<%= entityInstancePlural %>.push(d);