generator-jhipster 7.7.0 → 7.9.0

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

@@ -19,214 +19,193 @@
 <div class="d-flex justify-content-center">
     <div class="col-8">
         <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
-            <h2 id="<%= jhiPrefixDashed %>-<%= entityFileName %>-heading" data-cy="<%= entityClass %>CreateUpdateHeading" <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.home.createOrEditLabel">Create or edit a <%= entityClassHumanized %></h2>
+            <h2 id="<%= jhiPrefixDashed %>-<%= entityFileName %>-heading" data-cy="<%= entityClass %>CreateUpdateHeading" <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.home.createOrEditLabel"><%- this._getEntityClientTranslation(i18nKeyPrefix + '.home.createOrEditLabel') %></h2>
 
             <div>
                 <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
 <%_ for (const field of fields.filter(field => !field.hidden)) {
-    const fieldName = field.fieldName;
-    const fieldNameCapitalized = field.fieldNameCapitalized;
-    const fieldNameHumanized = field.fieldNameHumanized;
-    const fieldType = field.fieldType;
-    const fieldTypeBlobContent = field.fieldTypeBlobContent;
-    const id = !!field.id;
-    const readonly = field.readonly;
-    let fieldInputType = 'text';
-    let ngModelOption = '';
-    const translationKey = field.fieldTranslationKey;
-    if (field.fieldTypeNumeric) {
-        fieldInputType = 'number';
-    } else if (field.fieldTypeLocalDate) {
-        fieldInputType = 'date';
-    } else if (field.fieldTypeTimed) {
-        fieldInputType = 'datetime-local';
-    } else if (field.fieldTypeBoolean) {
-        fieldInputType = 'checkbox';
-    } else if (field.fieldTypeBinary && !field.blobContentTypeText) {
-        fieldInputType = 'hidden';
-    }
+  const fieldName = field.fieldName;
+  const fieldNameHumanized = field.fieldNameHumanized;
+  const fieldType = field.fieldType;
+  const fieldTypeBlobContent = field.fieldTypeBlobContent;
+  const readonly = field.readonly;
+  let fieldInputType = 'text';
+  const translationKey = field.fieldTranslationKey;
+  if (field.fieldTypeNumeric) {
+    fieldInputType = 'number';
+  } else if (field.fieldTypeLocalDate) {
+    fieldInputType = 'date';
+  } else if (field.fieldTypeTimed) {
+    fieldInputType = 'datetime-local';
+  } else if (field.fieldTypeBoolean) {
+    fieldInputType = 'checkbox';
+  } else if (field.fieldTypeBinary && !field.blobContentTypeText) {
+    fieldInputType = 'hidden';
+  }
 _%>
 
-                <div class="row mb-3"<% if (field.autoGenerate) { %> [hidden]="editForm.get('<%= primaryKey.name %>')!.value == null"<% } %>>
+                <div class="row mb-3"<% if (field.autoGenerate) { %> *ngIf="editForm.controls.<%= field.fieldName %>.value !== null"<% } %>>
                     <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= fieldName %>"<% if (field.javadoc) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.javadoc %>"<% } } %>><%= fieldNameHumanized %></label>
