generator-jhipster 8.7.1 → 8.7.3

package/dist/generators/spring-boot/prompts.js

@@ -25,7 +25,7 @@ const { GATEWAY, MONOLITH } = applicationTypes;
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS } = cacheTypes;
 const { OAUTH2 } = authenticationTypes;
 const { CASSANDRA, H2_DISK, H2_MEMORY, MONGODB, NEO4J, SQL, COUCHBASE } = databaseTypes;
-const { CACHE_PROVIDER, DATABASE_TYPE, DEV_DATABASE_TYPE, PROD_DATABASE_TYPE, SERVICE_DISCOVERY_TYPE, WEBSOCKET, SEARCH_ENGINE, ENABLE_SWAGGER_CODEGEN, } = OptionNames;
+const { SERVICE_DISCOVERY_TYPE, WEBSOCKET, SEARCH_ENGINE, ENABLE_SWAGGER_CODEGEN } = OptionNames;
 const NO_DATABASE = databaseTypes.NO;
 const NO_CACHE_PROVIDER = cacheTypes.NO;
 const { GATLING, CUCUMBER } = testFrameworkTypes;
@@ -49,15 +49,15 @@ const getOptionFromArray = (array, option) => {
 export async function askForServerSideOpts({ control }) {
     if (control.existingProject && !this.options.askAnswered)
         return;
-    const { applicationType } = this.jhipsterConfigWithDefaults;
+    const { applicationType, authenticationType, reactive } = this.jhipsterConfigWithDefaults;
     await this.prompt([
         {
             type: 'list',
-            name: DATABASE_TYPE,
+            name: 'databaseType',
             message: `Which ${chalk.yellow('*type*')} of database would you like to use?`,
-            choices: answers => {
+            choices: () => {
                 const opts = [];
-                if (!answers.reactive) {
+                if (!reactive) {
                     opts.push({
                         value: SQL,
                         name: 'SQL (H2, PostgreSQL, MySQL, MariaDB, Oracle, MSSQL)',
@@ -73,7 +73,7 @@ export async function askForServerSideOpts({ control }) {
                     value: MONGODB,
                     name: 'MongoDB',
                 });
-                if (answers.authenticationType !== OAUTH2) {
+                if (authenticationType !== OAUTH2) {
                     opts.push({
                         value: CASSANDRA,
                         name: 'Cassandra',
@@ -98,15 +98,15 @@ export async function askForServerSideOpts({ control }) {
         {
             when: response => response.databaseType === SQL,
             type: 'list',
-            name: PROD_DATABASE_TYPE,
+            name: 'prodDatabaseType',
             message: `Which ${chalk.yellow('*production*')} database would you like to use?`,
-            choices: answers => (answers.reactive ? R2DBC_DB_OPTIONS : SQL_DB_OPTIONS),
+            choices: reactive ? R2DBC_DB_OPTIONS : SQL_DB_OPTIONS,
             default: this.jhipsterConfigWithDefaults.prodDatabaseType,
         },
         {
             when: response => response.databaseType === SQL,
             type: 'list',
-            name: DEV_DATABASE_TYPE,
+            name: 'devDatabaseType',
             message: `Which ${chalk.yellow('*development*')} database would you like to use?`,
             choices: response => [SQL_DB_OPTIONS.find(it => it.value === response.prodDatabaseType)].concat([
                 {
@@ -121,9 +121,9 @@ export async function askForServerSideOpts({ control }) {
             default: this.jhipsterConfigWithDefaults.devDatabaseType,
         },
         {
-            when: answers => !answers.reactive,
+            when: !reactive,
             type: 'list',
-            name: CACHE_PROVIDER,
+            name: 'cacheProvider',
             message: 'Which cache do you want to use? (Spring cache abstraction)',
             choices: [
                 {
@@ -160,7 +160,7 @@ export async function askForServerSideOpts({ control }) {
         {
             when: answers => ((answers.cacheProvider !== NO_CACHE_PROVIDER && answers.cacheProvider !== MEMCACHED) || applicationType === GATEWAY) &&
                 answers.databaseType === SQL &&
-                !answers.reactive,
+                !reactive,
             type: 'confirm',
             name: 'enableHibernateCache',
             message: 'Do you want to use Hibernate 2nd level cache?',