generator-jhipster 7.8.0 → 7.9.1

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

@@ -19,161 +19,156 @@
 <div class="d-flex justify-content-center">
   <div class="col-8">
     <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
-      <h2 id="myUserLabel" <%= jhiPrefix %>Translate="userManagement.home.createOrEditLabel">Create or edit a User</h2>
+      <h2 id="myUserLabel" <%= jhiPrefix %>Translate="userManagement.home.createOrEditLabel"><%- this._getClientTranslation('userManagement.home.createOrEditLabel') %></h2>
 
-      <div *ngIf="user">
-        <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
+      <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
 
-        <div class="mb-3" [hidden]="!user.id">
-          <label <%= jhiPrefix %>Translate="global.field.id">ID</label>
-          <input type="text" class="form-control" name="id" formControlName="id" readonly />
-        </div>
+      <div class="mb-3" [hidden]="!editForm.value.id">
+        <label <%= jhiPrefix %>Translate="global.field.id"><%- this._getClientTranslation('global.field.id') %></label>
+        <input type="text" class="form-control" name="id" formControlName="id" readonly />
+      </div>
 
-        <div class="mb-3">
-          <label class="form-label" <%= jhiPrefix %>Translate="userManagement.login">Login</label>
-          <input type="text" class="form-control" name="login" formControlName="login" />
-
-          <div *ngIf="editForm.get('login')!.invalid && (editForm.get('login')!.dirty || editForm.get('login')!.touched)">
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('login')?.errors?.required"
-              <%= jhiPrefix %>Translate="entity.validation.required"
-            >
-              This field is required.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('login')?.errors?.maxlength"
-              <%= jhiPrefix %>Translate="entity.validation.maxlength"
-              [translateValues]="{ max: 50 }"
-            >
-              This field cannot be longer than 50 characters.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('login')?.errors?.pattern"
-              <%= jhiPrefix %>Translate="entity.validation.patternLogin"
-            >
-              This field can only contain letters, digits and e-mail addresses.
-            </small>
-          </div>
+      <div class="mb-3">
+        <label class="form-label" <%= jhiPrefix %>Translate="userManagement.login"><%- this._getClientTranslation('userManagement.login') %></label>
+        <input type="text" class="form-control" name="login" formControlName="login" />
+
+        <div *ngIf="editForm.get('login')!.invalid && (editForm.get('login')!.dirty || editForm.get('login')!.touched)">
+          <small
+            class="form-text text-danger"
+            *ngIf="editForm.get('login')?.errors?.required"
+            <%= jhiPrefix %>Translate="entity.validation.required"
+          >
+           <%- this._getClientTranslation('entity.validation.required') %>
+          </small>
+
+          <small
+            class="form-text text-danger"
+            *ngIf="editForm.get('login')?.errors?.maxlength"
+            <%= jhiPrefix %>Translate="entity.validation.maxlength"
+            [translateValues]="{ max: 50 }"
+          >
+            <%- this._getClientTranslation('entity.validation.maxlength', { max: '50' }) %>
+          </small>
+
+          <small
+            class="form-text text-danger"
+            *ngIf="editForm.get('login')?.errors?.pattern"
+            <%= jhiPrefix %>Translate="entity.validation.patternLogin"
+          >
+            <%- this._getClientTranslation('entity.validation.patternLogin') %>
+          </small>
         </div>
+      </div>
 
-        <div class="mb-3">
-          <label class="form-label" <%= jhiPrefix %>Translate="userManagement.firstName">First Name</label>
-          <input type="text" class="form-control" name="firstName" formControlName="firstName" />
-
-          <div *ngIf="editForm.get('firstName')!.invalid && (editForm.get('firstName')!.dirty || editForm.get('firstName')!.touched)">
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('firstName')?.errors?.maxlength"
-              <%= jhiPrefix %>Translate="entity.validation.maxlength"
-              [translateValues]="{ max: 50 }"
-            >
-              This field cannot be longer than 50 characters.
-            </small>
-          </div>
+      <div class="mb-3">
+        <label class="form-label" <%= jhiPrefix %>Translate="userManagement.firstName"><%- this._getClientTranslation('userManagement.firstName') %></label>
+        <input type="text" class="form-control" name="firstName" formControlName="firstName" />
+
+        <div *ngIf="editForm.get('firstName')!.invalid && (editForm.get('firstName')!.dirty || editForm.get('firstName')!.touched)">
+          <small
+            class="form-text text-danger"
+            *ngIf="editForm.get('firstName')?.errors?.maxlength"
+            <%= jhiPrefix %>Translate="entity.validation.maxlength"
+            [translateValues]="{ max: 50 }"
+          >
+            <%- this._getClientTranslation('entity.validation.maxlength', { max: '50' }) %>
+          </small>
         </div>
