generator-jhipster 7.2.0 → 7.4.1

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.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/service/user-management.service.spec.ts.ejs

@@ -30,65 +30,63 @@ import { User } from '../user-management.model';
 
 import { UserManagementService } from './user-management.service';
 
-describe('Service Tests', () => {
-  describe('User Service', () => {
-    let service: UserManagementService;
-    let httpMock: HttpTestingController;
-
-    beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
-      });
+describe('User Service', () => {
+  let service: UserManagementService;
+  let httpMock: HttpTestingController;
 
-      service = TestBed.inject(UserManagementService);
-      httpMock = TestBed.inject(HttpTestingController);
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
     });
 
-    afterEach(() => {
-      httpMock.verify();
-    });
+    service = TestBed.inject(UserManagementService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
 
-    describe('Service methods', () => {
-      it('should return User', () => {
-        let expectedResult: string | undefined;
+  afterEach(() => {
+    httpMock.verify();
+  });
 
-        service.find('user').subscribe(received => {
-          expectedResult = received.login;
-        });
+  describe('Service methods', () => {
+    it('should return User', () => {
+      let expectedResult: string | undefined;
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush(new User(<%- tsKeyId %>, 'user'));
-        expect(expectedResult).toEqual('user');
+      service.find('user').subscribe(received => {
+        expectedResult = received.login;
       });
 
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase) { _%>
-      it('should return Authorities', () => {
-        let expectedResult: string[] = [];
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush(new User(<%- tsKeyId %>, 'user'));
+      expect(expectedResult).toEqual('user');
+    });
 
-        service.authorities().subscribe(authorities => {
-          expectedResult = authorities;
-        });
-        const req = httpMock.expectOne({ method: 'GET' });
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase) { _%>
+    it('should return Authorities', () => {
+      let expectedResult: string[] = [];
 
-        req.flush([Authority.USER, Authority.ADMIN]);
-        expect(expectedResult).toEqual([Authority.USER, Authority.ADMIN]);
+      service.authorities().subscribe(authorities => {
+        expectedResult = authorities;
       });
+      const req = httpMock.expectOne({ method: 'GET' });
+
+      req.flush([Authority.USER, Authority.ADMIN]);
+      expect(expectedResult).toEqual([Authority.USER, Authority.ADMIN]);
+    });
 <%_ } _%>
 
-      it('should propagate not found response', () => {
-        let expectedResult = 0;
+    it('should propagate not found response', () => {
+      let expectedResult = 0;
 
-        service.find('user').subscribe({
-          error: (error: HttpErrorResponse) => expectedResult = error.status
-        });
+      service.find('user').subscribe({
+        error: (error: HttpErrorResponse) => expectedResult = error.status
+      });
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush('Invalid request parameters', {
-          status: 404,
-          statusText: 'Bad Request',
-        });
-        expect(expectedResult).toEqual(404);
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush('Invalid request parameters', {
+        status: 404,
+        statusText: 'Bad Request',
       });
+      expect(expectedResult).toEqual(404);
     });
   });
 });

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

@@ -31,90 +31,88 @@ import { User } from '../user-management.model';
 
 import { UserManagementUpdateComponent } from './user-management-update.component';
 
-describe('Component Tests', () => {
-  describe('User Management Update Component', () => {
-    let comp: UserManagementUpdateComponent;
-    let fixture: ComponentFixture<UserManagementUpdateComponent>;
-    let service: UserManagementService;
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [UserManagementUpdateComponent],
-          providers: [
-            FormBuilder,
-            {
-              provide: ActivatedRoute,
-              useValue: {
-                data: of({ user: new User(<%- tsKeyId %>, 'user', 'first', 'last', 'first@last.com', true, 'en', [Authority.USER], 'admin') }),
-              },
+describe('User Management Update Component', () => {
+  let comp: UserManagementUpdateComponent;
+  let fixture: ComponentFixture<UserManagementUpdateComponent>;
+  let service: UserManagementService;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [UserManagementUpdateComponent],
+        providers: [
+          FormBuilder,
+          {
+            provide: ActivatedRoute,
+            useValue: {
+              data: of({ user: new User(<%- tsKeyId %>, 'user', 'first', 'last', 'first@last.com', true, 'en', [Authority.USER], 'admin') }),
             },
-          ],
-        })
-          .overrideTemplate(UserManagementUpdateComponent, '')
-          .compileComponents();
+          },
+        ],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(UserManagementUpdateComponent);
-      comp = fixture.componentInstance;
-      service = TestBed.inject(UserManagementService);
-    });
-
-    describe('OnInit', () => {
-      it('Should load authorities and language on init', inject(
-        [],
-        fakeAsync(() => {
-          // GIVEN
-          jest.spyOn(service, 'authorities').mockReturnValue(of(['USER']));
-
-          // WHEN
-          comp.ngOnInit();
-
-          // THEN
-          expect(service.authorities).toHaveBeenCalled();
-          expect(comp.authorities).toEqual(['USER']);
-        })
-      ));
-    });
-
-    describe('save', () => {
-      it('Should call update service on save for existing user', inject(
-        [],
-        fakeAsync(() => {
-          // GIVEN
-          const entity = new User(<%- tsKeyId %>);
-          jest.spyOn(service, 'update').mockReturnValue(of(entity));
-          comp.user = entity;
-          comp.editForm.patchValue({ id: entity.id });
-          // WHEN
-          comp.save();
-          tick(); // simulate async
-
-          // THEN
-          expect(service.update).toHaveBeenCalledWith(entity);
-          expect(comp.isSaving).toEqual(false);
-        })
-      ));
-
-      it('Should call create service on save for new user', inject(
-        [],
-        fakeAsync(() => {
-          // GIVEN
-          const entity = new User();
-          jest.spyOn(service, 'create').mockReturnValue(of(entity));
-          comp.user = entity;
-          // WHEN
-          comp.save();
-          tick(); // simulate async
-
-          // THEN
-          expect(service.create).toHaveBeenCalledWith(entity);
-          expect(comp.isSaving).toEqual(false);
-        })
-      ));
-    });
+        .overrideTemplate(UserManagementUpdateComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserManagementUpdateComponent);
+    comp = fixture.componentInstance;
+    service = TestBed.inject(UserManagementService);
+  });
+
+  describe('OnInit', () => {
+    it('Should load authorities and language on init', inject(
+      [],
+      fakeAsync(() => {
+        // GIVEN
+        jest.spyOn(service, 'authorities').mockReturnValue(of(['USER']));
+
+        // WHEN
+        comp.ngOnInit();
+
+        // THEN
+        expect(service.authorities).toHaveBeenCalled();
+        expect(comp.authorities).toEqual(['USER']);
+      })
+    ));
+  });
+
+  describe('save', () => {
+    it('Should call update service on save for existing user', inject(
+      [],
+      fakeAsync(() => {
+        // GIVEN
+        const entity = new User(<%- tsKeyId %>);
+        jest.spyOn(service, 'update').mockReturnValue(of(entity));
+        comp.user = entity;
+        comp.editForm.patchValue({ id: entity.id });
+        // WHEN
+        comp.save();
+        tick(); // simulate async
+
+        // THEN
+        expect(service.update).toHaveBeenCalledWith(entity);
+        expect(comp.isSaving).toEqual(false);
+      })
+    ));
+
+    it('Should call create service on save for new user', inject(
+      [],
+      fakeAsync(() => {
+        // GIVEN
+        const entity = new User();
+        jest.spyOn(service, 'create').mockReturnValue(of(entity));
+        comp.user = entity;
+        // WHEN
+        comp.save();
+        tick(); // simulate async
+
+        // THEN
+        expect(service.create).toHaveBeenCalledWith(entity);
+        expect(comp.isSaving).toEqual(false);
+      })
+    ));
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs

@@ -113,6 +113,9 @@ import { ErrorComponent } from './layouts/error/error.component';
 })
 export class AppModule {
   constructor(applicationConfigService: ApplicationConfigService, iconLibrary: FaIconLibrary, dpConfig: NgbDatepickerConfig<% if (enableTranslation) { %>, translateService: TranslateService, sessionStorageService: SessionStorageService<% } %>) {
+<%_ if (applicationTypeMicroservice) { _%>
+    applicationConfigService.setMicrofrontend();
+<%_ } _%>
     applicationConfigService.setEndpointPrefix(SERVER_API_URL);
     registerLocaleData(locale);
     iconLibrary.addIcons(...fontAwesomeIcons);