Merge pull request #389 from sinedied/update-azure-integration

fix: hide options for Azure generator

Author: jdubois

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

@@ -27,12 +27,25 @@ import { JHipsterConfigurationModel } from '../generator/jhipster.configuration.
 })
 export class AzureGeneratorComponent implements OnInit {
   azureGeneratorConfig: GeneratorConfigurationModel = {
+    hideRepositoryName: true,
     hideApplicationType: true,
     hideServiceDiscoveryType: true,
     hideAuthenticationType: true,
     hideDatabaseType: true,
-    hideProdDatabaseTypeOptions: ['mysql', 'mariadb', 'oracle', 'mssql', 'mongodb', 'cassandra', 'couchbase', 'neo4j'],
-    hideDevDatabaseTypeOptions: ['h2Disk', 'h2Memory', 'mysql', 'mariadb', 'oracle', 'mssql', 'mongodb', 'cassandra', 'couchbase', 'neo4j'],
+    hideProdDatabaseTypeOptions: ['mysql', 'mariadb', 'oracle', 'mssql', 'mongodb', 'cassandra', 'couchbase', 'neo4j', 'no'],
+    hideDevDatabaseTypeOptions: [
+      'h2Disk',
+      'h2Memory',
+      'mysql',
+      'mariadb',
+      'oracle',
+      'mssql',
+      'mongodb',
+      'cassandra',
+      'couchbase',
+      'neo4j',
+      'no'
+    ],
     hideCacheProvider: true,
     hideBuildTool: true,
     hideOtherComponents: true,

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

@@ -18,7 +18,7 @@ <h4>Project configuration</h4>
                 </div>
             </div>
         </div>
-        <div class="row">
+        <div class="row" *ngIf="!config.hideRepositoryName">
             <div class="col-md-8">
                 <div class="form-group">
                     <label for="repositoryName">Repository name</label>
@@ -104,7 +104,7 @@ <h4>Server side options</h4>
                         <option value="no">No database</option>
                     </select>
                 </div>
-                <div class="form-group">
+                <div class="form-group" *ngIf="!config.hideProdDatabaseType">
                     <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()">
@@ -119,10 +119,10 @@ <h4>Server side options</h4>
                         <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="no" [hidden]="isProdDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
                     </select>
                 </div>
-                <div class="form-group">
+                <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">
@@ -139,7 +139,7 @@ <h4>Server side options</h4>
                         <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="no" [hidden]="isDevDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
                     </select>
                 </div>
                 <div class="form-group" *ngIf="!config.hideCacheProvider">

src/main/webapp/app/home/generator/generator.configuration.model.ts

@@ -45,11 +45,14 @@ export type ProdDatabaseType =
 export type DevDatabaseType = 'h2Disk' | 'h2Memory' | ProdDatabaseType;
 
 export interface GeneratorConfigurationModel {
+  hideRepositoryName?: boolean;
   hideApplicationType?: boolean;
   hideServiceDiscoveryType?: boolean;
   hideAuthenticationType?: boolean;
   hideDatabaseType?: boolean;
+  hideProdDatabaseType?: boolean;
   hideProdDatabaseTypeOptions?: ProdDatabaseType[];
+  hideDevDatabaseType?: boolean;
   hideDevDatabaseTypeOptions?: DevDatabaseType[];
   hideCacheProvider?: boolean;
   hideBuildTool?: boolean;