diff --git a/generators/generator-base.js b/generators/generator-base.js index f8bfb76a9d3e..9f9c4fe6ee4e 100644 --- a/generators/generator-base.js +++ b/generators/generator-base.js @@ -33,11 +33,13 @@ const constants = require('./generator-constants'); const PrivateBase = require('./generator-base-private'); const NeedleApi = require('./needle-api'); const { defaultConfig } = require('./generator-defaults'); +const { defaultConfigMicroservice } = require('./generator-defaults'); const { detectLanguage } = require('../utils/language'); const { formatDateForChangelog } = require('../utils/liquibase'); const { calculateDbNameWithLimit, hibernateSnakeCase } = require('../utils/db'); const defaultApplicationOptions = require('../jdl/jhipster/default-application-options'); const databaseTypes = require('../jdl/jhipster/database-types'); +const MICROSERVICE = require('../jdl/jhipster/application-types'); const JHIPSTER_CONFIG_DIR = constants.JHIPSTER_CONFIG_DIR; const MODULES_HOOK_FILE = `${JHIPSTER_CONFIG_DIR}/modules/jhi-hooks.json`; @@ -2606,7 +2608,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; return { ...defaultAppTypeConfig, ...defaultConfig }; } - setConfigDefaults(defaults = defaultConfig) { + setConfigDefaults(defaults = this.jhipsterConfig.applicationType !== MICROSERVICE ? defaultConfig : defaultConfigMicroservice) { const jhipsterVersion = packagejs.version; const baseName = this.getDefaultAppName(); const creationTimestamp = new Date().getTime(); diff --git a/generators/generator-defaults.js b/generators/generator-defaults.js index 53bbb2f06d0d..0449aa195e2d 100644 --- a/generators/generator-defaults.js +++ b/generators/generator-defaults.js @@ -110,6 +110,12 @@ const defaultConfig = { ...translationDefaultConfig, }; +const defaultConfigMicroservice = { + ...appDefaultConfig, + ...serverDefaultConfig, + ...translationDefaultConfig, +}; + const entityDefaultConfig = { pagination: binaryOptions.DefaultValues[binaryOptions.Options.PAGINATION], validation: false, @@ -134,6 +140,7 @@ module.exports = { serverDefaultConfig, clientDefaultConfig, defaultConfig, + defaultConfigMicroservice, requiredDefaultConfig, entityDefaultConfig, translationDefaultConfig, diff --git a/jdl/jhipster/default-application-options.js b/jdl/jhipster/default-application-options.js index 1170bb6d2cfe..3f5306beec02 100644 --- a/jdl/jhipster/default-application-options.js +++ b/jdl/jhipster/default-application-options.js @@ -155,6 +155,7 @@ function getConfigForMicroserviceApplication(customOptions = {}) { delete options[CLIENT_THEME]; delete options[CLIENT_THEME_VARIANT]; delete options[SKIP_SERVER]; + delete options[WITH_ADMIN_UI]; if (typeof options[SKIP_USER_MANAGEMENT] !== 'boolean') { options[SKIP_USER_MANAGEMENT] = true; }