generator-jhipster 7.8.0 → 7.9.1

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

@@ -17,37 +17,19 @@
  limitations under the License.
 -%>
 <%_
-const allRelationshipsByEntityNeedingOptions = Object
+  const allRelationshipsByEntityNeedingOptions = Object
     .values(differentRelationships)
     .map(relationships => relationships.filter(rel => rel.ownerSide))
     .filter(relationships => relationships.length > 0);
-
-const hasValidationRule = fields.some(field =>
-        field.fieldValidate && (
-                field.fieldValidationRequired ||
-                field.fieldValidationMinLength ||
-                field.fieldValidationMaxLength ||
-                field.fieldValidationMin ||
-                field.fieldValidationMax ||
-                field.fieldValidationPattern
-        )
-);
-const hasRequiredRelationship = relationships.some(relationship => relationship.relationshipRequired);
-const isValidatorsRequired = hasValidationRule || hasRequiredRelationship;
 _%>
 import { Component, OnInit<% if (fieldsContainImageBlob) { %>, ElementRef<% } %> } from '@angular/core';
 import { HttpResponse } from '@angular/common/http';
-import { FormBuilder,<%_ if (isValidatorsRequired) { _%> Validators<%_ } _%> } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { finalize<% if (relationships.some(rel => rel.ownerSide === true)) { %>, map<% } %> } from 'rxjs/operators';
 
-<%_ if (fieldsContainInstant || fieldsContainZonedDateTime) { _%>
-import dayjs from 'dayjs/esm';
-import { DATE_TIME_FORMAT } from 'app/config/input.constants';
-<%_ } _%>
-
-import { I<%= entityAngularName %>, <%= entityAngularName %> } from '../<%= entityFileName %>.model';
+import { <%= entityAngularName %>FormService, <%= entityAngularName %>FormGroup } from './<%= entityFileName %>-form.service';
+import { I<%= entityAngularName %> } from '../<%= entityFileName %>.model';
 import { <%= entityAngularName %>Service } from '../service/<%= entityFileName %>.service';
 <%_ if (fieldsContainBlob) { _%>
 import { AlertError } from 'app/shared/alert/alert-error.model';
@@ -56,22 +38,22 @@ import { DataUtils, FileLoadError } from 'app/core/util/data-util.service';
 <%_ } _%>
 <%_
 Object.keys(differentRelationships).forEach(key => {
-    if (differentRelationships[key].some(rel => rel.reference.owned)) {
-        const uniqueRel = differentRelationships[key][0];
-        if (uniqueRel.otherEntityAngularName !== entityAngularName) {
-            if (isBuiltInUser(uniqueRel.otherEntityAngularName)) {
+  if (differentRelationships[key].some(rel => rel.reference.owned)) {
+    const uniqueRel = differentRelationships[key][0];
+    if (uniqueRel.otherEntityAngularName !== entityAngularName) {
+      if (isBuiltInUser(uniqueRel.otherEntityAngularName)) {
 _%>
 import { IUser } from 'app/entities/user/user.model';
 import { UserService } from 'app/entities/user/user.service';
 <%_
-            } else {
+      } else {
 _%>
 import { I<%= uniqueRel.otherEntityAngularName %> } from 'app/entities/<%= uniqueRel.otherEntityPath %>/<%= uniqueRel.otherEntityFileName %>.model';
 import { <%= uniqueRel.otherEntityAngularName %>Service } from 'app/entities/<%= uniqueRel.otherEntityPath %>/service/<%= uniqueRel.otherEntityFileName %>.service';
 <%_
-            }
-        }
+      }
     }
+  }
 });
 _%>
 <%_ const enumImports = generateEntityClientEnumImports(fields); _%>
@@ -85,86 +67,62 @@ import { <%- importedType %> } from '<%- importedPath %>';
 })
 export class <%= entityAngularName %>UpdateComponent implements OnInit {
     isSaving = false;
+    <%= entityInstance %>: I<%= entityAngularName %> | null = null;
 <%_ enumImports.forEach( (importedPath, importedType) => { _%>
     <%- _.lowerFirst(importedType) %>Values = Object.keys(<%- importedType %>);
 <%_ }); _%>
 
 <%_ for (const relationshipsByEntityNeedingOptions of Object.values(differentRelationships).map(relationships => relationships.filter(rel => rel.ownerSide)).filter(relationships => relationships.length > 0)) { _%>
-    <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
-    <%_ if (relationshipsByEntityNeedingOptions.length > relationshipsWithCustomUniqueOptions.length) { _%>
-        <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity _%>
+  <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && rel.otherRelationship); _%>
+  <%_ if (relationshipsByEntityNeedingOptions.length > relationshipsWithCustomUniqueOptions.length) { _%>
+    <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity _%>
     <%= otherEntity.entityInstancePlural %>SharedCollection: I<%= otherEntity.entityAngularName %>[] = [];
-    <%_ } _%>
-    <%_ for (const relationship of relationshipsWithCustomUniqueOptions) { _%>
-    <%= relationship.relationshipFieldNamePlural %>Collection: I<%= relationship.otherEntityAngularName %>[] = [];
-    <%_ } _%>
+  <%_ } _%>
+  <%_ for (const relationship of relationshipsWithCustomUniqueOptions) { _%>
+    <%= relationship.relationshipFieldNamePlural %>Collection: I<%= relationship.otherEntity.entityAngularName %>[] = [];
+  <%_ } _%>
 <%_ } _%>
 
