Change User instead of Workspace settings. (#56)

Before: using our dropdown menu to change Location configuration would change them only in workspace scope, which could cause confusion, after changing projects. After: dropdown menu changes global configuration. --------- Co-authored-by: Filip Andrzej Kaminski <[email protected]>
software-mansion · Mar 29, 2024 · d008344 · d008344
1 parent 25aed84
commit d008344
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/packages/vscode-extension/src/common/WorkspaceConfig.ts b/packages/vscode-extension/src/common/WorkspaceConfig.ts
@@ -15,8 +15,8 @@ export interface WorkspaceConfigEventListener<T> {
 
 export interface WorkspaceConfig {
   getConfig(): Promise<WorkspaceConfigProps>;
-  // update method can take any of the keys from WorkspaceConfigProps and appropriate value:
-  update<K extends keyof WorkspaceConfigProps>(
+  // updateUserLevel method can take any of the keys from WorkspaceConfigProps and appropriate value:
+  updateUserLevel<K extends keyof WorkspaceConfigProps>(
     key: K,
     value: WorkspaceConfigProps[K]
   ): Promise<void>;

diff --git a/packages/vscode-extension/src/panels/WorkspaceConfigController.ts b/packages/vscode-extension/src/panels/WorkspaceConfigController.ts
@@ -37,9 +37,12 @@ export class WorkspaceConfigController implements Disposable, WorkspaceConfig {
     return this.config;
   }
 
-  async update<K extends keyof WorkspaceConfigProps>(key: K, value: WorkspaceConfigProps[K]) {
+  async updateUserLevel<K extends keyof WorkspaceConfigProps>(
+    key: K,
+    value: WorkspaceConfigProps[K]
+  ) {
     const configuration = workspace.getConfiguration("ReactNativeIDE");
-    await configuration.update(key as string, value);
+    await configuration.update(key as string, value, true);
   }
 
   async addListener<K extends keyof WorkspaceConfigEventMap>(

diff --git a/packages/vscode-extension/src/webview/components/SettingsDropdown.tsx b/packages/vscode-extension/src/webview/components/SettingsDropdown.tsx
@@ -15,7 +15,7 @@ interface SettingsDropdownProps {
 }
 
 function SettingsDropdown({ project, children, disabled }: SettingsDropdownProps) {
-  const { panelLocation, update } = useWorkspaceConfig();
+  const { panelLocation, updateUserLevel } = useWorkspaceConfig();
   const { openModal } = useModal();
   return (
     <DropdownMenu.Root>
@@ -55,14 +55,14 @@ function SettingsDropdown({ project, children, disabled }: SettingsDropdownProps
                 alignOffset={-5}>
                 <DropdownMenu.Item
                   className="dropdown-menu-item"
-                  onSelect={() => update("panelLocation", "tab")}>
+                  onSelect={() => updateUserLevel("panelLocation", "tab")}>
                   <span className="codicon codicon-layout-centered" />
                   Editor tab
                   {panelLocation === "tab" && <span className="codicon codicon-check right-slot" />}
                 </DropdownMenu.Item>
                 <DropdownMenu.Item
                   className="dropdown-menu-item"
-                  onSelect={() => update("panelLocation", "side-panel")}>
+                  onSelect={() => updateUserLevel("panelLocation", "side-panel")}>
                   <span className="codicon codicon-layout-sidebar-right" />
                   Side panel
                   {panelLocation === "side-panel" && (
@@ -72,7 +72,7 @@ function SettingsDropdown({ project, children, disabled }: SettingsDropdownProps
                 <DropdownMenu.Item
                   className="dropdown-menu-item"
                   onSelect={() => {
-                    update("panelLocation", "secondary-side-panel");
+                    updateUserLevel("panelLocation", "secondary-side-panel");
                     openModal(
                       "Drag and drop to secondary side panel",
                       <div>

diff --git a/packages/vscode-extension/src/webview/providers/WorkspaceConfigProvider.tsx b/packages/vscode-extension/src/webview/providers/WorkspaceConfigProvider.tsx
@@ -12,13 +12,16 @@ import { WorkspaceConfig, WorkspaceConfigProps } from "../../common/WorkspaceCon
 const workspaceConfig = makeProxy<WorkspaceConfig>("WorkspaceConfig");
 
 type WorkspaceConfigContextType = WorkspaceConfigProps & {
-  update: <K extends keyof WorkspaceConfigProps>(key: K, value: WorkspaceConfigProps[K]) => void;
+  updateUserLevel: <K extends keyof WorkspaceConfigProps>(
+    key: K,
+    value: WorkspaceConfigProps[K]
+  ) => void;
 };
 
 const WorkspaceConfigContext = createContext<WorkspaceConfigContextType>({
   panelLocation: "tab",
   relativeAppLocation: "",
-  update: () => {},
+  updateUserLevel: () => {},
 });
 
 export default function WorkspaceConfigProvider({ children }: PropsWithChildren) {
@@ -36,17 +39,21 @@ export default function WorkspaceConfigProvider({ children }: PropsWithChildren)
     };
   }, []);
 
-  const update = useCallback(
-    <K extends keyof WorkspaceConfigProps>(key: K, value: WorkspaceConfigProps[K]) => {
+  const updateUserLevel = useCallback(
+    <K extends keyof WorkspaceConfigProps>(
+      key: K,
+      value: WorkspaceConfigProps[K],
+      configurationTarget?: boolean
+    ) => {
       const newState = { ...config, [key]: value };
       setConfig(newState);
-      workspaceConfig.update(key, value);
+      workspaceConfig.updateUserLevel(key, value);
     },
     [config, setConfig]
   );
 
   return (
-    <WorkspaceConfigContext.Provider value={{ ...config, update }}>
+    <WorkspaceConfigContext.Provider value={{ ...config, updateUserLevel }}>
       {children}
     </WorkspaceConfigContext.Provider>
   );