-    <%_ if (field.fieldIsEnum) { _%>
+  <%_ if (field.fieldIsEnum) { _%>
                     <select class="form-control" name="<%= fieldName %>" formControlName="<%= fieldName %>" id="field_<%= fieldName %>" data-cy="<%= fieldName %>">
-        <%_ const enumPrefix = frontendAppName + '.'+ fieldType; _%>
+    <%_ const enumPrefix = frontendAppName + '.'+ fieldType; _%>
                         <option [ngValue]="null"><% if (enableTranslation) { %>{{ '<%= enumPrefix %>.null' | translate }}<% } %></option>
-        <%_ const values = field.enumValues;
-            const enumImports = generateEntityClientEnumImports(fields); _%> 
                         <option *ngFor="let <%= _.lowerFirst(fieldType) %> of <%- _.lowerFirst(fieldType) %>Values" [value]="<%= _.lowerFirst(fieldType) %>"><% if (enableTranslation) { %>{{ '<%= enumPrefix %>.' + <%= _.lowerFirst(fieldType) %> | translate }}<% } else { %><%= _.lowerFirst(fieldType) %><% } %></option>
                     </select>
-    <%_ } else { _%>
-        <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
+  <%_ } else { _%>
+    <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
                     <div>
-            <%_ if (field.blobContentTypeImage) { _%>
+      <%_ if (field.blobContentTypeImage) { _%>
                         <img [src]="'data:' + editForm.get('<%= fieldName %>ContentType')!.value + ';base64,' + editForm.get('<%= fieldName %>')!.value" style="max-height: 100px;" *ngIf="editForm.get('<%= fieldName %>')!.value" alt="<%= entityInstance %> image"/>
-            <%_ } _%>
+      <%_ } _%>
                         <div *ngIf="editForm.get('<%= fieldName %>')!.value" class="form-text text-danger clearfix">
-            <%_ if (field.blobContentTypeAny) { _%>
-                            <a class="pull-start" (click)="openFile(editForm.get('<%= fieldName %>')!.value, editForm.get('<%= fieldName %>ContentType')!.value)" <%= jhiPrefix %>Translate="entity.action.open">open</a><br>
-                            <span class="pull-start">{{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value) }}</span>
-            <%_ } else { _%>
-                            <span class="pull-start">{{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value) }}</span>
-            <%_ } _%>
-            <%_ if (field.blobContentTypeImage) { _%>
+      <%_ if (field.blobContentTypeAny) { _%>
+                            <a class="pull-start" (click)="openFile(editForm.get('<%= fieldName %>')!.value!, editForm.get('<%= fieldName %>ContentType')!.value!)" <%= jhiPrefix %>Translate="entity.action.open"><%- this._getClientTranslation('entity.action.open') %></a><br>
+                            <span class="pull-start">{{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value!) }}</span>
+      <%_ } else { _%>
+                            <span class="pull-start">{{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value!) }}</span>
+      <%_ } _%>
+      <%_ if (field.blobContentTypeImage) { _%>
                             <button type="button" (click)="clearInputImage('<%= fieldName %>', '<%= fieldName %>ContentType', 'file_<%= fieldName %>')" class="btn btn-secondary btn-xs pull-end">
-            <%_ } else { _%>
-                            <button type="button" (click)="editForm.patchValue({<%= fieldName %>: null});editForm.patchValue({<%= fieldName %>ContentType: null});"
+      <%_ } else { _%>
+                            <button type="button" (click)="editForm.patchValue({ <%= fieldName %>: undefined, <%= fieldName %>ContentType: undefined });"
                                     class="btn btn-secondary btn-xs pull-end">
-            <%_ } _%>
-                                <fa-icon icon="times"></fa-icon>
+      <%_ } _%>
+                                  <fa-icon icon="times"></fa-icon>
                             </button>
                         </div>
-                        <input type="file" id="file_<%= fieldName %>" data-cy="<%= fieldName %>" (change)="setFileData($event, '<%= fieldName %>', <% if (fieldTypeBlobContent === 'image') { %>true)" accept="image/*" <%= jhiPrefix %>Translate="entity.action.addimage"<% } else { %>false)" <%= jhiPrefix %>Translate="entity.action.addblob"<% } %>/>
+                        <input type="file" id="file_<%= fieldName %>" data-cy="<%= fieldName %>" (change)="setFileData($event, '<%= fieldName %>', <% if (fieldTypeBlobContent === 'image') { %>true)" accept="image/*"<% if (enableTranslation) { %> <%= jhiPrefix %>Translate="entity.action.addimage"<% } %><% } else { %>false)"<% if (enableTranslation) { %> <%= jhiPrefix %>Translate="entity.action.addblob"<% } %><% } %>/>
                     </div>
-        <%_ } _%>
-        <%_ if (field.fieldTypeLocalDate) { _%>
+    <%_ } _%>
+    <%_ if (field.fieldTypeLocalDate) { _%>
                     <div class="input-group">
                         <input id="field_<%= fieldName %>" data-cy="<%= fieldName %>" type="text" class="form-control" name="<%= fieldName %>" ngbDatepicker #<%= fieldName %>Dp="ngbDatepicker" formControlName="<%= fieldName %>"<% if (readonly) { %> [readonly]="true"<% } %>/>
                         <button type="button" class="btn btn-secondary" (click)="<%= fieldName %>Dp.toggle()"><fa-icon icon="calendar-alt"></fa-icon></button>
                     </div>
-        <%_ } else if (field.fieldTypeTimed) { _%>
+    <%_ } else if (field.fieldTypeTimed) { _%>
                     <div class="d-flex">
                         <input id="field_<%= fieldName %>" data-cy="<%= fieldName %>" type="<%= fieldInputType %>" class="form-control" name="<%= fieldName %>" formControlName="<%= fieldName %>" placeholder="YYYY-MM-DD HH:mm"<% if (readonly) { %> [readonly]="true"<% } %>/>
                     </div>
-        <%_ } else if (field.blobContentTypeText) { _%>
+    <%_ } else if (field.blobContentTypeText) { _%>
                     <textarea class="form-control" name="<%= fieldName %>" id="field_<%= fieldName %>" data-cy="<%= fieldName %>"
                               formControlName="<%= fieldName %>"<% if (readonly) { %> [readonly]="true"<% } %>></textarea>
-        <%_ } else if (field.fieldTypeBoolean) { _%>
+    <%_ } else if (field.fieldTypeBoolean) { _%>
                     <input type="<%= fieldInputType %>" class="form-check" name="<%= fieldName %>" id="field_<%= fieldName %>"
                            data-cy="<%= fieldName %>" formControlName="<%= fieldName %>" <% if (readonly) { %> [readonly]="true"<% } %>/>
-        <%_ } else { _%>
+    <%_ } else { _%>
                     <input type="<%= fieldInputType %>" class="form-control" name="<%= fieldName %>" id="field_<%= fieldName %>" data-cy="<%= fieldName %>"
                            formControlName="<%= fieldName %>"<% if (field.id && !field.autoGenerate) { %> [readonly]="editForm.get('<%= primaryKey.name %>')!.value != null"<% } else if (readonly) { %> [readonly]="true"<% } %>/>
-            <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
+      <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
                     <input type="hidden" class="form-control" name="<%= fieldName %>ContentType" id="field_<%= fieldName %>ContentType"
                            formControlName="<%= fieldName %>ContentType" />
-            <%_ } _%>
-        <%_ } _%>
+      <%_ } _%>
     <%_ } _%>
