From a5bb7e391ceceb8995be75e50d884a1a6b8a5306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Tron=C3=AD=C4=8Dek?= Date: Fri, 16 Dec 2022 21:25:08 +0000 Subject: [PATCH] Introduce new version designs --- .../dashboard/src/components/PillLabel.tsx | 4 +- .../dashboard/src/settings/SelectIDE.tsx | 56 +++++++++---------- .../testdata/render/aws-setup/output.golden | 4 ++ .../testdata/render/azure-setup/output.golden | 4 ++ .../render/customization/output.golden | 4 ++ .../render/external-registry/output.golden | 4 ++ .../testdata/render/gcp-setup/output.golden | 4 ++ .../testdata/render/http-proxy/output.golden | 4 ++ .../testdata/render/kind-ide/output.golden | 4 ++ .../testdata/render/kind-meta/output.golden | 4 ++ .../cmd/testdata/render/minimal/output.golden | 4 ++ .../testdata/render/shortname/output.golden | 4 ++ .../statefulset-customization/output.golden | 4 ++ .../use-pod-security-policies/output.golden | 4 ++ .../render/vsxproxy-pvc/output.golden | 4 ++ .../workspace-requests-limits/output.golden | 4 ++ .../ide-service/ide_config_configmap.go | 2 + 17 files changed, 88 insertions(+), 30 deletions(-) diff --git a/components/dashboard/src/components/PillLabel.tsx b/components/dashboard/src/components/PillLabel.tsx index 464f2dda497eda..cb6a3ec589ea6d 100644 --- a/components/dashboard/src/components/PillLabel.tsx +++ b/components/dashboard/src/components/PillLabel.tsx @@ -4,12 +4,13 @@ * See License.AGPL.txt in the project root for license information. */ -export type PillType = "info" | "warn" | "success"; +export type PillType = "info" | "warn" | "success" | "neutral"; const PillClsMap: Record = { info: "bg-blue-50 text-blue-500 dark:bg-blue-500 dark:text-blue-100", warn: "bg-orange-100 text-orange-700 dark:bg-orange-600 dark:text-orange-100", success: "bg-green-100 text-green-700 dark:bg-green-600 dark:text-green-100", + neutral: "bg-gray-300 text-gray-800 dark:bg-gray-600 dark:text-gray-100", }; /** @@ -19,6 +20,7 @@ const PillClsMap: Record = { * info: Renders a blue pile label (default).\ * warn: Renders an orange pile label. * success: Renders an green pile label. + * subtle: Renders a grey pile label. * * **className**\ * Add additional css classes to style this component. diff --git a/components/dashboard/src/settings/SelectIDE.tsx b/components/dashboard/src/settings/SelectIDE.tsx index 55a32f114234ae..0a7668b9972b20 100644 --- a/components/dashboard/src/settings/SelectIDE.tsx +++ b/components/dashboard/src/settings/SelectIDE.tsx @@ -176,42 +176,40 @@ function renderIdeOption( version: IDEOption["imageVersion"], onSelect: () => void, ): JSX.Element { - const label = option.type === "desktop" ? "" : option.type; + const shouldShowOptionType = option.type !== "desktop" || option.title === "VS Code"; // Force show of "Desktop" in the list for VS Code Desktop const card = ( -
- logo -
-
- {label ? ( - - {label} - - ) : ( - <> - )} -
- {version ? ( -
{version} -
+ + ) : ( + + )} +
+ logo +
+ {shouldShowOptionType ? ( + + {option.type} + ) : ( - <> + option.label && ( + + {option.label} + + ) )}
); diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden index c93ccc7bbf439e..8b79dd2b49127d 100644 --- a/install/installer/cmd/testdata/render/aws-setup/output.golden +++ b/install/installer/cmd/testdata/render/aws-setup/output.golden @@ -3493,6 +3493,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3529,6 +3530,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5126,6 +5128,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5162,6 +5165,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/azure-setup/output.golden b/install/installer/cmd/testdata/render/azure-setup/output.golden index 1df8017aee028f..7c84ce0608f4b0 100644 --- a/install/installer/cmd/testdata/render/azure-setup/output.golden +++ b/install/installer/cmd/testdata/render/azure-setup/output.golden @@ -3497,6 +3497,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3533,6 +3534,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5110,6 +5112,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5146,6 +5149,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/customization/output.golden b/install/installer/cmd/testdata/render/customization/output.golden index 385d791a6e7733..5130f84bf3bd4a 100644 --- a/install/installer/cmd/testdata/render/customization/output.golden +++ b/install/installer/cmd/testdata/render/customization/output.golden @@ -4362,6 +4362,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -4398,6 +4399,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -6120,6 +6122,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -6156,6 +6159,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/external-registry/output.golden b/install/installer/cmd/testdata/render/external-registry/output.golden index 44d871e4602760..e78cac9f9b2a4e 100644 --- a/install/installer/cmd/testdata/render/external-registry/output.golden +++ b/install/installer/cmd/testdata/render/external-registry/output.golden @@ -3638,6 +3638,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3674,6 +3675,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5297,6 +5299,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5333,6 +5336,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden index d49174f008cb3f..56e7bbf4be20d5 100644 --- a/install/installer/cmd/testdata/render/gcp-setup/output.golden +++ b/install/installer/cmd/testdata/render/gcp-setup/output.golden @@ -3468,6 +3468,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3504,6 +3505,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5071,6 +5073,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5107,6 +5110,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/http-proxy/output.golden b/install/installer/cmd/testdata/render/http-proxy/output.golden index 5d7ff045683e7a..609b2bb701b598 100644 --- a/install/installer/cmd/testdata/render/http-proxy/output.golden +++ b/install/installer/cmd/testdata/render/http-proxy/output.golden @@ -3807,6 +3807,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3843,6 +3844,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5520,6 +5522,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5556,6 +5559,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/kind-ide/output.golden b/install/installer/cmd/testdata/render/kind-ide/output.golden index 2f1d349a4727ce..b582ffda73b1a4 100644 --- a/install/installer/cmd/testdata/render/kind-ide/output.golden +++ b/install/installer/cmd/testdata/render/kind-ide/output.golden @@ -1324,6 +1324,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -1360,6 +1361,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -2643,6 +2645,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -2679,6 +2682,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/kind-meta/output.golden b/install/installer/cmd/testdata/render/kind-meta/output.golden index 6bd9a42ffcd09e..80b43966b416a4 100644 --- a/install/installer/cmd/testdata/render/kind-meta/output.golden +++ b/install/installer/cmd/testdata/render/kind-meta/output.golden @@ -2776,6 +2776,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -2812,6 +2813,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -4394,6 +4396,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -4430,6 +4433,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/minimal/output.golden b/install/installer/cmd/testdata/render/minimal/output.golden index c1040e2dc9b504..a3721860d6be76 100644 --- a/install/installer/cmd/testdata/render/minimal/output.golden +++ b/install/installer/cmd/testdata/render/minimal/output.golden @@ -3804,6 +3804,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3840,6 +3841,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5517,6 +5519,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5553,6 +5556,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/shortname/output.golden b/install/installer/cmd/testdata/render/shortname/output.golden index cd3ff9d34e8aea..88f0e96b96fd86 100644 --- a/install/installer/cmd/testdata/render/shortname/output.golden +++ b/install/installer/cmd/testdata/render/shortname/output.golden @@ -3804,6 +3804,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3840,6 +3841,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5517,6 +5519,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5553,6 +5556,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/statefulset-customization/output.golden b/install/installer/cmd/testdata/render/statefulset-customization/output.golden index 1351f2cee3c615..90ed2c098c2b51 100644 --- a/install/installer/cmd/testdata/render/statefulset-customization/output.golden +++ b/install/installer/cmd/testdata/render/statefulset-customization/output.golden @@ -3816,6 +3816,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3852,6 +3853,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5529,6 +5531,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5565,6 +5568,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden index c4aad438dda27b..53d7de2f799e26 100644 --- a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden +++ b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden @@ -4137,6 +4137,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -4173,6 +4174,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5850,6 +5852,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5886,6 +5889,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden index ddea31a794807c..96a45905620f19 100644 --- a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden +++ b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden @@ -3806,6 +3806,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3842,6 +3843,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5519,6 +5521,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5555,6 +5558,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden index 411e31dfd2b50f..231135e8ebd533 100644 --- a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden +++ b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden @@ -3807,6 +3807,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -3843,6 +3844,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5520,6 +5522,7 @@ data: "title": "IntelliJ IDEA", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/intellijIdeaLogo.svg", + "label": "Ultimate", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", @@ -5556,6 +5559,7 @@ data: "title": "PyCharm", "type": "desktop", "logo": "https://ide.gitpod.example.com/image/ide-logo/pycharmLogo.svg", + "label": "Professional", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", diff --git a/install/installer/pkg/components/ide-service/ide_config_configmap.go b/install/installer/pkg/components/ide-service/ide_config_configmap.go index 61262b6454efab..cfea5faf52e270 100644 --- a/install/installer/pkg/components/ide-service/ide_config_configmap.go +++ b/install/installer/pkg/components/ide-service/ide_config_configmap.go @@ -100,6 +100,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { intellij: { OrderKey: "04", Title: "IntelliJ IDEA", + Label: "Ultimate", Type: ide_config.IDETypeDesktop, Logo: getIdeLogoPath("intellijIdeaLogo"), Image: ctx.ImageName(ctx.Config.Repository, ide.IntelliJDesktopIDEImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.IntelliJImage.Version), @@ -124,6 +125,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { pycharm: { OrderKey: "06", Title: "PyCharm", + Label: "Professional", Type: ide_config.IDETypeDesktop, Logo: getIdeLogoPath("pycharmLogo"), Image: ctx.ImageName(ctx.Config.Repository, ide.PyCharmDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.PyCharmImage.Version),