generator-jhipster 7.1.0 → 7.4.0

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

@@ -51,6 +51,8 @@ import { DATE_TIME_LONG_FORMAT } from '@/shared/date/filters';
   <%_ } _%>
 <%_ } _%>
 
+import AlertService from '@/shared/alert/alert.service';
+
 <%_ const importEntitiesSeen = [entityAngularName];
   let hasManyToMany = false;
   for (relationship of relationships) { _%>
@@ -76,6 +78,10 @@ import { I<%= otherEntityAngularName %> } from '@/shared/model/<%= otherEntityMo
 <%_ importEntitiesSeen.push(otherEntityAngularName); } } _%>
 import { I<%= entityAngularName %>, <%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
 import <%= entityAngularName %>Service from './<%= entityFileName %>.service';
+<%_ const enumImports = generateEntityClientEnumImports(fields); _%>
+<%_ enumImports.forEach( (importedPath, importedType) => { _%>
+import { <%- importedType %> } from '<%- importedPath %>';
+<%_ }); _%>
 
 const validations: any = {
   <%= entityInstance %>: {
@@ -111,7 +117,7 @@ _%>
 <%_ } _%>
 <%_ for (relationship of relationships) { _%>
   <%_ if (relationship.relationshipValidate && relationship.relationshipRequired) { _%>
-    <%= relationship.relationshipFieldName %>: {
+    <%= relationship.collection ? relationship.relationshipFieldNamePlural : relationship.relationshipFieldName %>: {
       required
     },
   <%_ } _%>
@@ -124,6 +130,8 @@ _%>
 })
 export default class <%= entityAngularName %>Update extends <% if (fieldsContainBlob) { %>mixins(JhiDataUtils)<% } else { %>Vue<% } %> {
   @Inject('<%= entityInstance %>Service') private <%= entityInstance %>Service: () => <%= entityAngularName %>Service;
+  @Inject('alertService') private alertService: () => AlertService;
+
   public <%= entityInstance %>: I<%= entityAngularName %> = new <%= entityAngularName %>();
   <%_
     const entitiesSeen = [entityAngularName];
@@ -144,6 +152,9 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
   public <%= otherEntityNamePlural %> : <% if (otherEntityAngularName === 'User') { %>Array<any><%_ } else { _%>I<%= otherEntityAngularName %>[]<%_ } _%> = [];
   <%_ } _%>
   <%_ entitiesSeen.push(otherEntityAngularName);entitiesSeen.push(otherEntityNamePlural); } } _%>
+  <%_ enumImports.forEach( (importedPath, importedType) => { _%>
+  public <%- _.lowerFirst(importedType) %>Values : string[] = Object.keys(<%- importedType %>);
+  <%_ }); _%>
   public isSaving = false;
   public currentLanguage = '';
 
@@ -199,7 +210,10 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
           variant: 'info',
           solid: true,
           autoHideDelay: 5000,
-        });
+        })
+      }).catch(error => {
+          this.isSaving = false;
+          this.alertService().showHttpError(this,error.response);
       });
     } else {
       this.<%= entityInstance %>Service().create(this.<%= entityInstance %>).then((param) => {
@@ -217,7 +231,10 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
           solid: true,
           autoHideDelay: 5000,
         });
-      });
+      }).catch(error => {
+          this.isSaving = false;
+          this.alertService().showHttpError(this,error.response);
+      });;
     }
   }
 
@@ -264,6 +281,8 @@ _%>
       res.<%= fieldName %> = new Date(res.<%= fieldName %>);
 <%_ } } _%>
       this.<%= entityInstance %> = res;
+    }).catch(error => {
+      this.alertService().showHttpError(this,error.response);
     });
   }
 

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