-    editForm = this.fb.group({
-    <%_ for (const field of fields) {
-        const fieldName = field.fieldName;
-    _%>
-        <%= fieldName %>: [<% if (field.fieldValidate === true) { %>null,[<% if (field.fieldValidationRequired) { %>Validators.required,<% } %><% if (field.fieldValidationMinLength) { %>Validators.minLength(<%= field.fieldValidateRulesMinlength %>),<% } %><% if (field.fieldValidationMaxLength) { %>Validators.maxLength(<%= field.fieldValidateRulesMaxlength %>),<% } %><% if (field.fieldValidationMin) { %>Validators.min(<%= field.fieldValidateRulesMin %>),<% } %><% if (field.fieldValidationMax) { %>Validators.max(<%= field.fieldValidateRulesMax %>),<% } %><% if (field.fieldValidationPattern) { %>Validators.pattern('<%= field.fieldValidateRulesPattern.replace(/\\/g, '\\\\') %>'),<% } %>]<% } %>],
-        <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
-        <%= fieldName %>ContentType: [],
-        <%_ } _%>
-    <%_ } _%>
-<%_ for (const relationship of relationships) {
-    const ownerSide = relationship.ownerSide;
-    const relationshipName = relationship.relationshipName;
-    const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
-    const relationshipRequired = relationship.relationshipRequired;
-_%>
-    <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide)) { _%>
-        <%= relationshipName %>: [<% if (relationshipRequired) { %>null,Validators.required<% } %>],
-    <%_ } else if (relationship.relationshipManyToMany && ownerSide) { _%>
-        <%= relationshipFieldNamePlural %>: [<% if (relationshipRequired) { %>null,Validators.required<% } %>],
-    <%_ } _%>
-<%_ } _%>
-    });
+    editForm: <%= entityAngularName %>FormGroup = this.<%= entityInstance %>FormService.create<%= entityAngularName %>FormGroup();
 
     constructor(
-        <%_ if (fieldsContainBlob) { _%>
+<%_ if (fieldsContainBlob) { _%>
         protected dataUtils: DataUtils,
         protected eventManager: EventManager,
-        <%_ } _%>
+<%_ } _%>
         protected <%= entityInstance %>Service: <%= entityAngularName %>Service,
+        protected <%= entityInstance %>FormService: <%= entityAngularName %>FormService,
 <%_
 Object.keys(differentRelationships).forEach(key => {
-    if (differentRelationships[key].some(rel => rel.relationshipManyToOne || rel.relationshipOneToOne && rel.ownerSide || rel.relationshipManyToMany && rel.ownerSide)) {
-        const uniqueRel = differentRelationships[key][0];
-        if (uniqueRel.otherEntityAngularName !== entityAngularName) {
+  if (differentRelationships[key].some(rel => rel.relationshipManyToOne || rel.relationshipOneToOne && rel.ownerSide || rel.relationshipManyToMany && rel.ownerSide)) {
+    const uniqueRel = differentRelationships[key][0];
+    if (uniqueRel.otherEntityAngularName !== entityAngularName) {
 _%>
         protected <%= uniqueRel.otherEntityName %>Service: <%= uniqueRel.otherEntityAngularName %>Service,
 <%_
-        }
     }
+  }
 });
 _%>
-        <%_ if (fieldsContainImageBlob) { _%>
+<%_ if (fieldsContainImageBlob) { _%>
         protected elementRef: ElementRef,
-        <%_ } _%>
+<%_ } _%>
         protected activatedRoute: ActivatedRoute,
-        protected fb: FormBuilder,
     ) {}
+<%_ for (const relationshipsByEntity of Object.values(differentRelationships).filter(arr => arr.some(rel => rel.ownerSide && rel.otherEntity.primaryKey))) {
+      const { otherEntity } = relationshipsByEntity[0];
+_%>
+
+    compare<%= otherEntity.entityAngularName %> = (o1: I<%= otherEntity.entityAngularName %> | null, o2: I<%= otherEntity.entityAngularName %> | null): boolean =>
+        this.<%= otherEntity.entityInstance %>Service.compare<%= otherEntity.entityAngularName %>(o1, o2);
+<%_ } _%>
 
     ngOnInit(): void {
         this.activatedRoute.data.subscribe(({ <%= entityInstance %> }) => {
-        <%_ if (fieldsContainInstant || fieldsContainZonedDateTime) { _%>
-            if (<%= entityInstance %>.<%= primaryKey.name %> === undefined) {
-                const today = dayjs().startOf('day');
-            <%_ for (const field of fields) {
-                const fieldName = field.fieldName;
-                const fieldType = field.fieldType;
-            _%>
-                <%_ if (field.fieldTypeTimed) { _%>
-                <%= entityInstance %>.<%= fieldName %> = today;
-                <%_ } _%>
-            <%_ } _%>
+            this.<%= entityInstance %> = <%= entityInstance %>;
+            if (<%= entityInstance %>) {
+                this.updateForm(<%= entityInstance %>);
             }
-        <%_ } _%>
-
-            this.updateForm(<%= entityInstance %>);
 
 <%_ if (relationships.filter(rel => rel.ownerSide && !rel.otherEntityIsEmbedded).length > 0) { _%>
             this.loadRelationshipsOptions();
@@ -190,7 +148,7 @@ _%>
         });
     }
 
-    <%_ if (fieldsContainImageBlob) { _%>
+  <%_ if (fieldsContainImageBlob) { _%>
     clearInputImage(field: string, fieldContentType: string, idInput: string): void {
         this.editForm.patchValue({
             [field]: null,
@@ -200,7 +158,7 @@ _%>
             this.elementRef.nativeElement.querySelector('#' + idInput).value = null;
         }
     }
-    <%_ } _%>
+  <%_ } _%>
 <%_ } _%>
 
     previousState(): void {
@@ -209,34 +167,13 @@ _%>
 
     save(): void {
         this.isSaving = true;
-        const <%= entityInstance %> = this.createFromForm();
-        if (<%= entityInstance %>.<%= primaryKey.name %> !== undefined) {
-            this.subscribeToSaveResponse(
-                this.<%= entityInstance %>Service.update(<%= entityInstance %>));
+        const <%= entityInstance %> = this.<%= entityInstance %>FormService.get<%= entityAngularName %>(this.editForm);
+        if (<%= entityInstance %>.<%= primaryKey.name %> !== null) {
+            this.subscribeToSaveResponse(this.<%= entityInstance %>Service.update(<%= entityInstance %>));
         } else {
-            this.subscribeToSaveResponse(
-                this.<%= entityInstance %>Service.create(<%= entityInstance %>));
+            this.subscribeToSaveResponse(this.<%= entityInstance %>Service.create(<%= entityInstance %>));
         }
     }
-    <%_ for (reference of Object.values(differentRelationships).filter(arr => arr.some(rel => rel.reference.owned && rel.otherEntity.primaryKey)).map(arr => arr[0].reference)) { _%>
-
-    track<%= reference.relationship.otherEntity.entityAngularName %>By<%= reference.relationship.otherEntity.primaryKey.nameCapitalized %>(_index: number, item: I<%= reference.relationship.otherEntity.entityAngularName %>): <%= getTypescriptKeyType(reference.relationship.otherEntity.primaryKey.type) %> {
-        return item.<%= reference.relationship.otherEntity.primaryKey.name %>!;
-    }
-    <%_ } _%>
-    <%_ for (reference of Object.values(differentRelationships).filter(arr => arr.some(rel => rel.relationshipManyToMany && rel.reference.owned && rel.otherEntity.primaryKey)).map(arr => arr[0].reference)) { _%>
-
-    getSelected<%= reference.relationship.otherEntity.entityAngularName %>(option: I<%= reference.relationship.otherEntity.entityAngularName %>, selectedVals?: I<%= reference.relationship.otherEntity.entityAngularName %>[]): I<%= reference.relationship.otherEntity.entityAngularName %> {
-        if (selectedVals) {
-          for (const selectedVal of selectedVals) {
-              if (option.<%= reference.relationship.otherEntity.primaryKey.name %> === selectedVal.<%= reference.relationship.otherEntity.primaryKey.name %>) {
-                  return selectedVal;
-              }
-          }
-        }
-        return option;
-    }
-    <%_ } _%>
 
     protected subscribeToSaveResponse(result: Observable<HttpResponse<I<%= entityAngularName %>>>): void {
         result.pipe(finalize(() => this.onSaveFinalize())).subscribe({
@@ -258,117 +195,64 @@ _%>
     }
 
     protected updateForm(<%= entityInstance %>: I<%= entityAngularName %>): void {
-        this.editForm.patchValue({
-    <%_ for (const field of fields) {
-        const fieldName = field.fieldName;
-    _%>
-        <%_ if (field.fieldTypeTimed) { _%>
-            <%= fieldName %>: <%= entityInstance %>.<%= fieldName %> ? <%= entityInstance %>.<%= fieldName %>.format(DATE_TIME_FORMAT) : null,
-        <%_ } else if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
-            <%= fieldName %>: <%= entityInstance %>.<%= fieldName %>,
-            <%= fieldName %>ContentType: <%= entityInstance %>.<%= fieldName %>ContentType,
-        <%_ } else { _%>
-            <%= fieldName %>: <%= entityInstance %>.<%= fieldName %>,
-        <%_ } _%>
-    <%_ } _%>
-    <%_ for (const relationship of relationships) {
-        const ownerSide = relationship.ownerSide;
-        const relationshipName = relationship.relationshipName;
-        const relationshipFieldName = relationship.relationshipFieldName;
-        const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
-    _%>
-        <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide)) { _%>
-            <%= relationshipName %>: <%= entityInstance %>.<%= relationshipFieldName %>,
-        <%_ } else if (relationship.relationshipManyToMany && ownerSide) { _%>
-            <%= relationshipFieldNamePlural %>: <%= entityInstance %>.<%= relationshipFieldNamePlural %>,
-        <%_ } _%>
-    <%_ } _%>
-        });
+        this.<%= entityInstance %> = <%= entityInstance %>;
+        this.<%= entityInstance %>FormService.resetForm(this.editForm, <%= entityInstance %>);
 <%_ if (relationships.filter(rel => rel.ownerSide).length > 0) { _%>
 
-    <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
-        <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
-        <%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); _%>
-        <%_ if (relationshipsWithCustomSharedOptions.length > 0) { _%>
-            <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity _%>
-        this.<%= otherEntity.entityInstancePlural %>SharedCollection = this.<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing(
+  <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
+    <%_ 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 _%>
+        this.<%= otherEntity.entityInstancePlural %>SharedCollection = this.<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing<I<%= otherEntity.entityAngularName %>>(
             this.<%= otherEntity.entityInstancePlural %>SharedCollection,
-            <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
-                <%_ const reference = relationship.reference _%>
+      <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
+        <%_ const reference = relationship.reference _%>
             <%= relationship.collection ? '...(' : '' %><%= entityInstance %>.<%= reference.name %><%= relationship.collection ? ' ?? [])' : '' %>,
-            <%_ } _%>
+      <%_ } _%>
         );
-        <%_ } _%>
-        <%_ for (const relationship of relationshipsWithCustomUniqueOptions) { _%>
-            <%_ const otherEntity = relationship.otherEntity _%>
-            <%_ const reference = relationship.reference _%>
-        this.<%= relationship.relationshipFieldNamePlural %>Collection = this.<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing(this.<%= relationship.relationshipFieldNamePlural %>Collection, <%= relationship.collection ? '...(' : '' %><%= entityInstance %>.<%= reference.name %><%= relationship.collection ? ' ?? [])' : '' %>);
-        <%_ } _%>
     <%_ } _%>
+    <%_ for (const relationship of relationshipsWithCustomUniqueOptions) { _%>
+      <%_ const otherEntity = relationship.otherEntity _%>
+      <%_ const reference = relationship.reference _%>
+        this.<%= relationship.relationshipFieldNamePlural %>Collection = this.<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing<I<%= otherEntity.entityAngularName %>>(this.<%= relationship.relationshipFieldNamePlural %>Collection, <%= relationship.collection ? '...(' : '' %><%= entityInstance %>.<%= reference.name %><%= relationship.collection ? ' ?? [])' : '' %>);
+    <%_ } _%>
+  <%_ } _%>
 <%_ } _%>
     }
 
 <%_ if (relationships.filter(rel => rel.ownerSide && !rel.otherEntityIsEmbedded).length > 0) { _%>
     protected loadRelationshipsOptions(): void {
-    <%_ for (const relationshipsByEntityNeedingOptions of Object.values(differentRelationships).map(relationships => relationships.filter(rel => rel.ownerSide)).filter(relationships => relationships.length > 0)) { _%>
-        <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); %>
-        <%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); %>
-        <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity _%>
-        <%_ if (relationshipsWithCustomSharedOptions.length > 0) { _%>
+  <%_ for (const relationshipsByEntityNeedingOptions of Object.values(differentRelationships).map(relationships => relationships.filter(rel => rel.ownerSide)).filter(relationships => relationships.length > 0)) { _%>
+    <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && rel.otherRelationship); %>
+    <%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); %>
+    <%_ const { otherEntity } = relationshipsByEntityNeedingOptions[0] _%>
+    <%_ if (relationshipsWithCustomSharedOptions.length > 0) { _%>
         this.<%= otherEntity.entityInstance %>Service
             .query()
             .pipe(map((res: HttpResponse<I<%= otherEntity.entityAngularName %>[]>) => res.body ?? []))
-            .pipe(map((<%= otherEntity.entityInstancePlural %>: I<%= otherEntity.entityAngularName %>[]) => this.<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing(
+            .pipe(map((<%= otherEntity.entityInstancePlural %>: I<%= otherEntity.entityAngularName %>[]) => this.<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing<I<%= otherEntity.entityAngularName %>>(
                 <%= otherEntity.entityInstancePlural %>,
-            <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
-                <%_ if (relationship.collection) { _%>
-                ...(this.editForm.get('<%= relationship.reference.name %>')!.value ?? []),
-                <%_ } else { _%>
-                this.editForm.get('<%= relationship.reference.name %>')!.value,
-                <%_ } _%>
-            <%_ } _%>
+      <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
+        <%_ if (relationship.collection) { _%>
+                ...(this.<%= entityInstance %>?.<%= relationship.propertyName %> ?? []),
+        <%_ } else { _%>
+                this.<%= entityInstance %>?.<%= relationship.propertyName %>,
+        <%_ } _%>
+      <%_ } _%>
             )))
             .subscribe((<%= otherEntity.entityInstancePlural %>: I<%= otherEntity.entityAngularName %>[]) => (this.<%= otherEntity.entityInstancePlural %>SharedCollection = <%= otherEntity.entityInstancePlural %>));
-        <%_ } _%>
-        <%_ for (const relationship of relationshipsWithCustomUniqueOptions) { %>
-            <%_ const filter = relationship.jpaMetamodelFiltering ? `'${relationship.otherEntityRelationshipName}Id.specified': 'false'` : `filter: '${relationship.otherEntityRelationshipName.toLowerCase()}-is-null'`; _%>
+    <%_ } _%>
+    <%_ for (const relationship of relationshipsWithCustomUniqueOptions) { %>
+      <%_ const filter = relationship.jpaMetamodelFiltering ? `'${relationship.otherEntityRelationshipName}Id.specified': 'false'` : `filter: '${relationship.otherEntityRelationshipName.toLowerCase()}-is-null'`; _%>
 
         this.<%= relationship.otherEntityName %>Service
             .query({<%- filter %>})
             .pipe(map((res: HttpResponse<I<%= relationship.otherEntityAngularName %>[]>) => res.body ?? []))
-            .pipe(map((<%= otherEntity.entityInstancePlural %>: I<%= otherEntity.entityAngularName %>[]) => this.<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing(<%= otherEntity.entityInstancePlural %>, this.editForm.get('<%= relationship.reference.name %>')!.value)))
+            .pipe(map((<%= otherEntity.entityInstancePlural %>: I<%= otherEntity.entityAngularName %>[]) => this.<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing<I<%= otherEntity.entityAngularName %>>(<%= otherEntity.entityInstancePlural %>, this.<%= entityInstance %>?.<%= relationship.propertyName %>)))
             .subscribe((<%= otherEntity.entityInstancePlural %>: I<%= otherEntity.entityAngularName %>[]) => (this.<%= relationship.relationshipFieldNamePlural %>Collection = <%= otherEntity.entityInstancePlural %>));
-        <%_ } _%>
+      <%_ } _%>
     <%_ } _%>
     }
 <%_ } _%>
