generator-jhipster 7.6.0 → 7.8.1

package/generators/common/templates/README.md.jhi.ejs

@@ -37,7 +37,7 @@ let clientPackageMngrName = 'Npm';
 let clientPackageMngrAddGlobal = 'install -g';
 let clientPackageMngrAdd = 'install --save --save-exact';
 let clientPackageMngrAddDev = 'install --save-dev --save-exact';
-let DOCUMENTATION_ARCHIVE_URL = `${DOCUMENTATION_URL + DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`;
+let DOCUMENTATION_ARCHIVE_URL = `${DOCUMENTATION_URL}`;
 _%>
 This application was generated using JHipster <%= jhipsterVersion %>, you can find documentation and help at [<%= DOCUMENTATION_ARCHIVE_URL %>](<%= DOCUMENTATION_ARCHIVE_URL %>).
 <%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
@@ -61,8 +61,10 @@ JHipster configuration is stored in this file at `generator-jhipster` key. You m
 - `.yo-resolve` (optional) - Yeoman conflict resolver
 Allows to use a specific action when conflicts are found skipping prompts for files that matches a pattern. Each line should match `[pattern] [action]` with pattern been a [Minimatch](https://github.com/isaacs/minimatch#minimatch) pattern and action been one of skip (default if ommited) or force. Lines starting with `#` are considered comments and are ignored.
 - `.jhipster/*.json` - JHipster entity configuration files
+<%_ if (!skipClient) { %>
 - `npmw` - wrapper to use locally installed npm.
 JHipster installs Node and npm locally using the build tool by default. This wrapper makes sure npm is installed locally and uses it avoiding some differences different versions can cause. By using `./npmw` instead of the traditional `npm` you can configure a Node-less environment to develop or test your application.
+<%_ } _%>
 - `/src/main/docker` - Docker configurations for the application and services that the application depends on
 
 ## Development

package/generators/common/templates/package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "7.0.0",
+    "concurrently": "7.1.0",
     "husky": "7.0.4",
-    "lint-staged": "12.2.2",
-    "npm": "8.3.2",
-    "wait-on": "6.0.0"
+    "lint-staged": "12.3.7",
+    "npm": "8.6.0",
+    "wait-on": "6.0.1"
   }
 }

package/generators/common/templates/sonar-project.properties.ejs

@@ -45,7 +45,7 @@ sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey=squid:UndocumentedApi
 <%_ if (authenticationTypeJwt) { _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-4502 is ignored, as for JWT tokens we are not subject to CSRF attack
 sonar.issue.ignore.multicriteria.S4502.resourceKey=<%= MAIN_DIR %>java/**/*
-sonar.issue.ignore.multicriteria.S4502.ruleKey=squid:S4502
+sonar.issue.ignore.multicriteria.S4502.ruleKey=java:S4502
 <%_ } _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-4684
 sonar.issue.ignore.multicriteria.S4684.resourceKey=<%= MAIN_DIR %>java/**/*

package/generators/cypress/esm.mjs

@@ -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 { files } from './files.js';

package/generators/cypress/files.js

@@ -22,7 +22,7 @@
  * For any other config an object { file:.., method:.., template:.. } can be used
  */
 
-const faker = require('faker');
+const faker = require('@faker-js/faker');
 
 const constants = require('../generator-constants');
 