-    <%_ if (field.fieldValidate) { _%>
+  <%_ } _%>
+  <%_ if (field.fieldValidate) { _%>
                     <div *ngIf="editForm.get('<%= fieldName %>')!.invalid && (editForm.get('<%= fieldName %>')!.dirty || editForm.get('<%= fieldName %>')!.touched)">
-        <%_ if (field.fieldValidationRequired) { _%>
+    <%_ if (field.fieldValidationRequired) { _%>
                         <small class="form-text text-danger"
                                *ngIf="editForm.get('<%= fieldName %>')?.errors?.required" <%= jhiPrefix %>Translate="entity.validation.required">
-                        This field is required.
+                        <%- this._getClientTranslation('entity.validation.required') %>
                         </small>
-        <%_ } _%>
-        <%_ if (field.fieldValidationMinLength) { _%>
+    <%_ } _%>
+    <%_ if (field.fieldValidationMinLength) { _%>
                         <small class="form-text text-danger"
                                *ngIf="editForm.get('<%= fieldName %>')?.errors?.minlength" <%= jhiPrefix %>Translate="entity.validation.minlength" [translateValues]="{ min: <%= field.fieldValidateRulesMinlength %> }">
-                        This field is required to be at least <%= field.fieldValidateRulesMinlength %> characters.
+                        <%- this._getClientTranslation('entity.validation.minlength', { min: field.fieldValidateRulesMinlength }) %>
                         </small>
-        <%_ } _%>
-        <%_ if (field.fieldValidationMaxLength) { _%>
+    <%_ } _%>
+    <%_ if (field.fieldValidationMaxLength) { _%>
                         <small class="form-text text-danger"
                                *ngIf="editForm.get('<%= fieldName %>')?.errors?.maxlength" <%= jhiPrefix %>Translate="entity.validation.maxlength" [translateValues]="{ max: <%= field.fieldValidateRulesMaxlength %> }">
-                        This field cannot be longer than <%= field.fieldValidateRulesMaxlength %> characters.
+                        <%- this._getClientTranslation('entity.validation.maxlength', { max: field.fieldValidateRulesMaxlength }) %>
                         </small>
-        <%_ } _%>
-        <%_ if (field.fieldValidationMin) { _%>
+    <%_ } _%>
+    <%_ if (field.fieldValidationMin) { _%>
                         <small class="form-text text-danger"
                                *ngIf="editForm.get('<%= fieldName %>')?.errors?.min" <%= jhiPrefix %>Translate="entity.validation.min" [translateValues]="{ min: <%= field.fieldValidateRulesMin %> }">
-                            This field should be at least <%= field.fieldValidateRulesMin %>.
+                            <%- this._getClientTranslation('entity.validation.min', { min: field.fieldValidateRulesMin }) %>
                         </small>
-        <%_ } _%>
-        <%_ if (field.fieldValidationMax) { _%>
+    <%_ } _%>
+    <%_ if (field.fieldValidationMax) { _%>
                         <small class="form-text text-danger"
                                *ngIf="editForm.get('<%= fieldName %>')?.errors?.max" <%= jhiPrefix %>Translate="entity.validation.max" [translateValues]="{ max: <%= field.fieldValidateRulesMax %> }">
-                            This field cannot be more than <%= field.fieldValidateRulesMax %>.
+                            <%- this._getClientTranslation('entity.validation.max', { max: field.fieldValidateRulesMax }) %>
                         </small>
-        <%_ } _%>
-        <%_ if (field.fieldValidationPattern) { _%>
+    <%_ } _%>
+    <%_ if (field.fieldValidationPattern) { _%>
                         <small class="form-text text-danger"
                                *ngIf="editForm.get('<%= fieldName %>')?.errors?.pattern" <%= jhiPrefix %>Translate="entity.validation.pattern" [translateValues]="{ pattern: '<%= fieldNameHumanized %>' }">
-                            This field should follow pattern for "<%= fieldNameHumanized %>".
+                            <%- this._getClientTranslation('entity.validation.pattern', { pattern: fieldNameHumanized }) %>
                         </small>
-        <%_ } _%>
-        <%_ if (field.fieldTypeNumeric || field.fieldTypeDuration) { _%>
+    <%_ } _%>
+    <%_ if (field.fieldTypeNumeric || field.fieldTypeDuration) { _%>
                         <small class="form-text text-danger"
                             [hidden]="!editForm.get('<%= fieldName %>')?.errors?.number" <%= jhiPrefix %>Translate="entity.validation.number">
-                            This field should be a number.
+                            <%- this._getClientTranslation('entity.validation.number') %>
                         </small>
-        <%_ } _%>
-        <%_ if (field.fieldTypeTimed) { _%>
+    <%_ } _%>
+    <%_ if (field.fieldTypeTimed) { _%>
                         <small class="form-text text-danger"
-                            [hidden]="!editForm.get('<%= fieldName %>')?.errors?.ZonedDateTimelocal" <%= jhiPrefix %>Translate="entity.validation.ZonedDateTimelocal">
-                            This field should be a date and time.
+                            [hidden]="!editForm.get('<%= fieldName %>')?.errors?.datetimelocal" <%= jhiPrefix %>Translate="entity.validation.datetimelocal">
+                            <%- this._getClientTranslation('entity.validation.datetimelocal') %>
                         </small>
-        <%_ } _%>
-                    </div>
     <%_ } _%>
+                    </div>
+  <%_ } _%>
                 </div>
 <%_ } _%>
 <%_ for (const relationship of relationships.filter(rel => rel.otherEntity.primaryKey)) {
-    const otherEntity = relationship.otherEntity;
-    const ownerSide = relationship.ownerSide;
-    const otherEntityName = relationship.otherEntityName;
-    const relationshipName = relationship.relationshipName;
-    const relationshipNameHumanized = relationship.relationshipNameHumanized;
-    const relationshipFieldName = relationship.relationshipFieldName;
-    const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
-    const otherEntityField = relationship.otherEntityField;
-    const relationshipRequired = relationship.relationshipRequired;
-    const translationKey = `${i18nKeyPrefix}.${relationshipName}`;
+  const { otherEntity, ownerSide, relationshipName, propertyName, otherEntityField, relationshipRequired } = relationship;
+  const otherEntityName = relationship.otherEntityName;
+  const relationshipFieldName = relationship.relationshipFieldName;
+  const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
+  const translationKey = `${i18nKeyPrefix}.${relationshipName}`;
 _%>
-    <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide && relationship.otherEntityUser)) { _%>
+  <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide)) { _%>
 
                 <div class="row mb-3">
-                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipName %>"><%= relationshipNameHumanized %></label>
-                    <select class="form-control" id="field_<%= relationshipName %>" data-cy="<%= relationshipFieldName %>" name="<%= relationshipName %>" formControlName="<%= relationshipFieldName %>">
-            <%_ if (!relationshipRequired) { _%>
+                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipName %>"><%- this._getEntityClientTranslation(translationKey) %></label>
+                    <select class="form-control" id="field_<%= relationshipName %>" data-cy="<%= propertyName %>" name="<%= relationshipName %>" formControlName="<%= propertyName %>" [compareWith]="compare<%= otherEntity.entityAngularName %>">
+    <%_ if (!relationshipRequired) { _%>
                         <option [ngValue]="null"></option>
-            <%_ } else { _%>
+    <%_ } else if (!relationship.otherRelationship) { _%>
                         <option *ngIf="!editForm.get('<%= relationshipName %>')!.value" [ngValue]="null" selected></option>
-            <%_ } _%>
-                        <option [ngValue]="<%= otherEntityName %>Option.<%= relationship.otherEntity.primaryKey.name %> === editForm.get('<%= relationshipFieldName %>')!.value?.<%= relationship.otherEntity.primaryKey.name %> ? editForm.get('<%= relationshipFieldName %>')!.value : <%= otherEntityName %>Option" *ngFor="let <%= otherEntityName %>Option of <%= otherEntity.entityInstancePlural %>SharedCollection; trackBy: track<%= relationship.otherEntity.entityAngularName %>By<%= relationship.otherEntity.primaryKey.nameCapitalized %>">{{ <%= otherEntityName %>Option.<%= otherEntityField %> }}</option>
-                    </select>
-                </div>
-    <%_ } else if (relationship.relationshipOneToOne && ownerSide) { _%>
-
-                <div class="row mb-3">
-                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipName %>"><%= relationshipNameHumanized %></label>
-                    <select class="form-control" id="field_<%= relationshipName %>" data-cy="<%= relationshipFieldName %>" name="<%= relationshipName %>" formControlName="<%= relationshipName %>">
-            <%_ if (!relationshipRequired) { _%>
-                        <option [ngValue]="null"></option>
-            <%_ } else { _%>
+    <%_ } else { _%>
                         <option *ngIf="editForm.get([<%- buildAngularFormPath(relationship.reference) %>])!.value == null" [ngValue]="null" selected></option>
-            <%_ } _%>
-                        <option [ngValue]="<%= otherEntityName %>Option.<%= relationship.otherEntity.primaryKey.name %> === editForm.get('<%= relationshipFieldName %>')!.value?.<%= relationship.otherEntity.primaryKey.name %> ? editForm.get('<%= relationshipFieldName %>')!.value : <%= otherEntityName %>Option" *ngFor="let <%= otherEntityName %>Option of <%= relationshipFieldNamePlural %>Collection; trackBy: track<%= relationship.otherEntity.entityAngularName %>By<%= relationship.otherEntity.primaryKey.nameCapitalized %>">{{ <%= otherEntityName %>Option.<%= otherEntityField %> }}</option>
+    <%_ } _%>
+                        <option [ngValue]="<%= otherEntityName %>Option" *ngFor="let <%= otherEntityName %>Option of <% if (!relationship.otherRelationship || relationship.relationshipManyToOne) { %><%= otherEntity.entityInstancePlural %>Shared<% } else { %><%= relationshipFieldNamePlural %><% } %>Collection">{{ <%= otherEntityName %>Option.<%= otherEntityField %> }}</option>
                     </select>
                 </div>
-    <%_ } else if (relationship.relationshipManyToMany && ownerSide) { _%>
+  <%_ } else if (relationship.relationshipManyToMany && ownerSide) { _%>
 
                 <div class="row mb-3">
-                    <label <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipFieldNamePlural %>"><%= relationshipNameHumanized %></label>
-                    <select class="form-control" id="field_<%= relationshipFieldNamePlural %>" data-cy="<%= relationshipFieldName %>" multiple name="<%= relationshipFieldNamePlural %>" formControlName="<%= relationshipFieldNamePlural %>">
-                        <option [ngValue]="getSelected<%= relationship.otherEntity.entityAngularName %>(<%= otherEntityName %>Option, editForm.get('<%= relationshipFieldNamePlural %>')!.value)" *ngFor="let <%= otherEntityName %>Option of <%= otherEntity.entityInstancePlural %>SharedCollection; trackBy: track<%= relationship.otherEntity.entityAngularName %>By<%= relationship.otherEntity.primaryKey.nameCapitalized %>">{{ <%= otherEntityName %>Option.<%= otherEntityField %> }}</option>
+                    <label <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipFieldNamePlural %>"><%- this._getEntityClientTranslation(translationKey) %></label>
+                    <select class="form-control" id="field_<%= relationshipFieldNamePlural %>" data-cy="<%= relationshipFieldName %>" multiple name="<%= propertyName %>" formControlName="<%= propertyName %>" [compareWith]="compare<%= otherEntity.entityAngularName %>">
+                        <option [ngValue]="<%= otherEntityName %>Option" *ngFor="let <%= otherEntityName %>Option of <%= otherEntity.entityInstancePlural %>SharedCollection">{{ <%= otherEntityName %>Option.<%= otherEntityField %> }}</option>
                     </select>
                 </div>
-    <%_ } _%>
-    <%_ if (relationship.relationshipValidate && (relationship.relationshipManyToOne || ownerSide)) { _%>
+  <%_ } _%>
+  <%_ if (relationship.relationshipValidate && (relationship.relationshipManyToOne || ownerSide)) { _%>
                 <div *ngIf="editForm.get([<%- buildAngularFormPath(relationship.reference) %>])!.invalid && (editForm.get([<%- buildAngularFormPath(relationship.reference) %>])!.dirty || editForm.get([<%- buildAngularFormPath(relationship.reference) %>])!.touched)">
-        <%_ if (relationshipRequired) { _%>
+    <%_ if (relationshipRequired) { _%>
                     <small class="form-text text-danger"
                            *ngIf="editForm.get([<%- buildAngularFormPath(relationship.reference) %>])?.errors?.required" <%= jhiPrefix %>Translate="entity.validation.required">
-                        This field is required.
+                        <%- this._getClientTranslation('entity.validation.required') %>
                     </small>
-        <%_ } _%>
-                </div>
     <%_ } _%>
+                </div>
+  <%_ } _%>
 <%_ } _%>
             </div>
 
             <div>
                 <button type="button" id="cancel-save" data-cy="entityCreateCancelButton" class="btn btn-secondary" (click)="previousState()">
