Remove <SelectIDEModal />

Author: filiptronicek

components/dashboard/src/app/AppRoutes.tsx

@@ -4,16 +4,14 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { ContextURL, User } from "@gitpod/gitpod-protocol";
+import { User } from "@gitpod/gitpod-protocol";
 import React, { useContext, useState } from "react";
 import { Redirect, Route, Switch, useLocation } from "react-router";
 import { AppNotifications } from "../AppNotifications";
 import Menu from "../menu/Menu";
 import OAuthClientApproval from "../OauthClientApproval";
 import { projectsPathInstallGitHubApp, projectsPathNew } from "../projects/projects.routes";
-import { StartPage, StartPhase } from "../start/StartPage";
 import { parseProps } from "../start/StartWorkspace";
-import SelectIDEModal from "../user-settings/SelectIDEModal";
 import {
     settingsPathAccount,
     settingsPathBilling,
@@ -137,16 +135,7 @@ export const AppRoutes = () => {
     // TODO: Try and encapsulate this in a route for "/" (check for hash in route component, render or redirect accordingly)
     const isCreation = location.pathname === "/" && hash !== "";
     if (isCreation) {
-        // Prefix with `/#referrer` will specify an IDE for workspace
-        // After selection is saved, user will be updated, and this condition will be false
-        const showIDESelection = User.isOnboardingUser(user) && !hash.startsWith(ContextURL.REFERRER_PREFIX);
-        if (showIDESelection) {
-            return (
-                <StartPage phase={StartPhase.Checking}>
-                    <SelectIDEModal location="workspace_start" />
-                </StartPage>
-            );
-        } else if (new URLSearchParams(location.search).has("showOptions") || newCreateWsPage) {
+        if (new URLSearchParams(location.search).has("showOptions") || newCreateWsPage) {
             return <Redirect to={"/new" + location.pathname + location.search + location.hash} />;
         } else {
             return <CreateWorkspace contextUrl={hash} />;

components/dashboard/src/user-settings/SelectIDEModal.tsx

@@ -8,29 +8,22 @@ import { FunctionComponent, useCallback, useMemo, useState } from "react";
 import Header from "../components/Header";
 import { WorkspaceEntry } from "./WorkspaceEntry";
 import { ItemsList } from "../components/ItemsList";
-import { useCurrentUser } from "../user-context";
-import { User, WorkspaceInfo } from "@gitpod/gitpod-protocol";
-import SelectIDEModal from "../user-settings/SelectIDEModal";
+import { WorkspaceInfo } from "@gitpod/gitpod-protocol";
 import Arrow from "../components/Arrow";
 import ConfirmationModal from "../components/ConfirmationModal";
-import { ProfileState } from "../user-settings/ProfileInformation";
 import { useListWorkspacesQuery } from "../data/workspaces/list-workspaces-query";
 import { EmptyWorkspacesContent } from "./EmptyWorkspacesContent";
 import { WorkspacesSearchBar } from "./WorkspacesSearchBar";
 import { hoursBefore, isDateSmallerOrEqual } from "@gitpod/gitpod-protocol/lib/util/timeutil";
 import { useDeleteInactiveWorkspacesMutation } from "../data/workspaces/delete-inactive-workspaces-mutation";
-import { useFeatureFlags } from "../contexts/FeatureFlagContext";
 
 const WorkspacesPage: FunctionComponent = () => {
-    const user = useCurrentUser();
     const [limit, setLimit] = useState(50);
     const [searchTerm, setSearchTerm] = useState("");
     const [showInactive, setShowInactive] = useState(false);
     const [deleteModalVisible, setDeleteModalVisible] = useState(false);
     const { data, isLoading } = useListWorkspacesQuery({ limit });
-    const isOnboardingUser = useMemo(() => user && User.isOnboardingUser(user), [user]);
     const deleteInactiveWorkspaces = useDeleteInactiveWorkspacesMutation();
-    const { newSignupFlow } = useFeatureFlags();
 
     // Sort workspaces into active/inactive groups
     const { activeWorkspaces, inactiveWorkspaces } = useMemo(() => {
@@ -96,12 +89,6 @@ const WorkspacesPage: FunctionComponent = () => {
                 />
             )}
 
-            {/* TODO: can remove this once newSignupFlow flag is enabled */}
-            {isOnboardingUser && !newSignupFlow && <SelectIDEModal location={"workspace_list"} />}
-
-            {/* TODO: can remove this once newSignupFlow flag is enabled */}
-            {!isOnboardingUser && !newSignupFlow && <ProfileState.NudgeForProfileUpdateModal />}
-
             {!isLoading &&
                 (activeWorkspaces.length > 0 || inactiveWorkspaces.length > 0 || searchTerm ? (
                     <>