improvements to dev blueprint

.blueprint/cli/commands.mjs

@@ -22,6 +22,10 @@ const defaultCommands = {
     desc: 'Generate a test sample',
     blueprint: '@jhipster/jhipster-dev',
   },
+  'github-build-matrix': {
+    desc: 'Build a matrix of jobs for github actions',
+    blueprint: '@jhipster/jhipster-dev',
+  },
 };
 
 export default defaultCommands;

.blueprint/generate-sample/command.mjs

@@ -16,7 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { readdir } from 'node:fs/promises';
 import { GENERATOR_APP } from 'generator-jhipster/generators';
+
 /**
  * @type {import('generator-jhipster').JHipsterCommandDefinition}
  */
@@ -26,6 +28,19 @@ const command = {
       type: String,
     },
   },
+  configs: {
+    sampleName: {
+      argument: {
+        type: String,
+      },
+      prompt: gen => ({
+        type: 'list',
+        message: 'which sample do you want to generate?',
+        choices: async () => readdir(gen.templatePath('samples')),
+      }),
+      scope: 'generator',
+    },
+  },
   options: {},
   import: [GENERATOR_APP],
 };

.blueprint/generate-sample/generator.mjs

@@ -1,7 +1,6 @@
 import { readdir } from 'node:fs/promises';
 import { readFileSync } from 'node:fs';
 import BaseGenerator from 'generator-jhipster/generators/base';
-import command from './command.mjs';
 
 export default class extends BaseGenerator {
   sampleName;
@@ -26,15 +25,15 @@ export default class extends BaseGenerator {
   get [BaseGenerator.PROMPTING]() {
     return this.asPromptingTaskGroup({
       async askForSample() {
-        if (!this.sampleName) {
-          const answers = await this.prompt({
-            type: 'list',
-            name: 'sampleName',
-            message: 'which sample do you want to generate?',
-            choices: async () => readdir(this.templatePath('samples')),
-          });
-          this.sampleName = answers.sampleName;
-        }
+        await this.promptCurrentJHipsterCommand();
+      },
+    });
+  }
+
+  get [BaseGenerator.LOADING]() {
+    return this.asPromptingTaskGroup({
+      async promptingTemplateTask({ application }) {
+        await this.loadCurrentJHipsterCommandConfig(application);
       },
     });
   }

.blueprint/generate-sample/templates/samples/sample.jdl → .blueprint/generate-sample/templates/samples/user-tenant.jdl

@@ -1,25 +1,30 @@
 application {
   config {
     applicationType monolith
+    blueprints [tenantview]
     cacheProvider no
     creationTimestamp 1632872179205
+    jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ="
     testFrameworks [cypress]
   }
 
   entities Blog, Post, Tag
 }
 
+@TenantAware
 entity Blog {
   name String required minlength(3)
   handle String required minlength(2)
 }
 
+@TenantAware
 entity Post {
   title String required
   content TextBlob required
   date Instant required
 }
 
+@TenantAware
 entity Tag {
   name String required minlength(2)
 }

.blueprint/github-build-matrix/generator.mjs

@@ -0,0 +1,31 @@
+import { existsSync, appendFileSync } from 'node:fs';
+import os from 'node:os';
+import { readdir } from 'node:fs/promises';
+import BaseGenerator from 'generator-jhipster/generators/base';
+import { RECOMMENDED_JAVA_VERSION, RECOMMENDED_NODE_VERSION } from 'generator-jhipster';
+
+export default class extends BaseGenerator {
+  get [BaseGenerator.WRITING]() {
+    return this.asWritingTaskGroup({
+      async buildMatrix() {
+        const samples = await readdir(this.templatePath('../../generate-sample/templates/samples'));
+        const matrix = {
+          include: samples
+            .filter(sample => !sample.includes('disabled'))
+            .map(sample => ({
+              'sample-name': sample,
+              'node-version': RECOMMENDED_NODE_VERSION,
+              'java-version': RECOMMENDED_JAVA_VERSION,
+            })),
+        };
+        const matrixoutput = `matrix<<EOF${os.EOL}${JSON.stringify(matrix)}${os.EOL}EOF${os.EOL}`;
+        const filePath = process.env['GITHUB_OUTPUT'];
+        if (filePath && existsSync(filePath)) {
+          appendFileSync(filePath, matrixoutput, { encoding: 'utf8' });
+        } else {
+          console.log(matrixoutput);
+        }
+      },
+    });
+  }
+}

.blueprint/github-build-matrix/index.mjs

@@ -0,0 +1 @@
+export { default } from './generator.mjs';