generator-jhipster 7.3.0 → 7.5.0

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) { _%>

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

@@ -54,16 +54,16 @@
                 page: pageToLoad - 1,
                 query: this.currentSearch,
                 size: this.itemsPerPage,
-                sort: this.sort()}).subscribe(
-                    (res: HttpResponse<I<%= entityAngularName %>[]>) => {
+                sort: this.sort()}).subscribe({
+                    next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
                         this.isLoading = false;
                         this.onSuccess(res.body, res.headers, pageToLoad, !dontNavigate);
                     },
-                    () => {
+                    error: () => {
                         this.isLoading = false;
                         this.onError();
                     }
-                );
+                });
             return;
         }
 <%_ } _%>
@@ -71,16 +71,16 @@
         this.<%= entityInstance %>Service.query({
             page: pageToLoad - 1,
             size: this.itemsPerPage,
-            sort: this.sort()}).subscribe(
-                (res: HttpResponse<I<%= entityAngularName %>[]>) => {
+            sort: this.sort()}).subscribe({
+                next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
                     this.isLoading = false;
                     this.onSuccess(res.body, res.headers, pageToLoad, !dontNavigate);
                 },
-                () => {
+                error: () => {
                     this.isLoading = false;
                     this.onError();
                 }
-            );
+            });
     }
 
 <%_ if (searchEngine) { _%>

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs

@@ -19,12 +19,11 @@
 <%_
 const tsKeyId = generateTestEntityId(primaryKey.type);
 _%>
-jest.mock('@angular/router');
-
 import { TestBed } from '@angular/core/testing';
 import { HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, ActivatedRoute, Router, convertToParamMap } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
 import { I<%= entityAngularName %>, <%= entityAngularName %> } from '../<%= entityFileName %>.model';
@@ -41,11 +40,21 @@ describe('<%= entityAngularName %> routing resolve service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [Router, ActivatedRouteSnapshot],
+      imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([])],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              paramMap: convertToParamMap({})
+            },
+          },
+        },
+      ],
     });
     mockRouter = TestBed.inject(Router);
-    mockActivatedRouteSnapshot = TestBed.inject(ActivatedRouteSnapshot);
+    jest.spyOn(mockRouter, 'navigate').mockImplementation(() => Promise.resolve(true));
+    mockActivatedRouteSnapshot = TestBed.inject(ActivatedRoute).snapshot;
     routingResolveService = TestBed.inject(<%= entityAngularName %>RoutingResolveService);
     service = TestBed.inject(<%= entityAngularName %>Service);
     result<%= entityAngularName %> = undefined;

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

@@ -33,7 +33,7 @@ const <%= entityInstance %>Route: Routes = [
         component: <%= entityAngularName %>Component,
 <%_ if (paginationPagination) { _%>
         data: {
-            defaultSort: 'id,asc',
+            defaultSort: '<%- primaryKey.name %>,asc',
         },
 <%_ } _%>
         canActivate: [UserRouteAccessService]

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

@@ -25,7 +25,7 @@ _%>
 import { TestBed } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 <%_ if (fieldsContainDate) { _%>
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 <%_ } _%>
 
 <%_ if (fieldsContainDate) { _%>

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

@@ -27,7 +27,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 <%_ if (fieldsContainDate) { _%>
 import { map } from 'rxjs/operators';
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 <%_ } _%>
 
 import { isPresent } from 'app/core/util/operators';