Skip to content

Commit 333f88d

Browse files
mraiblemraible
authored
Merge branch 'main' into dependabot/npm_and_yarn/ip-1.1.9
2 parents 1eb04ab + 2585985 commit 333f88d

File tree

14 files changed

+62
-46
lines changed

14 files changed

+62
-46
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// "forwardPorts": [],
2525

2626
// Use 'postCreateCommand' to run commands after the container is created.
27-
"postCreateCommand": "npm install -g generator-jhipster generator-jhipster-azure-spring-apps@latest"
27+
"postCreateCommand": "npm install -g generator-jhipster generator-jhipster-azure-container-apps@latest"
2828

2929
// Configure tool-specific properties.
3030
// "customizations": {},

‎.github/workflows/github-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
- uses: actions/checkout@v3
3636
- uses: actions/setup-node@v3
3737
with:
38-
node-version: 16.19.0
38+
node-version: 22
3939

4040
- name: Set up Java
4141
uses: actions/setup-java@v3
4242
with:
4343
distribution: 'temurin'
44-
java-version: '11'
44+
java-version: '17'
4545
cache: 'maven'
4646

4747
- name: Stop MySQL server

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jhipster/jhipster:v8.2.1
1+
FROM jhipster/jhipster:v8.10.0
22
USER jhipster
33
COPY --chown=jhipster:jhipster . /home/jhipster/jhipster-online/
44
RUN \
@@ -12,7 +12,7 @@ RUN \
1212

1313
USER root
1414
RUN \
15-
npm install -g generator-jhipster-azure-spring-apps
15+
npm install -g generator-jhipster-azure-container-apps
1616

1717
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
1818
JHIPSTER_SLEEP=0 \

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jhonline",
3-
"version": "2.28.0",
3+
"version": "2.36.0",
44
"description": "JHipster Online is the best place to generate JHipster applications, with no installation required!",
55
"license": "Apache-2.0",
66
"keywords": [

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>io.github.jhipster.online</groupId>
77
<artifactId>jhonline</artifactId>
8-
<version>2.28.0</version>
8+
<version>2.36.0</version>
99
<packaging>war</packaging>
1010
<name>Jhonline</name>
1111

@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>org.testcontainers</groupId>
107107
<artifactId>testcontainers-bom</artifactId>
108-
<version>1.17.3</version>
108+
<version>1.20.3</version>
109109
<type>pom</type>
110110
<scope>import</scope>
111111
</dependency>

‎src/main/docker/mysql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
jhonline-mysql:
4-
image: mysql:8
4+
image: mysql:8.2.0
55
# volumes:
66
# - ~/volumes/jhipster/jhonline/mysql/:/var/lib/mysql/
77
environment:

‎src/main/webapp/app/home/azure-generator/azure-generator.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<div class="row" generator-header>
33
<div class="col-md-12">
44
<div class="alert alert-info" role="alert">
5-
<p>Generated applications can be deployed on <a href="https://azure.microsoft.com/products/spring-apps/" target="_blank">Azure Spring Apps</a> in a few easy steps, please refer to the readme file in the generated project for the deployment guide.</p>
6-
<p>Detailed documentation is also available <a href="https://learn.microsoft.com/azure/spring-apps/quickstart-deploy-web-app?pivots=sc-consumption-plan&tabs=Azure-Developer-CLI" target="_blank">here</a>.</p>
5+
<p>Generated applications can be deployed on <a href="https://azure.microsoft.com/products/container-apps/" target="_blank">Azure Container Apps</a> in a few easy steps, please refer to the readme file in the generated project for the deployment guide.</p>
6+
<p>Detailed documentation is also available <a href="https://learn.microsoft.com/azure/container-apps" target="_blank">here</a>.</p>
77
</div>
88
</div>
99
<div class="col-md-12">
@@ -15,7 +15,7 @@
1515
<p>Please note that the current version of this form only supports the following selections within NubesGen:</p>
1616
<ul>
1717
<li>Application Type: <b>Spring Boot Application</b></li>
18-
<li>Database: <b>Azure Database for PostgreSQL</b></li>
18+
<li>Database: <b>Azure Database for PostgreSQL</b> and <b>Azure Cosmos DB</b></li>
1919
</ul>
2020
<p>
2121
Services, Databases and selections not listed above are currently not supported and code will not be generated by this form if provisioned within NubesGen.
@@ -32,7 +32,7 @@ <h4>More details</h4>
3232
<b>Maven</b> will be the build tool used for the project.<br>
3333
<b>React</b> will be the default front-end framework used for the project.<br>
3434
<b>PostgreSQL</b> will default to passwordless database connections as it's more secure option.<br>
35-
The blueprint <a href="https://github.com/Azure/generator-jhipster-azure-spring-apps"><b>generator-jhipster-azure-spring-apps</b></a> will be added.<br>
35+
The blueprint <a href="https://github.com/Azure/generator-jhipster-azure-container-apps"><b>generator-jhipster-azure-container-apps</b></a> will be added.<br>
3636
</div>
3737
</div>
3838
</div>

‎src/main/webapp/app/home/azure-generator/azure-generator.component.ts‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,29 @@ export class AzureGeneratorComponent implements OnInit {
3131
hideApplicationType: true,
3232
hideServiceDiscoveryType: true,
3333
hideAuthenticationType: true,
34-
hideDatabaseType: true,
35-
hideProdDatabaseTypeOptions: ['mysql', 'mariadb', 'oracle', 'mssql', 'mongodb', 'cassandra', 'couchbase', 'neo4j', 'no'],
36-
hideDevDatabaseTypeOptions: [
37-
'h2Disk',
38-
'h2Memory',
39-
'mysql',
40-
'mariadb',
41-
'oracle',
42-
'mssql',
43-
'mongodb',
44-
'cassandra',
45-
'couchbase',
46-
'neo4j',
47-
'no'
48-
],
34+
hideHibernateCache: true,
35+
hideDevDatabaseType: true,
36+
hideIaCTool: true,
37+
hideDatabaseTypeOptions: ['cassandra', 'couchbase', 'neo4j', 'no'],
38+
hideProdDatabaseTypeOptions: ['mysql', 'mariadb', 'oracle', 'mssql', 'cassandra', 'couchbase', 'neo4j', 'no'],
39+
hideDevDatabaseTypeOptions: ['h2Disk', 'h2Memory', 'mysql', 'mariadb', 'oracle', 'mssql', 'cassandra', 'couchbase', 'neo4j', 'no'],
4940
hideCacheProvider: true,
5041
hideBuildTool: true,
5142
hideOtherComponents: true,
5243
hideClientSideOptions: true,
5344
hideI18nOptions: true,
54-
hideTestingOptions: true
45+
hideTestingOptions: true,
46+
disableNoDatabaseOptions: true
5547
};
5648
azureJHipsterModel: JHipsterConfigurationModel = new JHipsterConfigurationModel();
5749

5850
ngOnInit(): void {
59-
this.azureJHipsterModel.devDatabaseType = 'postgresql';
51+
this.azureJHipsterModel.databaseType = 'sql';
6052
this.azureJHipsterModel.prodDatabaseType = 'postgresql';
6153
this.azureJHipsterModel.cacheProvider = 'no';
6254
this.azureJHipsterModel.clientFramework = 'react';
6355
// Repository for this blueprint is
64-
// https://github.com/Azure/generator-jhipster-azure-spring-apps
65-
this.azureJHipsterModel.blueprints.push({ name: 'generator-jhipster-azure-spring-apps' });
56+
// https://github.com/Azure/generator-jhipster-azure-container-apps
57+
this.azureJHipsterModel.blueprints.push({ name: 'generator-jhipster-azure-container-apps' });
6658
}
6759
}