+      </div>
 
-        <div class="mb-3">
-          <label <%= jhiPrefix %>Translate="userManagement.lastName">Last Name</label>
-          <input type="text" class="form-control" name="lastName" formControlName="lastName" />
-
-          <div *ngIf="editForm.get('lastName')!.invalid && (editForm.get('lastName')!.dirty || editForm.get('lastName')!.touched)">
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('lastName')?.errors?.maxlength"
-              <%= jhiPrefix %>Translate="entity.validation.maxlength"
-              [translateValues]="{ max: 50 }"
-            >
-              This field cannot be longer than 50 characters.
-            </small>
-          </div>
+      <div class="mb-3">
+        <label <%= jhiPrefix %>Translate="userManagement.lastName"><%- this._getClientTranslation('userManagement.lastName') %></label>
+        <input type="text" class="form-control" name="lastName" formControlName="lastName" />
+
+        <div *ngIf="editForm.get('lastName')!.invalid && (editForm.get('lastName')!.dirty || editForm.get('lastName')!.touched)">
+          <small
+            class="form-text text-danger"
+            *ngIf="editForm.get('lastName')?.errors?.maxlength"
+            <%= jhiPrefix %>Translate="entity.validation.maxlength"
+            [translateValues]="{ max: 50 }"
+          >
+            <%- this._getClientTranslation('entity.validation.maxlength', { max: '50' }) %>
+          </small>
         </div>
+      </div>
 
-        <div class="mb-3">
-          <label class="form-label" <%= jhiPrefix %>Translate="userManagement.email">Email</label>
-          <input type="email" class="form-control" name="email" formControlName="email" />
-
-          <div *ngIf="editForm.get('email')!.invalid && (editForm.get('email')!.dirty || editForm.get('email')!.touched)">
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('email')?.errors?.required"
-              <%= jhiPrefix %>Translate="entity.validation.required"
-            >
-              This field is required.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('email')?.errors?.maxlength"
-              <%= jhiPrefix %>Translate="entity.validation.maxlength"
-              [translateValues]="{ max: 100 }"
-            >
-              This field cannot be longer than 100 characters.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('email')?.errors?.minlength"
-              <%= jhiPrefix %>Translate="entity.validation.minlength"
-              [translateValues]="{ min: 5 }"
-            >
-              This field is required to be at least 5 characters.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('email')?.errors?.email"
-              <%= jhiPrefix %>Translate="global.messages.validate.email.invalid"
-            >
-              Your email is invalid.
-            </small>
-          </div>
+      <div class="mb-3">
+        <label class="form-label" <%= jhiPrefix %>Translate="userManagement.email"><%- this._getClientTranslation('userManagement.email') %></label>
+        <input type="email" class="form-control" name="email" formControlName="email" />
+
+        <div *ngIf="editForm.get('email')!.invalid && (editForm.get('email')!.dirty || editForm.get('email')!.touched)">
+          <small
+            class="form-text text-danger"
+            *ngIf="editForm.get('email')?.errors?.required"
+            <%= jhiPrefix %>Translate="entity.validation.required"
+          >
+            <%- this._getClientTranslation('entity.validation.required') %>
+          </small>
+
+          <small
+            class="form-text text-danger"
+            *ngIf="editForm.get('email')?.errors?.maxlength"
+            <%= jhiPrefix %>Translate="entity.validation.maxlength"
+            [translateValues]="{ max: 100 }"
+          >
+            <%- this._getClientTranslation('entity.validation.maxlength', { max: '100' }) %>
+          </small>
+
+          <small
+            class="form-text text-danger"
+            *ngIf="editForm.get('email')?.errors?.minlength"
+            <%= jhiPrefix %>Translate="entity.validation.minlength"
+            [translateValues]="{ min: 5 }"
+          >
+            <%- this._getClientTranslation('entity.validation.minlength', { min: '5' }) %>
+          </small>
+
+          <small
+            class="form-text text-danger"
+            *ngIf="editForm.get('email')?.errors?.email"
+            <%= jhiPrefix %>Translate="global.messages.validate.email.invalid"
+          >
+           <%- this._getClientTranslation('global.messages.validate.email.invalid') %>
+          </small>
         </div>
+      </div>
 
