generator-jhipster 7.4.1 → 7.7.0

package/generators/entity/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -22,14 +22,30 @@ const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 
+const BaseBlueprintGenerator = require('../generator-base-blueprint');
+const {
+  INITIALIZING_PRIORITY,
+  PROMPTING_PRIORITY,
+  CONFIGURING_PRIORITY,
+  COMPOSING_PRIORITY,
+  LOADING_PRIORITY,
+  PREPARING_PRIORITY,
+  PREPARING_FIELDS_PRIORITY,
+  PREPARING_RELATIONSHIPS_PRIORITY,
+  DEFAULT_PRIORITY,
+  WRITING_PRIORITY,
+  INSTALL_PRIORITY,
+  END_PRIORITY,
+} = require('../../lib/constants/priorities.cjs').compat;
+
 const prompts = require('./prompts');
 const { defaultConfig } = require('../generator-defaults');
-const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const constants = require('../generator-constants');
 const statistics = require('../statistics');
 const { isReservedClassName, isReservedTableName } = require('../../jdl/jhipster/reserved-keywords');
 const {
   prepareEntityForTemplates,
+  prepareEntityServerDomainForTemplates,
   prepareEntityPrimaryKeyForTemplates,
   loadRequiredConfigIntoEntity,
   derivedPrimaryKeyProperties,
@@ -38,6 +54,8 @@ const { prepareFieldForTemplates, fieldIsEnum } = require('../../utils/field');
 const { prepareRelationshipForTemplates } = require('../../utils/relationship');
 const { stringify } = require('../../utils');
 const { GATEWAY, MICROSERVICE } = require('../../jdl/jhipster/application-types');
+const { NO: CLIENT_FRAMEWORK_NO } = require('../../jdl/jhipster/client-framework-types');
+const { NO: SEARCH_ENGINE_NO } = require('../../jdl/jhipster/search-engine-types');
 const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, ORACLE, SQL } = require('../../jdl/jhipster/database-types');
 const {
   GENERATOR_ENTITIES,
@@ -234,7 +252,9 @@ class EntityGenerator extends BaseBlueprintGenerator {
 
           if (this.jhipsterConfig.applications && !this.entityConfig.skipClient) {
             const remoteConfig = this.jhipsterConfig.applications[this.entityConfig.microserviceName];
-            if (remoteConfig.clientFramework === 'vue') {
+            if (remoteConfig && remoteConfig.clientFramework && remoteConfig.clientFramework !== CLIENT_FRAMEWORK_NO) {
+              // Gateway requires entities to discover a microfrontend.
+              // Microfrontends is generated at the microservice side, so skip it at gateway side.
               this.entityConfig.skipClient = true;
             }
           }
@@ -306,7 +326,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get initializing() {
+  get [INITIALIZING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
@@ -328,7 +348,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get prompting() {
+  get [PROMPTING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
@@ -359,8 +379,34 @@ class EntityGenerator extends BaseBlueprintGenerator {
           throw new Error(validation);
         }
 
+        if (this.entityConfig.searchEngine === undefined) {
+          const backendOnlyMicroservice =
+            context.applicationType === MICROSERVICE && (!context.clientFramework || context.clientFramework === CLIENT_FRAMEWORK_NO);
+          if (backendOnlyMicroservice && context.searchEngine && context.searchEngine !== SEARCH_ENGINE_NO && !context.entityExisted) {
+            // Propagate searchEngine to the entity, it's opt-in and should be propagated to gateway
+            this.entityConfig.searchEngine = true;
+          }
+        } else if (
+          (!context.searchEngine || context.searchEngine === SEARCH_ENGINE_NO) &&
+          (context.applicationType !== GATEWAY || !this.entityConfig.microserviceName)
+        ) {
+          if (this.entityConfig.searchEngine === SEARCH_ENGINE_NO) {
+            // Convert to boolean.
+            this.entityConfig.searchEngine = false;
+          }
+          // If search engine is disabled at application, and unless it's a gateway publishing a microservice entity.
+          if (this.entityConfig.searchEngine) {
+            this.warning('Search engine disabled at application, cannot be enabled at entity, disabling');
+            this.entityConfig.searchEngine = false;
+          }
+        }
+
         this.entityConfig.name = this.entityConfig.name || context.name;
-        if (![SQL, MONGODB, COUCHBASE, NEO4J].includes(context.databaseType)) {
+        // disable pagination if there is no database, unless it’s a microservice entity published by a gateway
+        if (
+          ![SQL, MONGODB, COUCHBASE, NEO4J].includes(context.databaseType) &&
+          (context.applicationType !== GATEWAY || !this.entityConfig.microserviceName)
+        ) {
           this.entityConfig.pagination = NO_PAGINATION;
         }
 
@@ -458,7 +504,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get configuring() {
+  get [CONFIGURING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
@@ -484,7 +530,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get composing() {
+  get [COMPOSING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._composing();
   }
@@ -493,13 +539,25 @@ class EntityGenerator extends BaseBlueprintGenerator {
   _loading() {
     return {
       loadEntity() {
+        loadRequiredConfigIntoEntity(this.context, this.jhipsterConfig);
         // Update current context with config from file.
         Object.assign(this.context, this.entityStorage.getAll());
         this.loadDerivedAppConfig(this.context);
+
+        // Entity searchEngine support should opt-in instead of opt-out for gateway/microservice.
+        // The entity definition should take precedence so frontend and backend are in sync.
+        // Doesn't apply to microfrontends.
+        if (
+          this.entityConfig.searchEngine === undefined &&
+          !this.context.microfrontend &&
+          (this.context.applicationTypeMicroservice || (this.entityConfig.microserviceName && this.context.applicationTypeGateway))
+        ) {
+          this.info(`searchEngine is missing in .jhipster/${this.entityConfig.name}.json, should opt-in for gateway/microservice entities`);
+          this.context.searchEngine = false;
+        }
         this.loadDerivedClientConfig(this.context);
         this.loadDerivedServerConfig(this.context);
         this.loadDerivedPlatformConfig(this.context);
-        loadRequiredConfigIntoEntity(this.context, this.jhipsterConfig);
         if (this.context.fields) {
           this.context.fields
             .filter(field => field.options)
@@ -548,7 +606,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get loading() {
+  get [LOADING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._loading();
   }
@@ -592,21 +650,12 @@ class EntityGenerator extends BaseBlueprintGenerator {
       },
 
       loadDomain() {
-        const entity = this.context;
-        const { entityPackage, packageName, packageFolder, persistClass } = entity;
-        let { entityAbsolutePackage = packageName, entityAbsoluteFolder = packageFolder } = entity;
-        if (entityPackage) {
-          entityAbsolutePackage = [packageName, entityPackage].join('.');
-          entityAbsoluteFolder = path.join(packageFolder, entityPackage.replace(/\./g, '/'));
-        }
-        entity.entityAbsolutePackage = entityAbsolutePackage;
-        entity.entityAbsoluteFolder = entityAbsoluteFolder;
-        entity.entityAbsoluteClass = `${entityAbsolutePackage}.domain.${persistClass}`;
+        prepareEntityServerDomainForTemplates(this.context);
       },
     };
   }
 
-  get preparingFields() {
+  get [PREPARING_FIELDS_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._preparingFields();
   }
@@ -632,7 +681,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get preparing() {
+  get [PREPARING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
@@ -670,7 +719,9 @@ class EntityGenerator extends BaseBlueprintGenerator {
           if (!this.context.differentRelationships[entityType]) {
             this.context.differentRelationships[entityType] = [];
           }
-          this.context.differentRelationships[entityType].push(relationship);
+          if (!relationship.otherEntityIsEmbedded) {
+            this.context.differentRelationships[entityType].push(relationship);
+          }
         });
       },
 
@@ -739,7 +790,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get preparingRelationships() {
+  get [PREPARING_RELATIONSHIPS_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._preparingRelationships();
   }
@@ -806,17 +857,19 @@ class EntityGenerator extends BaseBlueprintGenerator {
           .forEach(relationship => {
             relationship.relationshipEagerLoad =
               !relationship.embedded &&
-              // Allows the entity to force earger load every relationship
               (this.context.eagerLoad ||
                 (this.context.paginate !== PAGINATION &&
-                  relationship.relationshipType === 'many-to-many' &&
-                  relationship.ownerSide === true)) &&
+                  relationship.ownerSide &&
+                  // Fetch relationships if otherEntityField differs otherwise the id is enough
+                  (relationship.collection || relationship.otherEntity.primaryKey.name !== relationship.otherEntityField))) &&
               // Neo4j & Couchbase eagerly loads relations by default
-              ![NEO4J, COUCHBASE].includes(this.context.databaseType);
+              ![NEO4J, COUCHBASE, CASSANDRA].includes(this.context.databaseType);
+            relationship.bagRelationship = relationship.relationshipEagerLoad && relationship.collection;
           });
         this.context.relationshipsContainEagerLoad = this.context.relationships.some(relationship => relationship.relationshipEagerLoad);
         this.context.eagerRelations = this.context.relationships.filter(rel => rel.relationshipEagerLoad);
         this.context.regularEagerRelations = this.context.eagerRelations.filter(rel => rel.id !== true);
+        this.context.containsBagRelationships = this.context.relationships.some(relationship => relationship.bagRelationship);
 
         this.context.reactiveEagerRelations = this.context.relationships.filter(
           rel => rel.relationshipType === 'many-to-one' || (rel.relationshipType === 'one-to-one' && rel.ownerSide === true)
@@ -840,7 +893,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get default() {
+  get [DEFAULT_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._default();
   }
@@ -866,7 +919,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get writing() {
+  get [WRITING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._writing();
   }
@@ -896,7 +949,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get install() {
+  get [INSTALL_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._install();
   }
@@ -910,7 +963,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get end() {
+  get [END_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._end();
   }

package/generators/entity/prompts.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -156,7 +156,7 @@ function askForUpdate() {
 function askForFields() {
   const context = this.context;
   // don't prompt if data is imported from a file
-  if (context.useConfigurationFile && context.updateEntity !== 'add') {
+  if (this.options.defaults || (context.useConfigurationFile && context.updateEntity !== 'add')) {
     return undefined;
   }
 
@@ -209,6 +209,9 @@ function askForFieldsToRemove() {
 
 function askForRelationships() {
   const context = this.context;
+  if (this.options.defaults) {
+    return undefined;
+  }
   // don't prompt if data is imported from a file
   if (context.useConfigurationFile && context.updateEntity !== 'add') {
     return undefined;

package/generators/entity-client/esm.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -16,6 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';
+export { angularFiles, reactFiles, vueFiles, commonFiles } from './files.js';

package/generators/entity-client/files.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/generators/entity-client/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -18,11 +18,15 @@
  */
 /* eslint-disable consistent-return */
 const _ = require('lodash');
+
+const BaseBlueprintGenerator = require('../generator-base-blueprint');
+const { PREPARING_PRIORITY, DEFAULT_PRIORITY, WRITING_PRIORITY, POST_WRITING_PRIORITY } =
+  require('../../lib/constants/priorities.cjs').compat;
+
 const { writeFiles, addToMenu, replaceTranslations } = require('./files');
 const { entityClientI18nFiles } = require('../entity-i18n/files');
 
 const utils = require('../utils');
-const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const {
   SUPPORTED_CLIENT_FRAMEWORKS: { ANGULAR, REACT },
 } = require('../generator-constants');
@@ -52,7 +56,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get preparing() {
+  get [PREPARING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
@@ -85,7 +89,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get default() {
+  get [DEFAULT_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._default();
   }
@@ -144,7 +148,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get writing() {
+  get [WRITING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._writing();
   }
@@ -163,7 +167,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get postWriting() {
+  get [POST_WRITING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -20,7 +20,7 @@
     <div class="modal-header">
         <h4 class="modal-title" data-cy="<%= entityInstance %>DeleteDialogHeading" <%= jhiPrefix %>Translate="entity.delete.title">Confirm delete operation</h4>
 
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"
+        <button type="button" class="btn-close" data-dismiss="modal" aria-hidden="true"
                 (click)="cancel()">&times;</button>
     </div>
 

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -56,7 +56,7 @@ describe('<%= entityAngularName %> Management Delete Component', () => {
             inject([],
                 fakeAsync(() => {
                     // GIVEN
-                    jest.spyOn(service, 'delete').mockReturnValue(of(new HttpResponse({})));
+                    jest.spyOn(service, 'delete').mockReturnValue(of(new HttpResponse({ body: {} })));
 
                     // WHEN
                     comp.confirmDelete(<%- tsKeyId %>);

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<div class="row justify-content-center">
+<div class="d-flex justify-content-center">
     <div class="col-8">
         <div *ngIf="<%= entityInstance %>">
             <h2 data-cy="<%= entityInstance %>DetailsHeading"><span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.detail.title"><%= entityClassHumanized %></span></h2>
@@ -60,7 +60,7 @@ _%>
                 </dd>
 <%_ } _%>
 <%_
-for (const relationship of relationships) {
+for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedded)) {
     const ownerSide = relationship.ownerSide;
     const relationshipName = relationship.relationshipName;
     const relationshipFieldName = relationship.relationshipFieldName;
@@ -107,7 +107,7 @@ _%>
 <%_ if (!readOnly) { _%>
 
             <button type="button"
-                    [routerLink]="['/<%= entityUrl %>', <%= entityInstance %>.<%= primaryKey.name %>, 'edit']"
+                    [routerLink]="['/<%= entityPage %>', <%= entityInstance %>.<%= primaryKey.name %>, 'edit']"
                     class="btn btn-primary">
                 <fa-icon icon="pencil-alt"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.edit">Edit</span>
             </button>

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -17,13 +17,6 @@
  limitations under the License.
 -%>
 import { NgModule } from '@angular/core';
-<%_ if (applicationTypeMicroservice && enableTranslation) { _%>
-import { HttpClient } from '@angular/common/http';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { TranslateHttpLoader } from '@ngx-translate/http-loader';
-
-import { ApplicationConfigService } from 'app/core/config/application-config.service';
-<%_ } _%>
 import { SharedModule } from 'app/shared/shared.module';
 import { <%= entityAngularName %>Component } from './list/<%= entityFileName %>.component';
 import { <%= entityAngularName %>DetailComponent } from './detail/<%= entityFileName %>-detail.component';
@@ -33,28 +26,10 @@ import { <%= entityAngularName %>DeleteDialogComponent } from './delete/<%= enti
 <%_ } _%>
 import { <%= entityAngularName %>RoutingModule } from './route/<%= entityFileName %>-routing.module';
 
-<%_ if (applicationTypeMicroservice && enableTranslation) { _%>
-function translatePartialLoader(http: HttpClient, applicationConfigService: ApplicationConfigService): TranslateLoader {
-  const prefix = applicationConfigService.isMicrofrontend() ? 'i18n/' : applicationConfigService.getEndpointFor('i18n/', '<%= microserviceName %>');
-  return new TranslateHttpLoader(http, prefix, `.json?_=${I18N_HASH}`);
-}
-
-<%_ } _%>
 @NgModule({
   imports: [
     SharedModule,
     <%= entityAngularName %>RoutingModule,
-<%_ if (applicationTypeMicroservice && enableTranslation) { _%>
-    TranslateModule.forChild({
-      loader: {
-        provide: TranslateLoader,
-        useFactory: (translatePartialLoader),
-        deps: [HttpClient, ApplicationConfigService]
-      },
-      isolate: false,
-      extend: true,
-    }),
-<%_ } _%>
   ],
   declarations: [
     <%= entityAngularName %>Component,
@@ -70,13 +45,4 @@ function translatePartialLoader(http: HttpClient, applicationConfigService: Appl
   ]
 <%_ } _%>
 })
-export class <%= locals.microserviceName ? upperFirstCamelCase(locals.microserviceName) : '' %><%= entityAngularName %>Module {
-<%_ if (applicationTypeMicroservice && enableTranslation) { _%>
-  constructor(private translateService: TranslateService, private translateLoader: TranslateLoader) {
-    const currentLang = translateService.store.currentLang;
-    this.translateLoader.getTranslation(currentLang).subscribe(translation => {
-      this.translateService.setTranslation(currentLang, translation);
-    });
-  }
-<%_ } _%>
-}
+export class <%= locals.microserviceName ? upperFirstCamelCase(locals.microserviceName) : '' %><%= entityAngularName %>Module {}

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -23,7 +23,7 @@ const defaultVariablesValues = generateEntityClientFieldDefaultValues(fields);
 const enumImports = generateEntityClientEnumImports(fields);
 %>
 <%_ if (fieldsContainInstant || fieldsContainZonedDateTime || fieldsContainLocalDate) { _%>
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 <%_ } _%>
 <%_ typeImports.forEach((importedPath, importedType) => { _%>
     <%_ if (importedType !== `I${entityAngularName}`) { _%>