generator-jhipster 7.6.0 → 7.7.0

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/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,
@@ -649,16 +650,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 +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);
+          }
         });
       },
 
@@ -863,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)

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/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/update/entity-management-update.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">
         <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
             <h2 id="<%= jhiPrefixDashed %>-<%= entityFileName %>-heading" data-cy="<%= entityClass %>CreateUpdateHeading" <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.home.createOrEditLabel">Create or edit a <%= entityClassHumanized %></h2>
@@ -47,8 +47,8 @@
     }
 _%>
 
-                <div class="form-group"<% if (field.autoGenerate) { %> [hidden]="editForm.get('<%= primaryKey.name %>')!.value == null"<% } %>>
-                    <label class="form-control-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= fieldName %>"<% if (field.javadoc) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.javadoc %>"<% } } %>><%= fieldNameHumanized %></label>
+                <div class="row mb-3"<% if (field.autoGenerate) { %> [hidden]="editForm.get('<%= primaryKey.name %>')!.value == null"<% } %>>
+                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= fieldName %>"<% if (field.javadoc) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.javadoc %>"<% } } %>><%= fieldNameHumanized %></label>
     <%_ if (field.fieldIsEnum) { _%>
                     <select class="form-control" name="<%= fieldName %>" formControlName="<%= fieldName %>" id="field_<%= fieldName %>" data-cy="<%= fieldName %>">
         <%_ const enumPrefix = frontendAppName + '.'+ fieldType; _%>
@@ -65,16 +65,16 @@ _%>
             <%_ } _%>
                         <div *ngIf="editForm.get('<%= fieldName %>')!.value" class="form-text text-danger clearfix">
             <%_ if (field.blobContentTypeAny) { _%>
-                            <a class="pull-left" (click)="openFile(editForm.get('<%= fieldName %>')!.value, editForm.get('<%= fieldName %>ContentType')!.value)" <%= jhiPrefix %>Translate="entity.action.open">open</a><br>
-                            <span class="pull-left">{{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value) }}</span>
+                            <a class="pull-start" (click)="openFile(editForm.get('<%= fieldName %>')!.value, editForm.get('<%= fieldName %>ContentType')!.value)" <%= jhiPrefix %>Translate="entity.action.open">open</a><br>
+                            <span class="pull-start">{{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value) }}</span>
             <%_ } else { _%>
-                            <span class="pull-left">{{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value) }}</span>
+                            <span class="pull-start">{{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value) }}</span>
             <%_ } _%>
             <%_ if (field.blobContentTypeImage) { _%>
-                            <button type="button" (click)="clearInputImage('<%= fieldName %>', '<%= fieldName %>ContentType', 'file_<%= fieldName %>')" class="btn btn-secondary btn-xs pull-right">
+                            <button type="button" (click)="clearInputImage('<%= fieldName %>', '<%= fieldName %>ContentType', 'file_<%= fieldName %>')" class="btn btn-secondary btn-xs pull-end">
             <%_ } else { _%>
                             <button type="button" (click)="editForm.patchValue({<%= fieldName %>: null});editForm.patchValue({<%= fieldName %>ContentType: null});"
-                                    class="btn btn-secondary btn-xs pull-right">
+                                    class="btn btn-secondary btn-xs pull-end">
             <%_ } _%>
                                 <fa-icon icon="times"></fa-icon>
                             </button>
@@ -85,9 +85,7 @@ _%>
         <%_ 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 %>"<% if (readonly) { %> [readonly]="true"<% } %>/>
