From 7fc6f7a7aec21b693134dfe465830564e35a015a Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Sat, 18 May 2024 04:33:31 +0200
Subject: [PATCH] Add context when prompting for the keycloak version number

---
 src/bin/download-builtin-keycloak-theme.ts |  2 ++
 src/bin/initialize-email-theme.ts          |  3 +++
 src/bin/shared/promptKeycloakVersion.ts    | 13 +------------
 src/bin/start-keycloak-container.ts        |  2 ++
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/bin/download-builtin-keycloak-theme.ts b/src/bin/download-builtin-keycloak-theme.ts
index ba6deb56..03c00cba 100644
--- a/src/bin/download-builtin-keycloak-theme.ts
+++ b/src/bin/download-builtin-keycloak-theme.ts
@@ -14,6 +14,8 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const { log } = getLogger({ "isSilent": buildOptions.isSilent });
 
+    console.log("Select the Keycloak version from which you want to download the builtins theme:");
+
     const { keycloakVersion } = await promptKeycloakVersion({
         "startingFromMajor": undefined
     });
diff --git a/src/bin/initialize-email-theme.ts b/src/bin/initialize-email-theme.ts
index b6c09519..aba53c00 100644
--- a/src/bin/initialize-email-theme.ts
+++ b/src/bin/initialize-email-theme.ts
@@ -28,7 +28,10 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         process.exit(-1);
     }
 
+    console.log("Initialize with the base email theme from which version of Keycloak?");
+
     const { keycloakVersion } = await promptKeycloakVersion({
+        // NOTE: This is arbitrary
         "startingFromMajor": 17
     });
 
diff --git a/src/bin/shared/promptKeycloakVersion.ts b/src/bin/shared/promptKeycloakVersion.ts
index 7585d6a8..ea9ceb0c 100644
--- a/src/bin/shared/promptKeycloakVersion.ts
+++ b/src/bin/shared/promptKeycloakVersion.ts
@@ -1,7 +1,6 @@
 import { getLatestsSemVersionedTagFactory } from "../tools/octokit-addons/getLatestsSemVersionedTag";
 import { Octokit } from "@octokit/rest";
 import cliSelect from "cli-select";
-import { lastKeycloakVersionWithAccountV1 } from "./constants";
 import { SemVer } from "../tools/SemVer";
 
 export async function promptKeycloakVersion(params: { startingFromMajor: number | undefined }) {
@@ -21,8 +20,6 @@ export async function promptKeycloakVersion(params: { startingFromMajor: number
         return { getLatestsSemVersionedTag };
     })();
 
-    console.log("Select Keycloak version");
-
     const semVersionedTagByMajor = new Map<number, { tag: string; version: SemVer }>();
 
     (
@@ -45,15 +42,7 @@ export async function promptKeycloakVersion(params: { startingFromMajor: number
         semVersionedTagByMajor.set(semVersionedTag.version.major, semVersionedTag);
     });
 
-    const lastMajorVersions = Array.from(semVersionedTagByMajor.values()).map(({ tag: version }) => {
-        let out = version;
-
-        if (version === lastKeycloakVersionWithAccountV1) {
-            out += " (last version with account v1 built in)";
-        }
-
-        return out;
-    });
+    const lastMajorVersions = Array.from(semVersionedTagByMajor.values()).map(({ tag }) => tag);
 
     const { value } = await cliSelect<string>({
         "values": lastMajorVersions
diff --git a/src/bin/start-keycloak-container.ts b/src/bin/start-keycloak-container.ts
index b9917636..6e0bb7f4 100644
--- a/src/bin/start-keycloak-container.ts
+++ b/src/bin/start-keycloak-container.ts
@@ -22,6 +22,8 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const doesImplementAccountTheme = metaInfKeycloakThemes.themes.some(({ name }) => name === accountV1ThemeName);
 
+    console.log("On which version of Keycloak do you want to test your theme?");
+
     const { keycloakVersion, keycloakMajorNumber } = await (async function getKeycloakMajor(): Promise<{
         keycloakVersion: string;
         keycloakMajorNumber: number;