- {browserIdeOptions.map(([id, option]) => {
+
+ {allIdeOptions.map(([id, option]) => {
const selected = defaultIde === id;
const onSelect = () => actuallySetDefaultIde(id);
return renderIdeOption(option, selected, onSelect);
@@ -160,38 +160,6 @@ export default function Preferences() {
)}
-
- )}
- {desktopIdeOptions && (
- <>
-
- Desktop Editor
-
- Beta
-
-
-
- Optionally, choose the default desktop editor for opening workspaces.
-
-
- {desktopIdeOptions.map(([id, option]) => {
- const selected = defaultDesktopIde === id;
- const onSelect = () => actuallySetDefaultDesktopIde(id);
- if (id === DesktopNoneId) {
- option.logo = isDark ? IDENoneDark : IDENone;
- }
- return renderIdeOption(option, selected, onSelect);
- })}
-
- {ideOptions.options[defaultDesktopIde]?.notes && (
-
-
- {ideOptions.options[defaultDesktopIde].notes?.map((x, idx) => (
- - 0 ? "mt-2" : ""}>{x}
- ))}
-
-
- )}
The JetBrains desktop IDEs are currently in beta.{" "}
)}
+ Use the latest version for each editor.{" "}
+
+ Insiders
+ {" "}
+ for VS Code,{" "}
+
+ EAP
+ {" "}
+ for JetBrains IDEs.
+
+ }
checked={useLatestVersion}
onChange={(e) => actuallySetUseLatestVersion(e.target.checked)}
/>
@@ -307,10 +295,10 @@ export default function Preferences() {
);
}
-function orderedIdeOptions(ideOptions: IDEOptions, type: "browser" | "desktop") {
+function orderedIdeOptions(ideOptions: IDEOptions) {
// TODO: Maybe convert orderKey to number before sort?
return Object.entries(ideOptions.options)
- .filter(([_, x]) => x.type === type && !x.hidden)
+ .filter(([_, x]) => !x.hidden)
.sort((a, b) => {
const keyA = a[1].orderKey || a[0];
const keyB = b[1].orderKey || b[0];
@@ -319,23 +307,24 @@ function orderedIdeOptions(ideOptions: IDEOptions, type: "browser" | "desktop")
}
function renderIdeOption(option: IDEOption, selected: boolean, onSelect: () => void): JSX.Element {
+ const label = option.type === "desktop" ? "" : option.type;
const card = (
-
+
- {option.label ? (
+ {label ? (
- {option.label}
+ {label}
) : (
<>
)}
-
+
);
if (option.tooltip) {
diff --git a/components/dashboard/src/start/StartPage.tsx b/components/dashboard/src/start/StartPage.tsx
index 93dc9536e38e1d..7b3add2e9f35ae 100644
--- a/components/dashboard/src/start/StartPage.tsx
+++ b/components/dashboard/src/start/StartPage.tsx
@@ -5,7 +5,9 @@
*/
import { useEffect } from "react";
+import Alert from "../components/Alert";
import gitpodIconUA from "../icons/gitpod-ua.svg";
+import { gitpodHostUrl } from "../service/service";
export enum StartPhase {
Checking = 0,
@@ -74,6 +76,7 @@ export interface StartPageProps {
error?: StartWorkspaceError;
title?: string;
children?: React.ReactNode;
+ showLatestIdeWarning?: boolean;
}
export interface StartWorkspaceError {
@@ -105,6 +108,14 @@ export function StartPage(props: StartPageProps) {
)}
{error && }
{props.children}
+ {props.showLatestIdeWarning && (
+
+ You are using the latest release (unstable) for the editor.{" "}
+
+ Change Preferences
+
+
+ )}