-        <div class="form-check">
-          <label class="form-check-label" for="activated">
-            <input
-              class="form-check-input"
-              [attr.disabled]="user.id === undefined ? 'disabled' : null"
-              type="checkbox"
-              id="activated"
-              name="activated"
-              formControlName="activated"
-            />
-            <span <%= jhiPrefix %>Translate="userManagement.activated">Activated</span>
-          </label>
-        </div>
+      <div class="form-check">
+        <label class="form-check-label" for="activated">
+          <input
+            class="form-check-input"
+            [attr.disabled]="editForm.value.id === undefined ? 'disabled' : null"
+            type="checkbox"
+            id="activated"
+            name="activated"
+            formControlName="activated"
+          />
+          <span <%= jhiPrefix %>Translate="userManagement.activated"><%- this._getClientTranslation('userManagement.activated') %></span>
+        </label>
+      </div>
 <%_ if (enableTranslation) { _%>
 
-        <div class="mb-3" *ngIf="languages && languages.length > 0">
-          <label <%= jhiPrefix %>Translate="userManagement.langKey">Lang Key</label>
-          <select class="form-control" id="langKey" name="langKey" formControlName="langKey">
-            <option *ngFor="let language of languages" [value]="language">{{ language | findLanguageFromKey }}</option>
-          </select>
-        </div>
+      <div class="mb-3" *ngIf="languages && languages.length > 0">
+        <label <%= jhiPrefix %>Translate="userManagement.langKey"><%- this._getClientTranslation('userManagement.langKey') %></label>
+        <select class="form-control" id="langKey" name="langKey" formControlName="langKey">
+          <option *ngFor="let language of languages" [value]="language">{{ language | findLanguageFromKey }}</option>
+        </select>
+      </div>
 <%_ } _%>
 
-        <div class="mb-3">
-          <label <%= jhiPrefix %>Translate="userManagement.profiles">Profiles</label>
-          <select class="form-control" multiple name="authority" formControlName="authorities">
-            <option *ngFor="let authority of authorities" [value]="authority">{{ authority }}</option>
-          </select>
-        </div>
+      <div class="mb-3">
+        <label <%= jhiPrefix %>Translate="userManagement.profiles"><%- this._getClientTranslation('userManagement.profiles') %></label>
+        <select class="form-control" multiple name="authority" formControlName="authorities">
+          <option *ngFor="let authority of authorities" [value]="authority">{{ authority }}</option>
+        </select>
       </div>
+      <button type="button" class="btn btn-secondary" (click)="previousState()">
+        <fa-icon icon="ban"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.cancel"><%- this._getClientTranslation('entity.action.cancel') %></span>
+      </button>
 
-      <div *ngIf="user">
-        <button type="button" class="btn btn-secondary" (click)="previousState()">
-          <fa-icon icon="ban"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.cancel">Cancel</span>
-        </button>
-
-        <button type="submit" [disabled]="editForm.invalid || isSaving" class="btn btn-primary">
-          <fa-icon icon="save"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.save">Save</span>
-        </button>
-      </div>
+      <button type="submit" [disabled]="editForm.invalid || isSaving" class="btn btn-primary">
+        <fa-icon icon="save"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.save"><%- this._getClientTranslation('entity.action.save') %></span>
+      </button>
     </form>
   </div>
 </div>

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

@@ -36,25 +36,23 @@ describe('User Management Update Component', () => {
   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') }),
-            },
+  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();
+        },
+      ],
     })
-  );
+      .overrideTemplate(UserManagementUpdateComponent, '')
+      .compileComponents();
+  }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(UserManagementUpdateComponent);
@@ -84,16 +82,15 @@ describe('User Management Update Component', () => {
       [],
       fakeAsync(() => {
         // GIVEN
-        const entity = new User(<%- tsKeyId %>);
+        const entity = { id: <%- tsKeyId %> };
         jest.spyOn(service, 'update').mockReturnValue(of(entity));
-        comp.user = entity;
-        comp.editForm.patchValue({ id: entity.id });
+        comp.editForm.patchValue(entity);
         // WHEN
         comp.save();
         tick(); // simulate async
 
         // THEN
-        expect(service.update).toHaveBeenCalledWith(entity);
+        expect(service.update).toHaveBeenCalledWith(expect.objectContaining(entity));
         expect(comp.isSaving).toEqual(false);
       })
     ));