-                    <fa-icon icon="ban"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.cancel">Cancel</span>
+                    <fa-icon icon="ban"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.cancel"><%- this._getClientTranslation('entity.action.cancel') %></span>
                 </button>
 
                 <button type="submit" id="save-entity" data-cy="entityCreateSaveButton" [disabled]="editForm.invalid || isSaving" class="btn btn-primary">
-                    <fa-icon icon="save"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.save">Save</span>
+                    <fa-icon icon="save"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.save"><%- this._getClientTranslation('entity.action.save') %></span>
                 </button>
             </div>
         </form>

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

@@ -19,9 +19,9 @@
 <%_
 const tsKeyId = generateTestEntityId(primaryKey.type);
 const allRelationshipsByEntityNeedingOptions = Object
-    .values(differentRelationships)
-    .map(relationships => relationships.filter(rel => rel.ownerSide))
-    .filter(relationships => relationships.length > 0);
+  .values(differentRelationships)
+  .map(relationships => relationships.filter(rel => rel.ownerSide))
+  .filter(relationships => relationships.length > 0);
 const testEntityPrimaryKey0 = generateTestEntityPrimaryKey(primaryKey, 0);
 const testEntityPrimaryKey1 = generateTestEntityPrimaryKey(primaryKey, 1);
 _%>
