generator-jhipster 7.3.0 → 7.5.0

package/generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker.service.ts.ejs

@@ -21,8 +21,8 @@ import { Location } from '@angular/common';
 import { Router, NavigationEnd, Event } from '@angular/router';
 import { Subscription, ReplaySubject, Subject } from 'rxjs';
 import { filter } from 'rxjs/operators';
-import * as SockJS from 'sockjs-client';
-import * as Stomp from 'webstomp-client';
+import SockJS from 'sockjs-client';
+import Stomp, { Client, Subscription as StompSubscription, ConnectionHeaders, Message } from 'webstomp-client';
 
 <%_ if (authenticationTypeSession) { _%>
 import { CSRFService } from 'app/core/auth/csrf.service';
@@ -34,11 +34,11 @@ import { TrackerActivity } from './tracker-activity.model';
 
 @Injectable({ providedIn: 'root' })
 export class TrackerService {
-  private stompClient: Stomp.Client | null = null;
+  private stompClient: Client | null = null;
   private routerSubscription: Subscription | null = null;
   private connectionSubject: ReplaySubject<void> = new ReplaySubject(1);
   private connectionSubscription: Subscription | null = null;
-  private stompSubscription: Stomp.Subscription | null = null;
+  private stompSubscription: StompSubscription | null = null;
   private listenerSubject: Subject<TrackerActivity> = new Subject();
 
   constructor(
@@ -67,7 +67,7 @@ export class TrackerService {
 <%_ } _%>
     const socket: WebSocket = new SockJS(url);
     this.stompClient = Stomp.over(socket, { protocols: ['v12.stomp'] });
-    const headers: Stomp.ConnectionHeaders = {};
+    const headers: ConnectionHeaders = {};
 <%_ if (authenticationTypeSession) { _%>
     headers['X-XSRF-TOKEN'] = this.csrfService.getCSRF('XSRF-TOKEN');
 <%_ } _%>
@@ -111,7 +111,7 @@ export class TrackerService {
 
     this.connectionSubscription = this.connectionSubject.subscribe(() => {
       if (this.stompClient) {
-        this.stompSubscription = this.stompClient.subscribe('/topic/tracker', (data: Stomp.Message) => {
+        this.stompSubscription = this.stompClient.subscribe('/topic/tracker', (data: Message) => {
           this.listenerSubject.next(JSON.parse(data.body));
         });
       }

package/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs

@@ -49,7 +49,7 @@ export class ParseLinks {
       const queryString: { [key: string]: string | undefined } = {};
 
       url.replace(
-        new RegExp('([^?=&]+)(=([^&]*))?', 'g'),
+        /([^?=&]+)(=([^&]*))?/g,
         ($0: string, $1: string | undefined, $2: string | undefined, $3: string | undefined) => {
           if ($1 !== undefined) {
             queryString[$1] = $3;

package/generators/client/templates/angular/src/main/webapp/app/entities/entity-navbar-items.ts.ejs

@@ -0,0 +1,29 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+export const EntityNavbarItems = [
+<%_ for (const entity of localEntities) { _%>
+  {
+    name: '<%= entity.entityAngularName %>',
+    route: '<%= entity.entityPage %>',
+  <%_ if (enableTranslation) { _%>
+    translationKey: 'global.menu.entities.<%= entity.entityTranslationKey %>',
+  <%_ } _%>
+  },
+<%_ } _%>
+];

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

@@ -17,15 +17,14 @@
  limitations under the License.
 -%>
 jest.mock('app/core/auth/account.service');
-<%_ if (!authenticationTypeOauth2) { _%>
-jest.mock('@angular/router');
-<% } else { %>
+<%_ if (authenticationTypeOauth2) { _%>
 jest.mock('app/login/login.service');
 <%_ } _%>
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 <%_ if (!authenticationTypeOauth2) { _%>
 import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 <%_ } _%>
 import { of<% if (!authenticationTypeOauth2) { %>, Subject<% } %> } from 'rxjs';
 
@@ -37,135 +36,144 @@ import { LoginService } from 'app/login/login.service';
 
 import { HomeComponent } from './home.component';
 
-describe('Component Tests', () => {
-  describe('Home Component', () => {
-    let comp: HomeComponent;
-    let fixture: ComponentFixture<HomeComponent>;
-    let mockAccountService: AccountService;
+describe('Home Component', () => {
+  let comp: HomeComponent;
+  let fixture: ComponentFixture<HomeComponent>;
+  let mockAccountService: AccountService;
 <%_ if (!authenticationTypeOauth2) { _%>
-    let mockRouter: Router;
+  let mockRouter: Router;
 <%_ } else { _%>
-    let mockLoginService: LoginService;
+  let mockLoginService: LoginService;
 <%_ } _%>
-    const account: Account = {
-      activated: true,
-      authorities: [],
-      email: '',
-      firstName: null,
-      langKey: '',
-      lastName: null,
-      login: 'login',
-      imageUrl: null,
-    };
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          declarations: [HomeComponent],
-          providers: [AccountService, <% if (!authenticationTypeOauth2) { %>Router<% } else { %>LoginService<% } %>],
-        })
-          .overrideTemplate(HomeComponent, '')
-          .compileComponents();
+  const account: Account = {
+    activated: true,
+    authorities: [],
+    email: '',
+    firstName: null,
+    langKey: '',
+    lastName: null,
+    login: 'login',
+    imageUrl: null,
+  };
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+<%_ if (!authenticationTypeOauth2) { _%>
+        imports: [RouterTestingModule.withRoutes([])],
+<%_ } _%>
+        declarations: [HomeComponent],
+        providers: [
+          AccountService,
+<%_ if (authenticationTypeOauth2) { _%>
+          LoginService
+<%_ } _%>
+        ],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(HomeComponent);
-      comp = fixture.componentInstance;
-      mockAccountService = TestBed.inject(AccountService);
-      mockAccountService.identity = jest.fn(() => of(null));
-      mockAccountService.getAuthenticationState = jest.fn(() => of(null));
+        .overrideTemplate(HomeComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HomeComponent);
+    comp = fixture.componentInstance;
+    mockAccountService = TestBed.inject(AccountService);
+    mockAccountService.identity = jest.fn(() => of(null));
+    mockAccountService.getAuthenticationState = jest.fn(() => of(null));
 <%_ if (!authenticationTypeOauth2) { _%>
-      mockRouter = TestBed.inject(Router);
+
+    mockRouter = TestBed.inject(Router);
+    jest.spyOn(mockRouter, 'navigate').mockImplementation(() => Promise.resolve(true));
+
 <%_ } else { _%>
-      mockLoginService = TestBed.inject(LoginService);
+    mockLoginService = TestBed.inject(LoginService);
 <%_ } _%>
-    });
+  });
 
-    describe('ngOnInit', () => {
-      it('Should synchronize account variable with current account', () => {
+  describe('ngOnInit', () => {
+    it('Should synchronize account variable with current account', () => {
 <%_ if (!authenticationTypeOauth2) { _%>
-        // GIVEN
-        const authenticationState = new Subject<Account | null>();
-        mockAccountService.getAuthenticationState = jest.fn(() => authenticationState.asObservable());
+      // GIVEN
+      const authenticationState = new Subject<Account | null>();
+      mockAccountService.getAuthenticationState = jest.fn(() => authenticationState.asObservable());
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(comp.account).toBeNull();
+      // THEN
+      expect(comp.account).toBeNull();
 
-        // WHEN
-        authenticationState.next(account);
+      // WHEN
+      authenticationState.next(account);
 
-        // THEN
-        expect(comp.account).toEqual(account);
+      // THEN
+      expect(comp.account).toEqual(account);
 
-        // WHEN
-        authenticationState.next(null);
+      // WHEN
+      authenticationState.next(null);
 
-        // THEN
-        expect(comp.account).toBeNull();
+      // THEN
+      expect(comp.account).toBeNull();
 <%_ } else { _%>
-        // GIVEN
-        mockAccountService.identity = jest.fn(() => of(account));
+      // GIVEN
+      mockAccountService.identity = jest.fn(() => of(account));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(comp.account).toEqual(account);
+      // THEN
+      expect(comp.account).toEqual(account);
 <%_ } _%>
-      });
     });
+  });
 
-    describe('login', () => {
+  describe('login', () => {
 <%_ if (!authenticationTypeOauth2) { _%>
-      it('Should navigate to /login on login', () => {
-        // WHEN
-        comp.login();
+    it('Should navigate to /login on login', () => {
+      // WHEN
+      comp.login();
 
-        // THEN
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['/login']);
-      });
+      // THEN
+      expect(mockRouter.navigate).toHaveBeenCalledWith(['/login']);
+    });
 <%_ } else { _%>
-      it('Should call loginService.login on login', () => {
-        // WHEN
-        comp.login();
+    it('Should call loginService.login on login', () => {
+      // WHEN
+      comp.login();
 
-        // THEN
-        expect(mockLoginService.login).toHaveBeenCalled();
-      });
-<%_ } _%>
+      // THEN
+      expect(mockLoginService.login).toHaveBeenCalled();
     });
+<%_ } _%>
+  });
 
 <%_ if (!authenticationTypeOauth2) { _%>
-    describe('ngOnDestroy', () => {
-      it('Should destroy authentication state subscription on component destroy', () => {
-        // GIVEN
-        const authenticationState = new Subject<Account | null>();
-        mockAccountService.getAuthenticationState = jest.fn(() => authenticationState.asObservable());
+  describe('ngOnDestroy', () => {
+    it('Should destroy authentication state subscription on component destroy', () => {
+      // GIVEN
+      const authenticationState = new Subject<Account | null>();
+      mockAccountService.getAuthenticationState = jest.fn(() => authenticationState.asObservable());
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(comp.account).toBeNull();
+      // THEN
+      expect(comp.account).toBeNull();
 
-        // WHEN
-        authenticationState.next(account);
+      // WHEN
+      authenticationState.next(account);
 
-        // THEN
-        expect(comp.account).toEqual(account);
+      // THEN
+      expect(comp.account).toEqual(account);
 
-        // WHEN
-        comp.ngOnDestroy();
-        authenticationState.next(null);
+      // WHEN
+      comp.ngOnDestroy();
+      authenticationState.next(null);
 
-        // THEN
-        expect(comp.account).toEqual(account);
-      });
+      // THEN
+      expect(comp.account).toEqual(account);
     });
-<%_ } _%>
   });
+<%_ } _%>
 });