generator-jhipster 7.3.0 → 7.5.0

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

@@ -19,13 +19,13 @@
 <%_
 const tsKeyId = generateTestEntityId(user.primaryKey.type);
 _%>
-jest.mock('@angular/router');
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, waitForAsync, inject, fakeAsync, tick } from '@angular/core/testing';
 import { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
 import { UserManagementService } from '../service/user-management.service';
@@ -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, RouterTestingModule.withRoutes([])],
+        declarations: [UserManagementComponent],
+        providers: [{ 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

@@ -95,13 +95,13 @@ export class UserManagementComponent implements OnInit {
         size: this.itemsPerPage,
         sort: this.sort(),
       }<% } %>)
-      .subscribe(
-        (res: HttpResponse<User[]>) => {
+      .subscribe({
+        next: (res: HttpResponse<User[]>) => {
           this.isLoading = false;
           this.onSuccess(res.body<% if (!databaseTypeCassandra) { %>, res.headers<% } %>);
         },
-        () => this.isLoading = false
-      );
+        error: () => this.isLoading = false
+      });
   }
 
 <%_ if (!databaseTypeCassandra) { _%>

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/admin/user-management/update/user-management-update.component.ts.ejs

@@ -72,18 +72,18 @@ export class UserManagementUpdateComponent implements OnInit {
     this.isSaving = true;
     this.updateUser(this.user);
     if (this.user.id !== undefined) {
-      this.userService.update(this.user).subscribe(
-        () => this.onSaveSuccess(),
-        () => this.onSaveError()
-      );
+      this.userService.update(this.user).subscribe({
+        next: () => this.onSaveSuccess(),
+        error: () => this.onSaveError()
+      });
     } else {
 <%_ if (!enableTranslation) { _%>
       this.user.langKey = 'en';
 <%_ } _%>
-      this.userService.create(this.user).subscribe(
-        () => this.onSaveSuccess(),
-        () => this.onSaveError()
-      );
+      this.userService.create(this.user).subscribe({
+        next: () => this.onSaveSuccess(),
+        error: () => this.onSaveError()
+      });
     }
   }
 

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

@@ -26,8 +26,6 @@ import { Authority } from 'app/config/authority.constants';
 
 import { UserRouteAccessService } from 'app/core/auth/user-route-access.service';
 
-const LAYOUT_ROUTES = [navbarRoute, ...errorRoute];
-
 @NgModule({
   imports: [
     RouterModule.forRoot(
@@ -54,7 +52,20 @@ const LAYOUT_ROUTES = [navbarRoute, ...errorRoute];
           loadChildren: () => import('./login/login.module').then(m => m.LoginModule),
         },
 <%_ } _%>
-        ...LAYOUT_ROUTES,
+        {
+          path: '<%= applicationTypeMicroservice ? lowercaseBaseName : '' %>',
+          loadChildren: () => import(`./entities/entity-routing.module`).then(m => m.EntityRoutingModule),
+        },
+<%_ if (applicationTypeGateway) { _%>
+  <%_ for (const remote of microfrontends) { _%>
+        {
+          path: '<%= remote.lowercaseBaseName %>',
+          loadChildren: () => import(`<%= remote.lowercaseBaseName %>/entity-routing`).then(m => m.EntityRoutingModule),
+        },
+  <%_ } _%>
+<%_ } _%>
+        navbarRoute,
+        ...errorRoute,
       ],
       { enableTracing: DEBUG_INFO_ENABLED }
     ),

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

@@ -21,7 +21,7 @@
 _%>
 import { NgModule, LOCALE_ID } from '@angular/core';
 import { registerLocaleData } from '@angular/common';
-import { <% if (enableTranslation) { %>HttpClient, <% } %>HttpClientModule } from '@angular/common/http';
+import { HttpClientModule } from '@angular/common/http';
 import locale from '@angular/common/locales/<%= localeId %>';
 import { BrowserModule, Title } from '@angular/platform-browser';
 import { ServiceWorkerModule } from '@angular/service-worker';
@@ -29,19 +29,18 @@ import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
 <%_ if (authenticationTypeSession && communicationSpringWebsocket) { _%>
 import { CookieService } from 'ngx-cookie-service';
 <%_ } _%>
-<%_ if (enableTranslation) { _%>
-import { TranslateModule, TranslateService, TranslateLoader, MissingTranslationHandler } from '@ngx-translate/core';
-<%_ } _%>
-import { NgxWebstorageModule<% if (enableTranslation) { %>, SessionStorageService<% } %> } from 'ngx-webstorage';
-import * as dayjs from 'dayjs';
+import { NgxWebstorageModule } from 'ngx-webstorage';
+import dayjs from 'dayjs/esm';
 import { NgbDateAdapter, NgbDatepickerConfig } from '@ng-bootstrap/ng-bootstrap';
 
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
 import './config/dayjs';
 import { SharedModule } from 'app/shared/shared.module';
+<%_ if (enableTranslation) { _%>
+import { TranslationModule } from 'app/shared/language/translation.module';
+<%_ } _%>
 import { AppRoutingModule } from './app-routing.module';
 import { HomeModule } from './home/home.module';
-import { EntityRoutingModule } from './entities/entity-routing.module';
 // jhipster-needle-angular-add-module-import JHipster will add new module here
 import { NgbDateDayjsAdapter } from './config/datepicker-adapter';
 import { fontAwesomeIcons } from './config/font-awesome-icons';
@@ -49,9 +48,6 @@ import { httpInterceptorProviders } from 'app/core/interceptor/index';
 <%_ if (enableI18nRTL) { _%>
 import { FindLanguageFromKeyPipe } from 'app/shared/language/find-language-from-key.pipe';
 <%_ } _%>
-<%_ if (enableTranslation) { _%>
-import { translatePartialLoader, missingTranslationHandler } from './config/translation.config';
-<%_ } _%>
 import { MainComponent } from './layouts/main/main.component';
 import { NavbarComponent } from './layouts/navbar/navbar.component';
 import { FooterComponent } from './layouts/footer/footer.component';
@@ -67,24 +63,13 @@ import { ErrorComponent } from './layouts/error/error.component';
     SharedModule,
     HomeModule,
     // jhipster-needle-angular-add-module JHipster will add new module here
-    EntityRoutingModule,
     AppRoutingModule,
     // Set this to true to enable service worker (PWA)
     ServiceWorkerModule.register('ngsw-worker.js', { enabled: false }),
     HttpClientModule,
     NgxWebstorageModule.forRoot({ prefix: '<%= jhiPrefixDashed %>', separator: '-', caseSensitive: true }),
 <%_ if (enableTranslation) { _%>
-    TranslateModule.forRoot({
-      loader: {
-        provide: TranslateLoader,
-        useFactory: translatePartialLoader,
-        deps: [HttpClient],
-      },
-      missingTranslationHandler: {
-        provide: MissingTranslationHandler,
-        useFactory: missingTranslationHandler,
-      },
-    }),
+    TranslationModule,
 <%_ } _%>
   ],
   providers: [
@@ -112,7 +97,7 @@ import { ErrorComponent } from './layouts/error/error.component';
   bootstrap: [MainComponent],
 })
 export class AppModule {
-  constructor(applicationConfigService: ApplicationConfigService, iconLibrary: FaIconLibrary, dpConfig: NgbDatepickerConfig<% if (enableTranslation) { %>, translateService: TranslateService, sessionStorageService: SessionStorageService<% } %>) {
+  constructor(applicationConfigService: ApplicationConfigService, iconLibrary: FaIconLibrary, dpConfig: NgbDatepickerConfig) {
 <%_ if (applicationTypeMicroservice) { _%>
     applicationConfigService.setMicrofrontend();
 <%_ } _%>
@@ -120,11 +105,5 @@ export class AppModule {
     registerLocaleData(locale);
     iconLibrary.addIcons(...fontAwesomeIcons);
     dpConfig.minDate = { year: dayjs().subtract(100, 'year').year(), month: 1, day: 1 };
-<%_ if (enableTranslation) { _%>
-    translateService.setDefaultLang('<%= nativeLanguage %>');
-    // if user have changed language and navigates away from the application and back to the application then use previously choosed language
-    const langKey = sessionStorageService.retrieve('locale') ?? '<%= nativeLanguage %>';
-    translateService.use(langKey);
-<%_ } _%>
   }
 }

package/generators/client/templates/angular/src/main/webapp/app/config/datepicker-adapter.ts.ejs

@@ -21,7 +21,7 @@
  */
 import { Injectable } from '@angular/core';
 import { NgbDateAdapter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 
 @Injectable()
 export class NgbDateDayjsAdapter extends NgbDateAdapter<dayjs.Dayjs> {

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

@@ -16,10 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import * as dayjs from 'dayjs';
-import * as customParseFormat from 'dayjs/plugin/customParseFormat';
-import * as duration from 'dayjs/plugin/duration';
-import * as relativeTime from 'dayjs/plugin/relativeTime';
+import dayjs from 'dayjs/esm';
+import customParseFormat from 'dayjs/esm/plugin/customParseFormat';
+import duration from 'dayjs/esm/plugin/duration';
+import relativeTime from 'dayjs/esm/plugin/relativeTime';
 
 // jhipster-needle-i18n-language-dayjs-imports - JHipster will import languages from dayjs here
 

package/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs

@@ -16,20 +16,18 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-jest.mock('@angular/router');
-<%_ if (enableTranslation) { _%>
-jest.mock('@ngx-translate/core');
-<%_ } _%>
 jest.mock('app/core/auth/state-storage.service');
 <%_ if (communicationSpringWebsocket) { _%>
 jest.mock('app/core/tracker/tracker.service');
 <%_ } _%>
 
 import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 <%_ if (enableTranslation) { _%>
-import { TranslateService } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { of } from 'rxjs';
 <%_ } _%>
 import { NgxWebstorageModule<% if (enableTranslation) { %>, SessionStorageService<% } %> } from 'ngx-webstorage';
 
@@ -76,16 +74,19 @@ describe('Account Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, NgxWebstorageModule.forRoot()],
-      providers: [
+      imports: [
+        HttpClientTestingModule,
+        RouterTestingModule.withRoutes([]),
 <%_ if (enableTranslation) { _%>
-        TranslateService,
+        TranslateModule.forRoot(),
 <%_ } _%>
+        NgxWebstorageModule.forRoot()
+      ],
+      providers: [
 <%_ if (communicationSpringWebsocket) { _%>
         TrackerService,
 <%_ } _%>
         StateStorageService,
-        Router,
       ],
     });
 
@@ -96,11 +97,15 @@ describe('Account Service', () => {
     httpMock = TestBed.inject(HttpTestingController);
     mockStorageService = TestBed.inject(StateStorageService);
     mockRouter = TestBed.inject(Router);
+    jest.spyOn(mockRouter, 'navigateByUrl').mockImplementation(() => Promise.resolve(true));
 <%_ if (communicationSpringWebsocket) { _%>
+
     mockTrackerService = TestBed.inject(TrackerService);
 <%_ } _%>
 <%_ if (enableTranslation) { _%>
+
     mockTranslateService = TestBed.inject(TranslateService);
+    jest.spyOn(mockTranslateService, 'use').mockImplementation(() => of(''));
     sessionStorageService = TestBed.inject(SessionStorageService);
 <%_ } _%>
   });