@@ -102,15 +99,16 @@ describe('User Management Update Component', () => {
       [],
       fakeAsync(() => {
         // GIVEN
-        const entity = new User();
+        const entity = { login: 'foo' } as User;
         jest.spyOn(service, 'create').mockReturnValue(of(entity));
-        comp.user = entity;
+        comp.editForm.patchValue(entity);
         // WHEN
         comp.save();
         tick(); // simulate async
 
         // THEN
-        expect(service.create).toHaveBeenCalledWith(entity);
+        expect(comp.editForm.getRawValue().id).toBeNull();
+        expect(service.create).toHaveBeenCalledWith(expect.objectContaining(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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, Validators } from '@angular/forms';
+import { FormGroup, FormControl, Validators } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 
 <%_ if (enableTranslation) { _%>
@@ -26,42 +26,59 @@ import { LANGUAGES } from 'app/config/language.constants';
 import { User } from '../user-management.model';
 import { UserManagementService } from '../service/user-management.service';
 
+const initialUser: User = {
+<%_ if (enableTranslation) { _%>
+  langKey: '<%= nativeLanguage %>',
+<%_ } _%>
+};
+
 @Component({
   selector: '<%= jhiPrefixDashed %>-user-mgmt-update',
   templateUrl: './user-management-update.component.html',
 })
 export class UserManagementUpdateComponent implements OnInit {
-  user!: User;
 <%_ if (enableTranslation) { _%>
   languages = LANGUAGES;
 <%_ } _%>
   authorities: string[] = [];
   isSaving = false;
 
-  editForm = this.fb.group({
-    id: [],
-    login: ['', [Validators.required, Validators.minLength(1), Validators.maxLength(50), Validators.pattern("<%- LOGIN_REGEX %>")]],
-    firstName: ['', [Validators.maxLength(50)]],
-    lastName: ['', [Validators.maxLength(50)]],
-    email: ['', [Validators.minLength(5), Validators.maxLength(254), Validators.email]],
-    activated: [],
-    langKey: [],
-    authorities: [],
+  editForm = new FormGroup({
+    id: new FormControl(initialUser.id),
+    login: new FormControl(initialUser.login, {
+      nonNullable: true,
+      validators: [
+        Validators.required,
+        Validators.minLength(1),
+        Validators.maxLength(50),
+        Validators.pattern('^[a-zA-Z0-9!$&*+=?^_`{|}~.-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$|^[_.@A-Za-z0-9-]+$'),
+      ],
+    }),
+    firstName: new FormControl(initialUser.firstName, { validators: [Validators.maxLength(50)] }),
+    lastName: new FormControl(initialUser.lastName, { validators: [Validators.maxLength(50)] }),
+    email: new FormControl(initialUser.email, {
+      nonNullable: true,
+      validators: [Validators.minLength(5), Validators.maxLength(254), Validators.email],
+    }),
+    activated: new FormControl(initialUser.activated, { nonNullable: true }),
+<%_ if (enableTranslation) { _%>
+    langKey: new FormControl(initialUser.langKey, { nonNullable: true }),
+<%_ } _%>
+    authorities: new FormControl(initialUser.authorities, { nonNullable: true }),
   });
 
-  constructor(private userService: UserManagementService, private route: ActivatedRoute, private fb: FormBuilder) {}
+  constructor(private userService: UserManagementService, private route: ActivatedRoute) {}
 
   ngOnInit(): void {
     this.route.data.subscribe(({ user }) => {
       if (user) {
-        this.user = user;
-        if (this.user.id === undefined) {
-          this.user.activated = true;
+        if (user.id === undefined) {
+          user.activated = true;
         }
-        this.updateForm(user);
+        this.editForm.patchValue(user);
       }
     });
-    this.userService.authorities().subscribe(authorities => this.authorities = authorities);
+    this.userService.authorities().subscribe(authorities => (this.authorities = authorities));
   }
 
   previousState(): void {
@@ -70,46 +87,20 @@ export class UserManagementUpdateComponent implements OnInit {
 
   save(): void {
     this.isSaving = true;
-    this.updateUser(this.user);
-    if (this.user.id !== undefined) {
-      this.userService.update(this.user).subscribe({
+    const user = this.editForm.getRawValue();
+    if (user.id !== null) {
+      this.userService.update(user).subscribe({
         next: () => this.onSaveSuccess(),
-        error: () => this.onSaveError()
+        error: () => this.onSaveError(),
       });
     } else {
-<%_ if (!enableTranslation) { _%>
-      this.user.langKey = 'en';
-<%_ } _%>
-      this.userService.create(this.user).subscribe({
+      this.userService.create(user).subscribe({
         next: () => this.onSaveSuccess(),
-        error: () => this.onSaveError()
+        error: () => this.onSaveError(),
       });
     }
   }
 
-  private updateForm(user: User): void {
-    this.editForm.patchValue({
-      id: user.id,
-      login: user.login,
-      firstName: user.firstName,
-      lastName: user.lastName,
-      email: user.email,
-      activated: user.activated,
-      langKey: user.langKey,
-      authorities: user.authorities,
-    });
-  }
-
-  private updateUser(user: User): void {
-    user.login = this.editForm.get(['login'])!.value;
-    user.firstName = this.editForm.get(['firstName'])!.value;
-    user.lastName = this.editForm.get(['lastName'])!.value;
-    user.email = this.editForm.get(['email'])!.value;
-    user.activated = this.editForm.get(['activated'])!.value;
-    user.langKey = this.editForm.get(['langKey'])!.value;
-    user.authorities = this.editForm.get(['authorities'])!.value;
-  }
-
   private onSaveSuccess(): void {
     this.isSaving = false;
     this.previousState();

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

@@ -20,7 +20,7 @@
   const idType = getTypescriptKeyType(user.primaryKey.type);
 _%>
 export interface IUser {
-  id?: <%= idType %>;
+  id?: <%= idType %> | null;
   login?: string;
   firstName?: string | null;
   lastName?: string | null;
@@ -36,7 +36,7 @@ export interface IUser {
 
 export class User implements IUser {
   constructor(
-    public id?: <%= idType %>,
+    public id?: <%= idType %> | null,
     public login?: string,
     public firstName?: string | null,
     public lastName?: string | null,

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

@@ -34,6 +34,5 @@ import { userManagementRoute } from './user-management.route';
     UserManagementUpdateComponent,
     UserManagementDeleteDialogComponent,
   ],
-  entryComponents: [UserManagementDeleteDialogComponent],
 })
 export class UserManagementModule {}

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

@@ -0,0 +1,23 @@
+<%#
+ Copyright 2013-2022 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 ASC = 'asc';
+export const DESC = 'desc';
+export const SORT = 'sort';
+export const ITEM_DELETED_EVENT = 'deleted'
+export const DEFAULT_SORT_DATA = 'defaultSort'

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

@@ -16,7 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+export const TOTAL_COUNT_RESPONSE_HEADER = 'X-Total-Count';
+export const PAGE_HEADER = 'page';
 export const ITEMS_PER_PAGE = 20;
-export const ASC = 'asc';
-export const DESC = 'desc';
-export const SORT = 'sort';

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

@@ -23,7 +23,7 @@ export const createRequestOption = (req?: any): HttpParams => {
 
   if (req) {
     Object.keys(req).forEach(key => {
-      if (key !== 'sort') {
+      if (key !== 'sort' && req[key] && req[key] !== '') {
         options = options.set(key, req[key]);
       }
     });

package/generators/client/templates/angular/src/main/webapp/app/entities/user/user.model.ts.ejs

@@ -20,7 +20,7 @@
   const idType = getTypescriptKeyType(user.primaryKey.type);
 _%>
 export interface IUser {
-  id?: <%= idType %>;
+  id: <%= idType %>;
   login?: string;
 <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
     <%= field.fieldName %>?: string;
@@ -37,6 +37,6 @@ export class User implements IUser {
   ) {}
 }
 
-export function getUserIdentifier(user: IUser): <%= idType %> | undefined {
+export function getUserIdentifier(user: IUser): <%= idType %> {
   return user.id;
 }

package/generators/client/templates/angular/src/main/webapp/app/entities/user/user.service.ts.ejs

@@ -37,13 +37,17 @@ export class UserService {
     return this.http.get<IUser[]>(this.resourceUrl, { params: options, observe: 'response' });
   }
 
-  addUserToCollectionIfMissing(userCollection: IUser[], ...usersToCheck: (IUser | null | undefined)[]): IUser[] {
-    const users: IUser[] = usersToCheck.filter(isPresent);
+  compareUser(o1: Pick<IUser, 'id'> | null, o2: Pick<IUser, 'id'> | null): boolean {
+    return o1 && o2 ? o1.id === o2.id : o1 === o2;
+  }
+
+  addUserToCollectionIfMissing<Type extends Partial<IUser> & Pick<IUser, 'id'>>(userCollection: Type[], ...usersToCheck: (Type | null | undefined)[]): IUser[] {
+    const users: Type[] = usersToCheck.filter(isPresent);
     if (users.length > 0) {
       const userCollectionIdentifiers = userCollection.map(userItem => getUserIdentifier(userItem)!);
       const usersToAdd = users.filter(userItem => {
         const userIdentifier = getUserIdentifier(userItem);
-        if (userIdentifier == null || userCollectionIdentifiers.includes(userIdentifier)) {
+        if (userCollectionIdentifiers.includes(userIdentifier)) {
             return false;
         }
         userCollectionIdentifiers.push(userIdentifier);