-
-    protected createFromForm(): I<%= entityAngularName %> {
-        return {
-            ...new <%= entityAngularName %>(),
-    <%_ for (const field of fields) {
-        const fieldName = field.fieldName;
-    _%>
-        <%_ if (field.fieldTypeTimed) { _%>
-            <%= fieldName %>: this.editForm.get(['<%= fieldName %>'])!.value ? dayjs(this.editForm.get(['<%= fieldName %>'])!.value, DATE_TIME_FORMAT) : undefined,
-        <%_ } else if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
-            <%= fieldName %>ContentType: this.editForm.get(['<%= fieldName %>ContentType'])!.value,
-            <%= fieldName %>: this.editForm.get(['<%= fieldName %>'])!.value,
-        <%_ } else { _%>
-            <%= fieldName %>: this.editForm.get(['<%= fieldName %>'])!.value,
-        <%_ } _%>
-    <%_ } _%>
-    <%_ for (const relationship of relationships) {
-        const ownerSide = relationship.ownerSide;
-        const relationshipName = relationship.relationshipName;
-        const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
-    _%>
-        <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide)) { _%>
-            <%= relationshipName %>: this.editForm.get(['<%= relationshipName %>'])!.value,
-        <%_ } else if (relationship.relationshipManyToMany && relationship.ownerSide) { _%>
-            <%= relationshipFieldNamePlural %>: this.editForm.get(['<%= relationshipFieldNamePlural %>'])!.value,
-        <%_ } _%>
-    <%_ } _%>
-        };
-    }
 }

