generator-jhipster 9.1.0 → 9.2.0

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.spec.ts.ejs

@@ -17,9 +17,7 @@
  limitations under the License.
 -%>
 <%_ const tsKeyId = primaryKey.tsSampleValues[0]; _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap/modal';
@@ -48,8 +46,8 @@ describe('<%- entityAngularName %> Management Delete Component', () => {
   describe('confirmDelete', () => {
     it('should call delete service on confirmDelete', () => {
       // GIVEN
-      <%- clientTestFramework %>.spyOn(service, 'delete').mockReturnValue(of(undefined));
-      <%- clientTestFramework %>.spyOn(mockActiveModal, 'close');
+      vitest.spyOn(service, 'delete').mockReturnValue(of(undefined));
+      vitest.spyOn(mockActiveModal, 'close');
 
       // WHEN
       comp.confirmDelete(<%- tsKeyId %>);
@@ -61,9 +59,9 @@ describe('<%- entityAngularName %> Management Delete Component', () => {
 
     it('should not call delete service on clear', () => {
       // GIVEN
-      <%- clientTestFramework %>.spyOn(service, 'delete');
-      <%- clientTestFramework %>.spyOn(mockActiveModal, 'close');
-      <%- clientTestFramework %>.spyOn(mockActiveModal, 'dismiss');
+      vitest.spyOn(service, 'delete');
+      vitest.spyOn(mockActiveModal, 'close');
+      vitest.spyOn(mockActiveModal, 'dismiss');
 
       // WHEN
       comp.cancel();

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.ts.ejs

@@ -23,7 +23,6 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap/modal';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 import { AlertError } from 'app/shared/alert/alert-error';
 import { I<%- entityAngularName %> } from '../<%- entityFileName %>.model';
@@ -36,7 +35,6 @@ import { ITEM_DELETED_EVENT } from 'app/config/navigation.constants';
     imports: [
 <%_ if (enableTranslation) { _%>
       TranslateDirective,
-      TranslateModule,
 <%_ } _%>
       FormsModule,
       FontAwesomeModule,

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.html.ejs

@@ -31,7 +31,7 @@
       <dl class="row-md jh-entity-details">
 <%_ for (const field of fields.filter(field => !field.hidden)) { _%>
   <%_ const { fieldName, fieldType } = field; _%>
-        <dt><span<% if (field.documentation) { if (enableTranslation) { %> [ngbTooltip]="'<%- i18nKeyPrefix %>.help.<%- fieldName %>' | translate"<% } else { %> ngbTooltip="<%- field.documentation %>"<% } } %>>__jhiTranslateTag__('<%- field.propertyTranslationKey %>')</span></dt>
+        <dt><span<% if (field.documentation && enableTranslation) { %> [ngbTooltip]="'<%- i18nKeyPrefix %>.help.<%- fieldName %>' | translate"<% } else if (field.documentation) { %> ngbTooltip="<%- field.documentation %>"<% } %>>__jhiTranslateTag__('<%- field.propertyTranslationKey %>')</span></dt>
         <dd>
   <%_ if (field.fieldIsEnum) { _%>
           <%# TODO: import enum and use its key as label -%>

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.spec.ts.ejs

@@ -17,16 +17,14 @@
  limitations under the License.
 -%>
 <%_ const testEntity = tsPrimaryKeySamples[0]; _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideRouter, withComponentInputBinding } from '@angular/router';
 import { RouterTestingHarness } from '@angular/router/testing';
 import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
 import { faArrowLeft, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of } from 'rxjs';
 
@@ -45,10 +43,10 @@ describe('<%- entityAngularName %> Management Detail Component', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [
         provideRouter(
           [
             {
@@ -66,7 +64,7 @@ describe('<%- entityAngularName %> Management Detail Component', () => {
     library.addIcons(faPencilAlt);
 <%_ if (anyFieldIsBlobDerived) { _%>
     dataUtils = TestBed.inject(DataUtils);
-    <%- clientTestFramework %>.spyOn(window, 'open').mockImplementation(() => null);
+    vitest.spyOn(window, 'open').mockImplementation(() => null);
 <%_ } _%>
   });
 
@@ -87,7 +85,7 @@ describe('<%- entityAngularName %> Management Detail Component', () => {
 
   describe('PreviousState', () => {
     it('should navigate to previous state', () => {
-      <%- clientTestFramework %>.spyOn(globalThis.history, 'back');
+      vitest.spyOn(globalThis.history, 'back');
       comp.previousState();
       expect(globalThis.history.back).toHaveBeenCalled();
     });
@@ -97,7 +95,7 @@ describe('<%- entityAngularName %> Management Detail Component', () => {
   describe('byteSize', () => {
     it('should call byteSize from DataUtils', () => {
       // GIVEN
-      <%- clientTestFramework %>.spyOn(dataUtils, 'byteSize');
+      vitest.spyOn(dataUtils, 'byteSize');
       const fakeBase64 = 'fake base64';
 
       // WHEN
@@ -111,15 +109,11 @@ describe('<%- entityAngularName %> Management Detail Component', () => {
   describe('openFile', () => {
     it('should call openFile from DataUtils', () => {
       const newWindow = { ...window };
-  <%_ if (clientTestFrameworkVitest) { _%>
       vitest.stubGlobal('open', vitest.fn(() => newWindow));
-  <%_ } else { _%>
-      window.open = <%- clientTestFramework %>.fn(() => newWindow);
-  <%_ } _%>
-      window.onload = <%- clientTestFramework %>.fn(() => newWindow) as any;
-      window.URL.createObjectURL = <%- clientTestFramework %>.fn() as any;
+      window.onload = vitest.fn(() => newWindow) as any;
+      window.URL.createObjectURL = vitest.fn() as any;
       // GIVEN
-      <%- clientTestFramework %>.spyOn(dataUtils, 'openFile');
+      vitest.spyOn(dataUtils, 'openFile');
       const fakeContentType = 'fake content type';
       const fakeBase64 = 'fake base64';
 

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.ts.ejs

@@ -29,7 +29,7 @@ import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap/tooltip';
 <%_ } _%>
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 <%_ } _%>
 import { DurationPipe, FormatMediumDatetimePipe, FormatMediumDatePipe } from 'app/shared/date';
 import { I<%- entityAngularName %> } from '../<%- entityFileName %>.model';
@@ -50,7 +50,7 @@ import { DataUtils } from 'app/core/util/data-util.service';
       AlertError,
 <%_ if (enableTranslation) { _%>
       TranslateDirective,
-      TranslateModule,
+      TranslatePipe,
 <%_ } _%>
 <%_ if (entityFileName !== 'authority' && updatableEntity) { _%>
       RouterLink,
@@ -71,9 +71,7 @@ export class <%- entityAngularName %>Detail {
 
 <%_ if (anyFieldIsBlobDerived) { _%>
     protected dataUtils = inject(DataUtils);
-<%_ } _%>
 
-<%_ if (anyFieldIsBlobDerived) { _%>
     byteSize(base64String: string): string {
         return this.dataUtils.byteSize(base64String);
     }

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.spec.ts.ejs

@@ -20,9 +20,7 @@
     const testEntityPrimaryKey = tsPrimaryKeySamples[0];
     const testEntityPrimaryKey2 = tsPrimaryKeySamples[1];
 _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { MockInstance, afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 import {
   ComponentFixture, TestBed,
@@ -35,7 +33,7 @@ import { ActivatedRoute, convertToParamMap } from '@angular/router';
 import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
 import { faEye, faPencilAlt, faPlus<%- searchEngineAny ? ', faSearch' : '' %>, faSort, faSortDown, faSortUp, faSync, faTimes } from '@fortawesome/free-solid-svg-icons';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import {
   of,
@@ -45,9 +43,7 @@ import {
 } from 'rxjs';
 <%_ if (!readOnly) { _%>
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap/modal';
-<%_ } _%>
 
-<%_ if (!readOnly) { _%>
 import { sampleWithRequiredData } from '../<%- entityFileName %>.test-samples';
 <%_ } _%>
 import { <%- entityAngularName %>Service } from '../service/<%- entityFileName %>.service';
@@ -65,10 +61,10 @@ describe('<%- entityAngularName %> Management Component', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
+            providers: [
 <%_ if (enableTranslation) { _%>
-            imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-            providers: [
                 provideHttpClientTesting(),
                 {
                     provide: ActivatedRoute,
@@ -105,7 +101,7 @@ describe('<%- entityAngularName %> Management Component', () => {
         fixture = TestBed.createComponent(<%- entityAngularName %>);
         comp = fixture.componentInstance;
         service = TestBed.inject(<%- entityAngularName %>Service);
-        routerNavigateSpy = <%- clientTestFramework %>.spyOn(comp.router, 'navigate');
+        routerNavigateSpy = vitest.spyOn(comp.router, 'navigate');
 
     const library = TestBed.inject(FaIconLibrary);
     library.addIcons(faEye, faPencilAlt, faPlus<%- searchEngineAny ? ', faSearch' : '' %>, faSort, faSortDown, faSortUp, faSync, faTimes);
@@ -184,7 +180,7 @@ describe('<%- entityAngularName %> Management Component', () => {
     describe('track<%- primaryKey.nameCapitalized %>', () => {
         it('should forward to <%- entityInstance %>Service', () => {
             const entity = <%- tsPrimaryKeySamples[0] %>;
-            <%- clientTestFramework %>.spyOn(service, 'get<%- entityAngularName %>Identifier');
+            vitest.spyOn(service, 'get<%- entityAngularName %>Identifier');
             const <%- primaryKey.name %> = comp.track<%- primaryKey.nameCapitalized %>(entity);
             expect(service.get<%- entityAngularName %>Identifier).toHaveBeenCalledWith(entity);
             expect(<%- primaryKey.name %>).toBe(entity.<%- primaryKey.name %>);
@@ -230,7 +226,7 @@ describe('<%- entityAngularName %> Management Component', () => {
     let req = httpMock.expectOne({ method: 'GET' });
     req.flush([<%- testEntityPrimaryKey %>], { headers: { link: '<http://localhost/api/foo?page=1&size=20>; rel="next"' } });
     await vitest.runAllTimersAsync();
-    expect(comp.<%- entityInstancePlural %>().length).toEqual(1);
+    expect(comp.<%- entityInstancePlural %>()).toHaveLength(1);
     expect(comp.<%- entityInstancePlural %>()[0]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey %>));
 
     // WHEN
@@ -240,7 +236,7 @@ describe('<%- entityAngularName %> Management Component', () => {
     req = httpMock.expectOne({ method: 'GET' });
     req.flush([<%- testEntityPrimaryKey2 %>], { headers: { link: '<http://localhost/api/foo?page=0&size=20>; rel="prev",<http://localhost/api/foo?page=2&size=20>; rel="next"' } });
     await vitest.runAllTimersAsync();
-    expect(comp.<%- entityInstancePlural %>().length).toEqual(2);
+    expect(comp.<%- entityInstancePlural %>()).toHaveLength(2);
     expect(comp.<%- entityInstancePlural %>()[1]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey2 %>));
 
     comp.loadNextPage();
@@ -249,7 +245,7 @@ describe('<%- entityAngularName %> Management Component', () => {
     req = httpMock.expectOne({ method: 'GET' });
     req.flush([<%- testEntityPrimaryKey2 %>], { headers: { link: '<http://localhost/api/foo?page=0&size=20>; rel="prev",<http://localhost/api/foo?page=2&size=20>; rel="next"' } });
     await vitest.runAllTimersAsync();
-    expect(comp.<%- entityInstancePlural %>().length).toEqual(2);
+    expect(comp.<%- entityInstancePlural %>()).toHaveLength(2);
     expect(comp.<%- entityInstancePlural %>()[1]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey2 %>));
   });
 <%_ } _%>
@@ -275,12 +271,12 @@ describe('<%- entityAngularName %> Management Component', () => {
       // NgbModal is not a singleton using TestBed.inject.
       // ngbModal = TestBed.inject(NgbModal);
       ngbModal = (comp as any).modalService;
-      <%- clientTestFramework %>.spyOn(ngbModal, 'open').mockReturnValue(deleteModalMock);
+      vitest.spyOn(ngbModal, 'open').mockReturnValue(deleteModalMock);
     });
 
     it('on confirm should call load', inject([], () => {
       // GIVEN
-      <%- clientTestFramework %>.spyOn(comp, 'load');
+      vitest.spyOn(comp, 'load');
 
       // WHEN
       comp.delete(sampleWithRequiredData);
@@ -293,7 +289,7 @@ describe('<%- entityAngularName %> Management Component', () => {
 
     it('on dismiss should call load', inject([], () => {
       // GIVEN
-      <%- clientTestFramework %>.spyOn(comp, 'load');
+      vitest.spyOn(comp, 'load');
 
       // WHEN
       comp.delete(sampleWithRequiredData);

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.ts.ejs

@@ -51,7 +51,7 @@ import { Alert } from 'app/shared/alert/alert';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 <%_ } _%>
 import { sortStateSignal, SortDirective, SortByDirective, type SortState, SortService } from 'app/shared/sort';
 import { DurationPipe, FormatMediumDatetimePipe, FormatMediumDatePipe } from 'app/shared/date';
@@ -114,7 +114,7 @@ import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
       SortByDirective,
 <%_ if (enableTranslation) { _%>
       TranslateDirective,
-      TranslateModule,
+      TranslatePipe,
 <%_ } _%>
 <%_ if (anyFieldIsDuration) { _%>
       DurationPipe,

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs

@@ -17,9 +17,7 @@
  limitations under the License.
 -%>
 <%_ const tsKeyId = primaryKey.tsSampleValues[0]; _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 
 import { HttpErrorResponse } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
@@ -50,7 +48,7 @@ describe('<%- entityAngularName %> routing resolve service', () => {
       ],
     });
     mockRouter = TestBed.inject(Router);
-    <%- clientTestFramework %>.spyOn(mockRouter, 'navigate');
+    vitest.spyOn(mockRouter, 'navigate');
     mockActivatedRouteSnapshot = TestBed.inject(ActivatedRoute).snapshot;
     service = TestBed.inject(<%- entityAngularName %>Service);
   });
@@ -58,7 +56,7 @@ describe('<%- entityAngularName %> routing resolve service', () => {
   describe('resolve', () => {
     it('should return I<%- entityAngularName %> returned by find', async () => {
       // GIVEN
-      service.find = <%- clientTestFramework %>.fn(<%- primaryKey.name %> => of({ <%- primaryKey.name %> }));
+      service.find = vitest.fn(<%- primaryKey.name %> => of({ <%- primaryKey.name %> }));
       mockActivatedRouteSnapshot.params = { <%- primaryKey.name %>: <%- tsKeyId %> };
 
       // WHEN
@@ -78,7 +76,7 @@ describe('<%- entityAngularName %> routing resolve service', () => {
 
     it('should return null if id is not provided', async () => {
       // GIVEN
-      service.find = <%- clientTestFramework %>.fn();
+      service.find = vitest.fn();
       mockActivatedRouteSnapshot.params = {};
 
       // WHEN
@@ -88,7 +86,7 @@ describe('<%- entityAngularName %> routing resolve service', () => {
             next(result) {
               // THEN
               expect(service.find).not.toHaveBeenCalled();
-              expect(result).toEqual(null);
+              expect(result).toBeNull();
               resolve();
             },
           });
@@ -98,7 +96,7 @@ describe('<%- entityAngularName %> routing resolve service', () => {
 
     it('should route to 404 page if data not found in server', async () => {
       // GIVEN
-      <%- clientTestFramework %>.spyOn(service, 'find').mockReturnValue(throwError(() => new HttpErrorResponse({ status: 404, statusText: 'Not Found' })));
+      vitest.spyOn(service, 'find').mockReturnValue(throwError(() => new HttpErrorResponse({ status: 404, statusText: 'Not Found' })));
       mockActivatedRouteSnapshot.params = { <%- primaryKey.name %>: <%- tsKeyId %> };
 
       // WHEN
@@ -112,7 +110,7 @@ describe('<%- entityAngularName %> routing resolve service', () => {
 
     it('should route to error page if server returns an error other than 404', async () => {
       // GIVEN
-      <%- clientTestFramework %>.spyOn(service, 'find').mockReturnValue(throwError(() => new HttpErrorResponse({ status: 500, statusText: 'Internal Server Error' })));
+      vitest.spyOn(service, 'find').mockReturnValue(throwError(() => new HttpErrorResponse({ status: 500, statusText: 'Internal Server Error' })));
       mockActivatedRouteSnapshot.params = { <%- primaryKey.name %>: <%- tsKeyId %> };
 
       // WHEN

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.spec.ts.ejs

@@ -20,9 +20,7 @@
     const requiresRestTypeConversion = !builtInUserManagement && anyFieldIsDateDerived || builtInUserManagement && !userManagement.skipClient;
     const entityRestName = requiresRestTypeConversion ? `Rest${entityAngularName}` : `I${entityAngularName}`;
 _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 
@@ -134,7 +132,7 @@ describe('<%- entityAngularName %> Service', () => {
             service.delete(<%- tsKeyId %>).subscribe();
 
             const requests = httpMock.match({ method: 'DELETE' });
-            expect(requests.length).toBe(1);
+            expect(requests).toHaveLength(1);
         });
 <%_ } _%>
 

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.ts.ejs

@@ -19,6 +19,8 @@
 <%_ const searchType = paginationPagination || paginationInfiniteScroll ? 'SearchWithPagination' : 'Search';
     const requiresRestTypeConversion = !builtInUserManagement && anyFieldIsDateDerived || builtInUserManagement && !userManagement.skipClient;
     const entityRestName = requiresRestTypeConversion ? `Rest${entityAngularName}` : `I${entityAngularName}`;
+    const bodyArg = requiresRestTypeConversion ? 'copy' : entityInstance;
+    const convertResponsePipe = requiresRestTypeConversion ? '.pipe(map(res => this.convertResponseFromServer(res)))' : '';
 _%>
 import { computed, inject, Injectable, signal } from '@angular/core';
 import { HttpClient, HttpResponse, httpResource } from '@angular/common/http';
@@ -128,9 +130,9 @@ export class <%- entityAngularName %>Service extends <%- entityAngularNamePlural
   <%_ } _%>
         return this.http.post<<%- entityRestName %>>(
           this.resourceUrl,
-          <% if (requiresRestTypeConversion) { %> copy <% } else { %> <%- entityInstance %> <% } %>
+          <%- bodyArg %>
         )
-        <%- requiresRestTypeConversion ? '.pipe(map(res => this.convertResponseFromServer(res)))' : '' %>;
+        <%- convertResponsePipe %>;
     }
 <%_ } _%>
 <%_ if (!readOnly && updatableEntity) { _%>
@@ -140,9 +142,9 @@ export class <%- entityAngularName %>Service extends <%- entityAngularNamePlural
         const copy = this.convertValueFromClient(<%- entityInstance %>);
   <%_ } _%>
         return this.http.put<<%- entityRestName %>>(`${this.resourceUrl}/${encodeURIComponent(this.get<%- entityAngularName %>Identifier(<%- entityInstance %>))}`,
-                <% if (requiresRestTypeConversion) { %> copy <% } else { %> <%- entityInstance %> <% } %>,
+                <%- bodyArg %>,
                 )
-        <%- requiresRestTypeConversion ? '.pipe(map(res => this.convertResponseFromServer(res)))' : '' %>;
+        <%- convertResponsePipe %>;
     }
 
     partialUpdate(<%- entityInstance %>: PartialUpdate<%- entityAngularName %>): Observable<I<%- entityAngularName %>> {
@@ -150,15 +152,15 @@ export class <%- entityAngularName %>Service extends <%- entityAngularNamePlural
         const copy = this.convertValueFromClient(<%- entityInstance %>);
   <%_ } _%>
         return this.http.patch<<%- entityRestName %>>(`${this.resourceUrl}/${encodeURIComponent(this.get<%- entityAngularName %>Identifier(<%- entityInstance %>))}`,
-                <% if (requiresRestTypeConversion) { %> copy <% } else { %> <%- entityInstance %> <% } %>,
+                <%- bodyArg %>,
                 )
-        <%- requiresRestTypeConversion ? '.pipe(map(res => this.convertResponseFromServer(res)))' : '' %>;
+        <%- convertResponsePipe %>;
     }
 <%_ } _%>
 
     find(<%- primaryKey.name %>: <%- tsKeyType %>): Observable<I<%- entityAngularName %>> {
         return this.http.get<<%- entityRestName %>>(`${this.resourceUrl}/${encodeURIComponent(<%- primaryKey.name %>)}`)
-            <%- requiresRestTypeConversion ? '.pipe(map(res => this.convertResponseFromServer(res)))' : '' %>;
+            <%- convertResponsePipe %>;
     }
 
     query(req?: any): Observable<HttpResponse<I<%- entityAngularName %>[]>> {

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 
 import { sampleWithRequiredData, sampleWithNewData } from '../<%- entityFileName %>.test-samples';

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.html.ejs

@@ -24,12 +24,14 @@
             <div>
                 <<%- jhiPrefixDashed %>-alert-error />
 <%_ for (const field of fields.filter(field => !field.hidden)) { _%>
-  <%_ const { fieldName, fieldNameHumanized, fieldType, fieldTypeBlobContent, readonly } = field; _%>
+  <%_ const { fieldName, fieldNameHumanized, fieldType, fieldTypeBlobContent, readonly } = field;
+      const readonlyAttr = readonly ? ' [readonly]="true"' : '';
+  _%>
 
             <% if (field.autoGenerate) { %>@if (editForm.controls.<%- field.fieldName %>.value !== null) {<% } %>
                 <% if (field.fieldTypeBinary && !field.blobContentTypeText || field.fieldValidate) { %>@let <%- fieldName %>Ref = editForm.get('<%- fieldName %>')!;<% } %>
                 <div class="mb-3">
-                    <label class="form-label" for="field_<%- fieldName %>"<% if (field.documentation) { if (enableTranslation) { %> [ngbTooltip]="'<%- i18nKeyPrefix %>.help.<%- fieldName %>' | translate"<% } else { %> ngbTooltip="<%- field.documentation %>"<% } } %>>__jhiTranslateTag__('<%- field.propertyTranslationKey %>')</label>
+                    <label class="form-label" for="field_<%- fieldName %>"<% if (field.documentation && enableTranslation) { %> [ngbTooltip]="'<%- i18nKeyPrefix %>.help.<%- fieldName %>' | translate"<% } else if (field.documentation) { %> ngbTooltip="<%- field.documentation %>"<% } %>>__jhiTranslateTag__('<%- field.propertyTranslationKey %>')</label>
   <%_ if (field.fieldIsEnum) { _%>
                     <select class="form-control" name="<%- fieldName %>" formControlName="<%- fieldName %>" id="field_<%- fieldName %>" data-cy="<%- fieldName %>">
     <%_ const enumPrefix = `${frontendAppName}.${fieldType}`; _%>
@@ -64,27 +66,27 @@
                             </button>
                         </div>
                     }
-                        <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"<% } %><% } %>/>
+                        <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"<% } %><% } %> aria-label="<%- fieldNameHumanized %>"/>
                     </div>
     <%_ } _%>
     <%_ 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 %>"<%- readonly ? ' [readonly]="true"' : '' %>/>
+                        <input id="field_<%- fieldName %>" data-cy="<%- fieldName %>" type="text" class="form-control" name="<%- fieldName %>" ngbDatepicker #<%- fieldName %>Dp="ngbDatepicker" formControlName="<%- fieldName %>"<%- readonlyAttr %>/>
                         <button type="button" class="btn btn-secondary" (click)="<%- fieldName %>Dp.toggle()"><fa-icon icon="calendar-alt" /></button>
                     </div>
     <%_ } else if (field.fieldTypeTimed) { _%>
                     <div class="d-flex">
-                        <input id="field_<%- fieldName %>" data-cy="<%- fieldName %>" type="<%- field.htmlInputType %>" class="form-control" name="<%- fieldName %>" formControlName="<%- fieldName %>" placeholder="YYYY-MM-DD HH:mm"<%- readonly ? ' [readonly]="true"' : '' %>/>
+                        <input id="field_<%- fieldName %>" data-cy="<%- fieldName %>" type="<%- field.htmlInputType %>" class="form-control" name="<%- fieldName %>" formControlName="<%- fieldName %>" placeholder="YYYY-MM-DD HH:mm"<%- readonlyAttr %>/>
                     </div>
     <%_ } else if (field.blobContentTypeText) { _%>
                     <textarea class="form-control" name="<%- fieldName %>" id="field_<%- fieldName %>" data-cy="<%- fieldName %>"
-                              formControlName="<%- fieldName %>"<%- readonly ? ' [readonly]="true"' : '' %>></textarea>
+                              formControlName="<%- fieldName %>"<%- readonlyAttr %>></textarea>
     <%_ } else if (field.fieldTypeBoolean) { _%>
                     <input type="<%- field.htmlInputType %>" class="form-check" name="<%- fieldName %>" id="field_<%- fieldName %>"
-                           data-cy="<%- fieldName %>" formControlName="<%- fieldName %>" <%- readonly ? ' [readonly]="true"' : '' %>/>
+                           data-cy="<%- fieldName %>" formControlName="<%- fieldName %>" <%- readonlyAttr %>/>
     <%_ } else if (field.fieldTypeLocalTime) { _%>
                     <input type="time" class="form-control" name="<%- fieldName %>" id="field_<%- fieldName %>" data-cy="<%- fieldName %>"
-                           formControlName="<%- fieldName %>"<%- readonly ? ' [readonly]="true"' : '' %>/>
+                           formControlName="<%- fieldName %>"<%- readonlyAttr %>/>
     <%_ } else { _%>
                     <input type="<%- field.htmlInputType %>" class="form-control" name="<%- fieldName %>" id="field_<%- fieldName %>" data-cy="<%- fieldName %>"
                            formControlName="<%- fieldName %>"<% if (field.id && !field.autoGenerate) { %> [readonly]="editForm.get('<%- primaryKey.name %>')!.disabled"<% } else if (readonly) { %> [readonly]="true"<% } %>/>
@@ -98,42 +100,42 @@
                 @if (<%- fieldName %>Ref.invalid && (<%- fieldName %>Ref.dirty || <%- fieldName %>Ref.touched)) {
                     <div>
     <%_ if (field.fieldValidationRequired) { _%>
-                    @if (editForm.get('<%- fieldName %>')?.errors?.required) {
+                    @if (<%- fieldName %>Ref.errors?.required) {
                         <small class="form-text text-danger">__jhiTranslateTag__('entity.validation.required')</small>
                     }
     <%_ } _%>
     <%_ if (field.fieldValidationMinLength) { _%>
-                    @if (editForm.get('<%- fieldName %>')?.errors?.minlength) {
+                    @if (<%- fieldName %>Ref.errors?.minlength) {
                         <small class="form-text text-danger">__jhiTranslateValidationTag__('entity.validation.minlength', { "min": <%- field.fieldValidateRulesMinlength %> })</small>
                     }
     <%_ } _%>
     <%_ if (field.fieldValidationMaxLength) { _%>
-                    @if (editForm.get('<%- fieldName %>')?.errors?.maxlength) {
+                    @if (<%- fieldName %>Ref.errors?.maxlength) {
                         <small class="form-text text-danger">__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": <%- field.fieldValidateRulesMaxlength %> })</small>
                     }
     <%_ } _%>
     <%_ if (field.fieldValidationMin) { _%>
-                    @if (editForm.get('<%- fieldName %>')?.errors?.min) {
+                    @if (<%- fieldName %>Ref.errors?.min) {
                         <small class="form-text text-danger">__jhiTranslateValidationTag__('entity.validation.min', { "min": <%- field.fieldValidateRulesMin %> })</small>
                     }
     <%_ } _%>
     <%_ if (field.fieldValidationMax) { _%>
-                    @if (editForm.get('<%- fieldName %>')?.errors?.max) {
+                    @if (<%- fieldName %>Ref.errors?.max) {
                         <small class="form-text text-danger">__jhiTranslateValidationTag__('entity.validation.max', { "max": <%- field.fieldValidateRulesMax %> })</small>
                     }
     <%_ } _%>
     <%_ if (field.fieldValidationPattern) { _%>
-                    @if (editForm.get('<%- fieldName %>')?.errors?.pattern) {
+                    @if (<%- fieldName %>Ref.errors?.pattern) {
                         <small class="form-text text-danger">__jhiTranslateValidationTag__('entity.validation.pattern', { "pattern": "<%- fieldNameHumanized %>" })</small>
                     }
     <%_ } _%>
     <%_ if (field.fieldTypeNumeric || field.fieldTypeDuration) { _%>
                         <small class="form-text text-danger"
-                            [hidden]="!editForm.get('<%- fieldName %>')?.errors?.number">__jhiTranslateTag__('entity.validation.number')</small>
+                            [hidden]="!<%- fieldName %>Ref.errors?.number">__jhiTranslateTag__('entity.validation.number')</small>
     <%_ } _%>
     <%_ if (field.fieldTypeTimed) { _%>
                         <small class="form-text text-danger"
-                            [hidden]="!editForm.get('<%- fieldName %>')?.errors?.datetimelocal">__jhiTranslateTag__('entity.validation.datetimelocal')</small>
+                            [hidden]="!<%- fieldName %>Ref.errors?.datetimelocal">__jhiTranslateTag__('entity.validation.datetimelocal')</small>
     <%_ } _%>
                     </div>
                 }