-                        <span class="input-group-append">
-                            <button type="button" class="btn btn-secondary" (click)="<%= fieldName %>Dp.toggle()"><fa-icon icon="calendar-alt"></fa-icon></button>
-                        </span>
+                        <button type="button" class="btn btn-secondary" (click)="<%= fieldName %>Dp.toggle()"><fa-icon icon="calendar-alt"></fa-icon></button>
                     </div>
         <%_ } else if (field.fieldTypeTimed) { _%>
                     <div class="d-flex">
@@ -176,8 +174,8 @@ _%>
 _%>
     <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide && relationship.otherEntityUser)) { _%>
 
-                <div class="form-group">
-                    <label class="form-control-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipName %>"><%= relationshipNameHumanized %></label>
+                <div class="row mb-3">
+                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipName %>"><%= relationshipNameHumanized %></label>
                     <select class="form-control" id="field_<%= relationshipName %>" data-cy="<%= relationshipFieldName %>" name="<%= relationshipName %>" formControlName="<%= relationshipFieldName %>">
             <%_ if (!relationshipRequired) { _%>
                         <option [ngValue]="null"></option>
@@ -189,8 +187,8 @@ _%>
                 </div>
     <%_ } else if (relationship.relationshipOneToOne && ownerSide) { _%>
 
-                <div class="form-group">
-                    <label class="form-control-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipName %>"><%= relationshipNameHumanized %></label>
+                <div class="row mb-3">
+                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipName %>"><%= relationshipNameHumanized %></label>
                     <select class="form-control" id="field_<%= relationshipName %>" data-cy="<%= relationshipFieldName %>" name="<%= relationshipName %>" formControlName="<%= relationshipName %>">
             <%_ if (!relationshipRequired) { _%>
                         <option [ngValue]="null"></option>
@@ -202,7 +200,7 @@ _%>
                 </div>
     <%_ } else if (relationship.relationshipManyToMany && ownerSide) { _%>
 
-                <div class="form-group">
+                <div class="row mb-3">
                     <label <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipFieldNamePlural %>"><%= relationshipNameHumanized %></label>
                     <select class="form-control" id="field_<%= relationshipFieldNamePlural %>" data-cy="<%= relationshipFieldName %>" multiple name="<%= relationshipFieldNamePlural %>" formControlName="<%= relationshipFieldNamePlural %>">
                         <option [ngValue]="getSelected<%= relationship.otherEntity.entityAngularName %>(<%= otherEntityName %>Option, editForm.get('<%= relationshipFieldNamePlural %>')!.value)" *ngFor="let <%= otherEntityName %>Option of <%= otherEntity.entityInstancePlural %>SharedCollection; trackBy: track<%= relationship.otherEntity.entityAngularName %>By<%= relationship.otherEntity.primaryKey.nameCapitalized %>">{{ <%= otherEntityName %>Option.<%= otherEntityField %> }}</option>

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

@@ -166,7 +166,7 @@ _%>
 
             this.updateForm(<%= entityInstance %>);
 
-<%_ if (relationships.filter(rel => rel.ownerSide).length > 0) { _%>
+<%_ if (relationships.filter(rel => rel.ownerSide && !rel.otherEntityIsEmbedded).length > 0) { _%>
             this.loadRelationshipsOptions();
 <%_ } _%>
         });
@@ -308,7 +308,7 @@ _%>
 <%_ } _%>
     }
 