‎src/main/webapp/app/home/generator/generator.component.html‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ <h4>Server side options</h4>
9191
<label for="databaseType">Which <i>type</i> of database would you like to use?</label>
9292
<select id="databaseType" [(ngModel)]="model.databaseType" name="databaseType" class="form-control"
9393
#databaseType="ngModel" (change)="changeDatabaseType()">
94-
<option value="sql">SQL (H2, MySQL, MariaDB, PostgreSQL, Oracle, MSSQL)</option>
95-
<option value="mongodb">MongoDB</option>
96-
<option value="cassandra" *ngIf="model.authenticationType !== 'oauth2'">Cassandra</option>
97-
<option value="couchbase">Couchbase</option>
98-
<option value="neo4j">Neo4j</option>
99-
<option value="no">No database</option>
94+
<option value="sql" *ngIf="!isDatabaseTypeOptionHidden('sql')">SQL (H2, MySQL, MariaDB, PostgreSQL, Oracle, MSSQL)</option>
95+
<option value="mongodb" *ngIf="!isDatabaseTypeOptionHidden('mongodb')">MongoDB</option>
96+
<option value="cassandra" *ngIf="model.authenticationType !== 'oauth2' && !isDatabaseTypeOptionHidden('cassandra')">Cassandra</option>
97+
<option value="couchbase" *ngIf="!isDatabaseTypeOptionHidden('couchbase')">Couchbase</option>
98+
<option value="neo4j" *ngIf="!isDatabaseTypeOptionHidden('neo4j')">Neo4j</option>
99+
<option value="no" *ngIf="!isDatabaseTypeOptionHidden('no')">No database</option>
100100
</select>
101101
</div>
102102
<div class="form-group" *ngIf="!config.hideProdDatabaseType">
@@ -114,9 +114,16 @@ <h4>Server side options</h4>
114114
<option value="cassandra" *ngIf="!isProdDatabaseOptionHidden('cassandra', 'cassandra')">Cassandra</option>
115115
<option value="couchbase" *ngIf="!isProdDatabaseOptionHidden('couchbase', 'couchbase')">Couchbase</option>
116116
<option value="neo4j" *ngIf="!isProdDatabaseOptionHidden('neo4j', 'neo4j')">Neo4j</option>
117-
<option value="no" *ngIf="!isProdDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
117+
<option value="no" [hidden]="config.disableNoDatabaseOptions == true" *ngIf="!isProdDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
118118
</select>
119119
</div>
120+
<div class="form-group" *ngIf="config.hideIaCTool">
121+
<label for="iaCTools">Do you want to use Infrastructure as Code tool(multiple choice)?</label>
122+
<select id="iaCTools" [(ngModel)]="model.iaCTools" name="iaCTools" class="form-control"
123+
#iaCTools="ngModel" multiple>
124+
<option *ngFor="let option of iaCToolOptions" [value]="option.value">{{option.name}}</option>
125+
</select>
126+
</div>
120127
<div class="form-group" *ngIf="!config.hideDevDatabaseType">
121128
<label for="devDatabaseType">Which <i>development</i> database would you like to use?</label>
122129
<select id="devDatabaseType" [(ngModel)]="model.devDatabaseType" name="devDatabaseType"
@@ -134,7 +141,7 @@ <h4>Server side options</h4>
134141
<option value="cassandra" *ngIf="!isDevDatabaseOptionHidden('cassandra', 'cassandra')">Cassandra</option>
135142
<option value="couchbase" *ngIf="!isDevDatabaseOptionHidden('couchbase', 'couchbase')">Couchbase</option>
136143
<option value="neo4j" *ngIf="!isDevDatabaseOptionHidden('neo4j', 'neo4j')">Neo4j</option>
137-
<option value="no" *ngIf="!isDevDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
144+
<option value="no" [hidden]="config.disableNoDatabaseOptions == false" *ngIf="!isDevDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
138145
</select>
139146
</div>
140147
<div class="form-group" *ngIf="!config.hideCacheProvider">
@@ -150,7 +157,7 @@ <h4>Server side options</h4>
150157
<option value="no">No</option>
151158
</select>
152159
</div>
153-
<div class="form-group" [hidden]="model.databaseType !== 'sql' || model.cacheProvider === 'no'">
160+
<div class="form-group" [hidden]="model.databaseType !== 'sql' || model.cacheProvider === 'no'" *ngIf="!config.hideHibernateCache">
154161
<label for="enableHibernateCache">Do you want to use Hibernate 2nd level cache?</label>
155162
<select id="enableHibernateCache" [(ngModel)]="model.enableHibernateCache" name="enableHibernateCache"
156163
class="form-control" #enableHibernateCache="ngModel">

