Generate admin ui according to the flag value

generators/client/prompts.js

@@ -32,14 +32,14 @@ module.exports = {
     askForClientThemeVariant,
 };
 
-function askForModuleName() {
-    if (this.jhipsterConfig.baseName) return undefined;
+async function askForModuleName() {
+    if (this.jhipsterConfig.baseName) return;
 
-    return this.askModuleName(this);
+    await this.askModuleName(this);
 }
 
-function askForClient() {
-    if (this.existingProject) return true;
+async function askForClient() {
+    if (this.existingProject) return;
 
     const applicationType = this.applicationType;
 
@@ -62,28 +62,27 @@ function askForClient() {
         },
     ];
 
-    const PROMPT = {
+    const answers = await this.prompt({
         type: 'list',
         name: 'clientFramework',
-        when: response => applicationType !== 'microservice' && applicationType !== 'uaa',
+        when: () => applicationType !== 'microservice' && applicationType !== 'uaa',
         message: `Which ${chalk.yellow('*Framework*')} would you like to use for the client?`,
         choices,
         default: clientDefaultConfig.clientFramework,
-    };
-
-    return this.prompt(PROMPT).then(prompt => {
-        this.clientFramework = this.jhipsterConfig.clientFramework = prompt.clientFramework;
-        if (this.clientFramework === 'no') {
-            this.skipClient = this.jhipsterConfig.skipClient = true;
-        }
     });
+
+    this.clientFramework = this.jhipsterConfig.clientFramework = answers.clientFramework;
+    if (this.clientFramework === 'no') {
+        this.skipClient = this.jhipsterConfig.skipClient = true;
+    }
 }
 
-function askForClientTheme() {
+async function askForClientTheme() {
     if (this.existingProject) {
         return;
     }
 
+    const self = this;
     const skipClient = this.skipClient;
     const defaultChoices = [
         {
@@ -113,59 +112,28 @@ function askForClientTheme() {
         { value: 'yeti', name: 'Yeti' },
     ];
 
-    const PROMPT = {
+    const bootSwatchChoices = await retrieveBootswatchThemes(self).catch(() =>
+        self.warning('Could not fetch bootswatch themes from API. Using default ones.')
+    );
+    const answers = await this.prompt({
         type: 'list',
         name: 'clientTheme',
         when: () => !skipClient,
         message: 'Would you like to use a Bootswatch theme (https://bootswatch.com/)?',
-        choices: defaultChoices,
+        choices: bootSwatchChoices || defaultChoices,
         default: clientDefaultConfig.clientTheme,
-    };
+    });
 
-    const self = this;
-    const promptClientTheme = function (PROMPT) {
-        return self.prompt(PROMPT).then(prompt => {
-            self.clientTheme = self.jhipsterConfig.clientTheme = prompt.clientTheme;
-        });
-    };
-
-    const done = this.async();
-    this.httpsGet(
-        'https://bootswatch.com/api/4.json',
-        // eslint-disable-next-line consistent-return
-        body => {
-            try {
-                const { themes } = JSON.parse(body);
-
-                PROMPT.choices = [
-                    {
-                        value: 'none',
-                        name: 'Default JHipster',
-                    },
-                    ...themes.map(theme => ({
-                        value: theme.name.toLowerCase(),
-                        name: theme.name,
-                    })),
-                ];
-            } catch (err) {
-                this.warning('Could not fetch bootswatch themes from API. Using default ones.');
-            }
-            done(undefined, promptClientTheme(PROMPT));
-        },
-        () => {
-            this.warning('Could not fetch bootswatch themes from API. Using default ones.');
-            done(undefined, promptClientTheme(PROMPT));
-        }
-    );
+    this.clientTheme = this.jhipsterConfig.clientTheme = answers.clientTheme;
 }
 
-function askForClientThemeVariant() {
+async function askForClientThemeVariant() {
     if (this.existingProject) {
-        return undefined;
+        return;
     }
     if (this.clientTheme === 'none') {
         this.clientThemeVariant = '';
-        return undefined;
+        return;
     }
 
     const skipClient = this.skipClient;
@@ -176,36 +144,64 @@ function askForClientThemeVariant() {
         { value: 'light', name: 'Light' },
     ];
 
-    const PROMPT = {
+    const answers = await this.prompt({
         type: 'list',
         name: 'clientThemeVariant',
         when: () => !skipClient,
         message: 'Choose a Bootswatch variant navbar theme (https://bootswatch.com/)?',
         choices,
         default: clientDefaultConfig.clientThemeVariant,
-    };
-
-    return this.prompt(PROMPT).then(prompt => {
-        this.clientThemeVariant = this.jhipsterConfig.clientThemeVariant = prompt.clientThemeVariant;
     });
+
+    this.clientThemeVariant = this.jhipsterConfig.clientThemeVariant = answers.clientThemeVariant;
 }
 
-function askForAdminUi() {
+async function askForAdminUi() {
     if (this.existingProject) {
-        return undefined;
+        return;
     }
 
     const skipClient = this.skipClient;
 
-    const PROMPT = {
+    const answers = await this.prompt({
         type: 'confirm',
         name: 'withAdminUi',
         when: () => !skipClient,
         message: 'Do you want to generate the admin UI?',
         default: clientDefaultConfig.withAdminUi,
-    };
+    });
+
+    this.withAdminUi = this.jhipsterConfig.withAdminUi = answers.withAdminUi;
+}
 
-    return this.prompt(PROMPT).then(prompt => {
-        this.withAdminUi = this.jhipsterConfig.withAdminUi = prompt.withAdminUi;
+async function retrieveBootswatchThemes(generator) {
+    return new Promise((resolve, reject) => {
+        generator.httpsGet(
+            'https://bootswatch.com/api/4.json',
+            // eslint-disable-next-line consistent-return
+            body => {
+                let choices;
+                try {
+                    const { themes } = JSON.parse(body);
+
+                    choices = [
+                        {
+                            value: 'none',
+                            name: 'Default JHipster',
+                        },
+                        ...themes.map(theme => ({
+                            value: theme.name.toLowerCase(),
+                            name: theme.name,
+                        })),
+                    ];
+                } catch (err) {
+                    reject();
+                }
+                resolve(choices);
+            },
+            () => {
+                reject();
+            }
+        );
     });
 }

generators/generator-base.js

@@ -1996,35 +1996,31 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
      *
      * @param {object} generator - generator instance to use
      */
-    askModuleName(generator) {
-        const done = generator.async();
+    async askModuleName(generator) {
         const defaultAppBaseName = this.getDefaultAppName();
-        generator
-            .prompt({
-                type: 'input',
-                name: 'baseName',
-                validate: input => {
-                    if (!/^([a-zA-Z0-9_]*)$/.test(input)) {
-                        return 'Your base name cannot contain special characters or a blank space';
-                    }
-                    if ((generator.applicationType === 'microservice' || generator.applicationType === 'uaa') && /_/.test(input)) {
-                        return 'Your base name cannot contain underscores as this does not meet the URI spec';
-                    }
-                    if (generator.applicationType === 'uaa' && input === 'auth') {
-                        return "Your UAA base name cannot be named 'auth' as it conflicts with the gateway login routes";
-                    }
-                    if (input === 'application') {
-                        return "Your base name cannot be named 'application' as this is a reserved name for Spring Boot";
-                    }
-                    return true;
-                },
-                message: 'What is the base name of your application?',
-                default: defaultAppBaseName,
-            })
-            .then(prompt => {
-                generator.baseName = generator.jhipsterConfig.baseName = prompt.baseName;
-                done();
-            });
+        const answers = await generator.prompt({
+            type: 'input',
+            name: 'baseName',
+            validate: input => {
+                if (!/^([a-zA-Z0-9_]*)$/.test(input)) {
+                    return 'Your base name cannot contain special characters or a blank space';
+                }
+                if ((generator.applicationType === 'microservice' || generator.applicationType === 'uaa') && /_/.test(input)) {
+                    return 'Your base name cannot contain underscores as this does not meet the URI spec';
+                }
+                if (generator.applicationType === 'uaa' && input === 'auth') {
+                    return "Your UAA base name cannot be named 'auth' as it conflicts with the gateway login routes";
+                }
+                if (input === 'application') {
+                    return "Your base name cannot be named 'application' as this is a reserved name for Spring Boot";
+                }
+                return true;
+            },
+            message: 'What is the base name of your application?',
+            default: defaultAppBaseName,
+        });
+
+        generator.baseName = generator.jhipsterConfig.baseName = answers.baseName;
     }
 
     /**