package/generators/entity-client/templates/{common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs → cypress/src/test/javascript/cypress/e2e/entity/entity.cy.ts.ejs}

@@ -1,4 +1,3 @@
-import { entityItemSelector } from '../../support/commands';
 import {
   entityTableSelector,
   entityDetailsButtonSelector,
@@ -32,7 +31,7 @@ const skipCreateTest =
 
 const sampleFields = fields.filter(f => !f.autoGenerate && !f.nullable);
 
-if (workaroundRelationshipReactivePostgress && sampleFields.length === 0) {
+if (workaroundEntityCannotBeEmpty && sampleFields.length === 0) {
   const sample = fields.find(f => !f.autoGenerate);
   if (sample) {
     sampleFields.push(sample);
@@ -51,11 +50,11 @@ describe('<%= entityClass %> e2e test', () => {
   const <%= entityInstance %>PageUrlPattern = new RegExp('/<%= entityPage %>(\\?.*)?$');
   const username = Cypress.env('E2E_USERNAME') ?? 'user';
   const password = Cypress.env('E2E_PASSWORD') ?? 'user';
-  const <%= entityInstance %>Sample = <%- JSON.stringify(generateTestEntity(sampleFields.map(field => field.reference))) %>;
+  <% if (skipCreateTest) { %>// <% } %>const <%= entityInstance %>Sample = <%- JSON.stringify(generateTestEntity(sampleFields.map(field => field.reference))) %>;
 
-  let <%= entityInstance %>: any;
+  let <%= entityInstance %>;
 <%_ for (otherEntity of requiredOtherEntities) { _%>
-  <%_ if (skipCreateTest) { _%>// <%_ } _%>let <%= otherEntity.entityInstance %>: any;
+  <% if (skipCreateTest) { %>// <% } %>let <%= otherEntity.entityInstance %>;
 <%_ } _%>
 
   beforeEach(() => {
@@ -145,7 +144,7 @@ describe('<%= entityClass %> e2e test', () => {
     cy.visit('/');
     cy.clickOnEntityMenuItem('<%= entityPage %>');
     cy.wait('@entitiesRequest').then(({ response }) => {
-      if (response!.body.length === 0) {
+      if (response.body.length === 0) {
         cy.get(entityTableSelector).should('not.exist');
       } else {
         cy.get(entityTableSelector).should('exist');
@@ -170,7 +169,7 @@ describe('<%= entityClass %> e2e test', () => {
         cy.get(entityCreateSaveButtonSelector).should('exist');
         cy.get(entityCreateCancelButtonSelector).click();
         cy.wait('@entitiesRequest').then(({ response }) => {
-          expect(response!.statusCode).to.equal(200);
+          expect(response.statusCode).to.equal(200);
         });
         cy.url().should('match', <%= entityInstance %>PageUrlPattern);
       });
@@ -231,7 +230,7 @@ describe('<%= entityClass %> e2e test', () => {
         cy.visit(<%= entityInstance %>PageUrl);
 
         cy.wait('@entitiesRequest').then(({ response }) => {
-          if (response!.body.length === 0) {
+          if (response.body.length === 0) {
             this.skip();
           }
         });
@@ -243,19 +242,29 @@ describe('<%= entityClass %> e2e test', () => {
         cy.getEntityDetailsHeading('<%= entityInstance %>');
         cy.get(entityDetailsBackButtonSelector).click();
         cy.wait('@entitiesRequest').then(({ response }) => {
-          expect(response!.statusCode).to.equal(200);
+          expect(response.statusCode).to.equal(200);
         });
         cy.url().should('match', <%= entityInstance %>PageUrlPattern);
       });
 
 <%_ if (!readOnly) { _%>
-      it('edit button click should load edit <%= entityClass %> page', () => {
+      it('edit button click should load edit <%= entityClass %> page and go back', () => {
         cy.get(entityEditButtonSelector).first().click();
         cy.getEntityCreateUpdateHeading('<%= entityClass %>');
         cy.get(entityCreateSaveButtonSelector).should('exist');
         cy.get(entityCreateCancelButtonSelector).click();
         cy.wait('@entitiesRequest').then(({ response }) => {
-          expect(response!.statusCode).to.equal(200);
+          expect(response.statusCode).to.equal(200);
+        });
+        cy.url().should('match', <%= entityInstance %>PageUrlPattern);
+      });
+
+      it<% if (jpaMetamodelFiltering && (clientFrameworkAngular || clientFrameworkVue)) { %>.skip<% } %>('edit button click should load edit <%= entityClass %> page and save', () => {
+        cy.get(entityEditButtonSelector).first().click();
+        cy.getEntityCreateUpdateHeading('<%= entityClass %>');
+        cy.get(entityCreateSaveButtonSelector).click();
+        cy.wait('@entitiesRequest').then(({ response }) => {
+          expect(response.statusCode).to.equal(200);
         });
         cy.url().should('match', <%= entityInstance %>PageUrlPattern);
       });
@@ -271,10 +280,10 @@ describe('<%= entityClass %> e2e test', () => {
         cy.getEntityDeleteDialogHeading('<%= entityInstance %>').should('exist');
         cy.get(entityConfirmDeleteButtonSelector).click();
         cy.wait('@deleteEntityRequest').then(({ response }) => {
-          expect(response!.statusCode).to.equal(204);
+          expect(response.statusCode).to.equal(204);
         });
         cy.wait('@entitiesRequest').then(({ response }) => {
-          expect(response!.statusCode).to.equal(200);
+          expect(response.statusCode).to.equal(200);
         });
         cy.url().should('match', <%= entityInstance %>PageUrlPattern);
   <% if (cypressBootstrapEntities) { %>
@@ -315,7 +324,7 @@ describe('<%= entityClass %> e2e test', () => {
       cy.get(`[data-cy="<%= fieldName %>"]`).select('<%= fieldValue %>');
 
     <%_ } else if (field.fieldTypeString || field.fieldTypeNumeric || field.fieldTypeLocalDate || field.fieldTypeTimed || field.fieldTypeDuration) { _%>
-      cy.get(`[data-cy="<%= fieldName %>"]`).type('<%= fieldValue %>').should('have.value', '<%= fieldValue %>');
+      cy.get(`[data-cy="<%= fieldName %>"]`).type('<%= fieldValue %>')<% if (field.fieldTypeLocalDate || field.fieldTypeTimed || field.fieldTypeDuration) { %>.blur()<% } %>.should('have.value', '<%= fieldValue %>');
 
     <%_ } else { _%>
       cy.get(`[data-cy="<%= fieldName %>"]`).type('<%= fieldValue %>').invoke('val').should('match', new RegExp('<%= fieldValue %>'));
@@ -336,11 +345,11 @@ describe('<%= entityClass %> e2e test', () => {
       cy.get(entityCreateSaveButtonSelector).click();
 
       cy.wait('@postEntityRequest').then(({ response }) => {
-        expect(response!.statusCode).to.equal(201);
-        <%= entityInstance %> = response!.body;
+        expect(response.statusCode).to.equal(201);
+        <%= entityInstance %> = response.body;
       });
       cy.wait('@entitiesRequest').then(({ response }) => {
-        expect(response!.statusCode).to.equal(200);
+        expect(response.statusCode).to.equal(200);
       });
       cy.url().should('match', <%= entityInstance %>PageUrlPattern);
     });

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import React, { useEffect, useState } from 'react';
-import { RouteComponentProps } from 'react-router-dom';
+import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
 import { Translate } from 'react-jhipster';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -25,12 +25,17 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { useAppDispatch, useAppSelector } from 'app/config/store';
 import { getEntity, deleteEntity } from './<%= entityFileName %>.reducer';
 
-export const <%= entityReactName %>DeleteDialog = (props: RouteComponentProps<{ id: string }>) => {
-  const [loadModal, setLoadModal] = useState(false);
+export const <%= entityReactName %>DeleteDialog = () => {
   const dispatch = useAppDispatch();
 
+  const location = useLocation();
+  const navigate = useNavigate();
+  const { id } = useParams<'id'>();
+
+  const [loadModal, setLoadModal] = useState(false);
+
   useEffect(() => {
-    dispatch(getEntity(props.match.params.id));
+    dispatch(getEntity(id));
     setLoadModal(true);
   }, []);
 
@@ -38,7 +43,7 @@ export const <%= entityReactName %>DeleteDialog = (props: RouteComponentProps<{
   const updateSuccess = useAppSelector(state => state.<%= entityReactState %>.updateSuccess);
 
   const handleClose = () => {
-    props.history.push('/<%= entityPage %>'<%_ if (paginationPagination) { _%> + props.location.search<%_ } _%>);
+    navigate('/<%= entityPage %>'<%_ if (paginationPagination) { _%> + location.search<%_ } _%>);
   };
 
   useEffect(() => {

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import React, { useEffect } from 'react';
-import { Link, RouteComponentProps } from 'react-router-dom';
+import { Link, useParams } from 'react-router-dom';
 import { Button, <% if (haveFieldWithJavadoc) { %>UncontrolledTooltip, <% } %>Row, Col } from 'reactstrap';
 import {
   Translate,
@@ -41,11 +41,13 @@ import { useAppDispatch, useAppSelector } from 'app/config/store';
 
 import { getEntity } from './<%= entityFileName %>.reducer';
 
-export const <%= entityReactName %>Detail = (props: RouteComponentProps<{id: string}>) => {
+export const <%= entityReactName %>Detail = () => {
   const dispatch = useAppDispatch();
 
+  const { id } = useParams<'id'>();
+
   useEffect(() => {
-    dispatch(getEntity(props.match.params.id));
+    dispatch(getEntity(id));
   }, []);
 
   const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityReactState %>.entity);

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs

@@ -25,7 +25,7 @@ for (const field of fields.filter(field => !field.id)) {
 }
 _%>
 import React, { useState, useEffect } from 'react';
-import { Link, RouteComponentProps } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 import {
   Button,
   Row,
@@ -108,10 +108,14 @@ import {
   reset
 } from './<%= entityFileName %>.reducer';
 
-export const <%= entityReactName %>Update = (props: RouteComponentProps<{id: string}>) => {
+export const <%= entityReactName %>Update = () => {
   const dispatch = useAppDispatch();
 
-  const [isNew] = useState(!props.match.params || !props.match.params.id);
+  const navigate = useNavigate();
+
+  const { id } = useParams<'id'>();
+  const isNew = id === undefined;
+
 
   <%_ otherEntityActions.forEach(val => { _%>
   const <%= val.instance %> = useAppSelector(state => state.<%= val.reducer %>);
@@ -123,20 +127,21 @@ export const <%= entityReactName %>Update = (props: RouteComponentProps<{id: str
   <%_ enumImports.forEach( (importedPath, importedType) => { _%>
   const <%- _.lowerFirst(importedType) %>Values = Object.keys(<%- importedType %>);
   <%_ }); _%>
+
   const handleClose = () => {
-    props.history.push('/<%= entityPage %>'<%_ if (paginationPagination) { _%> + props.location.search<%_ } _%>);
+    navigate('/<%= entityPage %>'<%_ if (paginationPagination) { _%> + location.search<%_ } _%>);
   }
 
   useEffect(() => {
 <%_ if (paginationInfiniteScroll) { _%>
     if (!isNew) {
-      dispatch(getEntity(props.match.params.id));
+      dispatch(getEntity(id));
     }
 <%_ } else { _%>
     if (isNew) {
       dispatch(reset());
     } else {
-      dispatch(getEntity(props.match.params.id));
+      dispatch(getEntity(id));
     }
 <%_ } _%>