@@ -33,18 +33,19 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of, Subject, from } from 'rxjs';
 
+import { <%= entityAngularName %>FormService } from './<%= entityFileName %>-form.service';
 import { <%= entityAngularName %>Service } from '../service/<%= entityFileName %>.service';
-import { I<%= entityAngularName %>, <%= entityAngularName %> } from '../<%= entityFileName %>.model';
+import { I<%= entityAngularName %> } from '../<%= entityFileName %>.model';
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions.filter(relationships => relationships[0].otherEntity.entityAngularName !== entityAngularName)) { _%>
-    <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
-    <%_ if (isBuiltInUser(otherEntity.entityAngularName)) { _%>
+  <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
+  <%_ if (isBuiltInUser(otherEntity.entityAngularName)) { _%>
 
 import { IUser } from 'app/entities/user/user.model';
 import { UserService } from 'app/entities/user/user.service';
-    <%_ } else { _%>
+  <%_ } else { _%>
 import { I<%= otherEntity.entityAngularName %> } from 'app/entities/<%= otherEntity.entityFolderName %>/<%= otherEntity.entityFileName %>.model';
 import { <%= otherEntity.entityAngularName %>Service } from 'app/entities/<%= otherEntity.entityFolderName %>/service/<%= otherEntity.entityFileName %>.service';
-    <%_ } _%>
+  <%_ } _%>
 <%_ } _%>
 
 import { <%= entityAngularName %>UpdateComponent } from './<%= entityFileName %>-update.component';
