generator-jhipster 7.3.0 → 7.5.0

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

@@ -33,234 +33,232 @@ import { FindLanguageFromKeyPipe } from 'app/shared/language/find-language-from-
 
 import { MainComponent } from './main.component';
 
-describe('Component Tests', () => {
-  describe('MainComponent', () => {
-    let comp: MainComponent;
-    let fixture: ComponentFixture<MainComponent>;
-    let titleService: Title;
+describe('MainComponent', () => {
+  let comp: MainComponent;
+  let fixture: ComponentFixture<MainComponent>;
+  let titleService: Title;
 <%_ if (enableTranslation) { _%>
-    let translateService: TranslateService;
+  let translateService: TranslateService;
   <%_ if (enableI18nRTL) { _%>
-    let findLanguageFromKeyPipe: FindLanguageFromKeyPipe;
+  let findLanguageFromKeyPipe: FindLanguageFromKeyPipe;
   <%_ } _%>
 <%_ } _%>
-    let mockAccountService: AccountService;
-    const routerEventsSubject = new Subject<RouterEvent>();
-    const routerState: any = { snapshot: { root: { data: {} } } };
-    class MockRouter {
-      events = routerEventsSubject;
-      routerState = routerState;
-    }
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
+  let mockAccountService: AccountService;
+  const routerEventsSubject = new Subject<RouterEvent>();
+  const routerState: any = { snapshot: { root: { data: {} } } };
+  class MockRouter {
+    events = routerEventsSubject;
+    routerState = routerState;
+  }
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
 <%_ if (enableTranslation) { _%>
-          imports: [TranslateModule.forRoot()],
+        imports: [TranslateModule.forRoot()],
 <%_ } _%>
-          declarations: [MainComponent],
-          providers: [
-            Title,
+        declarations: [MainComponent],
+        providers: [
+          Title,
 <%_ if (enableI18nRTL) { _%>
-            FindLanguageFromKeyPipe,
+          FindLanguageFromKeyPipe,
 <%_ } _%>
-            AccountService,
-            {
-              provide: Router,
-              useClass: MockRouter,
-            },
-          ],
-        })
-          .overrideTemplate(MainComponent, '')
-          .compileComponents();
+          AccountService,
+          {
+            provide: Router,
+            useClass: MockRouter,
+          },
+        ],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(MainComponent);
-      comp = fixture.componentInstance;
-      titleService = TestBed.inject(Title);
+        .overrideTemplate(MainComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MainComponent);
+    comp = fixture.componentInstance;
+    titleService = TestBed.inject(Title);
 <%_ if (enableTranslation) { _%>
-      translateService = TestBed.inject(TranslateService);
+    translateService = TestBed.inject(TranslateService);
   <%_ if (enableI18nRTL) { _%>
-      findLanguageFromKeyPipe = TestBed.inject(FindLanguageFromKeyPipe);
+    findLanguageFromKeyPipe = TestBed.inject(FindLanguageFromKeyPipe);
   <%_ } _%>
 <%_ } _%>
-      mockAccountService = TestBed.inject(AccountService);
-      mockAccountService.identity = jest.fn(() => of(null));
-      mockAccountService.getAuthenticationState = jest.fn(() => of(null));
-    });
+    mockAccountService = TestBed.inject(AccountService);
+    mockAccountService.identity = jest.fn(() => of(null));
+    mockAccountService.getAuthenticationState = jest.fn(() => of(null));
+  });
 
