[dashboard] allow show options on ws start

Author: svenefftinge

components/dashboard/src/start/CreateWorkspace.tsx

@@ -28,6 +28,7 @@ import { BillingAccountSelector } from "../components/BillingAccountSelector";
 import { FeatureFlagContext } from "../contexts/FeatureFlagContext";
 import { UsageLimitReachedModal } from "../components/UsageLimitReachedModal";
 import { StartOptions } from "@gitpod/gitpod-protocol/lib/util/gitpod-host-url";
+import { StartWorkspaceModal } from "../workspaces/StartWorkspaceModal";
 
 export interface CreateWorkspaceProps {
     contextUrl: string;
@@ -56,13 +57,21 @@ function parseSearchParams(search: string): GitpodServer.StartWorkspaceOptions {
     return options;
 }
 
+function isShowOptions(search: string): boolean {
+    const params = new URLSearchParams(search);
+    return params.has(StartOptions.SHOW_OPTIONS);
+}
+
 export default class CreateWorkspace extends React.Component<CreateWorkspaceProps, CreateWorkspaceState> {
     constructor(props: CreateWorkspaceProps) {
         super(props);
         this.state = { stillParsing: true };
     }
 
     componentDidMount() {
+        if (isShowOptions(window.location.search)) {
+            return;
+        }
         this.createWorkspace();
     }
 
@@ -135,6 +144,13 @@ export default class CreateWorkspace extends React.Component<CreateWorkspaceProp
                 </StartPage>
             );
         }
+        if (isShowOptions(window.location.search)) {
+            return (
+                <StartPage>
+                    <StartWorkspaceModal contextUrl={this.props.contextUrl} />
+                </StartPage>
+            );
+        }
 
         let phase = StartPhase.Checking;
         let statusMessage = (

components/dashboard/src/workspaces/StartWorkspaceModal.tsx

@@ -14,16 +14,23 @@ import SelectWorkspaceClassComponent from "../components/SelectWorkspaceClassCom
 import { UserContext } from "../user-context";
 import { StartWorkspaceModalContext } from "./start-workspace-modal-context";
 
-export function StartWorkspaceModal() {
+export interface StartWorkspaceProps {
+    uselatestIde?: boolean;
+    ide?: string;
+    workspaceClass?: string;
+    contextUrl?: string;
+}
+
+export function StartWorkspaceModal(props: StartWorkspaceProps) {
     const { user } = useContext(UserContext);
     const { isStartWorkspaceModalVisible, setIsStartWorkspaceModalVisible } = useContext(StartWorkspaceModalContext);
     const location = useLocation();
     const [useLatestIde, setUseLatestIde] = useState<boolean | undefined>(
-        !!user?.additionalData?.ideSettings?.useLatestVersion,
+        props.uselatestIde || !!user?.additionalData?.ideSettings?.useLatestVersion,
     );
-    const [selectedIde, setSelectedIde] = useState(user?.additionalData?.ideSettings?.defaultIde);
-    const [selectedWsClass, setSelectedWsClass] = useState<string | undefined>();
-    const [repo, setRepo] = useState<string | undefined>(undefined);
+    const [selectedIde, setSelectedIde] = useState(props.ide || user?.additionalData?.ideSettings?.defaultIde);
+    const [selectedWsClass, setSelectedWsClass] = useState<string | undefined>(props.workspaceClass);
+    const [repo, setRepo] = useState<string | undefined>(props.contextUrl);
     const onSelectEditorChange = useCallback(
         (ide: string, useLatest: boolean) => {
             setSelectedIde(ide);
@@ -59,10 +66,18 @@ export function StartWorkspaceModal() {
 
     useEffect(() => {
         // reset state when visibility changes.
-        setSelectedIde(user?.additionalData?.ideSettings?.defaultIde);
-        setUseLatestIde(!!user?.additionalData?.ideSettings?.useLatestVersion);
-        setRepo(undefined);
-    }, [user, setSelectedIde, setUseLatestIde, isStartWorkspaceModalVisible]);
+        setSelectedIde(props.ide || user?.additionalData?.ideSettings?.defaultIde);
+        setUseLatestIde(props.uselatestIde || !!user?.additionalData?.ideSettings?.useLatestVersion);
+        setRepo(props.contextUrl);
+    }, [
+        user,
+        setSelectedIde,
+        setUseLatestIde,
+        isStartWorkspaceModalVisible,
+        props.ide,
+        props.uselatestIde,
+        props.contextUrl,
+    ]);
 
     return (
         <Modal

components/gitpod-protocol/src/util/gitpod-host-url.ts

@@ -25,6 +25,7 @@ export namespace StartOptions {
     export const WORKSPACE_CLASS = "workspaceClass";
     export const EDITOR = "editor";
     export const USE_LATEST_EDITOR = "useLatestEditor";
+    export const SHOW_OPTIONS = "showOptions";
 }
 
 export class GitpodHostUrl {