generator-jhipster 7.8.1 → 7.9.0

package/generators/docker-compose/files.js

@@ -26,6 +26,10 @@ module.exports = {
 
 function writeFiles() {
   return {
+    cleanup() {
+      this.removeFile('realm-config/jhipster-users-0.json');
+    },
+
     writeDockerCompose() {
       this.template('docker-compose.yml.ejs', 'docker-compose.yml');
       this.template('README-DOCKER-COMPOSE.md.ejs', 'README-DOCKER-COMPOSE.md');
@@ -40,7 +44,6 @@ function writeFiles() {
     writeKeycloakFiles() {
       if (this.authenticationType === OAUTH2 && this.applicationType !== MICROSERVICE) {
         this.template('realm-config/jhipster-realm.json.ejs', 'realm-config/jhipster-realm.json');
-        this.template('realm-config/jhipster-users-0.json.ejs', 'realm-config/jhipster-users-0.json');
       }
     },
 
@@ -50,7 +53,7 @@ function writeFiles() {
       // Generate a list of target apps to monitor for the prometheus config
       const appsToMonitor = [];
       for (let i = 0; i < this.appConfigs.length; i++) {
-        appsToMonitor.push(`        - ${this.appConfigs[i].baseName}:${this.appConfigs[i].serverPort}`);
+        appsToMonitor.push(`        - ${this.appConfigs[i].baseName}:${this.appConfigs[i].composePort}`);
       }
 
       // Format the application target list as a YAML array

package/generators/docker-compose/index.js

@@ -30,15 +30,12 @@ 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, MONGODB, ORACLE } = require('../../jdl/jhipster/database-types');
+const { CASSANDRA, COUCHBASE, MONGODB, ORACLE, NO: NO_DATABASE } = 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');
-const databaseTypes = require('../../jdl/jhipster/database-types');
 const { GENERATOR_DOCKER_COMPOSE } = require('../generator-list');
 
-const NO_DATABASE = databaseTypes.NO;
-
 /* eslint-disable consistent-return */
 module.exports = class extends BaseDockerGenerator {
   async _postConstruct() {
@@ -131,13 +128,12 @@ module.exports = class extends BaseDockerGenerator {
       loadConfig() {
         this.usesOauth2 = this.appConfigs.some(appConfig => appConfig.authenticationTypeOauth2);
         this.useKafka = this.appConfigs.some(appConfig => appConfig.messageBroker === KAFKA);
+        this.entryPort = 8080;
       },
 
       setAppsYaml() {
         this.appsYaml = [];
         this.keycloakRedirectUris = '';
-        let portIndex = 8080;
-        this.serverPort = portIndex;
         this.appConfigs.forEach(appConfig => {
           const lowercaseBaseName = appConfig.baseName.toLowerCase();
           const parentConfiguration = {};
@@ -146,15 +142,14 @@ module.exports = class extends BaseDockerGenerator {
           const yaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/app.yml`));
           const yamlConfig = yaml.services[`${lowercaseBaseName}-app`];
           if (appConfig.applicationType === GATEWAY || appConfig.applicationType === MONOLITH) {
-            this.keycloakRedirectUris += `"http://localhost:${portIndex}/*", "https://localhost:${portIndex}/*", `;
+            this.keycloakRedirectUris += `"http://localhost:${appConfig.composePort}/*", "https://localhost:${appConfig.composePort}/*", `;
             if (appConfig.devServerPort !== undefined) {
               this.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPort}/*", `;
             }
             // Split ports by ":" and take last 2 elements to skip the hostname/IP if present
             const ports = yamlConfig.ports[0].split(':').slice(-2);
-            ports[0] = portIndex;
+            ports[0] = appConfig.composePort;
             yamlConfig.ports[0] = ports.join(':');
-            portIndex++;
           }
 
           if (appConfig.applicationType === MONOLITH && this.monitoring === PROMETHEUS) {
@@ -174,7 +169,7 @@ module.exports = class extends BaseDockerGenerator {
           parentConfiguration[`${lowercaseBaseName}`] = yamlConfig;
 
           // Add database configuration
-          const database = appConfig.prodDatabaseType;
+          const database = appConfig.databaseTypeSql ? appConfig.prodDatabaseType : appConfig.databaseType;
           if (database !== NO_DATABASE && database !== ORACLE) {
             const relativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/docker`));
             const databaseYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/${database}.yml`));
@@ -184,19 +179,15 @@ module.exports = class extends BaseDockerGenerator {
             delete databaseYamlConfig.ports;
 
             if (database === CASSANDRA) {
-              // node config
-              const cassandraClusterYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/cassandra-cluster.yml`));
-              const cassandraNodeConfig = cassandraClusterYaml.services[`${databaseServiceName}-node`];
-              parentConfiguration[`${databaseServiceName}-node`] = cassandraNodeConfig;
-
               // migration service config
-              const cassandraMigrationYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/cassandra-migration.yml`));
-              const cassandraMigrationConfig = cassandraMigrationYaml.services[`${databaseServiceName}-migration`];
+              const cassandraMigrationConfig = databaseYaml.services[`${databaseServiceName}-migration`];
+
+              // replace script with prod
+              cassandraMigrationConfig.environment = [
+                ...cassandraMigrationConfig.environment.filter(envVariable => !envVariable.includes('CREATE_KEYSPACE_SCRIPT=')),
+                'CREATE_KEYSPACE_SCRIPT=create-keyspace-prod.cql',
+              ];
               cassandraMigrationConfig.build.context = relativePath;
-              const createKeyspaceScript = cassandraClusterYaml.services[`${databaseServiceName}-migration`].environment.find(envVariable =>
-                envVariable.includes('CREATE_KEYSPACE_SCRIPT')
-              );
-              cassandraMigrationConfig.environment.push(createKeyspaceScript);
               const cqlFilesRelativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/resources/config/cql`));
               cassandraMigrationConfig.volumes[0] = `${cqlFilesRelativePath}:/cql:ro`;
 
@@ -308,11 +299,9 @@ module.exports = class extends BaseDockerGenerator {
     this.log(`You can launch all your infrastructure by running : ${chalk.cyan('docker-compose up -d')}`);
     if (this.gatewayNb + this.monolithicNb > 1) {
       this.log('\nYour applications will be accessible on these URLs:');
-      let portIndex = 8080;
       this.appConfigs.forEach(appConfig => {
         if (appConfig.applicationType === GATEWAY || appConfig.applicationType === MONOLITH) {
-          this.log(`\t- ${appConfig.baseName}: http://localhost:${portIndex}`);
-          portIndex++;
+          this.log(`\t- ${appConfig.baseName}: http://localhost:${appConfig.composePort}`);
         }
       });
       this.log('\n');

package/generators/docker-compose/templates/README-DOCKER-COMPOSE.md.ejs

@@ -19,7 +19,7 @@ Launch all your infrastructure by running: `docker-compose up -d`.
 ### Applications and dependencies:
 <%_ for(let i = 0; i < appConfigs.length; i++) { _%>
 - <%= appConfigs[i].baseName %> (<%= appConfigs[i].applicationType %> application)
-- <%= appConfigs[i].baseName %>'s <%= appConfigs[i].prodDatabaseType %> database
+- <%= appConfigs[i].baseName %>'s <%= appConfigs[i].databaseTypeSql ? appConfigs[i].prodDatabaseType : appConfigs[i].databaseType %> database
 <%_ if (appConfigs[i].searchEngine && !appConfigs[i].searchEngineCouchbase) { _%>
 - <%= appConfigs[i].baseName %>'s <%= appConfigs[i].searchEngine %> search engine
 <%_ } _%>

package/generators/docker-compose/templates/docker-compose.yml.ejs

@@ -49,7 +49,7 @@ services:
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
   <%_ if (usesOauth2) { _%>
-      - JHIPSTER_SLEEP=20
+      - JHIPSTER_SLEEP=30
   <%_ } _%>
       - SPRING_PROFILES_ACTIVE=dev<% if (usesOauth2) { %>,oauth2<% } %>
       - SPRING_SECURITY_USER_PASSWORD=<%= adminPassword %>
@@ -68,7 +68,7 @@ services:
   <%_ } _%>
   <%_ if (usesOauth2) { _%>
       # For Keycloak to work, you need to add '127.0.0.1 keycloak' to your hosts file
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/auth/realms/jhipster
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=jhipster-registry
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=jhipster-registry
   <%_ } _%>
@@ -95,17 +95,19 @@ services:
 <%_ if (usesOauth2) { _%>
   keycloak:
     image: <%= DOCKER_KEYCLOAK %>
-    command: ["-b", "0.0.0.0", "-Dkeycloak.migration.action=import", "-Dkeycloak.migration.provider=dir", "-Dkeycloak.migration.dir=/opt/jboss/keycloak/realm-config", "-Dkeycloak.migration.strategy=OVERWRITE_EXISTING", "-Djboss.socket.binding.port-offset=1000", "-Dkeycloak.profile.feature.upload_scripts=enabled"]
+    command: ['start-dev --import-realm']
     volumes:
-      - ./realm-config:/opt/jboss/keycloak/realm-config
+      - ./realm-config:/opt/keycloak/data/import
     environment:
-      - KEYCLOAK_USER=admin
-      - KEYCLOAK_PASSWORD=admin
-      - DB_VENDOR=h2
+      - KC_DB=dev-file
+      - KEYCLOAK_ADMIN=admin
+      - KEYCLOAK_ADMIN_PASSWORD=admin
+      - KC_FEATURES=scripts
+      - KC_HTTP_PORT=9080
+      - KC_HTTPS_PORT=9443
     ports:
       - 9080:9080
       - 9443:9443
-      - 10990:10990
 <%_ } _%>
 <%_ if (monitoringPrometheus) { _%>
 

package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs

@@ -1024,8 +1024,8 @@
     {
       "id": "6e8deddb-b4d6-4e2e-b389-b397d3f74fcd",
       "clientId": "web_app",
-      "rootUrl": "http://localhost:<%= serverPort %>",
-      "adminUrl": "http://localhost:<%= serverPort %>",
+      "rootUrl": "http://localhost:<%= entryPort %>",
+      "adminUrl": "http://localhost:<%= entryPort %>",
       "surrogateAuthRequired": false,
       "enabled": true,
       "alwaysDisplayInConsole": false,
@@ -2492,12 +2492,70 @@
     "clientOfflineSessionIdleTimeout": "0",
     "cibaInterval": "5"
   },
-  "keycloakVersion": "16.1.0",
+  "keycloakVersion": "18.0.0",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []
   },
   "clientPolicies": {
     "policies": []
-  }
+  },
+  "users": [
+    {
+      "id": "4c973896-5761-41fc-8217-07c5d13a004b",
+      "createdTimestamp": 1505479415590,
+      "username": "admin",
+      "enabled": true,
+      "totp": false,
+      "emailVerified": true,
+      "firstName": "Admin",
+      "lastName": "Administrator",
+      "email": "admin@localhost",
+      "credentials": [
+        {
+          "id": "b860462b-9b02-48ba-9523-d3a8926a917b",
+          "type": "password",
+          "createdDate": 1505479429154,
+          "secretData": "{\"value\":\"4pf9K2jWSCcHC+CwsZP/qidN5pSmDUe6AX6wBerSGdBVKkExay8MWKx+EKmaaObZW6FVsD8vdW/ZsyUFD9gJ1Q==\",\"salt\":\"1/qNkZ5kr77jOMOBPBogGw==\"}",
+          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
+        }
+      ],
+      "disableableCredentialTypes": [],
+      "requiredActions": [],
+      "realmRoles": ["offline_access", "uma_authorization"],
+      "clientRoles": {
+        "account": ["view-profile", "manage-account"]
+      },
+      "notBefore": 0,
+      "groups": ["/Admins", "/Users"]
+    },
+    {
+      "id": "c4af4e2f-b432-4c3b-8405-cca86cd5b97b",
+      "createdTimestamp": 1505479373742,
+      "username": "user",
+      "enabled": true,
+      "totp": false,
+      "emailVerified": true,
+      "firstName": "",
+      "lastName": "User",
+      "email": "user@localhost",
+      "credentials": [
+        {
+          "id": "7821832b-1e82-45a2-b8d3-f1a6ad909e64",
+          "type": "password",
+          "createdDate": 1505479392766,
+          "secretData": "{\"value\":\"MbKsMgWPnZyImih8s4SaoCSCq+XIY/c6S9F93sXEidHF1TjPWxCqMkec0+o3860CMLXHt3az61cIJOWI0FW9aw==\",\"salt\":\"fmpBI1r8R1u75hDLMUlwBw==\"}",
+          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
+        }
+      ],
+      "disableableCredentialTypes": [],
+      "requiredActions": [],
+      "realmRoles": ["offline_access", "uma_authorization"],
+      "clientRoles": {
+        "account": ["view-profile", "manage-account"]
+      },
+      "notBefore": 0,
+      "groups": ["/Users"]
+    }
+  ]
 }

package/generators/docker-prompts.js

@@ -21,7 +21,6 @@ const shelljs = require('shelljs');
 const { loadConfigs, setClusteredApps } = require('./docker-base');
 const { getBase64Secret } = require('./utils');
 const { MICROSERVICE, MONOLITH, GATEWAY } = require('../jdl/jhipster/application-types');
-const { COUCHBASE, MONGODB } = require('../jdl/jhipster/database-types');
 const { PROMETHEUS } = require('../jdl/jhipster/monitoring-types');
 const monitoring = require('../jdl/jhipster/monitoring-types');
 
@@ -183,7 +182,7 @@ async function askForClustersMode() {
 
   const clusteredDbApps = [];
   this.appConfigs.forEach((appConfig, index) => {
-    if (appConfig.prodDatabaseType === MONGODB || appConfig.prodDatabaseType === COUCHBASE) {
+    if (appConfig.databaseTypeMongodb || appConfig.databaseTypeCouchbase) {
       clusteredDbApps.push(this.appsFolders[index]);
     }
   });

package/generators/docker-utils.js

@@ -35,7 +35,6 @@ module.exports = {
 
 /**
  * Check that Docker exists.
- * @param failOver flag
  */
 function checkDocker() {
   if (this.abort || this.skipChecks) return;

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,
@@ -364,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);
@@ -628,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,
@@ -741,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;
@@ -1010,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)) {
@@ -1030,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;
   }

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,
+};