@@ -79,6 +79,7 @@ const cypressFiles = {
 };
 module.exports = {
   writeFiles,
+  files: cypressFiles,
 };
 
 function writeFiles() {

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs

@@ -66,20 +66,24 @@ describe('/account/settings', () => {
     cy.wait('@settingsSave').then(({ response }) => expect(response.statusCode).to.equal(200));
   });
 
-  it("should not be able to change 'user' settings if email already exists", () => {
-    cy.login(adminUsername, adminPassword);
-    cy.visit('');
-    cy.clickOnSettingsItem();
-    cy.get(emailSettingsSelector).clear().type('admin@localhost.fr');
-    cy.get(submitSettingsSelector).click();
+  describe('if there is another user with an email', () => {
+    before(() => {
+      cy.login(adminUsername, adminPassword);
+      cy.visit('/account/settings');
+      cy.get(emailSettingsSelector).clear().type('admin@localhost.fr');
+      cy.intercept({
+        method: 'POST',
+        url: '/api/account',
+        times: 1,
+      }).as('settingsSave');
+      cy.get(submitSettingsSelector).click();
+      cy.wait('@settingsSave');
+    });
 
-    cy.login(username, password);
-    cy.visit('');
-    cy.clickOnSettingsItem();
-
-    cy.intercept('POST', '/api/account').as('settingsNotSave');
-    cy.get(emailSettingsSelector).clear().type('admin@localhost.fr');
-    cy.get(submitSettingsSelector).click();
-    cy.wait('@settingsNotSave').then(({ response }) => expect(response.statusCode).to.equal(400));
+    it("should not be able to change 'user' email to same value", () => {
+      cy.get(emailSettingsSelector).clear().type('admin@localhost.fr');
+      cy.get(submitSettingsSelector).click();
+      cy.wait('@settingsSave').then(({ response }) => expect(response.statusCode).to.equal(400));
+  });
   });
 });

package/generators/database-changelog/esm.mjs

@@ -16,6 +16,4 @@
  * 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';

package/generators/database-changelog/index.js

@@ -98,7 +98,7 @@ module.exports = class extends BaseBlueprintGenerator {
   /* ======================================================================== */
 
   _composeWithIncrementalChangelogProvider(databaseChangelog) {
-    const skipWriting = !this.options.entities.includes(databaseChangelog.entityName);
+    const skipWriting = this.options.skipWriting || !this.options.entities.includes(databaseChangelog.entityName);
     return this.composeWithJHipster(GENERATOR_DATABASE_CHANGELOG_LIQUIBASE, {
       databaseChangelog,
       skipWriting,

package/generators/database-changelog-liquibase/esm.mjs

@@ -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 { addEntityFiles, updateEntityFiles, updateConstraintsFiles, updateMigrateFiles, fakeFiles } from './files.js';

package/generators/docker-compose/esm.mjs

@@ -16,6 +16,4 @@
  * 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';

package/generators/docker-compose/index.js

@@ -20,6 +20,7 @@ const chalk = require('chalk');
 const shelljs = require('shelljs');
 const jsyaml = require('js-yaml');
 const pathjs = require('path');
+const normalize = require('normalize-path');
 
 const BaseDockerGenerator = require('../generator-base-docker');
 const { INITIALIZING_PRIORITY, PROMPTING_PRIORITY, CONFIGURING_PRIORITY, LOADING_PRIORITY, PREPARING_PRIORITY, WRITING_PRIORITY } =
@@ -29,7 +30,7 @@ const writeFiles = require('./files').writeFiles;
 const { GATEWAY, MONOLITH } = require('../../jdl/jhipster/application-types');
 const { PROMETHEUS } = require('../../jdl/jhipster/monitoring-types');
 const { EUREKA } = require('../../jdl/jhipster/service-discovery-types');
-const { CASSANDRA, COUCHBASE, MARIADB, MONGODB, ORACLE } = require('../../jdl/jhipster/database-types');
+const { CASSANDRA, COUCHBASE, MONGODB, ORACLE } = require('../../jdl/jhipster/database-types');
 const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
 const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
 const { MEMCACHED, REDIS } = require('../../jdl/jhipster/cache-types');
@@ -175,11 +176,12 @@ module.exports = class extends BaseDockerGenerator {
           // Add database configuration
           const database = appConfig.prodDatabaseType;
           if (database !== NO_DATABASE && database !== ORACLE) {
-            const relativePath = pathjs.relative(this.destinationRoot(), `${path}/src/main/docker`);
+            const relativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/docker`));
             const databaseYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/${database}.yml`));
             const databaseServiceName = `${lowercaseBaseName}-${database}`;
             let databaseYamlConfig = databaseYaml.services[databaseServiceName];
-            if (database !== MARIADB) delete databaseYamlConfig.ports;
+            // Don't export database ports
+            delete databaseYamlConfig.ports;
 
             if (database === CASSANDRA) {
               // node config
@@ -191,9 +193,11 @@ module.exports = class extends BaseDockerGenerator {
               const cassandraMigrationYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/cassandra-migration.yml`));
               const cassandraMigrationConfig = cassandraMigrationYaml.services[`${databaseServiceName}-migration`];
               cassandraMigrationConfig.build.context = relativePath;
-              const createKeyspaceScript = cassandraClusterYaml.services[`${databaseServiceName}-migration`].environment[0];
+              const createKeyspaceScript = cassandraClusterYaml.services[`${databaseServiceName}-migration`].environment.find(envVariable =>
+                envVariable.includes('CREATE_KEYSPACE_SCRIPT')
+              );
               cassandraMigrationConfig.environment.push(createKeyspaceScript);
-              const cqlFilesRelativePath = pathjs.relative(this.destinationRoot(), `${path}/src/main/resources/config/cql`);
+              const cqlFilesRelativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/resources/config/cql`));
               cassandraMigrationConfig.volumes[0] = `${cqlFilesRelativePath}:/cql:ro`;
 
               parentConfiguration[`${databaseServiceName}-migration`] = cassandraMigrationConfig;

package/generators/entities/esm.mjs

@@ -16,6 +16,4 @@
  * 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';

package/generators/entities/index.js

@@ -139,7 +139,7 @@ module.exports = class extends BaseBlueprintGenerator {
             const selectedEntity = this.options.entities.includes(entityName);
             const { regenerate = !selectedEntity } = this.options;
             await this.composeWithJHipster(GENERATOR_ENTITY, [entityName], {
-              skipWriting: !this.options.writeEveryEntity && !selectedEntity,
+              skipWriting: this.options.skipWriting || (!this.options.writeEveryEntity && !selectedEntity),
               regenerate,
               skipDbChangelog: this.jhipsterConfig.databaseType === SQL || this.options.skipDbChangelog,
               skipInstall: true,
@@ -175,7 +175,7 @@ module.exports = class extends BaseBlueprintGenerator {
   _default() {
     return {
       async composeEntitiesClient() {
-        if (this.options.entities.length !== this.jhipsterConfig.entities.length) return;
+        if (this.options.skipWriting || this.options.entities.length !== this.jhipsterConfig.entities.length) return;
         const clientEntities = this.getExistingEntityNames()
           .map(entityName => {
             const entity = this.configOptions.sharedEntities[entityName];

package/generators/entities-client/esm.mjs

@@ -16,6 +16,4 @@
  * 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';

package/generators/entity/esm.mjs

@@ -16,6 +16,4 @@
  * 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';

package/generators/entity/index.js

@@ -45,6 +45,7 @@ const statistics = require('../statistics');
 const { isReservedClassName, isReservedTableName } = require('../../jdl/jhipster/reserved-keywords');
 const {
   prepareEntityForTemplates,
+  prepareEntityServerDomainForTemplates,
   prepareEntityPrimaryKeyForTemplates,
   loadRequiredConfigIntoEntity,
   derivedPrimaryKeyProperties,
@@ -71,16 +72,14 @@ const { IMAGE, TEXT } = BlobTypes;
 
 const { PaginationTypes, ServiceTypes } = require('../../jdl/jhipster/entity-options');
 
-const { PAGINATION } = PaginationTypes;
-const NO_PAGINATION = PaginationTypes.NO;
-const NO_SERVICE = ServiceTypes.NO;
+const { NO: NO_PAGINATION } = PaginationTypes;
+const { NO: NO_SERVICE } = ServiceTypes;
 
 const { MAX, MIN, MAXLENGTH, MINLENGTH, MAXBYTES, MINBYTES, PATTERN } = require('../../jdl/jhipster/validations');
 
 /* constants used throughout */
-const SUPPORTED_VALIDATION_RULES = constants.SUPPORTED_VALIDATION_RULES;
+const { SUPPORTED_VALIDATION_RULES, JHIPSTER_CONFIG_DIR } = constants;
 const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
-const JHIPSTER_CONFIG_DIR = constants.JHIPSTER_CONFIG_DIR;
 
 class EntityGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -649,16 +648,7 @@ 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);
       },
     };
   }
@@ -727,7 +717,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);
+          }
         });
       },
 
@@ -816,6 +808,12 @@ class EntityGenerator extends BaseBlueprintGenerator {
         this.context.otherEntities = _.uniq(this.context.relationships.map(rel => rel.otherEntity));
       },
 
+      checkUpdatableEntity() {
+        this.context.updatableEntity =
+          this.context.fields.some(field => !field.id && !field.transient) ||
+          this.context.relationships.some(relationship => !relationship.id && relationship.ownerSide);
+      },
+
       processOtherReferences() {
         this.context.otherReferences = this.context.otherRelationships.map(relationship => relationship.reference);
         this.context.allReferences
@@ -843,6 +841,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
       processEntityPrimaryKeysDerivedProperties() {
         if (!this.context.primaryKey) return;
         derivedPrimaryKeyProperties(this.context.primaryKey);
+        this._checkPersistableInterfaceRequirement();
       },
 
       processPrimaryKeyTypesForRelations() {
@@ -858,20 +857,28 @@ class EntityGenerator extends BaseBlueprintGenerator {
        * Process relationships that should be loaded eagerly.
        */
       processEagerLoadRelationships() {
-        this.context.relationships
-          .filter(relationship => relationship.relationshipEagerLoad === undefined)
-          .forEach(relationship => {
+        this.context.relationships.forEach(relationship => {
+          if (relationship.otherEntity.embedded) {
+            relationship.bagRelationship = false;
+            relationship.relationshipEagerLoad = false;
+            return;
+          }
+          relationship.bagRelationship = relationship.ownerSide && relationship.collection;
+          if (relationship.relationshipEagerLoad === undefined) {
             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)) &&
-              // Neo4j & Couchbase eagerly loads relations by default
-              ![NEO4J, COUCHBASE].includes(this.context.databaseType);
-          });
+              relationship.bagRelationship ||
+              this.context.eagerLoad ||
+              // Fetch relationships if otherEntityField differs otherwise the id is enough
+              (relationship.ownerSide && relationship.otherEntity.primaryKey.name !== relationship.otherEntityField);
+          }
+        });
         this.context.relationshipsContainEagerLoad = this.context.relationships.some(relationship => relationship.relationshipEagerLoad);
+        this.context.containsBagRelationships = this.context.relationships.some(relationship => relationship.bagRelationship);
+        this.context.implementsEagerLoadApis = // Cassandra doesn't provides *WithEagerReationships apis
+          ![CASSANDRA, COUCHBASE].includes(this.context.databaseType) &&
+          // Only sql and mongodb provides *WithEagerReationships apis for imperative implementation
+          (this.context.reactive || [SQL, MONGODB].includes(this.context.databaseType)) &&
+          this.context.relationshipsContainEagerLoad;
         this.context.eagerRelations = this.context.relationships.filter(rel => rel.relationshipEagerLoad);
         this.context.regularEagerRelations = this.context.eagerRelations.filter(rel => rel.id !== true);
 
@@ -1146,6 +1153,10 @@ class EntityGenerator extends BaseBlueprintGenerator {
   _derivedCompositePrimaryKeyProperties(types) {
     this.context.otherEntityPrimaryKeyTypesIncludesUUID = types.includes(UUID);
   }
+
+  _checkPersistableInterfaceRequirement() {
+    this.context.requiresPersistableImplementation = this.context.fields.some(field => field.requiresPersistableImplementation);
+  }
 }
 
 module.exports = EntityGenerator;

package/generators/entity/prompts.js

@@ -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

@@ -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/index.js

@@ -53,6 +53,13 @@ module.exports = class extends BaseBlueprintGenerator {
       async loadNativeLanguage() {
         await this._loadEntityClientTranslations(this.entity, this.jhipsterConfig);
       },
+      async prepareReact() {
+        const entity = this.entity;
+        if (!entity.clientFrameworkReact) return;
+        entity.entityReactState = entity.applicationTypeMonolith
+          ? entity.entityInstance
+          : `${entity.lowercaseBaseName}.${entity.entityInstance}`;
+      },
     };
   }
 
@@ -157,6 +164,7 @@ module.exports = class extends BaseBlueprintGenerator {
   _postWriting() {
     return {
       addToMenu() {
+        if (this.skipClient || (this.microfrontend && this.applicationTypeGateway && this.microserviceName)) return undefined;
         return addToMenu.call(this);
       },
 

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

@@ -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/detail/entity-management-detail.component.html.ejs

@@ -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;

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

@@ -31,7 +31,7 @@ _%>
         <span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.home.title"><%= entityClassPluralHumanized %></span>
 
         <div class="d-flex justify-content-end">
-            <button class="btn btn-info mr-2" (click)="<%= refreshMethod %>" [disabled]="isLoading">
+            <button class="btn btn-info me-2" (click)="<%= refreshMethod %>" [disabled]="isLoading">
                 <fa-icon icon="sync" [spin]="isLoading"></fa-icon>
                 <span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.home.refreshListLabel">Refresh List</span>
             </button>
@@ -52,23 +52,22 @@ _%>
     <<%= jhiPrefixDashed %>-alert></<%= jhiPrefixDashed %>-alert>
 <%_ if (searchEngine) { _%>
 
-    <div class="row">
+    <form name="searchForm" class="row row-cols-sm-auto align-items-center">
         <div class="col-sm-12">
-            <form name="searchForm" class="form-inline">
-                <div class="input-group w-100 mt-3">
-                    <input type="text" class="form-control" [(ngModel)]="currentSearch" id="currentSearch" name="currentSearch" placeholder="<% if (enableTranslation) { %>{{ '<%= i18nKeyPrefix %>.home.search' | translate }}<% } else { %>Query<% } %>">
-
-                    <button class="input-group-append btn btn-info" (click)="search(currentSearch)">
-                        <fa-icon icon="search"></fa-icon>
-                    </button>
-
-                    <button class="input-group-append btn btn-danger" (click)="search('')" *ngIf="currentSearch">
-                        <fa-icon icon="trash-alt"></fa-icon>
-                    </button>
-                </div>
-            </form>
+            <div class="input-group w-100 mt-3">
+                <label class="visually-hidden" for="currentSearch" <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.home.search">Query</label>
+                <input type="text" class="form-control" [(ngModel)]="currentSearch" id="currentSearch" name="currentSearch" placeholder="<% if (enableTranslation) { %>{{ '<%= i18nKeyPrefix %>.home.search' | translate }}<% } else { %>Query<% } %>">
+
+                <button class="btn btn-info" (click)="search(currentSearch)">
+                    <fa-icon icon="search"></fa-icon>
+                </button>
+
+                <button class="btn btn-danger" (click)="search('')" *ngIf="currentSearch">
+                    <fa-icon icon="trash-alt"></fa-icon>
+                </button>
+            </div>
         </div>
-    </div>
+    </form>
 <%_ } _%>
 
     <div class="alert alert-warning" id="no-result" *ngIf="<%= entityInstancePlural %>?.length === 0">
@@ -82,7 +81,7 @@ _%>
 <%_ for (const field of fields.filter(field => !field.hidden)) { _%>
                     <th scope="col"<% if (!paginationNo) { %> <%= jhiPrefix %>SortBy="<%= field.fieldName %>"<% } %>><span <%= jhiPrefix %>Translate="<%= field.fieldTranslationKey %>"><%= field.fieldNameHumanized %></span><% if (!paginationNo) { %> <fa-icon <% if (searchEngine && !field.fieldTypeBoolean && !field.fieldTypeNumeric && !field.fieldTypeTemporal) { %>*ngIf="!currentSearch" <% } %>icon="sort"></fa-icon><% } %></th>
 <%_ } _%>
-<%_ for (const relationship of relationships) { _%>
+<%_ for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedded)) { _%>
     <%_ if (relationship.relationshipManyToOne
             || (relationship.relationshipOneToOne && relationship.ownerSide)
             || (relationship.relationshipManyToMany && relationship.ownerSide && paginationNo)) {
@@ -126,7 +125,7 @@ _%>
                     <td<% if (field.id) { %>><a<%- routerLink %><% } %>>{{ <%= entityInstance %>.<%= fieldName %> }}<% if (field.id) { %></a><% } %></td>
     <%_ } _%>
 <%_ } _%>
-<%_ for (const relationship of relationships) {
+<%_ for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedded)) {
     const ownerSide = relationship.ownerSide;
     const relationshipFieldName = relationship.relationshipFieldName;
     const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
@@ -160,7 +159,7 @@ _%>
                     </td>
     <%_ } _%>
 <%_ } _%>
-                    <td class="text-right">
+                    <td class="text-end">
                         <div class="btn-group">
                             <button type="submit"
                                     [routerLink]="['/<%= entityPage %>', <%= entityInstance %>.<%= primaryKey.name %>, 'view']"
@@ -195,11 +194,11 @@ _%>
 <%_ if (paginationPagination) { _%>
 
     <div *ngIf="<%= entityInstancePlural %> && <%= entityInstancePlural %>.length > 0">
-        <div class="row justify-content-center">
+        <div class="d-flex justify-content-center">
             <<%= jhiPrefixDashed %>-item-count [params]="{ page: page, totalItems: totalItems, itemsPerPage: itemsPerPage }"></<%= jhiPrefixDashed %>-item-count>
         </div>
 
-        <div class="row justify-content-center">
+        <div class="d-flex justify-content-center">
             <ngb-pagination [collectionSize]="totalItems" [(page)]="ngbPaginationPage" [pageSize]="itemsPerPage" [maxSize]="5" [rotate]="true" [boundaryLinks]="true" (pageChange)="loadPage($event)"></ngb-pagination>
         </div>
     </div>

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

@@ -63,7 +63,7 @@ export class <%= entityAngularName %>Component implements OnInit {
 <%_ } _%>
 
 <%_ if (primaryKey) { _%>
-    track<%= primaryKey.nameCapitalized %>(index: number, item: I<%= entityAngularName %>): <%= primaryKey.tsType %> {
+    track<%= primaryKey.nameCapitalized %>(_index: number, item: I<%= entityAngularName %>): <%= primaryKey.tsType %> {
         return item.<%= primaryKey.name %>!;
     }