‎src/main/webapp/app/home/generator/generator.component.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { GeneratorOutputDialogComponent } from './generator.output.component';
2929
import {
3030
AllDevDatabaseTypes,
3131
AllProdDatabaseTypes,
32+
DatabaseType,
3233
DevDatabaseType,
3334
GeneratorConfigurationModel,
3435
ProdDatabaseType
@@ -47,6 +48,7 @@ export class GeneratorComponent implements OnInit {
4748
submitted = false;
4849

4950
languageOptions: any;
51+
iaCToolOptions: any;
5052

5153
selectedGitProvider: string | undefined;
5254
selectedGitCompany: string | undefined;
@@ -122,6 +124,10 @@ export class GeneratorComponent implements OnInit {
122124
ngOnInit(): void {
123125
this.newGenerator();
124126
this.languageOptions = GeneratorComponent.getAllSupportedLanguageOptions();
127+
this.iaCToolOptions = [
128+
{ name: 'Terraform', value: 'terraform' },
129+
{ name: 'Bicep', value: 'bicep' }
130+
];
125131
this.gitConfig = this.gitConfigurationService.gitConfig;
126132
if (this.gitConfig) {
127133
this.gitlabConfigured = this.gitConfig.gitlabConfigured ?? false;
@@ -334,6 +340,10 @@ export class GeneratorComponent implements OnInit {
334340
return this.model.databaseType !== validDatabaseType || Boolean(this.config?.hideProdDatabaseTypeOptions?.includes(databaseName));
335341
}
336342

343+
isDatabaseTypeOptionHidden(databaseType: DatabaseType): boolean {
344+
return Boolean(this.config?.hideDatabaseTypeOptions?.includes(databaseType));
345+
}
346+
337347
isDevDatabaseOptionHidden(validDatabaseType: string, databaseName: DevDatabaseType): boolean {
338348
return (
339349
this.model.databaseType !== validDatabaseType ||

0 commit comments

Comments
 (0)