use useUpdateCurrentUserMutation

Author: filiptronicek

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

@@ -5,69 +5,53 @@
  */
 
 import { useContext, useEffect, useState } from "react";
-import { getGitpodService } from "../service/service";
 import { UserContext } from "../user-context";
 import CheckBox from "../components/CheckBox";
 import { User } from "@gitpod/gitpod-protocol";
 import SelectIDEComponent from "../components/SelectIDEComponent";
 import PillLabel from "../components/PillLabel";
+import { useUpdateCurrentUserMutation } from "../data/current-user/update-mutation";
 
 export type IDEChangedTrackLocation = "workspace_list" | "workspace_start" | "preferences";
 interface SelectIDEProps {
     updateUserContext?: boolean;
     location: IDEChangedTrackLocation;
 }
 
-export const updateUserIDEInfo = async (
-    user: User,
-    selectedIde: string,
-    useLatestVersion: boolean,
-    location: IDEChangedTrackLocation,
-) => {
-    const additionalData = user?.additionalData ?? {};
-    const settings = additionalData.ideSettings ?? {};
-    settings.settingVersion = "2.0";
-    settings.defaultIde = selectedIde;
-    settings.useLatestVersion = useLatestVersion;
-    additionalData.ideSettings = settings;
-    getGitpodService()
-        .server.trackEvent({
-            event: "ide_configuration_changed",
-            properties: {
-                ...settings,
-                location,
-            },
-        })
-        .then()
-        .catch(console.error);
-    return getGitpodService().server.updateLoggedInUser({ additionalData });
-};
-
 export default function SelectIDE(props: SelectIDEProps) {
     const { user, setUser } = useContext(UserContext);
+    const updateUser = useUpdateCurrentUserMutation();
 
     // Only exec once when we access this component
     useEffect(() => {
         user && User.migrationIDESettings(user);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-    const actualUpdateUserIDEInfo = async (user: User, selectedIde: string, useLatestVersion: boolean) => {
-        const newUserData = await updateUserIDEInfo(user, selectedIde, useLatestVersion, props.location);
+    const [defaultIde, setDefaultIde] = useState<string>(user?.additionalData?.ideSettings?.defaultIde || "code");
+    const [useLatestVersion, setUseLatestVersion] = useState<boolean>(
+        user?.additionalData?.ideSettings?.useLatestVersion ?? false,
+    );
+
+    const actualUpdateUserIDEInfo = async (selectedIde: string, useLatestVersion: boolean) => {
+        const additionalData = user?.additionalData ?? {};
+        const settings = additionalData.ideSettings ?? {};
+        settings.settingVersion = "2.0";
+        settings.defaultIde = selectedIde;
+        settings.useLatestVersion = useLatestVersion;
+        additionalData.ideSettings = settings;
+
+        const newUserData = await updateUser.mutateAsync({ additionalData });
         props.updateUserContext && setUser({ ...newUserData });
     };
 
-    const [defaultIde, setDefaultIde] = useState<string>(user?.additionalData?.ideSettings?.defaultIde || "code");
     const actuallySetDefaultIde = async (value: string) => {
-        await actualUpdateUserIDEInfo(user!, value, useLatestVersion);
+        await actualUpdateUserIDEInfo(value, useLatestVersion);
         setDefaultIde(value);
     };
 
-    const [useLatestVersion, setUseLatestVersion] = useState<boolean>(
-        user?.additionalData?.ideSettings?.useLatestVersion ?? false,
-    );
     const actuallySetUseLatestVersion = async (value: boolean) => {
-        await actualUpdateUserIDEInfo(user!, defaultIde, value);
+        await actualUpdateUserIDEInfo(defaultIde, value);
         setUseLatestVersion(value);
     };