@@ -34,12 +34,9 @@ _%>
                         <label class="form-control-label" v-text="$t('<%= translationKey %>')" for="<%= entityFileName %>-<%= fieldName %>"><%= fieldNameHumanized %></label>
   <%_ if (field.fieldIsEnum) { _%>
                         <select class="form-control" name="<%= fieldName %>" :class="{'valid': !$v.<%= entityInstance %>.<%= fieldName %>.$invalid, 'invalid': $v.<%= entityInstance %>.<%= fieldName %>.$invalid }" v-model="$v.<%= entityInstance %>.<%= fieldName %>.$model" id="<%= entityFileName %>-<%= fieldName %>" data-cy="<%= fieldName %>" <% if (field.fieldValidate === true && field.fieldValidateRules.includes('required')) { %> required<% } %>>
-    <%_ const enumPrefix = frontendAppName + '.'+ fieldType;
-      const values = field.enumValues;
-      for (key in values) {
-        const enumValue = values[key]; _%>
-                            <option value="<%= enumValue.name %>" v-bind:label="$t('<%=enumPrefix%>.<%= enumValue.name %>')"><%= enumValue.value %></option>
-    <%_ } _%>
+    <%_ const enumPrefix = frontendAppName + '.'+ fieldType; _%>
+                            <option v-for="<%= _.lowerFirst(fieldType) %> in <%= _.lowerFirst(fieldType)%>Values" :key="<%= _.lowerFirst(fieldType) %>" v-bind:value="<%= _.lowerFirst(fieldType) %>" v-bind:label="$t('<%= enumPrefix %>.'+<%= _.lowerFirst(fieldType) %>)">{{ <%= _.lowerFirst(fieldType) %> }}</option>
+    
                         </select>
   <%_ } else { _%>
     <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
@@ -195,15 +192,15 @@ _%>
   <%_ } else if (relationship.relationshipManyToMany && ownerSide) { _%>
                     <div class="form-group">
                         <label v-text="$t('<%= translationKey %>')" for="<%= entityFileName %>-<%= relationshipName %>"><%= relationshipNameHumanized %></label>
-                        <select class="form-control" id="<%= entityFileName %>-<%= relationshipName %>" data-cy="<%= relationshipFieldName %>" multiple name="<%= relationshipName %>" v-if="<%=entityInstance %>.<%=relationshipFieldNamePlural %> !== undefined" v-model="<%=entityInstance %>.<%=relationshipFieldNamePlural %>"<% if (relationshipRequired) { %> required<% } %>>
+                        <select class="form-control" id="<%= entityFileName %>-<%= relationshipFieldNamePlural %>" data-cy="<%= relationshipFieldName %>" multiple name="<%= relationshipName %>" v-if="<%=entityInstance %>.<%=relationshipFieldNamePlural %> !== undefined" v-model="<%=entityInstance %>.<%=relationshipFieldNamePlural %>"<% if (relationshipRequired) { %> required<% } %>>
                             <option v-bind:value="getSelected(<%=entityInstance %>.<%=relationshipFieldNamePlural %>, <%=otherEntityName %>Option)" v-for="<%=otherEntityName %>Option in <%=otherEntityNamePlural %>" :key="<%=otherEntityName %>Option.id">{{<%=otherEntityName %>Option.<%=otherEntityField %>}}</option>
                         </select>
                     </div>
   <%_ } _%>
   <%_ if (relationship.relationshipValidate) { _%>
-                    <div v-if="$v.<%= entityInstance %>.<%= relationshipName %>.$anyDirty && $v.<%= entityInstance %>.<%= relationshipName %>.$invalid">
+                    <div v-if="$v.<%= entityInstance %>.<%= relationship.collection ? relationshipFieldNamePlural : relationshipFieldName %>.$anyDirty && $v.<%= entityInstance %>.<%= relationship.collection ? relationshipFieldNamePlural : relationshipFieldName %>.$invalid">
     <%_ if (relationshipRequired) { _%>
-                        <small class="form-text text-danger" v-if="!$v.<%= entityInstance %>.<%= relationshipName %>.required" v-text="$t('entity.validation.required')">
+                        <small class="form-text text-danger" v-if="!$v.<%= entityInstance %>.<%= relationship.collection ? relationshipFieldNamePlural : relationshipFieldName %>.required" v-text="$t('entity.validation.required')">
                             This field is required.
                         </small>
     <%_ } _%>

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

@@ -1,5 +1,6 @@
+<%_ if (fieldsContainBlob || paginationInfiniteScroll) { -%>
 import { mixins } from 'vue-class-component';
-
+<%_ } -%>
 import { Component, Vue, Inject } from 'vue-property-decorator';
 import Vue2Filters from 'vue2-filters';
 import { I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
@@ -7,12 +8,15 @@ import { I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFileNam
 import JhiDataUtils from '@/shared/data/data-utils.service';
 <% } %>
 import <%= entityAngularName %>Service from './<%= entityFileName %>.service';
+import AlertService from '@/shared/alert/alert.service';
 
 @Component({
   mixins: [Vue2Filters.mixin]
 })
 export default class <%= entityAngularName %> extends <% if (fieldsContainBlob || paginationInfiniteScroll) { %>mixins(JhiDataUtils)<% } else { %>Vue<% } %> {
   @Inject('<%= entityInstance %>Service') private <%= entityInstance %>Service: () => <%= entityAngularName %>Service;
+  @Inject('alertService') private alertService: () => AlertService;
+
 <%_ if (searchEngine) { _%>
   public currentSearch = '';
 <%_ } _%>
@@ -114,6 +118,7 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
   <%_ } _%>
       }, err => {
         this.isFetching = false;
+        this.alertService().showHttpError(this,err.response);
       });
       return;
     }
