generator-jhipster 7.3.0 → 7.5.0

package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit<% if (enableTranslation && applicationTypeGateway) { %>, Compiler, Injector, NgModuleFactory, Type<% } %> } from '@angular/core';
 import { Router } from '@angular/router';
 <%_ if (enableTranslation) { _%>
 import { TranslateService } from '@ngx-translate/core';
@@ -31,6 +31,7 @@ import { Account } from 'app/core/auth/account.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { LoginService } from 'app/login/login.service';
 import { ProfileService } from 'app/layouts/profiles/profile.service';
+import { EntityNavbarItems } from 'app/entities/entity-navbar-items';
 
 @Component({
   selector: '<%= jhiPrefixDashed %>-navbar',
@@ -46,12 +47,22 @@ export class NavbarComponent implements OnInit {
   openAPIEnabled?: boolean;
   version = '';
   account: Account | null = null;
+  entitiesNavbarItems: any[] = [];
+<%_ if (applicationTypeGateway) { _%>
+  <%_ for (const remote of microfrontends) { _%>
+  <%= remote.lowercaseBaseName %>EntityNavbarItems: any[] = [];
+  <%_ } _%>
+<%_ } _%>
 
   constructor(
     private loginService: LoginService,
 <%_ if (enableTranslation) { _%>
     private translateService: TranslateService,
     private sessionStorageService: SessionStorageService,
+  <%_ if (applicationTypeGateway) { _%>
+    private compiler: Compiler,
+    private injector: Injector,
+  <%_ } _%>
 <%_ } _%>
     private accountService: AccountService,
     private profileService: ProfileService,
@@ -63,11 +74,32 @@ export class NavbarComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    this.entitiesNavbarItems = EntityNavbarItems;
     this.profileService.getProfileInfo().subscribe(profileInfo => {
       this.inProduction = profileInfo.inProduction;
       this.openAPIEnabled = profileInfo.openAPIEnabled;
     });
-    this.accountService.getAuthenticationState().subscribe(account => (this.account = account));
+
+    this.accountService.getAuthenticationState().subscribe(account => {
+      this.account = account;
+    <%_ if (applicationTypeGateway) { _%>
+  <%_ for (const remote of microfrontends) { _%>
+      import('<%= remote.lowercaseBaseName %>/entity-navbar-items').then(
+        <%= enableTranslation ? 'async ' : '' %>({ EntityNavbarItems: <%= remote.capitalizedBaseName %>EntityNavbarItems }) => {
+          this.<%= remote.lowercaseBaseName %>EntityNavbarItems = <%= remote.capitalizedBaseName %>EntityNavbarItems;
+    <%_ if (enableTranslation) { _%>
+          const { LazyTranslationModule } = await import('<%= remote.lowercaseBaseName %>/translation-module');
+          this.loadModule(LazyTranslationModule as Type<any>);
+    <%_ } _%>
+        },
+        error => {
+          // eslint-disable-next-line no-console
+          console.log('Error loading <%= remote.lowercaseBaseName %> entities', error);
+        }
+      );
+  <%_ } _%>
+<%_ } _%>
+    });
   }
 
 <%_ if (enableTranslation) { _%>
@@ -98,4 +130,11 @@ export class NavbarComponent implements OnInit {
   toggleNavbar(): void {
     this.isNavbarCollapsed = !this.isNavbarCollapsed;
   }
+<%_ if (enableTranslation && applicationTypeGateway) { _%>
+
+  private loadModule(moduleType: Type<any>): void {
+    const moduleFactory = this.compiler.compileModuleAndAllComponentsSync(moduleType);
+    moduleFactory.ngModuleFactory.create(this.injector);
+  }
+<%_ } _%>
 }

package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs

@@ -7,38 +7,36 @@ import { ProfileService } from 'app/layouts/profiles/profile.service';
 
 import { PageRibbonComponent } from './page-ribbon.component';
 
-describe('Component Tests', () => {
-  describe('Page Ribbon Component', () => {
-    let comp: PageRibbonComponent;
-    let fixture: ComponentFixture<PageRibbonComponent>;
-    let profileService: ProfileService;
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [PageRibbonComponent],
-        })
-          .overrideTemplate(PageRibbonComponent, '')
-          .compileComponents();
+describe('Page Ribbon Component', () => {
+  let comp: PageRibbonComponent;
+  let fixture: ComponentFixture<PageRibbonComponent>;
+  let profileService: ProfileService;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [PageRibbonComponent],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(PageRibbonComponent);
-      comp = fixture.componentInstance;
-      profileService = TestBed.inject(ProfileService);
-    });
+        .overrideTemplate(PageRibbonComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PageRibbonComponent);
+    comp = fixture.componentInstance;
+    profileService = TestBed.inject(ProfileService);
+  });
 
-    it('Should call profileService.getProfileInfo on init', () => {
-      // GIVEN
-      jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
+  it('Should call profileService.getProfileInfo on init', () => {
+    // GIVEN
+    jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
 
-      // WHEN
-      comp.ngOnInit();
+    // WHEN
+    comp.ngOnInit();
 
-      // THEN
-      expect(profileService.getProfileInfo).toHaveBeenCalled();
-    });
+    // THEN
+    expect(profileService.getProfileInfo).toHaveBeenCalled();
   });
 });

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

@@ -16,7 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-jest.mock('@angular/router');
 jest.mock('app/core/auth/account.service');
 jest.mock('app/login/login.service');
 
@@ -24,6 +23,7 @@ import { ElementRef } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { Router, Navigation } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of, throwError } from 'rxjs';
 
 import { AccountService } from 'app/core/auth/account.service';
@@ -31,144 +31,143 @@ import { AccountService } from 'app/core/auth/account.service';
 import { LoginService } from './login.service';
 import { LoginComponent } from './login.component';
 
-describe('Component Tests', () => {
-  describe('LoginComponent', () => {
-    let comp: LoginComponent;
-    let fixture: ComponentFixture<LoginComponent>;
-    let mockRouter: Router;
-    let mockAccountService: AccountService;
-    let mockLoginService: LoginService;
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          declarations: [LoginComponent],
-          providers: [
-            FormBuilder,
-            AccountService,
-            Router,
-            {
-              provide: LoginService,
-              useValue: {
-                login: jest.fn(() => of({})),
-              },
+describe('LoginComponent', () => {
+  let comp: LoginComponent;
+  let fixture: ComponentFixture<LoginComponent>;
+  let mockRouter: Router;
+  let mockAccountService: AccountService;
+  let mockLoginService: LoginService;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [RouterTestingModule.withRoutes([])],
+        declarations: [LoginComponent],
+        providers: [
+          FormBuilder,
+          AccountService,
+          {
+            provide: LoginService,
+            useValue: {
+              login: jest.fn(() => of({})),
             },
-          ],
-        })
-          .overrideTemplate(LoginComponent, '')
-          .compileComponents();
+          },
+        ],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(LoginComponent);
-      comp = fixture.componentInstance;
-      mockRouter = TestBed.inject(Router);
-      mockLoginService = TestBed.inject(LoginService);
-      mockAccountService = TestBed.inject(AccountService);
-    });
+        .overrideTemplate(LoginComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LoginComponent);
+    comp = fixture.componentInstance;
+    mockRouter = TestBed.inject(Router);
+    jest.spyOn(mockRouter, 'navigate').mockImplementation(() => Promise.resolve(true));
+    mockLoginService = TestBed.inject(LoginService);
+    mockAccountService = TestBed.inject(AccountService);
+  });
 
-    describe('ngOnInit', () => {
-      it('Should call accountService.identity on Init', () => {
-        // GIVEN
-        mockAccountService.identity = jest.fn(() => of(null));
-        mockAccountService.getAuthenticationState = jest.fn(() => of(null));
+  describe('ngOnInit', () => {
+    it('Should call accountService.identity on Init', () => {
+      // GIVEN
+      mockAccountService.identity = jest.fn(() => of(null));
+      mockAccountService.getAuthenticationState = jest.fn(() => of(null));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(mockAccountService.identity).toHaveBeenCalled();
-      });
+      // THEN
+      expect(mockAccountService.identity).toHaveBeenCalled();
+    });
 
-      it('Should call accountService.isAuthenticated on Init', () => {
-        // GIVEN
-        mockAccountService.identity = jest.fn(() => of(null));
+    it('Should call accountService.isAuthenticated on Init', () => {
+      // GIVEN
+      mockAccountService.identity = jest.fn(() => of(null));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(mockAccountService.isAuthenticated).toHaveBeenCalled();
-      });
+      // THEN
+      expect(mockAccountService.isAuthenticated).toHaveBeenCalled();
+    });
 
-      it('should navigate to home page on Init if authenticated=true', () => {
-        // GIVEN
-        mockAccountService.identity = jest.fn(() => of(null));
-        mockAccountService.getAuthenticationState = jest.fn(() => of(null));
-        mockAccountService.isAuthenticated = () => true;
+    it('should navigate to home page on Init if authenticated=true', () => {
+      // GIVEN
+      mockAccountService.identity = jest.fn(() => of(null));
+      mockAccountService.getAuthenticationState = jest.fn(() => of(null));
+      mockAccountService.isAuthenticated = () => true;
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['']);
-      });
+      // THEN
+      expect(mockRouter.navigate).toHaveBeenCalledWith(['']);
     });
+  });
 
-    describe('ngAfterViewInit', () => {
-      it('shoult set focus to username input after the view has been initialized', () => {
-        // GIVEN
-        const node = {
-          focus: jest.fn(),
-        };
-        comp.username = new ElementRef(node);
+  describe('ngAfterViewInit', () => {
+    it('shoult set focus to username input after the view has been initialized', () => {
+      // GIVEN
+      const node = {
+        focus: jest.fn(),
+      };
+      comp.username = new ElementRef(node);
 
-        // WHEN
-        comp.ngAfterViewInit();
+      // WHEN
+      comp.ngAfterViewInit();
 
-        // THEN
-        expect(node.focus).toHaveBeenCalled();
-      });
+      // THEN
+      expect(node.focus).toHaveBeenCalled();
     });
+  });
 
-    describe('login', () => {
-      it('should authenticate the user and navigate to home page', () => {
-        // GIVEN
-        const credentials = {
-          username: 'admin',
-          password: 'admin',
-          rememberMe: true,
-        };
-
-        comp.loginForm.patchValue({
-          username: 'admin',
-          password: 'admin',
-          rememberMe: true,
-        });
-
-        // WHEN
-        comp.login();
-
-        // THEN
-        expect(comp.authenticationError).toEqual(false);
-        expect(mockLoginService.login).toHaveBeenCalledWith(credentials);
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['']);
+  describe('login', () => {
+    it('should authenticate the user and navigate to home page', () => {
+      // GIVEN
+      const credentials = {
+        username: 'admin',
+        password: 'admin',
+        rememberMe: true,
+      };
+
+      comp.loginForm.patchValue({
+        username: 'admin',
+        password: 'admin',
+        rememberMe: true,
       });
 
-      it('should authenticate the user but not navigate to home page if authentication process is already routing to cached url from localstorage', () => {
-        // GIVEN
-        jest.spyOn(mockRouter, 'getCurrentNavigation').mockReturnValue({} as Navigation);
+      // WHEN
+      comp.login();
 
-        // WHEN
-        comp.login();
+      // THEN
+      expect(comp.authenticationError).toEqual(false);
+      expect(mockLoginService.login).toHaveBeenCalledWith(credentials);
+      expect(mockRouter.navigate).toHaveBeenCalledWith(['']);
+    });
 
-        // THEN
-        expect(comp.authenticationError).toEqual(false);
-        expect(mockRouter.navigate).not.toHaveBeenCalled();
-      });
+    it('should authenticate the user but not navigate to home page if authentication process is already routing to cached url from localstorage', () => {
+      // GIVEN
+      jest.spyOn(mockRouter, 'getCurrentNavigation').mockReturnValue({} as Navigation);
 
-      it('should stay on login form and show error message on login error', () => {
-        // GIVEN
-        mockLoginService.login = jest.fn(() => throwError({}));
+      // WHEN
+      comp.login();
 
-        // WHEN
-        comp.login();
+      // THEN
+      expect(comp.authenticationError).toEqual(false);
+      expect(mockRouter.navigate).not.toHaveBeenCalled();
+    });
 
-        // THEN
-        expect(comp.authenticationError).toEqual(true);
-        expect(mockRouter.navigate).not.toHaveBeenCalled();
-      });
+    it('should stay on login form and show error message on login error', () => {
+      // GIVEN
+      mockLoginService.login = jest.fn(() => throwError({}));
+
+      // WHEN
+      comp.login();
+
+      // THEN
+      expect(comp.authenticationError).toEqual(true);
+      expect(mockRouter.navigate).not.toHaveBeenCalled();
     });
   });
 });

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

@@ -66,15 +66,15 @@ export class LoginComponent implements OnInit, AfterViewInit {
         password: this.loginForm.get('password')!.value,
         rememberMe: this.loginForm.get('rememberMe')!.value,
       })
-      .subscribe(
-        () => {
+      .subscribe({
+        next: () => {
           this.authenticationError = false;
           if (!this.router.getCurrentNavigation()) {
             // There were no routing during login (eg from navigationToStoredUrl)
             this.router.navigate(['']);
           }
         },
-        () => this.authenticationError = true
-      );
+        error: () => this.authenticationError = true
+      });
   }
 }