@@ -53,6 +54,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
     let comp: <%= entityAngularName %>UpdateComponent;
     let fixture: ComponentFixture<<%= entityAngularName %>UpdateComponent>;
     let activatedRoute: ActivatedRoute;
+    let <%= entityInstance %>FormService: <%= entityAngularName %>FormService;
     let <%= entityInstance %>Service: <%= entityAngularName %>Service;
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions.filter(relationships => relationships[0].otherEntity.entityAngularName !== entityAngularName)) { _%>
   <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
@@ -78,6 +80,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
 
         fixture = TestBed.createComponent(<%= entityAngularName %>UpdateComponent);
         activatedRoute = TestBed.inject(ActivatedRoute);
+        <%= entityInstance %>FormService = TestBed.inject(<%= entityAngularName %>FormService);
         <%= entityInstance %>Service = TestBed.inject(<%= entityAngularName %>Service);
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions.filter(relationships => relationships[0].otherEntity.entityAngularName !== entityAngularName)) { _%>
   <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
@@ -89,7 +92,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
 
     describe('ngOnInit', () => {
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
-  <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
+  <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && rel.otherRelationship); _%>
   <%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); _%>
   <%_ if (relationshipsWithCustomSharedOptions.length > 0) { _%>
     <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
@@ -97,7 +100,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
                 const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
     <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
       <%_ const reference = relationship.reference _%>
-       <%_ if (relationship.collection) { _%>
+      <%_ if (relationship.collection) { _%>
                 const <%= reference.name %> : I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
       <%_ } else { _%>
                 const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
@@ -109,7 +112,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
                 jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= otherEntity.entityInstance %>Collection })));
                 const additional<%= otherEntity.entityAngularNamePlural %> = [
     <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
-        <%_ const reference = relationship.reference _%>
+      <%_ const reference = relationship.reference _%>
                     <% if (relationship.collection) { %>...<% } %><%= reference.name %>,
     <%_ } _%>
                 ];
