generator-jhipster 7.7.0 → 7.9.0

package/generators/entity/index.js

@@ -56,7 +56,7 @@ 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 { CASSANDRA, COUCHBASE, MONGODB, NEO4J, SQL } = require('../../jdl/jhipster/database-types');
 const {
   GENERATOR_ENTITIES,
   GENERATOR_ENTITY,
@@ -72,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) {
@@ -366,12 +364,6 @@ class EntityGenerator extends BaseBlueprintGenerator {
         }
       },
 
-      /*
-       * Postpone entity table name prompt to wait entity table to be configured.
-       * It should be asked only when entity table name isn't valid.
-       */
-      askForTableName: prompts.askForTableName,
-
       configureEntity() {
         const context = this.context;
         const validation = this._validateTableName(context.entityTableName);
@@ -630,10 +622,11 @@ class EntityGenerator extends BaseBlueprintGenerator {
             (relationship.relationshipType === 'many-to-many' ||
               // OneToOne back reference is required due to filtering
               relationship.relationshipType === 'one-to-one' ||
-              (relationship.relationshipType === 'one-to-many' && !this.context.databaseTypeNeo4j))
+              (relationship.relationshipType === 'one-to-many' && !this.context.databaseTypeNeo4j && !this.context.databaseTypeNo))
           ) {
             relationship.otherEntityRelationshipName = _.lowerFirst(this.context.name);
             otherEntity.relationships.push({
+              otherEntity: this.context,
               otherEntityName: relationship.otherEntityRelationshipName,
               ownerSide: !relationship.ownerSide,
               otherEntityRelationshipName: relationship.relationshipName,
@@ -743,9 +736,11 @@ class EntityGenerator extends BaseBlueprintGenerator {
 
           if (fieldType === ZONED_DATE_TIME) {
             entity.fieldsContainZonedDateTime = true;
+            entity.fieldsContainTimed = true;
             entity.fieldsContainDate = true;
           } else if (fieldType === INSTANT) {
             entity.fieldsContainInstant = true;
+            entity.fieldsContainTimed = true;
             entity.fieldsContainDate = true;
           } else if (fieldType === DURATION) {
             entity.fieldsContainDuration = true;
@@ -810,6 +805,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
@@ -837,6 +838,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
       processEntityPrimaryKeysDerivedProperties() {
         if (!this.context.primaryKey) return;
         derivedPrimaryKeyProperties(this.context.primaryKey);
+        this._checkPersistableInterfaceRequirement();
       },
 
       processPrimaryKeyTypesForRelations() {
@@ -852,24 +854,30 @@ 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 &&
-              (this.context.eagerLoad ||
-                (this.context.paginate !== PAGINATION &&
-                  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, CASSANDRA].includes(this.context.databaseType);
-            relationship.bagRelationship = relationship.relationshipEagerLoad && relationship.collection;
-          });
+              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);
-        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)
@@ -999,7 +1007,6 @@ class EntityGenerator extends BaseBlueprintGenerator {
     const context = this.context;
     const prodDatabaseType = context.prodDatabaseType;
     const jhiTablePrefix = context.jhiTablePrefix;
-    const skipCheckLengthOfIdentifier = context.skipCheckLengthOfIdentifier;
     const instructions = `You can specify a different table name in your JDL file or change it in .jhipster/${context.name}.json file and then run again 'jhipster entity ${context.name}.'`;
 
     if (!/^([a-zA-Z0-9_]*)$/.test(entityTableName)) {
@@ -1019,12 +1026,6 @@ class EntityGenerator extends BaseBlueprintGenerator {
           `The table name contain the '${entityTableName.toUpperCase()}' reserved keyword but you have defined an empty jhiPrefix so it won't be prefixed and thus the generated application might not work'.\n${instructions}`
         );
       }
-    } else if (prodDatabaseType === ORACLE && entityTableName.length > 26 && !skipCheckLengthOfIdentifier) {
-      return `The table name is too long for Oracle, try a shorter name.\n${instructions}`;
-    } else if (prodDatabaseType === ORACLE && entityTableName.length > 14 && !skipCheckLengthOfIdentifier) {
-      this.warning(
-        `The table name is long for Oracle, long table names can cause issues when used to create constraint names and join table names.\n${instructions}`
-      );
     }
     return true;
   }
@@ -1142,6 +1143,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

@@ -21,7 +21,7 @@ const fs = require('fs');
 const _ = require('lodash');
 const constants = require('../generator-constants');
 const { isReservedPaginationWords, isReservedFieldName, isReservedTableName } = require('../../jdl/jhipster/reserved-keywords');
-const { CASSANDRA, ORACLE, SQL } = require('../../jdl/jhipster/database-types');
+const { CASSANDRA, SQL } = require('../../jdl/jhipster/database-types');
 const databaseTypes = require('../../jdl/jhipster/database-types');
 const { GATEWAY } = require('../../jdl/jhipster/application-types');
 const { FilteringTypes, MapperTypes, ServiceTypes, PaginationTypes } = require('../../jdl/jhipster/entity-options');
@@ -55,7 +55,6 @@ module.exports = {
   askForFieldsToRemove,
   askForRelationships,
   askForRelationsToRemove,
-  askForTableName,
   askForDTO,
   askForService,
   askForFiltering,
@@ -269,51 +268,6 @@ function askForRelationsToRemove() {
   });
 }
 
-function askForTableName() {
-  const context = this.context;
-  // don't prompt if there are no relationships
-  const entityTableName = context.entityTableName;
-  const prodDatabaseType = context.prodDatabaseType;
-  const skipCheckLengthOfIdentifier = context.skipCheckLengthOfIdentifier;
-  if (
-    skipCheckLengthOfIdentifier ||
-    !this.entityConfig.relationships ||
-    this.entityConfig.relationships.length === 0 ||
-    !((prodDatabaseType === ORACLE && entityTableName.length > 14) || entityTableName.length > 30)
-  ) {
-    return undefined;
-  }
-  const prompts = [
-    {
-      type: 'input',
-      name: 'entityTableName',
-      message: 'The table name for this entity is too long to form constraint names. Please use a shorter table name',
-      validate: input => {
-        if (!/^([a-zA-Z0-9_]*)$/.test(input)) {
-          return 'The table name cannot contain special characters';
-        }
-        if (input === '') {
-          return 'The table name cannot be empty';
-        }
-        if (prodDatabaseType === 'oracle' && input.length > 14 && !skipCheckLengthOfIdentifier) {
-          return 'The table name is too long for Oracle, try a shorter name';
-        }
-        if (input.length > 30 && !skipCheckLengthOfIdentifier) {
-          return 'The table name is too long, try a shorter name';
-        }
-        return true;
-      },
-      default: entityTableName,
-    },
-  ];
-  return this.prompt(prompts).then(props => {
-    /* overwrite the table name for the entity using name obtained from the user */
-    if (props.entityTableName !== this.entityConfig.entityTableName) {
-      context.entityTableName = this.entityConfig.entityTableName = _.snakeCase(props.entityTableName).toLowerCase();
-    }
-  });
-}
-
 function askForFiltering() {
   const context = this.context;
   // don't prompt if server is skipped, or the backend is not sql, or no service requested
@@ -468,10 +422,8 @@ function askForField() {
   const context = this.context;
   this.log(chalk.green(`\nGenerating field #${this.entityConfig.fields.length + 1}\n`));
   const skipServer = context.skipServer;
-  const prodDatabaseType = context.prodDatabaseType;
   const databaseType = context.databaseType;
   const clientFramework = context.clientFramework;
-  const skipCheckLengthOfIdentifier = context.skipCheckLengthOfIdentifier;
   const possibleFiltering = databaseType === SQL && !context.reactive;
   const prompts = [
     {
@@ -503,9 +455,6 @@ function askForField() {
         if ((clientFramework !== undefined || clientFramework === REACT) && isReservedFieldName(input, REACT)) {
           return 'Your field name cannot contain a Java or React reserved keyword';
         }
-        if (prodDatabaseType === 'oracle' && input.length > 30 && !skipCheckLengthOfIdentifier) {
-          return 'The field name cannot be of more than 30 characters';
-        }
         // we don't know, if filtering will be used
         if (possibleFiltering && isReservedPaginationWords(input)) {
           return 'Your field name cannot be a value, which is used as a parameter by Spring for pagination';

package/generators/entity-client/files-angular.cjs

@@ -0,0 +1,169 @@
+/**
+ * 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.
+ *
+ * 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 { replaceAngularTranslations } = require('../client/transform-angular.cjs');
+const constants = require('../generator-constants');
+
+/* Constants use throughout */
+const { CLIENT_TEST_SRC_DIR, ANGULAR_DIR } = constants;
+
+const angularFiles = {
+  _: {
+    transform: [replaceAngularTranslations],
+  },
+  client: [
+    {
+      path: ANGULAR_DIR,
+      templates: [
+        {
+          file: 'entities/entity.model.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.model.ts`,
+        },
+        {
+          file: 'entities/entity.test-samples.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.test-samples.ts`,
+        },
+      ],
+    },
+    {
+      condition: generator => !generator.embedded,
+      path: ANGULAR_DIR,
+      templates: [
+        {
+          file: 'entities/list/entity-management.component.html',
+          renameTo: generator => `entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.html`,
+        },
+        {
+          file: 'entities/detail/entity-management-detail.component.html',
+          renameTo: generator => `entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.html`,
+        },
+        {
+          file: 'entities/entity-management.module.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.module.ts`,
+        },
+        {
+          file: 'entities/route/entity-management-routing.module.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/route/${generator.entityFileName}-routing.module.ts`,
+        },
+        {
+          file: 'entities/route/entity-management-routing-resolve.service.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/route/${generator.entityFileName}-routing-resolve.service.ts`,
+        },
+        {
+          file: 'entities/list/entity-management.component.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.ts`,
+        },
+        {
+          file: 'entities/detail/entity-management-detail.component.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.ts`,
+        },
+        {
+          file: 'entities/service/entity.service.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/service/${generator.entityFileName}.service.ts`,
+        },
+      ],
+    },
+    {
+      condition: generator => !generator.readOnly && !generator.embedded,
+      path: ANGULAR_DIR,
+      templates: [
+        {
+          file: 'entities/update/entity-form.service.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/update/${generator.entityFileName}-form.service.ts`,
+        },
+        {
+          file: 'entities/update/entity-form.service.spec.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/update/${generator.entityFileName}-form.service.spec.ts`,
+        },
+        {
+          file: 'entities/update/entity-management-update.component.html',
+          renameTo: generator => `entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.html`,
+        },
+        {
+          file: 'entities/delete/entity-management-delete-dialog.component.html',
+          renameTo: generator => `entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.html`,
+        },
+        {
+          file: 'entities/update/entity-management-update.component.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.ts`,
+        },
+        {
+          file: 'entities/delete/entity-management-delete-dialog.component.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.ts`,
+        },
+      ],
+    },
+  ],
+  test: [
+    {
+      condition: generator => !generator.embedded,
+      path: ANGULAR_DIR,
+      templates: [
+        {
+          file: 'entities/detail/entity-management-detail.component.spec.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.spec.ts`,
+        },
+        {
+          file: 'entities/list/entity-management.component.spec.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.spec.ts`,
+        },
+        {
+          file: 'entities/route/entity-management-routing-resolve.service.spec.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/route/${generator.entityFileName}-routing-resolve.service.spec.ts`,
+        },
+        {
+          file: 'entities/service/entity.service.spec.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/service/${generator.entityFileName}.service.spec.ts`,
+        },
+      ],
+    },
+    {
+      condition: generator => !generator.readOnly && !generator.embedded,
+      path: ANGULAR_DIR,
+      templates: [
+        {
+          file: 'entities/update/entity-management-update.component.spec.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.spec.ts`,
+        },
+        {
+          file: 'entities/delete/entity-management-delete-dialog.component.spec.ts',
+          renameTo: generator =>
+            `entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.spec.ts`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.protractorTests && !generator.embedded,
+      path: CLIENT_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'e2e/entities/entity-page-object.ts',
+          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.page-object.ts`,
+        },
+        {
+          file: 'e2e/entities/entity.spec.ts',
+          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.spec.ts`,
+        },
+      ],
+    },
+  ],
+};
+
+module.exports = {
+  angularFiles,
+};

package/generators/entity-client/files-cypress.cjs

@@ -0,0 +1,52 @@
+/**
+ * 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.
+ *
+ * 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 cypressEntityFiles = {
+  testsCypress: [
+    {
+      condition: generator => generator.cypressTests && !generator.embedded,
+      path: generator => generator.cypressFolder,
+      templates: [
+        {
+          file: 'e2e/entity/entity.cy.ts',
+          renameTo: generator => `e2e/entity/${generator.entityFileName}.cy.ts`,
+        },
+      ],
+    },
+  ],
+};
+
+function cleanupCypressEntityFiles() {
+  if (!this.cypressTests) return;
+  this.cypressFolder = `${this.CLIENT_TEST_SRC_DIR}cypress/`;
+  if (this.isJhipsterVersionLessThan('7.8.2')) {
+    this.removeFile(`${this.cypressFolder}integration/entity/${this.entityFileName}.spec.ts`);
+  }
+}
+
+function writeCypressEntityFiles() {
+  if (this.skipClient || !this.cypressTests) return undefined;
+  this.cypressFolder = `${this.CLIENT_TEST_SRC_DIR}cypress/`;
+  return this.writeFiles({ sections: cypressEntityFiles, rootTemplatesPath: 'cypress' });
+}
+
+module.exports = {
+  cypressEntityFiles,
+  cleanupCypressEntityFiles,
+  writeCypressEntityFiles,
+};

package/generators/entity-client/files-react.cjs

@@ -0,0 +1,113 @@
+/**
+ * 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.
+ *
+ * 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 { replaceReactTranslations } = require('../client/transform-react.cjs');
+const { CLIENT_TEST_SRC_DIR, REACT_DIR } = require('../generator-constants');
+
+const reactFiles = {
+  _: {
+    transform: [replaceReactTranslations],
+  },
+  client: [
+    {
+      condition: generator => !generator.embedded,
+      path: REACT_DIR,
+      templates: [
+        {
+          file: 'entities/entity-detail.tsx',
+          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-detail.tsx`,
+        },
+        {
+          file: 'entities/entity.tsx',
+          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.tsx`,
+        },
+        {
+          file: 'entities/entity.reducer.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.reducer.ts`,
+        },
+        {
+          file: 'entities/index.tsx',
+          renameTo: generator => `entities/${generator.entityFolderName}/index.tsx`,
+        },
+      ],
+    },
+    {
+      path: REACT_DIR,
+      templates: [
+        {
+          file: 'entities/entity.model.ts',
+          renameTo: generator => `shared/model/${generator.entityModelFileName}.model.ts`,
+        },
+      ],
+    },
+    {
+      condition: generator => !generator.readOnly && !generator.embedded,
+      path: REACT_DIR,
+      templates: [
+        {
+          file: 'entities/entity-delete-dialog.tsx',
+          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-delete-dialog.tsx`,
+        },
+        {
+          file: 'entities/entity-update.tsx',
+          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-update.tsx`,
+        },
+      ],
+    },
+  ],
+  test: [
+    {
+      condition: generator => !generator.embedded,
+      path: REACT_DIR,
+      templates: [
+        {
+          file: 'entities/entity-reducer.spec.ts',
+          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-reducer.spec.ts`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.protractorTests && !generator.embedded,
+      path: CLIENT_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'e2e/entities/entity-page-object.ts',
+          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.page-object.ts`,
+        },
+        {
+          file: 'e2e/entities/entity.spec.ts',
+          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.spec.ts`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.protractorTests && !generator.readOnly && !generator.embedded,
+      path: CLIENT_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'e2e/entities/entity-update-page-object.ts',
+          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}-update.page-object.ts`,
+        },
+      ],
+    },
+  ],
+};
+
+module.exports = {
+  reactFiles,
+};