-<%_ if (relationships.filter(rel => rel.ownerSide).length > 0) { _%>
+<%_ if (relationships.filter(rel => rel.ownerSide && !rel.otherEntityIsEmbedded).length > 0) { _%>
     protected loadRelationshipsOptions(): void {
     <%_ for (const relationshipsByEntityNeedingOptions of Object.values(differentRelationships).map(relationships => relationships.filter(rel => rel.ownerSide)).filter(relationships => relationships.length > 0)) { _%>
         <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); %>

package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs

@@ -19,7 +19,7 @@ const baseApi = entityApi + 'api/';
 const entityFakeData = generateFakeData('cypress');
 const requiredRelationships = relationships.filter(rel => rel.relationshipRequired || rel.id);
 const requiredOtherEntities = _.uniq(requiredRelationships.map(rel => rel.otherEntity));
-const otherEntities = _.uniq(Object.values(differentRelationships).map(rels => rels[0].otherEntity));
+const otherEntities = _.uniq(Object.values(differentRelationships).filter(rels => rels.length > 0).map(rels => rels[0].otherEntity));
 // We cannot generate a required entity with relationship with required relationships.
 const skipCreateTest =
   (

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

@@ -389,7 +389,7 @@ describe('Entities reducer tests', () => {
 
         }
       ];
-      await store.dispatch(partialUpdateEntity({ id: <%- generateTestEntityId(primaryKey.type) %> }));
+      await store.dispatch(partialUpdateEntity({ <%- primaryKey.name %>: <%- generateTestEntityId(primaryKey.type) %> }));
       expect(store.getActions()[0]).toMatchObject(expectedActions[0]);
       expect(store.getActions()[1]).toMatchObject(expectedActions[1]);
       <%_ if (!paginationInfiniteScroll) { _%>

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

@@ -211,7 +211,7 @@ _%>
     const relationshipFieldName = rel.relationshipFieldName;
     const relationshipFieldNamePlural = rel.relationshipFieldNamePlural;
   if (rel.relationshipManyToOne || (rel.relationshipOneToOne && rel.ownerSide)) { _%>
-          <%= relationshipFieldName %>: <%= entityInstance %>Entity?.<%= relationshipFieldName %>?.id,
+          <%= relationshipFieldName %>: <%= entityInstance %>Entity?.<%= relationshipFieldName %>?.<%= otherEntityPkName %>,
   <%_ } else if (rel.relationshipManyToMany && rel.ownerSide) { _%>
           <%= relationshipFieldNamePlural %>: <%= entityInstance %>Entity?.<%= relationshipFieldNamePlural %>?.map(e => e.<%= otherEntityPkName %>.toString()),
   <%_ } _%>

package/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs

@@ -30,7 +30,7 @@ let elementGetter = `getText()`;
 let openBlockComment = ``;
 let closeBlockComment = ``;
 if (enableTranslation) {
-    elementGetter = `getAttribute('jhiTranslate')`;
+    elementGetter = `getAttribute('${jhiPrefix}Translate')`;
 }
 for (let relationship of relationships) {
   if (relationship.relationshipRequired) {

package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs

@@ -26,7 +26,7 @@ let elementGetter = `getText()`;
 let openBlockComment = ``;
 let closeBlockComment = ``;
 if (enableTranslation) {
-  elementGetter = `getAttribute('jhiTranslate')`;
+  elementGetter = `getAttribute('${jhiPrefix}Translate')`;
 }
 for (let relationship of relationships) {
   if (relationship.relationshipRequired) {

package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs

@@ -47,7 +47,7 @@ let elementGetter = `getText()`;
 let openBlockComment = ``;
 let closeBlockComment = ``;
 if (enableTranslation) {
-  elementGetter = `getAttribute('jhiTranslate')`;
+  elementGetter = `getAttribute('${jhiPrefix}Translate')`;
 }
 for (let relationship of relationships) {
   if (relationship.relationshipRequired || relationship.id) {

package/generators/entity-i18n/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 { entityClientI18nFiles, enumClientI18nFiles } from './files.js';

package/generators/entity-server/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 { serverFiles as files } from './files.js';

package/generators/entity-server/files-couchbase.js

@@ -21,12 +21,23 @@ const { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } = require('../generator-const
 const entityCouchbaseFiles = {
   dbChangelog: [
     {
-      condition: generator => generator.searchEngineCouchbase && !generator.skipDbChangelog,
+      condition: generator => !generator.skipDbChangelog && !generator.embedded,
+      path: SERVER_MAIN_RES_DIR,
+      templates: [
+        {
+          file: 'config/couchmove/changelog/entity.n1ql',
+          renameTo: generator => `config/couchmove/changelog/V${generator.changelogDate}__${generator.entityInstance.toLowerCase()}.n1ql`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.searchEngineCouchbase && !generator.skipDbChangelog && !generator.embedded,
       path: SERVER_MAIN_RES_DIR,
       templates: [
         {
           file: 'config/couchmove/changelog/entity.fts',
-          renameTo: generator => `config/couchmove/changelog/V${generator.changelogDate}__${generator.entityInstance.toLowerCase()}.fts`,
+          renameTo: generator =>
+            `config/couchmove/changelog/V${parseInt(generator.changelogDate, 10) + 10}__${generator.entityInstance.toLowerCase()}.fts`,
         },
       ],
     },
@@ -56,6 +67,16 @@ const entityCouchbaseFiles = {
 
 function writeEntityCouchbaseFiles() {
   return {
+    cleanupCouchbaseFiles() {
+      if (!this.databaseTypeCouchbase) return;
+
+      if (this.isJhipsterVersionLessThan('7.6.1')) {
+        this.removeFile(
+          `${SERVER_MAIN_RES_DIR}config/couchmove/changelog/V${this.changelogDate}__${this.entityInstance.toLowerCase()}.fts`
+        );
+      }
+    },
+
     async writeEntityCouchbaseFiles() {
       if (this.skipServer || !this.databaseTypeCouchbase) return;
 

package/generators/entity-server/files.js

@@ -177,8 +177,8 @@ const serverFiles = {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: 'package/repository/search/SortToFieldSortBuilderConverter.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/search/SortToFieldSortBuilderConverter.java`,
+          file: 'package/repository/search/SortToSortBuilderListConverter.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/search/SortToSortBuilderListConverter.java`,
         },
       ],
     },
@@ -192,6 +192,20 @@ const serverFiles = {
         },
       ],
     },
+    {
+      condition: generator => !generator.reactive && generator.databaseTypeSql && !generator.embedded && generator.containsBagRelationships,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/repository/EntityRepositoryWithBagRelationships.java',
+          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}RepositoryWithBagRelationships.java`,
+        },
+        {
+          file: 'package/repository/EntityRepositoryWithBagRelationshipsImpl.java',
+          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}RepositoryWithBagRelationshipsImpl.java`,
+        },
+      ],
+    },
     {
       condition: generator => generator.reactive && !generator.embedded && generator.databaseType !== COUCHBASE,
       path: SERVER_MAIN_SRC_DIR,