@@ -120,7 +123,10 @@ describe('<%= entityAngularName %> Management Update Component', () => {
                 comp.ngOnInit();
 
                 expect(<%= otherEntity.entityInstance %>Service.query).toHaveBeenCalled();
-                expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(<%= otherEntity.entityInstance %>Collection, ...additional<%= otherEntity.entityAngularNamePlural %>);
+                expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(
+                  <%= otherEntity.entityInstance %>Collection,
+                  ...additional<%= otherEntity.entityAngularNamePlural %>.map(expect.objectContaining)
+                );
                 expect(comp.<%= otherEntity.entityInstancePlural %>SharedCollection).toEqual(expectedCollection);
         });
 
@@ -153,30 +159,31 @@ describe('<%= entityAngularName %> Management Update Component', () => {
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
   <%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
     <%_ const otherEntity = relationship.otherEntity _%>
-            const <%= relationship.reference.name %>: I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
-            <%= entityInstance %>.<%= relationship.reference.name %> = <%= relationship.collection ? `[${relationship.reference.name}]` : relationship.reference.name %>;
+            const <%= relationship.relationshipName %>: I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
+            <%= entityInstance %>.<%= relationship.reference.name %> = <%= relationship.collection ? `[${relationship.relationshipName}]` : relationship.relationshipName %>;
   <%_ } _%>
 <%_ } _%>
 
             activatedRoute.data = of({ <%= entityInstance %> });
             comp.ngOnInit();
 
-            expect(comp.editForm.value).toEqual(expect.objectContaining(<%= entityInstance %>));
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
-  <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
+  <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && rel.otherRelationship); _%>
   <%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
     <%_ const otherEntity = relationship.otherEntity _%>
-            expect(comp.<% if (!relationshipsWithCustomUniqueOptions.includes(relationship)) { %><%= otherEntity.entityInstancePlural %>Shared<% } else { %><%= relationship.relationshipFieldNamePlural %><% } %>Collection).toContain(<%= relationship.reference.name %>);
+            expect(comp.<% if (!relationshipsWithCustomUniqueOptions.includes(relationship)) { %><%= otherEntity.entityInstancePlural %>Shared<% } else { %><%= relationship.relationshipFieldNamePlural %><% } %>Collection).toContain(<%= relationship.relationshipName %>);
   <%_ } _%>
 <%_ } _%>
