Update how skillmap handles preferences

microsoft · Mar 6, 2025 · 3d23568 · 3d23568
1 parent 11e9b41
commit 3d23568
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/skillmap/src/App.tsx b/skillmap/src/App.tsx
@@ -422,6 +422,7 @@ class AppImpl extends React.Component<AppProps, AppState> {
     changeTheme(theme: pxt.ColorThemeInfo) {
         pxt.tickEvent(`skillmap.menu.theme.changetheme`, { theme: theme.id });
         this.themeManager.switchColorTheme(theme.id);
+        authClient.setColorThemeIdAsync(theme.id);
     }
 
     render() {

diff --git a/skillmap/src/components/makecodeFrame.tsx b/skillmap/src/components/makecodeFrame.tsx
@@ -175,8 +175,7 @@ class MakeCodeFrameImpl extends React.Component<MakeCodeFrameProps, MakeCodeFram
             {
                 type: "pxteditor",
                 action: "setcolorthemebyid",
-                colorThemeId,
-                savePreference: true
+                colorThemeId
             } as pxt.editor.EditorMessageSetColorThemeRequest
         );
     }

diff --git a/skillmap/src/lib/authClient.ts b/skillmap/src/lib/authClient.ts
@@ -142,9 +142,26 @@ export async function getBadgeStateAsync(): Promise<pxt.auth.UserBadgeState | un
 }
 
 export async function getColorThemeIdAsync(): Promise<string | undefined> {
+    const prefs = await userPreferencesAsync();
+    if(prefs) {
+        return prefs?.colorThemeIds?.[pxt.appTarget.id];
+    }
+}
+
+export async function setColorThemeIdAsync(themeId: string): Promise<void> {
     const cli = await clientAsync();
-    const prefs = await cli?.userPreferencesAsync();
-    return prefs?.colorThemeIds?.[pxt.appTarget.id];
+    if (cli) {
+        const currentPrefs = await cli.userPreferencesAsync();
+        const newColorThemePref = {
+            ...currentPrefs?.colorThemeIds,
+            [pxt.appTarget.id]: themeId
+        };
+        await cli.patchUserPreferencesAsync({
+            op: 'replace',
+            path: ['colorThemeIds'],
+            value: newColorThemePref
+        });
+    }
 }
 
 export async function userPreferencesAsync(): Promise<pxt.auth.UserPreferences | undefined> {