generator-jhipster 7.1.0 → 7.4.0

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs

@@ -24,40 +24,38 @@ import { MetricsComponent } from './metrics.component';
 import { MetricsService } from './metrics.service';
 import { Metrics } from './metrics.model';
 
-describe('Component Tests', () => {
-  describe('MetricsComponent', () => {
-    let comp: MetricsComponent;
-    let fixture: ComponentFixture<MetricsComponent>;
-    let service: MetricsService;
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [MetricsComponent],
-        })
-          .overrideTemplate(MetricsComponent, '')
-          .compileComponents();
+describe('MetricsComponent', () => {
+  let comp: MetricsComponent;
+  let fixture: ComponentFixture<MetricsComponent>;
+  let service: MetricsService;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [MetricsComponent],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(MetricsComponent);
-      comp = fixture.componentInstance;
-      service = TestBed.inject(MetricsService);
-    });
+        .overrideTemplate(MetricsComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetricsComponent);
+    comp = fixture.componentInstance;
+    service = TestBed.inject(MetricsService);
+  });
 
-    describe('refresh', () => {
-      it('should call refresh on init', () => {
-        // GIVEN
-        jest.spyOn(service, 'getMetrics').mockReturnValue(of({} as Metrics));
+  describe('refresh', () => {
+    it('should call refresh on init', () => {
+      // GIVEN
+      jest.spyOn(service, 'getMetrics').mockReturnValue(of({} as Metrics));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(service.getMetrics).toHaveBeenCalled();
-      });
+      // THEN
+      expect(service.getMetrics).toHaveBeenCalled();
     });
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs

@@ -22,80 +22,78 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { MetricsService } from './metrics.service';
 import { ThreadDump, ThreadState } from './metrics.model';
 
-describe('Service Tests', () => {
-  describe('Logs Service', () => {
-    let service: MetricsService;
-    let httpMock: HttpTestingController;
+describe('Logs Service', () => {
+  let service: MetricsService;
+  let httpMock: HttpTestingController;
 
-    beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
-      });
-      service = TestBed.inject(MetricsService);
-      httpMock = TestBed.inject(HttpTestingController);
-    });
-
-    afterEach(() => {
-      httpMock.verify();
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
     });
+    service = TestBed.inject(MetricsService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
 
-    describe('Service methods', () => {
-      it('should return Metrics', () => {
-        let expectedResult;
-        const metrics = {
-          jvm: {},
-          'http.server.requests': {},
-          cache: {},
-          services: {},
-          databases: {},
-          garbageCollector: {},
-          processMetrics: {},
-        };
+  afterEach(() => {
+    httpMock.verify();
+  });
 
-        service.getMetrics().subscribe(received => {
-          expectedResult = received;
-        });
+  describe('Service methods', () => {
+    it('should return Metrics', () => {
+      let expectedResult;
+      const metrics = {
+        jvm: {},
+        'http.server.requests': {},
+        cache: {},
+        services: {},
+        databases: {},
+        garbageCollector: {},
+        processMetrics: {},
+      };
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush(metrics);
-        expect(expectedResult).toEqual(metrics);
+      service.getMetrics().subscribe(received => {
+        expectedResult = received;
       });
 
-      it('should return Thread Dump', () => {
-        let expectedResult: ThreadDump | null = null;
-        const dump: ThreadDump = {
-          threads: [
-            {
-              threadName: 'Reference Handler',
-              threadId: 2,
-              blockedTime: -1,
-              blockedCount: 7,
-              waitedTime: -1,
-              waitedCount: 0,
-              lockName: null,
-              lockOwnerId: -1,
-              lockOwnerName: null,
-              daemon: true,
-              inNative: false,
-              suspended: false,
-              threadState: ThreadState.Runnable,
-              priority: 10,
-              stackTrace: [],
-              lockedMonitors: [],
-              lockedSynchronizers: [],
-              lockInfo: null,
-            },
-          ],
-        };
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush(metrics);
+      expect(expectedResult).toEqual(metrics);
+    });
 
-        service.threadDump().subscribe(received => {
-          expectedResult = received;
-        });
+    it('should return Thread Dump', () => {
+      let expectedResult: ThreadDump | null = null;
+      const dump: ThreadDump = {
+        threads: [
+          {
+            threadName: 'Reference Handler',
+            threadId: 2,
+            blockedTime: -1,
+            blockedCount: 7,
+            waitedTime: -1,
+            waitedCount: 0,
+            lockName: null,
+            lockOwnerId: -1,
+            lockOwnerName: null,
+            daemon: true,
+            inNative: false,
+            suspended: false,
+            threadState: ThreadState.Runnable,
+            priority: 10,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null,
+          },
+        ],
+      };
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush(dump);
-        expect(expectedResult).toEqual(dump);
+      service.threadDump().subscribe(received => {
+        expectedResult = received;
       });
+
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush(dump);
+      expect(expectedResult).toEqual(dump);
     });
   });
 });

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

@@ -27,48 +27,46 @@ import { UserManagementService } from '../service/user-management.service';
 
 import { UserManagementDeleteDialogComponent } from './user-management-delete-dialog.component';
 
-describe('Component Tests', () => {
-  describe('User Management Delete Component', () => {
-    let comp: UserManagementDeleteDialogComponent;
-    let fixture: ComponentFixture<UserManagementDeleteDialogComponent>;
-    let service: UserManagementService;
-    let mockActiveModal: NgbActiveModal;
+describe('User Management Delete Component', () => {
+  let comp: UserManagementDeleteDialogComponent;
+  let fixture: ComponentFixture<UserManagementDeleteDialogComponent>;
+  let service: UserManagementService;
+  let mockActiveModal: NgbActiveModal;
 
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [UserManagementDeleteDialogComponent],
-          providers: [NgbActiveModal],
-        })
-          .overrideTemplate(UserManagementDeleteDialogComponent, '')
-          .compileComponents();
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [UserManagementDeleteDialogComponent],
+        providers: [NgbActiveModal],
       })
-    );
+        .overrideTemplate(UserManagementDeleteDialogComponent, '')
+        .compileComponents();
+    })
+  );
 
-    beforeEach(() => {
-      fixture = TestBed.createComponent(UserManagementDeleteDialogComponent);
-      comp = fixture.componentInstance;
-      service = TestBed.inject(UserManagementService);
-      mockActiveModal = TestBed.inject(NgbActiveModal);
-    });
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserManagementDeleteDialogComponent);
+    comp = fixture.componentInstance;
+    service = TestBed.inject(UserManagementService);
+    mockActiveModal = TestBed.inject(NgbActiveModal);
+  });
 
-    describe('confirmDelete', () => {
-      it('Should call delete service on confirmDelete', inject(
-        [],
-        fakeAsync(() => {
-          // GIVEN
-          jest.spyOn(service, 'delete').mockReturnValue(of({}));
+  describe('confirmDelete', () => {
+    it('Should call delete service on confirmDelete', inject(
+      [],
+      fakeAsync(() => {
+        // GIVEN
+        jest.spyOn(service, 'delete').mockReturnValue(of({}));
 
-          // WHEN
-          comp.confirmDelete('user');
-          tick();
+        // WHEN
+        comp.confirmDelete('user');
+        tick();
 
-          // THEN
-          expect(service.delete).toHaveBeenCalledWith('user');
-          expect(mockActiveModal.close).toHaveBeenCalledWith('deleted');
-        })
-      ));
-    });
+        // THEN
+        expect(service.delete).toHaveBeenCalledWith('user');
+        expect(mockActiveModal.close).toHaveBeenCalledWith('deleted');
+      })
+    ));
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs

@@ -28,54 +28,52 @@ import { User } from '../user-management.model';
 
 import { UserManagementDetailComponent } from './user-management-detail.component';
 
-describe('Component Tests', () => {
-  describe('User Management Detail Component', () => {
-    let comp: UserManagementDetailComponent;
-    let fixture: ComponentFixture<UserManagementDetailComponent>;
+describe('User Management Detail Component', () => {
+  let comp: UserManagementDetailComponent;
+  let fixture: ComponentFixture<UserManagementDetailComponent>;
 
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          declarations: [UserManagementDetailComponent],
-          providers: [
-            {
-              provide: ActivatedRoute,
-              useValue: {
-                data: of({ user: new User(<%- tsKeyId %>, 'user', 'first', 'last', 'first@last.com', true, 'en', [Authority.USER], 'admin') }),
-              },
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [UserManagementDetailComponent],
+        providers: [
+          {
+            provide: ActivatedRoute,
+            useValue: {
+              data: of({ user: new User(<%- tsKeyId %>, 'user', 'first', 'last', 'first@last.com', true, 'en', [Authority.USER], 'admin') }),
             },
-          ],
-        })
-          .overrideTemplate(UserManagementDetailComponent, '')
-          .compileComponents();
+          },
+        ],
       })
-    );
+        .overrideTemplate(UserManagementDetailComponent, '')
+        .compileComponents();
+    })
+  );
 
-    beforeEach(() => {
-      fixture = TestBed.createComponent(UserManagementDetailComponent);
-      comp = fixture.componentInstance;
-    });
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserManagementDetailComponent);
+    comp = fixture.componentInstance;
+  });
 
-    describe('OnInit', () => {
-      it('Should call load all on init', () => {
-        // WHEN
-        comp.ngOnInit();
+  describe('OnInit', () => {
+    it('Should call load all on init', () => {
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(comp.user).toEqual(
-          expect.objectContaining({
-            id: <%- tsKeyId %>,
-            login: 'user',
-            firstName: 'first',
-            lastName: 'last',
-            email: 'first@last.com',
-            activated: true,
-            langKey: 'en',
-            authorities: [Authority.USER],
-            createdBy: 'admin',
-          })
-        );
-      });
+      // THEN
+      expect(comp.user).toEqual(
+        expect.objectContaining({
+          id: <%- tsKeyId %>,
+          login: 'user',
+          firstName: 'first',
+          lastName: 'last',
+          email: 'first@last.com',
+          activated: true,
+          langKey: 'en',
+          authorities: [Authority.USER],
+          createdBy: 'admin',
+        })
+      );
     });
   });
 });

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

@@ -38,7 +38,7 @@
   <div class="table-responsive" *ngIf="users">
     <table class="table table-striped" aria-describedby="user-management-page-heading">
       <thead>
-        <tr<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>Sort [(predicate)]="predicate" [(ascending)]="ascending" [callback]="transition.bind(this)"<% } %>>
+        <tr<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>Sort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="transition()"<% } %>>
           <th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="id"<% } %>>
             <span <%= jhiPrefix %>Translate="global.field.id">ID</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
           </th>

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

@@ -34,96 +34,94 @@ import { AccountService } from 'app/core/auth/account.service';
 
 import { UserManagementComponent } from './user-management.component';
 
-describe('Component Tests', () => {
-  describe('User Management Component', () => {
-    let comp: UserManagementComponent;
-    let fixture: ComponentFixture<UserManagementComponent>;
-    let service: UserManagementService;
-    let mockAccountService: AccountService;
-    const data = of({
-      defaultSort: 'id,asc',
-    });
-    const queryParamMap = of(
-      jest.requireActual('@angular/router').convertToParamMap({
-        page: '1',
-        size: '1',
-        sort: 'id,desc',
+describe('User Management Component', () => {
+  let comp: UserManagementComponent;
+  let fixture: ComponentFixture<UserManagementComponent>;
+  let service: UserManagementService;
+  let mockAccountService: AccountService;
+  const data = of({
+    defaultSort: 'id,asc',
+  });
+  const queryParamMap = of(
+    jest.requireActual('@angular/router').convertToParamMap({
+      page: '1',
+      size: '1',
+      sort: 'id,desc',
+    })
+  );
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [UserManagementComponent],
+        providers: [Router, { provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
+      })
+        .overrideTemplate(UserManagementComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserManagementComponent);
+    comp = fixture.componentInstance;
+    service = TestBed.inject(UserManagementService);
+    mockAccountService = TestBed.inject(AccountService);
+    mockAccountService.identity = jest.fn(() => of(null));
+  });
+
+  describe('OnInit', () => {
+    it('Should call load all on init', inject(
+      [],
+      fakeAsync(() => {
+        // GIVEN
+        const headers = new HttpHeaders().append('link', 'link;link');
+        jest.spyOn(service, 'query').mockReturnValue(
+          of(
+            new HttpResponse({
+              body: [new User(<%- tsKeyId %>)],
+              headers,
+            })
+          )
+        );
+
+        // WHEN
+        comp.ngOnInit();
+        tick(); // simulate async
+
+        // THEN
+        expect(service.query).toHaveBeenCalled();
+        expect(comp.users?.[0]).toEqual(expect.objectContaining({ id: <%- tsKeyId %> }));
       })
-    );
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [UserManagementComponent],
-          providers: [Router, { provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
-        })
-          .overrideTemplate(UserManagementComponent, '')
-          .compileComponents();
+    ));
+  });
+
+  describe('setActive', () => {
+    it('Should update user and call load all', inject(
+      [],
+      fakeAsync(() => {
+        // GIVEN
+        const headers = new HttpHeaders().append('link', 'link;link');
+        const user = new User(<%- tsKeyId %>);
+        jest.spyOn(service, 'query').mockReturnValue(
+          of(
+            new HttpResponse({
+              body: [user],
+              headers,
+            })
+          )
+        );
+        jest.spyOn(service, 'update').mockReturnValue(of(user));
+
+        // WHEN
+        comp.setActive(user, true);
+        tick(); // simulate async
+
+        // THEN
+        expect(service.update).toHaveBeenCalledWith({ ...user, activated: true });
+        expect(service.query).toHaveBeenCalled();
+        expect(comp.users?.[0]).toEqual(expect.objectContaining({ id: <%- tsKeyId %> }));
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(UserManagementComponent);
-      comp = fixture.componentInstance;
-      service = TestBed.inject(UserManagementService);
-      mockAccountService = TestBed.inject(AccountService);
-      mockAccountService.identity = jest.fn(() => of(null));
-    });
-
-    describe('OnInit', () => {
-      it('Should call load all on init', inject(
-        [],
-        fakeAsync(() => {
-          // GIVEN
-          const headers = new HttpHeaders().append('link', 'link;link');
-          jest.spyOn(service, 'query').mockReturnValue(
-            of(
-              new HttpResponse({
-                body: [new User(<%- tsKeyId %>)],
-                headers,
-              })
-            )
-          );
-
-          // WHEN
-          comp.ngOnInit();
-          tick(); // simulate async
-
-          // THEN
-          expect(service.query).toHaveBeenCalled();
-          expect(comp.users?.[0]).toEqual(expect.objectContaining({ id: <%- tsKeyId %> }));
-        })
-      ));
-    });
-
-    describe('setActive', () => {
-      it('Should update user and call load all', inject(
-        [],
-        fakeAsync(() => {
-          // GIVEN
-          const headers = new HttpHeaders().append('link', 'link;link');
-          const user = new User(<%- tsKeyId %>);
-          jest.spyOn(service, 'query').mockReturnValue(
-            of(
-              new HttpResponse({
-                body: [user],
-                headers,
-              })
-            )
-          );
-          jest.spyOn(service, 'update').mockReturnValue(of(user));
-
-          // WHEN
-          comp.setActive(user, true);
-          tick(); // simulate async
-
-          // THEN
-          expect(service.update).toHaveBeenCalledWith({ ...user, activated: true });
-          expect(service.query).toHaveBeenCalled();
-          expect(comp.users?.[0]).toEqual(expect.objectContaining({ id: <%- tsKeyId %> }));
-        })
-      ));
-    });
+    ));
   });
 });

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

@@ -110,7 +110,7 @@ export class UserManagementComponent implements OnInit {
       relativeTo: this.activatedRoute.parent,
       queryParams: {
         page: this.page,
-        sort: this.predicate + ',' + (this.ascending ? ASC : DESC),
+        sort: `${this.predicate},${this.ascending ? ASC : DESC}`,
       },
     });
   }
@@ -118,7 +118,7 @@ export class UserManagementComponent implements OnInit {
   private handleNavigation(): void {
     combineLatest([this.activatedRoute.data, this.activatedRoute.queryParamMap]).subscribe(([data, params]) => {
       const page = params.get('page');
-      this.page = page !== null ? +page : 1;
+      this.page = +(page ?? 1);
       const sort = (params.get(SORT) ?? data['defaultSort']).split(',');
       this.predicate = sort[0];
       this.ascending = sort[1] === ASC;
@@ -129,7 +129,7 @@ export class UserManagementComponent implements OnInit {
 
 <%_ if (!databaseTypeCassandra) { _%>
   private sort(): string[] {
-    const result = [this.predicate + ',' + (this.ascending ? ASC : DESC)];
+    const result = [`${this.predicate},${this.ascending ? ASC : DESC}`];
     if (this.predicate !== 'id') {
       result.push('id');
     }