+            expect(comp.<%= entityInstance %>).toEqual(<%= entityInstance %>);
         });
     });
 
     describe('save', () => {
         it('Should call update service on save for existing entity', () => {
             // GIVEN
-            const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
+            const saveSubject = new Subject<HttpResponse<I<%= entityAngularName %>>>();
             const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
+            jest.spyOn(<%= entityInstance %>FormService, 'get<%= entityAngularName %>').mockReturnValue(<%= entityInstance %>);
             jest.spyOn(<%= entityInstance %>Service, 'update').mockReturnValue(saveSubject);
             jest.spyOn(comp, 'previousState');
             activatedRoute.data = of({ <%= entityInstance %> });
@@ -189,18 +196,20 @@ describe('<%= entityAngularName %> Management Update Component', () => {
             saveSubject.complete();
 
             // THEN
+            expect(<%= entityInstance %>FormService.get<%= entityAngularName %>).toHaveBeenCalled();
             expect(comp.previousState).toHaveBeenCalled();
-            expect(<%= entityInstance %>Service.update).toHaveBeenCalledWith(<%= entityInstance %>);
+            expect(<%= entityInstance %>Service.update).toHaveBeenCalledWith(expect.objectContaining(<%= entityInstance %>));
             expect(comp.isSaving).toEqual(false);
         });
 
         it('Should call create service on save for new entity', () => {
             // GIVEN
-            const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
-            const <%= entityInstance %> = new <%= entityAngularName %>();
+            const saveSubject = new Subject<HttpResponse<I<%= entityAngularName %>>>();
+            const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
+            jest.spyOn(<%= entityInstance %>FormService, 'get<%= entityAngularName %>').mockReturnValue({ <%= primaryKey.name %>: null });
             jest.spyOn(<%= entityInstance %>Service, 'create').mockReturnValue(saveSubject);
             jest.spyOn(comp, 'previousState');
-            activatedRoute.data = of({ <%= entityInstance %> });
+            activatedRoute.data = of({ <%= entityInstance %>: null });
             comp.ngOnInit();
 
             // WHEN
@@ -210,14 +219,15 @@ describe('<%= entityAngularName %> Management Update Component', () => {
             saveSubject.complete();
 
             // THEN
-            expect(<%= entityInstance %>Service.create).toHaveBeenCalledWith(<%= entityInstance %>);
+            expect(<%= entityInstance %>FormService.get<%= entityAngularName %>).toHaveBeenCalled();
+            expect(<%= entityInstance %>Service.create).toHaveBeenCalled();
             expect(comp.isSaving).toEqual(false);
             expect(comp.previousState).toHaveBeenCalled();
         });
 
         it('Should set isSaving to false on error', () => {
             // GIVEN
-            const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
+            const saveSubject = new Subject<HttpResponse<I<%= entityAngularName %>>>();
             const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
             jest.spyOn(<%= entityInstance %>Service, 'update').mockReturnValue(saveSubject);
             jest.spyOn(comp, 'previousState');
@@ -230,61 +240,27 @@ describe('<%= entityAngularName %> Management Update Component', () => {
             saveSubject.error('This is an error!');
 
             // THEN
-            expect(<%= entityInstance %>Service.update).toHaveBeenCalledWith(<%= entityInstance %>);
+            expect(<%= entityInstance %>Service.update).toHaveBeenCalled();
             expect(comp.isSaving).toEqual(false);
             expect(comp.previousState).not.toHaveBeenCalled();
         });
     });
-<%_ const trackedEntities = Object.values(differentRelationships).filter(arr => arr.some(rel => rel.reference.owned && rel.otherEntity.primaryKey)).map(arr => arr[0].reference);
-    if (trackedEntities.length > 0) {
-_%>
 
-    describe('Tracking relationships identifiers', () => {
-  <%_ for (reference of trackedEntities) {
-        const otherEntity = reference.relationship.otherEntity;
-  _%>
-        describe('track<%= otherEntity.entityAngularName %>By<%= otherEntity.primaryKey.nameCapitalized %>', () => {
-            it('Should return tracked <%= otherEntity.entityAngularName %> primary key', () => {
-                const entity = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                const trackResult = comp.track<%= otherEntity.entityAngularName %>By<%= otherEntity.primaryKey.nameCapitalized %>(0, entity);
-                expect(trackResult).toEqual(entity.<%= otherEntity.primaryKey.name %>);
-            });
-        });
-
-  <%_ } _%>
-    });
-<%_ } _%>
-<%_ const selectableEntities = Object.values(differentRelationships).filter(arr => arr.some(rel => rel.relationshipManyToMany && rel.reference.owned && rel.otherEntity.primaryKey)).map(arr => arr[0].reference);
-  if (selectableEntities.length > 0) {
+<%_ const trackedRelationships = Object.values(differentRelationships).filter(arr => arr.some(rel => rel.ownerSide && rel.otherEntity.primaryKey));
+    if (trackedRelationships.length > 0) {
 _%>
 
-    describe('Getting selected relationships', () => {
-  <%_ for (reference of selectableEntities) {
-        const otherEntity = reference.relationship.otherEntity;
+    describe('Compare relationships', () => {
+  <%_ for (const relationship of trackedRelationships) {
+        const { otherEntity } = relationship[0];
   _%>
-        describe('getSelected<%= otherEntity.entityAngularName %>', () => {
-            it('Should return option if no <%= otherEntity.entityAngularName %> is selected', () => {
-                const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                const result = comp.getSelected<%= otherEntity.entityAngularName %>(option);
-                expect(result === option).toEqual(true);
-            });
-
-            it('Should return selected <%= otherEntity.entityAngularName %> for according option', () => {
-                const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                const selected2 = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
-                const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected2, selected]);
-                expect(result === selected).toEqual(true);
-                expect(result === selected2).toEqual(false);
-                expect(result === option).toEqual(false);
-            });
-
-            it('Should return option if this <%= otherEntity.entityAngularName %> is not selected', () => {
-                const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
-                const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected]);
-                expect(result === option).toEqual(true);
-                expect(result === selected).toEqual(false);
+        describe('compare<%= otherEntity.entityAngularName %>', () => {
+            it('Should forward to <%= otherEntity.entityInstance %>Service', () => {
+                const entity = <%- this.generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
+                const entity2 = <%- this.generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
+                jest.spyOn(<%= otherEntity.entityInstance %>Service, 'compare<%= otherEntity.entityAngularName %>');
+                comp.compare<%= otherEntity.entityAngularName %>(entity, entity2);
+                expect(<%= otherEntity.entityInstance %>Service.compare<%= otherEntity.entityAngularName %>).toHaveBeenCalledWith(entity, entity2);
             });
         });