-    describe('page title', () => {
-      const defaultPageTitle = '<% if (enableTranslation) { %>global.title<% } else { %><%= humanizedBaseName %><% } %>';
-      const parentRoutePageTitle = 'parentTitle';
-      const childRoutePageTitle = 'childTitle';
-      const navigationEnd = new NavigationEnd(1, '', '');
-      const navigationStart = new NavigationStart(1, '');
+  describe('page title', () => {
+    const defaultPageTitle = '<% if (enableTranslation) { %>global.title<% } else { %><%= humanizedBaseName %><% } %>';
+    const parentRoutePageTitle = 'parentTitle';
+    const childRoutePageTitle = 'childTitle';
+    const navigationEnd = new NavigationEnd(1, '', '');
+    const navigationStart = new NavigationStart(1, '');
 <%_ if (enableTranslation) { _%>
-      const langChangeEvent: LangChangeEvent = { lang: '<%= nativeLanguage %>', translations: null };
+    const langChangeEvent: LangChangeEvent = { lang: '<%= nativeLanguage %>', translations: null };
 <%_ } _%>
 
-      beforeEach(() => {
-        routerState.snapshot.root = { data: {} };
+    beforeEach(() => {
+      routerState.snapshot.root = { data: {} };
 <%_ if (enableTranslation) { _%>
-        jest.spyOn(translateService, 'get').mockImplementation((key: string | string[]) => of(`${key as string} translated`));
-        translateService.currentLang = '<%= nativeLanguage %>';
+      jest.spyOn(translateService, 'get').mockImplementation((key: string | string[]) => of(`${key as string} translated`));
+      translateService.currentLang = '<%= nativeLanguage %>';
 <%_ } _%>
-        jest.spyOn(titleService, 'setTitle');
-        comp.ngOnInit();
-      });
+      jest.spyOn(titleService, 'setTitle');
+      comp.ngOnInit();
+    });
 
-      describe('navigation end', () => {
-        it('should set page title to default title if pageTitle is missing on routes', () => {
-          // WHEN
-          routerEventsSubject.next(navigationEnd);
+    describe('navigation end', () => {
+      it('should set page title to default title if pageTitle is missing on routes', () => {
+        // WHEN
+        routerEventsSubject.next(navigationEnd);
 
-          // THEN
+        // THEN
 <%_ if (enableTranslation) { _%>
-          expect(translateService.get).toHaveBeenCalledWith(defaultPageTitle);
+        expect(translateService.get).toHaveBeenCalledWith(defaultPageTitle);
 <%_ } _%>
-          expect(titleService.setTitle).toHaveBeenCalledWith(defaultPageTitle<% if (enableTranslation) { %> + ' translated'<% } %>);
-        });
+        expect(titleService.setTitle).toHaveBeenCalledWith(defaultPageTitle<% if (enableTranslation) { %> + ' translated'<% } %>);
+      });
 
-        it('should set page title to root route pageTitle if there is no child routes', () => {
-          // GIVEN
-          routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
+      it('should set page title to root route pageTitle if there is no child routes', () => {
+        // GIVEN
+        routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
 
-          // WHEN
-          routerEventsSubject.next(navigationEnd);
+        // WHEN
+        routerEventsSubject.next(navigationEnd);
 
-          // THEN
+        // THEN
 <%_ if (enableTranslation) { _%>
-          expect(translateService.get).toHaveBeenCalledWith(parentRoutePageTitle);
+        expect(translateService.get).toHaveBeenCalledWith(parentRoutePageTitle);
 <%_ } _%>
-          expect(titleService.setTitle).toHaveBeenCalledWith(parentRoutePageTitle<% if (enableTranslation) { %> + ' translated'<% } %>);
-        });
+        expect(titleService.setTitle).toHaveBeenCalledWith(parentRoutePageTitle<% if (enableTranslation) { %> + ' translated'<% } %>);
+      });
 
-        it('should set page title to child route pageTitle if child routes exist and pageTitle is set for child route', () => {
-          // GIVEN
-          routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
-          routerState.snapshot.root.firstChild = { data: { pageTitle: childRoutePageTitle } };
+      it('should set page title to child route pageTitle if child routes exist and pageTitle is set for child route', () => {
+        // GIVEN
+        routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
+        routerState.snapshot.root.firstChild = { data: { pageTitle: childRoutePageTitle } };
 
-          // WHEN
-          routerEventsSubject.next(navigationEnd);
+        // WHEN
+        routerEventsSubject.next(navigationEnd);
 
-          // THEN
+        // THEN
 <%_ if (enableTranslation) { _%>
-          expect(translateService.get).toHaveBeenCalledWith(childRoutePageTitle);
+        expect(translateService.get).toHaveBeenCalledWith(childRoutePageTitle);
 <%_ } _%>
-          expect(titleService.setTitle).toHaveBeenCalledWith(childRoutePageTitle<% if (enableTranslation) { %> + ' translated'<% } %>);
-        });
+        expect(titleService.setTitle).toHaveBeenCalledWith(childRoutePageTitle<% if (enableTranslation) { %> + ' translated'<% } %>);
+      });
 
-        it('should set page title to parent route pageTitle if child routes exists but pageTitle is not set for child route data', () => {
-          // GIVEN
-          routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
-          routerState.snapshot.root.firstChild = { data: {} };
+      it('should set page title to parent route pageTitle if child routes exists but pageTitle is not set for child route data', () => {
+        // GIVEN
+        routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
+        routerState.snapshot.root.firstChild = { data: {} };
 
-          // WHEN
-          routerEventsSubject.next(navigationEnd);
+        // WHEN
+        routerEventsSubject.next(navigationEnd);
 
-          // THEN
+        // THEN
 <%_ if (enableTranslation) { _%>
-          expect(translateService.get).toHaveBeenCalledWith(parentRoutePageTitle);
+        expect(translateService.get).toHaveBeenCalledWith(parentRoutePageTitle);
 <%_ } _%>
-          expect(titleService.setTitle).toHaveBeenCalledWith(parentRoutePageTitle<% if (enableTranslation) { %> + ' translated'<% } %>);
-        });
+        expect(titleService.setTitle).toHaveBeenCalledWith(parentRoutePageTitle<% if (enableTranslation) { %> + ' translated'<% } %>);
       });
+    });
 
-      describe('navigation start', () => {
-        it('should not set page title on navigation start', () => {
-          // WHEN
-          routerEventsSubject.next(navigationStart);
+    describe('navigation start', () => {
+      it('should not set page title on navigation start', () => {
+        // WHEN
+        routerEventsSubject.next(navigationStart);
 
-          // THEN
-          expect(titleService.setTitle).not.toHaveBeenCalled();
-        });
+        // THEN
+        expect(titleService.setTitle).not.toHaveBeenCalled();
       });
+    });
 
 <%_ if (enableTranslation) { _%>
-      describe('language change', () => {
-        it('should set page title to default title if pageTitle is missing on routes', () => {
-          // WHEN
-          translateService.onLangChange.emit(langChangeEvent);
-
-          // THEN
-          expect(translateService.get).toHaveBeenCalledWith(defaultPageTitle);
-          expect(titleService.setTitle).toHaveBeenCalledWith(defaultPageTitle + ' translated');
-        });
-
-        it('should set page title to root route pageTitle if there is no child routes', () => {
-          // GIVEN
-          routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
-
-          // WHEN
-          translateService.onLangChange.emit(langChangeEvent);
-
-          // THEN
-          expect(translateService.get).toHaveBeenCalledWith(parentRoutePageTitle);
-          expect(titleService.setTitle).toHaveBeenCalledWith(parentRoutePageTitle + ' translated');
-        });
-
-        it('should set page title to child route pageTitle if child routes exist and pageTitle is set for child route', () => {
-          // GIVEN
-          routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
-          routerState.snapshot.root.firstChild = { data: { pageTitle: childRoutePageTitle } };
-
-          // WHEN
-          translateService.onLangChange.emit(langChangeEvent);
-
-          // THEN
-          expect(translateService.get).toHaveBeenCalledWith(childRoutePageTitle);
-          expect(titleService.setTitle).toHaveBeenCalledWith(childRoutePageTitle + ' translated');
-        });
-
-        it('should set page title to parent route pageTitle if child routes exists but pageTitle is not set for child route data', () => {
-          // GIVEN
-          routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
-          routerState.snapshot.root.firstChild = { data: {} };
-
-          // WHEN
-          translateService.onLangChange.emit(langChangeEvent);
-
-          // THEN
-          expect(translateService.get).toHaveBeenCalledWith(parentRoutePageTitle);
-          expect(titleService.setTitle).toHaveBeenCalledWith(parentRoutePageTitle + ' translated');
-        });
+    describe('language change', () => {
+      it('should set page title to default title if pageTitle is missing on routes', () => {
+        // WHEN
+        translateService.onLangChange.emit(langChangeEvent);
+
+        // THEN
+        expect(translateService.get).toHaveBeenCalledWith(defaultPageTitle);
+        expect(titleService.setTitle).toHaveBeenCalledWith(defaultPageTitle + ' translated');
+      });
+
+      it('should set page title to root route pageTitle if there is no child routes', () => {
+        // GIVEN
+        routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
+
+        // WHEN
+        translateService.onLangChange.emit(langChangeEvent);
+
+        // THEN
+        expect(translateService.get).toHaveBeenCalledWith(parentRoutePageTitle);
+        expect(titleService.setTitle).toHaveBeenCalledWith(parentRoutePageTitle + ' translated');
+      });
+
+      it('should set page title to child route pageTitle if child routes exist and pageTitle is set for child route', () => {
+        // GIVEN
+        routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
+        routerState.snapshot.root.firstChild = { data: { pageTitle: childRoutePageTitle } };
+
+        // WHEN
+        translateService.onLangChange.emit(langChangeEvent);
+
+        // THEN
+        expect(translateService.get).toHaveBeenCalledWith(childRoutePageTitle);
+        expect(titleService.setTitle).toHaveBeenCalledWith(childRoutePageTitle + ' translated');
       });
-<%_ } _%>
-    });
-<%_ if (enableTranslation) { _%>
 
-    describe('page language attribute', () => {
-      it('should change page language attribute on language change', () => {
+      it('should set page title to parent route pageTitle if child routes exists but pageTitle is not set for child route data', () => {
         // GIVEN
-        comp.ngOnInit();
+        routerState.snapshot.root.data = { pageTitle: parentRoutePageTitle };
+        routerState.snapshot.root.firstChild = { data: {} };
 
         // WHEN
+        translateService.onLangChange.emit(langChangeEvent);
+
+        // THEN
+        expect(translateService.get).toHaveBeenCalledWith(parentRoutePageTitle);
+        expect(titleService.setTitle).toHaveBeenCalledWith(parentRoutePageTitle + ' translated');
+      });
+    });
+<%_ } _%>
+  });
+<%_ if (enableTranslation) { _%>
+
+  describe('page language attribute', () => {
+    it('should change page language attribute on language change', () => {
+      // GIVEN
+      comp.ngOnInit();
+
+      // WHEN
   <%_ if (enableI18nRTL) { _%>
-        findLanguageFromKeyPipe.isRTL = jest.fn(() => false);
+      findLanguageFromKeyPipe.isRTL = jest.fn(() => false);
   <%_ } _%>
-        translateService.onLangChange.emit({ lang: 'lang1', translations: null });
+      translateService.onLangChange.emit({ lang: 'lang1', translations: null });
 
-        // THEN
-        expect(document.querySelector('html')?.getAttribute('lang')).toEqual('lang1');
+      // THEN
+      expect(document.querySelector('html')?.getAttribute('lang')).toEqual('lang1');
   <%_ if (enableI18nRTL) { _%>
-        expect(document.querySelector('html')?.getAttribute('dir')).toEqual('ltr');
+      expect(document.querySelector('html')?.getAttribute('dir')).toEqual('ltr');
   <%_ } _%>
 
-        // WHEN
+      // WHEN
   <%_ if (enableI18nRTL) { _%>
-        findLanguageFromKeyPipe.isRTL = jest.fn(() => true);
+      findLanguageFromKeyPipe.isRTL = jest.fn(() => true);
   <%_ } _%>
-        translateService.onLangChange.emit({ lang: 'lang2', translations: null });
+      translateService.onLangChange.emit({ lang: 'lang2', translations: null });
 
-        // THEN
-        expect(document.querySelector('html')?.getAttribute('lang')).toEqual('lang2');
+      // THEN
+      expect(document.querySelector('html')?.getAttribute('lang')).toEqual('lang2');
   <%_ if (enableI18nRTL) { _%>
-        expect(document.querySelector('html')?.getAttribute('dir')).toEqual('rtl');
+      expect(document.querySelector('html')?.getAttribute('dir')).toEqual('rtl');
   <%_ } _%>
-      });
     });
-<%_ } _%>
   });
+<%_ } _%>
 });

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

@@ -21,7 +21,7 @@ import { Title } from '@angular/platform-browser';
 import { Router, ActivatedRouteSnapshot, NavigationEnd } from '@angular/router';
 <%_ if (enableTranslation) { _%>
 import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 <%_ } _%>
 
 import { AccountService } from 'app/core/auth/account.service';

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

@@ -60,6 +60,26 @@
           </span>
         </a>
         <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="entity-menu">
+<%_ if (applicationTypeGateway) { _%>
+  <%_ for (const remote of microfrontends) { _%>
+          <li *ngFor="let entityNavbarItem of <%= remote.lowercaseBaseName %>EntityNavbarItems">
+            <a
+              class="dropdown-item"
+              [routerLink]="entityNavbarItem.route"
+              routerLinkActive="active"
+              [routerLinkActiveOptions]="{ exact: true }"
+              (click)="collapseNavbar()"
+            >
+              <fa-icon icon="asterisk" [fixedWidth]="true"></fa-icon>
+              <span
+    <%_ if (enableTranslation) { _%>
+              [jhiTranslate]="entityNavbarItem.translationKey"
+    <%_ } _%>
+              >{{entityNavbarItem.name}}</span>
+            </a>
+          </li>
+  <%_ } _%>
+<%_ } _%>
           <!-- jhipster-needle-add-entity-to-menu - JHipster will add entities to the menu here -->
         </ul>
       </li>

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

@@ -16,12 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-jest.mock('@angular/router');
 jest.mock('app/login/login.service');
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 import { NgxWebstorageModule } from 'ngx-webstorage';
 <%_ if (enableTranslation) { _%>
@@ -36,88 +35,93 @@ import { LoginService } from 'app/login/login.service';
 
 import { NavbarComponent } from './navbar.component';
 
-describe('Component Tests', () => {
-  describe('Navbar Component', () => {
-    let comp: NavbarComponent;
-    let fixture: ComponentFixture<NavbarComponent>;
-    let accountService: AccountService;
-    let profileService: ProfileService;
-    const account: Account = {
-      activated: true,
-      authorities: [],
-      email: '',
-      firstName: 'John',
-      langKey: '',
-      lastName: 'Doe',
-      login: 'john.doe',
-      imageUrl: '',
-    };
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule, NgxWebstorageModule.forRoot()<% if (enableTranslation) { %>, TranslateModule.forRoot()<% } %>],
-          declarations: [NavbarComponent],
-          providers: [Router, LoginService],
-        })
-          .overrideTemplate(NavbarComponent, '')
-          .compileComponents();
+describe('Navbar Component', () => {
+  let comp: NavbarComponent;
+  let fixture: ComponentFixture<NavbarComponent>;
+  let accountService: AccountService;
+  let profileService: ProfileService;
+  const account: Account = {
+    activated: true,
+    authorities: [],
+    email: '',
+    firstName: 'John',
+    langKey: '',
+    lastName: 'Doe',
+    login: 'john.doe',
+    imageUrl: '',
+  };
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [
+          HttpClientTestingModule,
+          RouterTestingModule.withRoutes([]),
+<%_ if (enableTranslation) { _%>
+          TranslateModule.forRoot(),
+<%_ } _%>
+          NgxWebstorageModule.forRoot()
+        ],
+        declarations: [NavbarComponent],
+        providers: [LoginService],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(NavbarComponent);
-      comp = fixture.componentInstance;
-      accountService = TestBed.inject(AccountService);
-      profileService = TestBed.inject(ProfileService);
-    });
+        .overrideTemplate(NavbarComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NavbarComponent);
+    comp = fixture.componentInstance;
+    accountService = TestBed.inject(AccountService);
+    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();
+  });
 
-    it('Should hold current authenticated user in variable account', () => {
-      // WHEN
-      comp.ngOnInit();
+  it('Should hold current authenticated user in variable account', () => {
+    // WHEN
+    comp.ngOnInit();
 
-      // THEN
-      expect(comp.account).toBeNull();
+    // THEN
+    expect(comp.account).toBeNull();
 
-      // WHEN
-      accountService.authenticate(account);
+    // WHEN
+    accountService.authenticate(account);
 
-      // THEN
-      expect(comp.account).toEqual(account);
+    // THEN
+    expect(comp.account).toEqual(account);
 
-      // WHEN
-      accountService.authenticate(null);
+    // WHEN
+    accountService.authenticate(null);
 
-      // THEN
-      expect(comp.account).toBeNull();
-    });
+    // THEN
+    expect(comp.account).toBeNull();
+  });
 
-    it('Should hold current authenticated user in variable account if user is authenticated before page load', () => {
-      // GIVEN
-      accountService.authenticate(account);
+  it('Should hold current authenticated user in variable account if user is authenticated before page load', () => {
+    // GIVEN
+    accountService.authenticate(account);
 
-      // WHEN
-      comp.ngOnInit();
+    // WHEN
+    comp.ngOnInit();
 
-      // THEN
-      expect(comp.account).toEqual(account);
+    // THEN
+    expect(comp.account).toEqual(account);
 
-      // WHEN
-      accountService.authenticate(null);
+    // WHEN
+    accountService.authenticate(null);
 
-      // THEN
-      expect(comp.account).toBeNull();
-    });
+    // THEN
+    expect(comp.account).toBeNull();
   });
 });