@@ -146,6 +151,7 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
 <%_ } _%>
     }, err => {
       this.isFetching = false;
+      this.alertService().showHttpError(this,err.response);
     });
   }
 
@@ -182,6 +188,8 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
       this.retrieveAll<%= entityAngularName %>s();
   <%_ } _%>
       this.closeDialog();
+    }).catch(error => {
+      this.alertService().showHttpError(this,error.response);
     });
   }
 

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

@@ -32,7 +32,7 @@ import { <%- importedType %> } from '<%- importedPath %>';
 <%_ }); _%>
 
 <%_ enumImports.forEach( (importedPath, importedType) => { _%>
-import { <%- importedType %> } from '<%- importedPath.replace('app/', '@/'); %>';
+import { <%- importedType %> } from '<%- importedPath %>';
 <%_ }); _%>
 export interface I<%= entityAngularName %> {
     <%_ variablesWithTypes.forEach(variablesWithType => { _%>

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

@@ -4,13 +4,9 @@ import buildPaginationQueryOpts from '@/shared/sort/sorts';
 <% } %>
 import { I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
 
-<%_
-const baseApi = (applicationTypeGateway && locals.microserviceName) ? 'services/' + microserviceName.toLowerCase() + '/api/' : 'api/';
-_%>
-
-const baseApiUrl = '<%= baseApi + entityApiUrl %>';
+const baseApiUrl = '<%= entityApi %>api/<%= entityApiUrl %>';
 <%_ if (searchEngine) { _%>
-const baseSearchApiUrl = '<%= baseApi %>_search/<%= entityApiUrl %>?query=';
+const baseSearchApiUrl = '<%= entityApi %>api/_search/<%= entityApiUrl %>?query=';
 <%_ } _%>
 
 export default class <%= entityAngularName %>Service {

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

@@ -29,6 +29,7 @@ import <%= entityAngularName %>DetailComponent from '@/entities/<%= entityFolder
 import <%= entityAngularName %>Class from '@/entities/<%= entityFolderName %>/<%= entityFileName %>-details.component';
 import <%= entityAngularName %>Service from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.service';
 import router from '@/router';
+import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
 localVue.use(VueRouter);
@@ -51,7 +52,7 @@ describe('Component Tests', () => {
     beforeEach(() => {
       <%= entityInstance %>ServiceStub = sinon.createStubInstance<<%= entityAngularName %>Service>(<%= entityAngularName %>Service);
 
-      wrapper = shallowMount<<%= entityAngularName %>Class>(<%= entityAngularName %>DetailComponent, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, router, provide: { <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub } });
+      wrapper = shallowMount<<%= entityAngularName %>Class>(<%= entityAngularName %>DetailComponent, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, router, provide: { <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub, alertService: () => new AlertService(), } });
       comp = wrapper.vm;
     });
 

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

@@ -55,6 +55,7 @@ import <%= otherEntityAngularName %>Service from '@/entities/<%= otherEntityClie
     <%_ importEntitiesSeen.push(otherEntityAngularName); _%>
   <%_ } _%>
 <%_ } _%>
+import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
 
@@ -90,6 +91,7 @@ describe('Component Tests', () => {
         router,
         provide: {
           <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub,
+          alertService: () => new AlertService(),
 <%_
   const entitiesSeen = [entityAngularName];
   for (relationship of relationships) { _%>

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

@@ -27,6 +27,7 @@ import * as config from '@/shared/config/config';
 import <%= entityAngularName %>Component from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.vue';
 import <%= entityAngularName %>Class from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.component';
 import <%= entityAngularName %>Service from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.service';
+import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
 
@@ -70,7 +71,8 @@ describe('Component Tests', () => {
         localVue,
         stubs: {<%_ if (!paginationNo) { _%>jhiItemCount:true, bPagination:true,<%_ } _%> bModal: bModalStub as any},
         provide: {
-          <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub
+          <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub,
+          alertService: () => new AlertService(),
         }
       });
       comp = wrapper.vm;

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

@@ -33,7 +33,7 @@ import { <%_ if (fieldsContainLocalDate) { _%>DATE_FORMAT,<%_ } if (fieldsContai
 import <%= entityAngularName %>Service from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.service';
 import { <%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
 <%_ enumImports.forEach( (importedPath, importedType) => { _%>
-import { <%- importedType %> } from '<%- importedPath.replace('app/', '@/') %>';
+import { <%- importedType %> } from '<%- importedPath %>';
 <%_ }); _%>
 
 const error = {

package/generators/entity-i18n/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;

package/generators/entity-i18n/files.js

@@ -16,49 +16,84 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const { startCase } = require('lodash');
 const utils = require('../utils');
 
 /**
  * The default is to use a file path string. It implies use of the template method.
  * For any other config an object { file:.., method:.., template:.. } can be used
  */
+const entityClientI18nFiles = {
+  entityBaseFiles: [
+    {
+      templates: [
+        {
+          sourceFile: context => `i18n/entity_${context.lang}.json.ejs`,
+          destinationFile: context => `${context.clientSrcDir}i18n/${context.lang}/${context.entityTranslationKey}.json`,
+        },
+      ],
+    },
+  ],
+};
+
+const enumClientI18nFiles = {
+  enumBaseFiles: [
+    {
+      templates: [
+        {
+          sourceFile: 'i18n/enum.json.ejs',
+          destinationFile: context => `${context.clientSrcDir}i18n/${context.lang}/${context.clientRootFolder}${context.enumInstance}.json`,
+        },
+      ],
+    },
+  ],
+};
 
 module.exports = {
+  entityClientI18nFiles,
+  enumClientI18nFiles,
   writeFiles,
 };
 
 function writeFiles() {
   return {
-    writeEnumFiles() {
-      this.fields.forEach(field => {
-        if (field.fieldIsEnum === true) {
-          const enumInfo = {
-            ...utils.getEnumInfo(field, this.clientRootFolder),
-            frontendAppName: this.frontendAppName,
-            packageName: this.packageName,
-          };
-
-          // Copy for each
-          if (!this.skipClient && this.enableTranslation) {
+    async writeEnumFiles() {
+      if (this.skipClient || !this.enableTranslation) return;
+      const { clientSrcDir, packageName, frontendAppName } = this;
+      await Promise.all(
+        this.fields
+          .map(field => {
+            if (!field.fieldIsEnum) return undefined;
+            // Copy for each
             const languages = this.languages || this.getAllInstalledLanguages();
-            languages.forEach(language => {
-              this.copyEnumI18n(language, enumInfo, this.fetchFromInstalledJHipster('entity-i18n/templates'));
-            });
-          }
-        }
-      });
+            return languages.map(lang =>
+              this.writeFiles({
+                sections: enumClientI18nFiles,
+                context: {
+                  ...utils.getEnumInfo(field, this.clientRootFolder),
+                  lang,
+                  frontendAppName,
+                  packageName,
+                  clientSrcDir,
+                },
+              })
+            );
+          })
+          .flat()
+      );
     },
 
-    writeClientFiles() {
-      if (this.skipClient) return;
+    async writeClientFiles() {
+      if (this.skipClient || !this.enableTranslation) return;
 
-      // Copy for each
-      if (this.enableTranslation) {
-        const languages = this.languages || this.getAllInstalledLanguages();
-        languages.forEach(language => {
-          this.copyI18n(language, this.fetchFromInstalledJHipster('entity-i18n/templates'));
-        });
-      }
+      // Copy each
+      const { clientSrcDir, frontendAppName, languages = this.getAllInstalledLanguages() } = this;
+      await Promise.all(
+        languages.map(async lang => {
+          await this.writeFiles({ sections: entityClientI18nFiles, context: { ...this.entity, clientSrcDir, frontendAppName, lang } });
+          this.addEntityTranslationKey(this.entityTranslationKeyMenu, this.entityClassHumanized || startCase(this.entityClass), lang);
+        })
+      );
     },
   };
 }

package/generators/entity-i18n/generator.spec.mjs

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2013-2021 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import testSupport from '../../test/support/index.cjs';
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+const { testBlueprintSupport } = testSupport;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+  describe('blueprint support', () => testBlueprintSupport(generator));
+});

package/generators/entity-i18n/index.js

@@ -19,20 +19,23 @@
 /* eslint-disable consistent-return */
 const writeFiles = require('./files').writeFiles;
 const utils = require('../utils');
-const { GENERATOR_ENTITY_I18N } = require('../generator-list');
+const { GENERATOR_ENTITY_I_18_N } = require('../generator-list');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 
 /* constants used throughout */
-let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
-    this.entity = opts.context;
-    this.jhipsterContext = opts.jhipsterContext || opts.context;
+    this.entity = this.options.context;
+    this.jhipsterContext = this.options.jhipsterContext || this.options.context;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_I18N, { context: opts.context });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_ENTITY_I_18_N, { context: this.options.context });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -47,7 +50,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -57,7 +60,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 };

package/generators/entity-i18n/templates/i18n/entity_pa.json.ejs

@@ -0,0 +1,69 @@
+<%#
+ Copyright 2013-2021 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.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%><%
+let helpBlocks = 0; %>
+{
+    "<%= frontendAppName %>": {
+        "<%= entityTranslationKey %>" : {
+            "home": {
+                "title": "<%= entityClassPluralHumanized %>",
+                "refreshListLabel": "ਸੂਚੀ ਤਾਜ਼ਾ ਕਰੋ",
+<%_ if (!readOnly) { _%>
+                "createLabel": "ਇੱਕ ਨਵਾਂ <%= entityClassHumanized %> ਬਣਾਓ",
+                "createOrEditLabel": "ਇੱਕ <%= entityClassHumanized %> ਬਣਾਓ ਜਾਂ ਸੰਪਾਦਿਤ ਕਰੋ",
+<%_ } _%>
+<%_ if (searchEngine) { _%>
+                "search": "<%= entityClassHumanized %> ਲਈ ਖੋਜ",
+<%_ } _%>
+                "notFound": "ਕੋਈ <%= entityClassPluralHumanized %> ਨਹੀਂ ਮਿਲਿਆ"
+            },
+<%_ if (!microserviceAppName && !readOnly) { _%>
+            "created": "ਇੱਕ ਨਵਾਂ <%= entityClassHumanized %> ਪਛਾਣਕਰਤਾ {{ param }} ਨਾਲ ਬਣਾਇਆ ਗਿਆ ਹੈ",
+            "updated": "ਇੱਕ <%= entityClassHumanized %> ਪਛਾਣਕਰਤਾ {{ param }} ਨਾਲ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ ਹੈ",
+            "deleted": "ਇੱਕ <%= entityClassHumanized %> ਪਛਾਣਕਰਤਾ {{ param }} ਨਾਲ ਮਿਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ",
+<%_ } _%>
+<%_ if (!readOnly) { _%>
+            "delete": {
+                "question": "ਕੀ ਤੁਸੀਂ ਨਿਸ਼ਚਤ ਰੂਪ ਤੋਂ <%= entityClassHumanized %> {{ id }} ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+            },
+<%_ } _%>
+            "detail": {
+                "title": "<%= entityClassHumanized %>"
+            }<% for (idx in fields) {
+            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
+            "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
+            "help": {<% for (idx in fields) {
+                if (fields[idx].javadoc) {
+                    --helpBlocks; %>
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                }
+            } %>
+            }<% } %>
+        }
+    }
+<%_ if (microserviceAppName && !readOnly) { _%>,
+    "<%= microserviceAppName %>": {
+        "<%= entityTranslationKey %>" : {
+            "created": "ਇੱਕ ਨਵਾਂ <%= entityClassHumanized %> ਪਛਾਣਕਰਤਾ  {{ param }} ਨਾਲ ਬਣਾਇਆ ਗਿਆ ਹੈ",
+            "updated": "ਇੱਕ <%= entityClassHumanized %> ਪਛਾਣਕਰਤਾ  {{ param }} ਨਾਲ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ ਹੈ",
+            "deleted": "ਇੱਕ <%= entityClassHumanized %> ਪਛਾਣਕਰਤਾ  {{ param }} ਨਾਲ ਮਿਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ"
+        }
+    }
+<%_ } _%>
+}

package/generators/entity-server/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;

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

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2013-2021 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } = require('../generator-constants');
+
+const entityCouchbaseFiles = {
+  dbChangelog: [
+    {
+      condition: generator => generator.searchEngineCouchbase && !generator.skipDbChangelog,
+      path: SERVER_MAIN_RES_DIR,
+      templates: [
+        {
+          file: 'config/couchmove/changelog/entity.fts',
+          renameTo: generator => `config/couchmove/changelog/V${generator.changelogDate}__${generator.entityInstance.toLowerCase()}.fts`,
+        },
+      ],
+    },
+  ],
+  server: [
+    {
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/Entity.java.jhi.spring_data_couchbase',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.spring_data_couchbase`,
+        },
+      ],
+    },
+    {
+      condition: generator => !generator.embedded,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/repository/EntityRepository.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}Repository.java`,
+        },
+      ],
+    },
+  ],
+};
+
+function writeEntityCouchbaseFiles() {
+  return {
+    async writeEntityCouchbaseFiles() {
+      if (this.skipServer || !this.databaseTypeCouchbase) return;
+
+      await this.writeFiles({
+        sections: entityCouchbaseFiles,
+        rootTemplatesPath: 'couchbase',
+      });
+    },
+  };
+}
+
+module.exports = {
+  writeEntityCouchbaseFiles,
+  entityCouchbaseFiles,
+};