generator-jhipster 7.2.0 → 7.4.1

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

@@ -38,289 +38,287 @@ import { I<%= entityAngularName %><% if (!readOnly) { %>, <%= entityAngularName
 
 import { <%= entityAngularName %>Service } from './<%= entityFileName %>.service';
 
-describe('Service Tests', () => {
-    describe('<%= entityAngularName %> Service', () => {
-        let service: <%= entityAngularName %>Service;
-        let httpMock: HttpTestingController;
-        let elemDefault: I<%= entityAngularName %>;
-        let expectedResult: I<%= entityAngularName %> | I<%= entityAngularName %>[] | boolean | null;
+describe('<%= entityAngularName %> Service', () => {
+    let service: <%= entityAngularName %>Service;
+    let httpMock: HttpTestingController;
+    let elemDefault: I<%= entityAngularName %>;
+    let expectedResult: I<%= entityAngularName %> | I<%= entityAngularName %>[] | boolean | null;
 <%_ if (fieldsContainDate) { _%>
-        let currentDate: dayjs.Dayjs;
+    let currentDate: dayjs.Dayjs;
 <%_ } _%>
 
-        beforeEach(() => {
-            TestBed.configureTestingModule({
-                imports: [
-                    HttpClientTestingModule
-                ]
-            });
-            expectedResult = null;
-            service = TestBed.inject(<%= entityAngularName %>Service);
-            httpMock = TestBed.inject(HttpTestingController);
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                HttpClientTestingModule
+            ]
+        });
+        expectedResult = null;
+        service = TestBed.inject(<%= entityAngularName %>Service);
+        httpMock = TestBed.inject(HttpTestingController);
 <%_ if (fieldsContainDate) { _%>
-            currentDate = dayjs();
+        currentDate = dayjs();
 <%_ } _%>
 
-            elemDefault = {
+        elemDefault = {
 <%_ fields.forEach((field) => {
     const fieldType = field.fieldType;
 _%>
     <%_ if (field.fieldIsEnum) { _%>
-                <%= field.fieldName %>: <%= fieldType + '.' + field.enumValues[0].name %>,
+            <%= field.fieldName %>: <%= fieldType + '.' + field.enumValues[0].name %>,
     <%_ } else if (field.fieldTypeBoolean) { _%>
-                <%= field.fieldName %>: false,
+            <%= field.fieldName %>: false,
     <%_ } else if (field.fieldTypeDuration) { _%>
-                <%= field.fieldName %>: 'PT1S',
+            <%= field.fieldName %>: 'PT1S',
     <%_ } else if (field.fieldTypeNumeric) { _%>
-                <%= field.fieldName %>: 0,
+            <%= field.fieldName %>: 0,
     <%_ } else if (field.fieldTypeCharSequence) { _%>
-                <%= field.fieldName %>: 'AAAAAAA',
+            <%= field.fieldName %>: 'AAAAAAA',
     <%_ } else if (field.fieldTypeTemporal) { _%>
-                <%= field.fieldName %>: currentDate,
+            <%= field.fieldName %>: currentDate,
     <%_ } else if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
-                <%= field.fieldName %>ContentType: 'image/png',
-                <%= field.fieldName %>: 'AAAAAAA',
+            <%= field.fieldName %>ContentType: 'image/png',
+            <%= field.fieldName %>: 'AAAAAAA',
     <%_ } else { /* (fieldType === 'byte[]' || fieldType === 'ByteBuffer') && fieldTypeBlobContent === 'any' || (fieldType === 'byte[]' || fieldType === 'ByteBuffer') && fieldTypeBlobContent === 'image' || fieldType === 'LocalDate' */ _%>
-                <%= field.fieldName %>: 'AAAAAAA',
+            <%= field.fieldName %>: 'AAAAAAA',
     <%_ } _%>
 <%_ }) _%>
-            };
-        });
+        };
+    });
 
-        describe('Service methods', () => {
-            it('should find an element', () => {
-                const returnedFromService = Object.assign({
+    describe('Service methods', () => {
+        it('should find an element', () => {
+            const returnedFromService = Object.assign({
 <%_ fields.forEach((field) => { _%>
     <%_ if (field.fieldTypeLocalDate) { _%>
-                    <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
+                <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
     <%_ } else if (field.fieldTypeTimed) { _%>
-                    <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
+                <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
     <%_ } _%>
 <%_ }) _%>
-                }, elemDefault);
+            }, elemDefault);
 
-                service.find(<%- tsKeyId %>).subscribe(resp => expectedResult = resp.body);
+            service.find(<%- tsKeyId %>).subscribe(resp => expectedResult = resp.body);
 
-                const req = httpMock.expectOne({ method: 'GET' });
-                req.flush(returnedFromService);
-                expect(expectedResult).toMatchObject(elemDefault);
-            });
+            const req = httpMock.expectOne({ method: 'GET' });
+            req.flush(returnedFromService);
+            expect(expectedResult).toMatchObject(elemDefault);
+        });
 
 <%_ if (!readOnly) { _%>
-            it('should create a <%= entityAngularName %>', () => {
-                const returnedFromService = Object.assign({
+        it('should create a <%= entityAngularName %>', () => {
+            const returnedFromService = Object.assign({
     <%_ if (tsKeyType === 'string') { _%>
-                    id: 'ID',
+                id: 'ID',
     <%_ } else { _%>
-                    id: 0,
+                id: 0,
     <%_ } _%>
 <%_ fields.forEach((field) => { _%>
     <%_ if (field.fieldTypeLocalDate) { _%>
-                    <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
+                <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
     <%_ } else if (field.fieldTypeTimed) { _%>
-                    <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
+                <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
     <%_ } _%>
 <%_ }) _%>
-                }, elemDefault);
+            }, elemDefault);
 
-                const expected = Object.assign({
+            const expected = Object.assign({
 <%_ fields.forEach((field) => { _%>
     <%_ if (field.fieldTypeLocalDate) { _%>
-                    <%= field.fieldName %>: currentDate,
+                <%= field.fieldName %>: currentDate,
     <%_ } else if (field.fieldTypeTimed) { _%>
-                    <%= field.fieldName %>: currentDate,
+                <%= field.fieldName %>: currentDate,
     <%_ } _%>
 <%_ }) _%>
-                }, returnedFromService);
+            }, returnedFromService);
 
-                service.create(new <%= entityAngularName %>()).subscribe(resp => expectedResult = resp.body);
+            service.create(new <%= entityAngularName %>()).subscribe(resp => expectedResult = resp.body);
 
-                const req = httpMock.expectOne({ method: 'POST' });
-                req.flush(returnedFromService);
-                expect(expectedResult).toMatchObject(expected);
-            });
+            const req = httpMock.expectOne({ method: 'POST' });
+            req.flush(returnedFromService);
+            expect(expectedResult).toMatchObject(expected);
+        });
 
-            it('should update a <%= entityAngularName %>', () => {
-                const returnedFromService = Object.assign({
+        it('should update a <%= entityAngularName %>', () => {
+            const returnedFromService = Object.assign({
 <%_ fields.forEach((field) => { _%>
     <%_ if (field.fieldTypeBoolean) { _%>
-                    <%= field.fieldName %>: true,
+                <%= field.fieldName %>: true,
     <%_ } else if (field.fieldTypeNumeric) { _%>
-                    <%= field.fieldName %>: 1,
+                <%= field.fieldName %>: 1,
     <%_ } else if (field.fieldTypeCharSequence) { _%>
-                    <%= field.fieldName %>: 'BBBBBB',
+                <%= field.fieldName %>: 'BBBBBB',
     <%_ } else if (field.fieldTypeLocalDate) { _%>
-                    <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
+                <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
     <%_ } else if (field.fieldTypeTimed) { _%>
-                    <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
+                <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
     <%_ } else { _%>
-                    <%= field.fieldName %>: 'BBBBBB',
+                <%= field.fieldName %>: 'BBBBBB',
     <%_ } _%>
 <%_ }) _%>
-                }, elemDefault);
+            }, elemDefault);
 
-                const expected = Object.assign({
+            const expected = Object.assign({
 <%_ fields.forEach((field) => { _%>
     <%_ if (field.fieldTypeLocalDate) { _%>
-                    <%= field.fieldName %>: currentDate,
+                <%= field.fieldName %>: currentDate,
     <%_ } else if (field.fieldTypeTimed) { _%>
-                    <%= field.fieldName %>: currentDate,
+                <%= field.fieldName %>: currentDate,
     <%_ } _%>
 <%_ }) _%>
-                }, returnedFromService);
+            }, returnedFromService);
 
-                service.update(expected).subscribe(resp => expectedResult = resp.body);
+            service.update(expected).subscribe(resp => expectedResult = resp.body);
 
-                const req = httpMock.expectOne({ method: 'PUT' });
-                req.flush(returnedFromService);
-                expect(expectedResult).toMatchObject(expected);
-            });
+            const req = httpMock.expectOne({ method: 'PUT' });
+            req.flush(returnedFromService);
+            expect(expectedResult).toMatchObject(expected);
+        });
 
 <%_ const fieldsToIncludeInPartialPatchTest = fields.filter(field => !field.id && !field.transient && faker.datatype.boolean()); _%>
-            it('should partial update a <%= entityAngularName %>', () => {
-                const patchObject = Object.assign({
+        it('should partial update a <%= entityAngularName %>', () => {
+            const patchObject = Object.assign({
 <%_ fieldsToIncludeInPartialPatchTest.forEach((field) => { _%>
     <%_ if (field.fieldTypeBoolean) { _%>
-                        <%= field.fieldName %>: true,
+                    <%= field.fieldName %>: true,
     <%_ } else if (field.fieldTypeNumeric) { _%>
-                        <%= field.fieldName %>: 1,
+                    <%= field.fieldName %>: 1,
     <%_ } else if (field.fieldTypeCharSequence) { _%>
-                        <%= field.fieldName %>: 'BBBBBB',
+                    <%= field.fieldName %>: 'BBBBBB',
     <%_ } else if (field.fieldTypeLocalDate) { _%>
-                        <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
+                    <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
     <%_ } else if (field.fieldTypeTimed) { _%>
-                        <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
+                    <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
     <%_ } else { _%>
-                        <%= field.fieldName %>: 'BBBBBB',
+                    <%= field.fieldName %>: 'BBBBBB',
     <%_ } _%>
 <%_ }) _%>
-                }, new <%= entityAngularName %>())
+            }, new <%= entityAngularName %>())
 
-                const returnedFromService = Object.assign(patchObject, elemDefault);
+            const returnedFromService = Object.assign(patchObject, elemDefault);
 
-                const expected = Object.assign({
+            const expected = Object.assign({
 <%_ fields.forEach((field) => { _%>
     <%_ if (field.fieldTypeLocalDate) { _%>
-                        <%= field.fieldName %>: currentDate,
+                    <%= field.fieldName %>: currentDate,
     <%_ } else if (field.fieldTypeTimed) { _%>
-                        <%= field.fieldName %>: currentDate,
+                    <%= field.fieldName %>: currentDate,
     <%_ } _%>
 <%_ }) _%>
-                }, returnedFromService);
+            }, returnedFromService);
 
-                service.partialUpdate(patchObject).subscribe(resp => expectedResult = resp.body);
+            service.partialUpdate(patchObject).subscribe(resp => expectedResult = resp.body);
 
-                const req = httpMock.expectOne({ method: 'PATCH' });
-                req.flush(returnedFromService);
-                expect(expectedResult).toMatchObject(expected);
-            });
-        <%_ } _%>
+            const req = httpMock.expectOne({ method: 'PATCH' });
+            req.flush(returnedFromService);
+            expect(expectedResult).toMatchObject(expected);
+        });
+<%_ } _%>
 
-            it('should return a list of <%= entityAngularName %>', () => {
-                const returnedFromService = Object.assign({
+        it('should return a list of <%= entityAngularName %>', () => {
+            const returnedFromService = Object.assign({
 <%_ fields.forEach((field) => { _%>
     <%_ if (field.fieldTypeBoolean) { _%>
-                    <%= field.fieldName %>: true,
+                <%= field.fieldName %>: true,
     <%_ } else if (field.fieldTypeNumeric) { _%>
-                    <%= field.fieldName %>: 1,
+                <%= field.fieldName %>: 1,
     <%_ } else if (field.fieldTypeCharSequence) { _%>
-                    <%= field.fieldName %>: 'BBBBBB',
+                <%= field.fieldName %>: 'BBBBBB',
     <%_ } else if (field.fieldTypeLocalDate) { _%>
-                    <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
+                <%= field.fieldName %>: currentDate.format(DATE_FORMAT),
     <%_ } else if (field.fieldTypeTimed) { _%>
-                    <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
+                <%= field.fieldName %>: currentDate.format(DATE_TIME_FORMAT),
     <%_ } else { /* (fieldType === 'byte[]' || fieldType === 'ByteBuffer') && fieldTypeBlobContent === 'any' || (fieldType === 'byte[]' || fieldType === 'ByteBuffer') && fieldTypeBlobContent === 'image' || fieldType === 'LocalDate' */ _%>
-                    <%= field.fieldName %>: 'BBBBBB',
+                <%= field.fieldName %>: 'BBBBBB',
     <%_ } _%>
 <%_ }) _%>
-                }, elemDefault);
+            }, elemDefault);
 
-                const expected = Object.assign({
+            const expected = Object.assign({
 <%_ fields.forEach((field) => { _%>
     <%_ if (field.fieldTypeLocalDate) { _%>
-                    <%= field.fieldName %>: currentDate,
+                <%= field.fieldName %>: currentDate,
     <%_ } else if (field.fieldTypeTimed) { _%>
-                    <%= field.fieldName %>: currentDate,
+                <%= field.fieldName %>: currentDate,
     <%_ } _%>
 <%_ }) _%>
-                }, returnedFromService);
+            }, returnedFromService);
 
-                service.query().subscribe(resp => expectedResult = resp.body);
+            service.query().subscribe(resp => expectedResult = resp.body);
 
-                const req = httpMock.expectOne({ method: 'GET' });
-                req.flush([returnedFromService]);
-                httpMock.verify();
-                expect(expectedResult).toContainEqual(expected);
-            });
+            const req = httpMock.expectOne({ method: 'GET' });
+            req.flush([returnedFromService]);
+            httpMock.verify();
+            expect(expectedResult).toContainEqual(expected);
+        });
 
 <%_ if (!readOnly) { _%>
-            it('should delete a <%= entityAngularName %>', () => {
-                service.delete(<%- tsKeyId %>).subscribe(resp => expectedResult = resp.ok);
+        it('should delete a <%= entityAngularName %>', () => {
+            service.delete(<%- tsKeyId %>).subscribe(resp => expectedResult = resp.ok);
 
-                const req = httpMock.expectOne({ method: 'DELETE' });
-                req.flush({ status: 200 });
-                expect(expectedResult);
-            });
+            const req = httpMock.expectOne({ method: 'DELETE' });
+            req.flush({ status: 200 });
+            expect(expectedResult);
+        });
 <%_ } _%>
 
-            describe('add<%= entityAngularName %>ToCollectionIfMissing', () => {
-                it('should add a <%= entityAngularName %> to an empty array', () => {
-                    const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
-                    expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing([], <%= entityInstance %>);
-                    expect(expectedResult).toHaveLength(1);
-                    expect(expectedResult).toContain(<%= entityInstance %>);
-                });
-
-                it('should not add a <%= entityAngularName %> to an array that contains it', () => {
-                    const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
-                    const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [{
-                        ...<%= entityInstance %>,
-                    }, <%- testEntityPrimaryKey1 %>];
-                    expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, <%= entityInstance %>);
-                    expect(expectedResult).toHaveLength(2);
-                });
-
-                it("should add a <%= entityAngularName %> to an array that doesn't contain it", () => {
-                    const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
-                    const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [<%- testEntityPrimaryKey1 %>];
-                    expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, <%= entityInstance %>);
-                    expect(expectedResult).toHaveLength(2);
-                    expect(expectedResult).toContain(<%= entityInstance %>);
-                });
-
-                it('should add only unique <%= entityAngularName %> to an array', () => {
-                    const <%= entityInstance %>Array: I<%= entityAngularName %>[] = [<%- testEntityPrimaryKey0 %>, <%- testEntityPrimaryKey1 %>, <%- generateTestEntityPrimaryKey(primaryKey) %>];
-                    const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [<%- testEntityPrimaryKey0 %>];
-                    expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, ...<%= entityInstance %>Array);
-                    expect(expectedResult).toHaveLength(3);
-                });
-
-                it('should accept varargs', () => {
-                    const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
-                    const <%= entityInstance %>2: I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
-                    expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing([], <%= entityInstance %>, <%= entityInstance %>2);
-                    expect(expectedResult).toHaveLength(2);
-                    expect(expectedResult).toContain(<%= entityInstance %>);
-                    expect(expectedResult).toContain(<%= entityInstance %>2);
-                });
-
-                it('should accept null and undefined values', () => {
-                    const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
-                    expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing([], null, <%= entityInstance %>, undefined);
-                    expect(expectedResult).toHaveLength(1);
-                    expect(expectedResult).toContain(<%= entityInstance %>);
-                });
-
-                it('should return initial array if no <%= entityAngularName %> is added', () => {
-                  const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [<%- testEntityPrimaryKey0 %>];
-                  expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, undefined, null);
-                  expect(expectedResult).toEqual(<%= entityInstance %>Collection);
-                });
+        describe('add<%= entityAngularName %>ToCollectionIfMissing', () => {
+            it('should add a <%= entityAngularName %> to an empty array', () => {
+                const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
+                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing([], <%= entityInstance %>);
+                expect(expectedResult).toHaveLength(1);
+                expect(expectedResult).toContain(<%= entityInstance %>);
             });
-        });
 
-        afterEach(() => {
-            httpMock.verify();
+            it('should not add a <%= entityAngularName %> to an array that contains it', () => {
+                const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
+                const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [{
+                    ...<%= entityInstance %>,
+                }, <%- testEntityPrimaryKey1 %>];
+                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, <%= entityInstance %>);
+                expect(expectedResult).toHaveLength(2);
+            });
+
+            it("should add a <%= entityAngularName %> to an array that doesn't contain it", () => {
+                const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
+                const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [<%- testEntityPrimaryKey1 %>];
+                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, <%= entityInstance %>);
+                expect(expectedResult).toHaveLength(2);
+                expect(expectedResult).toContain(<%= entityInstance %>);
+            });
+
+            it('should add only unique <%= entityAngularName %> to an array', () => {
+                const <%= entityInstance %>Array: I<%= entityAngularName %>[] = [<%- testEntityPrimaryKey0 %>, <%- testEntityPrimaryKey1 %>, <%- generateTestEntityPrimaryKey(primaryKey) %>];
+                const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [<%- testEntityPrimaryKey0 %>];
+                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, ...<%= entityInstance %>Array);
+                expect(expectedResult).toHaveLength(3);
+            });
+
+            it('should accept varargs', () => {
+                const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
+                const <%= entityInstance %>2: I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
+                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing([], <%= entityInstance %>, <%= entityInstance %>2);
+                expect(expectedResult).toHaveLength(2);
+                expect(expectedResult).toContain(<%= entityInstance %>);
+                expect(expectedResult).toContain(<%= entityInstance %>2);
+            });
+
+            it('should accept null and undefined values', () => {
+                const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey0 %>;
+                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing([], null, <%= entityInstance %>, undefined);
+                expect(expectedResult).toHaveLength(1);
+                expect(expectedResult).toContain(<%= entityInstance %>);
+            });
+
+            it('should return initial array if no <%= entityAngularName %> is added', () => {
+                const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [<%- testEntityPrimaryKey0 %>];
+                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, undefined, null);
+                expect(expectedResult).toEqual(<%= entityInstance %>Collection);
+            });
         });
     });
+
+    afterEach(() => {
+        httpMock.verify();
+    });
 });

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

@@ -54,10 +54,8 @@ _%>
         <%_ const enumPrefix = frontendAppName + '.'+ fieldType; _%>
                         <option [ngValue]="null"><% if (enableTranslation) { %>{{ '<%= enumPrefix %>.null' | translate }}<% } %></option>
         <%_ const values = field.enumValues;
-            for (key in values) {
-                const enumValue = values[key]; _%>
-                        <option value="<%= enumValue.name %>"><% if (enableTranslation) { %>{{ '<%= enumPrefix %>.<%= enumValue.name %>' | translate }}<% } else { %><%= enumValue.value %><% } %></option>
-        <%_ } _%>
+            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) { _%>