Fix ide not exists bug

gitpod-io · Apr 22, 2022 · 1bcf2a0 · 1bcf2a0
1 parent d3d65b3
commit 1bcf2a0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/components/server/src/workspace/workspace-starter.spec.ts b/components/server/src/workspace/workspace-starter.spec.ts
@@ -249,5 +249,19 @@ describe("workspace-starter", function () {
             const result = chooseIDE("unknown-custom", customOptions, useLatest, hasPerm);
             expect(result.ideImage).to.equal(ideOptions.options["code"].latestImage);
         });
+
+        it("not exists ide with custom permission", function () {
+            const useLatest = true;
+            const hasPerm = true;
+            const result = chooseIDE("not-exists", ideOptions, useLatest, hasPerm);
+            expect(result.ideImage).to.equal(ideOptions.options["code"].latestImage);
+        });
+
+        it("not exists ide with custom permission", function () {
+            const useLatest = true;
+            const hasPerm = false;
+            const result = chooseIDE("not-exists", ideOptions, useLatest, hasPerm);
+            expect(result.ideImage).to.equal(ideOptions.options["code"].latestImage);
+        });
     });
 });
diff --git a/components/server/src/workspace/workspace-starter.ts b/components/server/src/workspace/workspace-starter.ts
@@ -156,7 +156,7 @@ export const chooseIDE = (
     const data: { desktopIdeImage?: string; ideImage: string } = {
         ideImage: defaultIdeImage,
     };
-    const chooseOption = ideOptions.options[ideChoice];
+    const chooseOption = ideOptions.options[ideChoice] ?? defaultIDEOption;
     const isDesktopIde = chooseOption.type === "desktop";
     if (isDesktopIde) {
         data.desktopIdeImage = useLatest ? chooseOption?.latestImage ?? chooseOption?.image : chooseOption?.image;