Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/adobe/css-tools-4.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanielFran
DanielFran authored Sep 22, 2023
2 parents 93ae6db + c441471 commit 186c2e1
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 27 deletions.
52 changes: 26 additions & 26 deletions src/main/webapp/app/home/generator/generator.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ <h4>Server side options</h4>
class="form-control" #authenticationType="ngModel" (change)="changeAuthenticationType()">
<option value="jwt">JWT authentication (stateless, with a token)</option>
<option value="oauth2">OAuth 2.0 / OIDC Authentication (stateful, works with Keycloak and Okta)</option>
<option value="session" [hidden]="model.serviceDiscoveryType === 'eureka' || model.applicationType !== 'monolith'">HTTP Session
<option value="session" *ngIf="model.serviceDiscoveryType !== 'eureka' && model.applicationType === 'monolith'">HTTP Session
Authentication (stateful, default Spring Security mechanism)
</option>
</select>
Expand All @@ -93,7 +93,7 @@ <h4>Server side options</h4>
#databaseType="ngModel" (change)="changeDatabaseType()">
<option value="sql">SQL (H2, MySQL, MariaDB, PostgreSQL, Oracle, MSSQL)</option>
<option value="mongodb">MongoDB</option>
<option value="cassandra" [hidden]="model.authenticationType === 'oauth2'">Cassandra</option>
<option value="cassandra" *ngIf="model.authenticationType !== 'oauth2'">Cassandra</option>
<option value="couchbase">Couchbase</option>
<option value="neo4j">Neo4j</option>
<option value="no">No database</option>
Expand All @@ -103,38 +103,38 @@ <h4>Server side options</h4>
<label for="prodDatabaseType">Which <i>production</i> database would you like to use?</label>
<select id="prodDatabaseType" [(ngModel)]="model.prodDatabaseType" name="prodDatabaseType"
class="form-control" #prodDatabaseType="ngModel" (change)="changeProdDatabaseType()">
<option value="postgresql" [hidden]="isProdDatabaseOptionHidden('sql', 'postgresql')">PostgreSQL</option>
<option value="mysql" [hidden]="isProdDatabaseOptionHidden('sql', 'mysql')">MySQL</option>
<option value="mariadb" [hidden]="isProdDatabaseOptionHidden('sql', 'mariadb')">MariaDB</option>
<option value="oracle" [hidden]="isProdDatabaseOptionHidden('sql', 'oracle')">Oracle (Please follow our documentation to use the Oracle proprietary
<option value="postgresql" *ngIf="!isProdDatabaseOptionHidden('sql', 'postgresql')">PostgreSQL</option>
<option value="mysql" *ngIf="!isProdDatabaseOptionHidden('sql', 'mysql')">MySQL</option>
<option value="mariadb" *ngIf="!isProdDatabaseOptionHidden('sql', 'mariadb')">MariaDB</option>
<option value="oracle" *ngIf="!isProdDatabaseOptionHidden('sql', 'oracle')">Oracle (Please follow our documentation to use the Oracle proprietary
driver)
</option>
<option value="mssql" [hidden]="isProdDatabaseOptionHidden('sql', 'mssql')">Microsoft SQL Server</option>
<option value="mongodb" [hidden]="isProdDatabaseOptionHidden('mongodb', 'mongodb')">MongoDB</option>
<option value="cassandra" [hidden]="isProdDatabaseOptionHidden('cassandra', 'cassandra')">Cassandra</option>
<option value="couchbase" [hidden]="isProdDatabaseOptionHidden('couchbase', 'couchbase')">Couchbase</option>
<option value="neo4j" [hidden]="isProdDatabaseOptionHidden('neo4j', 'neo4j')">Neo4j</option>
<option value="no" [hidden]="isProdDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
<option value="mssql" *ngIf="!isProdDatabaseOptionHidden('sql', 'mssql')">Microsoft SQL Server</option>
<option value="mongodb" *ngIf="!isProdDatabaseOptionHidden('mongodb', 'mongodb')">MongoDB</option>
<option value="cassandra" *ngIf="!isProdDatabaseOptionHidden('cassandra', 'cassandra')">Cassandra</option>
<option value="couchbase" *ngIf="!isProdDatabaseOptionHidden('couchbase', 'couchbase')">Couchbase</option>
<option value="neo4j" *ngIf="!isProdDatabaseOptionHidden('neo4j', 'neo4j')">Neo4j</option>
<option value="no" *ngIf="!isProdDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
</select>
</div>
<div class="form-group" *ngIf="!config.hideDevDatabaseType">
<label for="devDatabaseType">Which <i>development</i> database would you like to use?</label>
<select id="devDatabaseType" [(ngModel)]="model.devDatabaseType" name="devDatabaseType"
class="form-control" #devDatabaseType="ngModel">
<option value="h2Disk" [hidden]="isDevDatabaseOptionHidden('sql', 'h2Disk')">H2 with disk-based persistence</option>
<option value="h2Memory" [hidden]="isDevDatabaseOptionHidden('sql', 'h2Memory')">H2 with in-memory persistence</option>
<option value="mysql" [hidden]="isDevDatabaseOptionHidden('sql', 'mysql')">MySQL</option>
<option value="mariadb" [hidden]="isDevDatabaseOptionHidden('sql', 'mariadb')">MariaDB</option>
<option value="postgresql" [hidden]="isDevDatabaseOptionHidden('sql', 'postgresql')">PostgreSQL</option>
<option value="oracle" [hidden]="isDevDatabaseOptionHidden('sql', 'oracle')">Oracle (Please follow our documentation to use the Oracle proprietary
<option value="h2Disk" *ngIf="!isDevDatabaseOptionHidden('sql', 'h2Disk')">H2 with disk-based persistence</option>
<option value="h2Memory" *ngIf="!isDevDatabaseOptionHidden('sql', 'h2Memory')">H2 with in-memory persistence</option>
<option value="mysql" *ngIf="!isDevDatabaseOptionHidden('sql', 'mysql')">MySQL</option>
<option value="mariadb" *ngIf="!isDevDatabaseOptionHidden('sql', 'mariadb')">MariaDB</option>
<option value="postgresql" *ngIf="!isDevDatabaseOptionHidden('sql', 'postgresql')">PostgreSQL</option>
<option value="oracle" *ngIf="!isDevDatabaseOptionHidden('sql', 'oracle')">Oracle (Please follow our documentation to use the Oracle proprietary
driver)
</option>
<option value="mssql" [hidden]="isDevDatabaseOptionHidden('sql', 'mssql')">Microsoft SQL Server</option>
<option value="mongodb" [hidden]="isDevDatabaseOptionHidden('mongodb', 'mongodb')">MongoDB</option>
<option value="cassandra" [hidden]="isDevDatabaseOptionHidden('cassandra', 'cassandra')">Cassandra</option>
<option value="couchbase" [hidden]="isDevDatabaseOptionHidden('couchbase', 'couchbase')">Couchbase</option>
<option value="neo4j" [hidden]="isDevDatabaseOptionHidden('neo4j', 'neo4j')">Neo4j</option>
<option value="no" [hidden]="isDevDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
<option value="mssql" *ngIf="!isDevDatabaseOptionHidden('sql', 'mssql')">Microsoft SQL Server</option>
<option value="mongodb" *ngIf="!isDevDatabaseOptionHidden('mongodb', 'mongodb')">MongoDB</option>
<option value="cassandra" *ngIf="!isDevDatabaseOptionHidden('cassandra', 'cassandra')">Cassandra</option>
<option value="couchbase" *ngIf="!isDevDatabaseOptionHidden('couchbase', 'couchbase')">Couchbase</option>
<option value="neo4j" *ngIf="!isDevDatabaseOptionHidden('neo4j', 'neo4j')">Neo4j</option>
<option value="no" *ngIf="!isDevDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
</select>
</div>
<div class="form-group" *ngIf="!config.hideCacheProvider">
Expand Down Expand Up @@ -286,8 +286,8 @@ <h4>Testing options</h4>
multiple>
<option value="gatling">Gatling</option>
<option value="cucumber">Cucumber</option>
<option value="cypress" [hidden]="model.applicationType === 'microservice'">Cypress</option>
<option value="protractor" [hidden]="model.applicationType === 'microservice'">Protractor (deprecated)</option>
<option value="cypress" *ngIf="model.applicationType !== 'microservice'">Cypress</option>
<option value="protractor" *ngIf="model.applicationType !== 'microservice'">Protractor (deprecated)</option>
</select>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion src/main/webapp/app/home/home.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { AccountService } from 'app/core/auth/account.service';
import { Account } from 'app/core/user/account.model';
import { GitConfigurationService } from 'app/core/git/git-configuration.service';
import { GitConfigurationModel } from 'app/core/git/git-configuration.model';
import { ActivatedRoute } from '@angular/router';

@Component({
selector: 'jhi-home',
Expand Down

0 comments on commit 186c2e1

Please sign in to comment.