finally hide all the config IPC inside the config slice

Signed-off-by: Sven Dowideit <[email protected]>
workbenchapp · May 18, 2022 · c1be631 · c1be631
1 parent 3b3f018
commit c1be631
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 34 deletions.
diff --git a/src/main/config.ts b/src/main/config.ts
@@ -13,7 +13,7 @@ declare type IpcEvent = IpcRendererEvent & IpcMainEvent;
 export function initConfigPromises() {
   // gets written to .\AppData\Roaming\SolanaWorkbench\electron-cfg.json on windows
   promiseIpc.on('CONFIG-GetAll', (event: IpcEvent | undefined) => {
-    logger.info('main: called CONFIG-GetAll', event);
+    logger.silly('main: called CONFIG-GetAll', event);
     const config = cfg.get('config');
     if (!config) {
       return {};
@@ -23,30 +23,10 @@ export function initConfigPromises() {
   promiseIpc.on(
     'CONFIG-Set',
     (key: unknown, val: unknown, event?: IpcEvent | undefined) => {
-      logger.info(`main: called CONFIG-Set, ${key}, ${val}, ${event}`);
+      logger.silly(`main: called CONFIG-Set, ${key}, ${val}, ${event}`);
       return cfg.set(`config.${key}`, val);
     }
   );
 }
 
 export default {};
-// TODO: https://github.com/sindresorhus/electron-store has schema, so am very likely to move to that
-
-/*
-PS C:\Users\svend> more '.\AppData\Roaming\SolanaWorkbench\electron-cfg.json'
-{
-  "windowState": {
-    "main": {
-      "isMaximized": false,
-      "isFullScreen": false,
-      "x": 772,
-      "y": 177,
-      "width": 1994,
-      "height": 1359
-    }
-  },
-  "config": {
-    "analytics_enabled": "false"
-  }
-}
-*/
diff --git a/src/main/preload.js b/src/main/preload.js
@@ -24,9 +24,6 @@ contextBridge.exposeInMainWorld('electron', {
     fetchAnchorIDL(msg) {
       send('fetch-anchor-idl', msg);
     },
-    config(msg) {
-      send('config', msg);
-    },
     on(method, func) {
       ipcRenderer.on(method, (event, ...args) => func(...args));
     },

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
@@ -46,6 +46,8 @@ declare global {
   interface Window {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     electron?: any;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    promiseIpc?: any;
   }
 }
 
@@ -228,12 +230,10 @@ function AnalyticsBanner() {
           type="button"
           onClick={() => {
             dispatch(
-              setConfigValue({ key: ConfigKey.AnalyticsEnabled, value: false })
-            );
-            window.promiseIpc.send(
-              'CONFIG-Set',
-              ConfigKey.AnalyticsEnabled,
-              analyticsEnabled
+              setConfigValue({
+                key: ConfigKey.AnalyticsEnabled,
+                value: analyticsEnabled,
+              })
             );
           }}
         >

diff --git a/src/renderer/data/Config/configState.ts b/src/renderer/data/Config/configState.ts
@@ -44,6 +44,9 @@ export const configSlice = createSlice({
     ) => {
       if (state.values) {
         state.values[action.payload.key] = action.payload.value;
+        window.promiseIpc
+          .send('CONFIG-Set', action.payload.key, action.payload.value)
+          .catch(logger.error);
       }
     },
   },
@@ -65,7 +68,6 @@ export function useConfigState() {
       window.promiseIpc
         .send('CONFIG-GetAll')
         .then((ret: ConfigMap) => {
-          logger.info(`CONFIG-GetAll => ConfigMap ${JSON.stringify(ret)}`);
           dispatch(
             setConfig({
               values: ret,
@@ -74,9 +76,9 @@ export function useConfigState() {
           );
           return `return ${ret}`;
         })
-        .catch((e) => logger.error(e));
+        .catch((e: Error) => logger.error(e));
     }
-  }, [dispatch, config.loading]);
+  }, [dispatch, config.loading, config.values]);
 
   return config;
 }