From 14fcac5add34bda5b83a0893e66b1ffb7aab7f98 Mon Sep 17 00:00:00 2001 From: Charlie Mordant Date: Tue, 13 Apr 2021 09:04:47 +0200 Subject: [PATCH] derived property for datatypetypes --- .../layouts/navbar/navbar.component.html.ejs | 2 +- .../app/shared/layout/header/header.tsx.ejs | 2 +- .../app/shared/layout/menus/admin.tsx.ejs | 6 +++--- .../app/core/jhi-navbar/jhi-navbar.vue.ejs | 2 +- .../templates/partials/save_template.ejs | 10 ++++----- .../java/package/common/inject_template.ejs | 2 +- .../main/java/package/domain/Entity.java.ejs | 4 ++-- generators/generator-base.js | 21 +++++++++++-------- 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs index b4c0013ca63..4ac192e083f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs @@ -135,7 +135,7 @@ -<%_ if (devDatabaseTypeH2Disk || devDatabaseTypeH2Memory || devDatabaseTypeCouchbase) { _%> +<%_ if (devDatabaseTypeH2Any || devDatabaseTypeCouchbase) { _%>
  • diff --git a/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs index 5385289dd60..ab93a9aee88 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs @@ -94,7 +94,7 @@ const Header = (props: IHeaderProps) => { {props.isAuthenticated && } {props.isAuthenticated && props.isAdmin && - showDatabase={!props.isInProduction} <%_ } _%> />} + showDatabase={!props.isInProduction} <%_ } _%> />} <%_ if (enableTranslation) { _%> <%_ } _%> diff --git a/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs index 05146c7d915..6be8397aecd 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs @@ -50,7 +50,7 @@ const openAPIItem = ( API ); -<% if (devDatabaseTypeH2Disk || devDatabaseTypeH2Memory) { %> +<% if (devDatabaseTypeH2Any) { %> const databaseItem = ( Database @@ -58,11 +58,11 @@ const databaseItem = ( ); <%_ } _%> -export const AdminMenu = ({ showOpenAPI <% if (devDatabaseTypeH2Disk || devDatabaseTypeH2Memory) { %>, showDatabase <%_ } _%>}) => ( +export const AdminMenu = ({ showOpenAPI <% if (devDatabaseTypeH2Any) { %>, showDatabase <%_ } _%>}) => ( {adminMenuItems} {showOpenAPI && openAPIItem} -<% if (devDatabaseTypeH2Disk || devDatabaseTypeH2Memory) { %> +<% if (devDatabaseTypeH2Any) { %> {showDatabase && databaseItem} <%_ } _%> diff --git a/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs b/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs index e04b16d8ba1..619d30114aa 100644 --- a/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +++ b/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs @@ -87,7 +87,7 @@ API -<%_ if (devDatabaseTypeH2Disk || devDatabaseTypeH2Memory || devDatabaseTypeCouchbase) { _%> +<%_ if (devDatabaseTypeH2Any || devDatabaseTypeCouchbase) { _%> Database diff --git a/generators/entity-server/templates/partials/save_template.ejs b/generators/entity-server/templates/partials/save_template.ejs index 6fe6bd89f7d..dc43b570e2e 100644 --- a/generators/entity-server/templates/partials/save_template.ejs +++ b/generators/entity-server/templates/partials/save_template.ejs @@ -28,11 +28,11 @@ let mapsIdEntityInstance; let mapsIdRepoInstance; let otherEntityName; -if (isUsingMapsId === true) { +if (isUsingMapsId) { mapsIdEntityInstance = mapsIdAssoc.otherEntityNameCapitalized.charAt(0).toLowerCase() + mapsIdAssoc.otherEntityNameCapitalized.slice(1); mapsIdRepoInstance = `${mapsIdEntityInstance}Repository`; otherEntityName = mapsIdAssoc.otherEntityName; - if (isController === true) { _%> + if (isController) { _%> if (Objects.isNull(<%= instanceName %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>())) { throw new BadRequestAlertException("Invalid association value provided", ENTITY_NAME, "null"); } @@ -40,9 +40,9 @@ if (isUsingMapsId === true) { <%_ } _%> <%_ if (!viaService) { _%> <%_ if (dtoMapstruct) { _%> - resultEntity = persistInstance; _%> + <%_ resultEntity = persistInstance; _%> <%= persistClass %> <%= persistInstance %> = <%= dtoToEntity %>(<%= instanceName %>); - <%_ if (isUsingMapsId === true) { _%> + <%_ if (isUsingMapsId) { _%> <%= mapsIdAssoc.otherEntity.primaryKey.type %> <%= otherEntityName %>Id = <%= instanceName %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>(); <%= mapsIdRepoInstance %>.findById(<%= otherEntityName %>Id).ifPresent(<%= persistInstance %>::<%_ if (!fluentMethods) { _%>set<%= mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%= mapsIdAssoc.relationshipName %><%_ } _%>); <%_ } _%> @@ -63,7 +63,7 @@ if (isUsingMapsId === true) { <%_ } _%> <%_ } _%> <%_ } else { _%> - <%_ if (isUsingMapsId === true && isController === false) { _%> + <%_ if (isUsingMapsId && !isController) { _%> <%= mapsIdAssoc.otherEntity.primaryKey.type %> <%= otherEntityName %>Id = <%= entityInstance %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>(); <%= mapsIdRepoInstance %>.findById(<%= otherEntityName %>Id).ifPresent(<%= entityInstance %>::<%_ if (!fluentMethods) { _%>set<%= mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%= otherEntityName %><%_ } _%>); <%_ } _%> diff --git a/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs b/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs index c0274d2e027..ac27d1fb0dc 100644 --- a/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs @@ -23,7 +23,7 @@ if (queryService) { beans.push({class: `${entityClass}QueryService`, instance: `${entityInstance}QueryService`}); } - if (isUsingMapsId === true && isController === false) { + if (isUsingMapsId && isController) { const mapsIdEntity = mapsIdAssoc.otherEntityNameCapitalized; const mapsIdEntityInstance = mapsIdEntity.charAt(0).toLowerCase() + mapsIdEntity.slice(1); const mapsIdRepoInstance = `${mapsIdEntityInstance}Repository`; diff --git a/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs index 071bd354401..ad4099f257e 100644 --- a/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs @@ -607,7 +607,7 @@ _%> <%_ if (!databaseTypeNeo4j) { _%> <%= otherEntityName %>.set<%= otherEntityRelationshipNameCapitalized %>(this); <%_ } _%> - <%_ } else if (otherEntityRelationshipNameCapitalizedPlural && !otherEntityUser && relationship.relationshipManyToMany) { + <%_ } else if (otherEntityRelationshipNameCapitalizedPlural && !relationship.otherEntityUser && relationship.relationshipManyToMany) { /* JHipster version < 3.6.0 didn't ask for this relationship name */ _%> <%= otherEntityName %>.get<%= otherEntityRelationshipNameCapitalizedPlural %>().add(this); <%_ } _%> @@ -627,7 +627,7 @@ _%> <%_ if (!databaseTypeNeo4j) { _%> <%= otherEntityName %>.set<%= otherEntityRelationshipNameCapitalized %>(null); <%_ } _%> - <%_ } else if (otherEntityRelationshipNameCapitalizedPlural && !otherEntityUser && relationship.relationshipManyToMany) { + <%_ } else if (otherEntityRelationshipNameCapitalizedPlural && !relationship.otherEntityUser && relationship.relationshipManyToMany) { /* JHipster version < 3.6.0 didn't ask for this relationship name */ _%> <%= otherEntityName %>.get<%= otherEntityRelationshipNameCapitalizedPlural %>().remove(this); <%_ } _%> diff --git a/generators/generator-base.js b/generators/generator-base.js index 52191fad4f4..61f2ef49548 100644 --- a/generators/generator-base.js +++ b/generators/generator-base.js @@ -2581,20 +2581,21 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; dest.cacheProviderHazelcast = config.cacheProvider === HAZELCAST; dest.cacheProviderMemcached = config.cacheProvider === MEMCACHED; + dest.devDatabaseTypeH2Disk = config.devDatabaseType === H2_DISK; + dest.devDatabaseTypeH2Memory = config.devDatabaseType === H2_MEMORY; + dest.devDatabaseTypeH2Any = dest.devDatabaseTypeH2Disk || dest.devDatabaseTypeH2Memory; + dest.devDatabaseTypeCouchbase = config.devDatabaseType === COUCHBASE; + dest.databaseTypeNo = config.databaseType === NO_DATABASE; dest.databaseTypeSql = config.databaseType === SQL; dest.databaseTypeCassandra = config.databaseType === CASSANDRA; dest.databaseTypeCouchbase = config.databaseType === COUCHBASE; dest.databaseTypeMongodb = config.databaseType === MONGODB; - dest.databaseTypeMysql = config.databaseType === MYSQL; - dest.databaseTypeMariadb = config.databaseType === MARIADB; dest.databaseTypeNeo4j = config.databaseType === NEO4J; - dest.databaseTypePostgres = config.databaseType === POSTGRESQL; - - dest.devDatabaseTypeH2Disk = config.devDatabaseType === H2_DISK; - dest.devDatabaseTypeH2Memory = config.devDatabaseType === H2_MEMORY; - dest.devDatabaseTypeH2Any = dest.devDatabaseTypeH2Disk || dest.devDatabaseTypeH2Memory; - dest.devDatabaseTypeCouchbase = config.devDatabaseType === COUCHBASE; + dest.databaseTypeMysql = config.databaseType === SQL && (config.devDatabaseType === MYSQL || config.prodDatabaseType === MYSQL); + dest.databaseTypeMariadb = config.databaseType === SQL && (config.devDatabaseType === MARIADB || config.prodDatabaseType === MARIADB); + dest.databaseTypePostgres = + config.databaseType === SQL && (config.devDatabaseType === POSTGRESQL || config.prodDatabaseType === POSTGRESQL); dest.authenticationTypeSession = config.authenticationType === SESSION; dest.authenticationTypeJwt = config.authenticationType === JWT; @@ -2610,7 +2611,9 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; dest.searchEngineElasticsearch = config.searchEngine === ELASTICSEARCH; dest.searchEngineCouchbase = config.searchEngine === COUCHBASE; - dest.reactiveSqlTestContainers = config.reactive && [MYSQL, POSTGRESQL, MSSQL, MARIADB].includes(config.prodDatabaseType); + dest.reactiveSqlTestContainers = + config.reactive && + ([MYSQL, POSTGRESQL, MSSQL, MARIADB].includes(config.prodDatabaseType) || [MYSQL, POSTGRESQL, MSSQL, MARIADB].includes(config.devDatabaseType)); } loadPlatformConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {}