From 26f38527eb50bc117bd56808b0b23ff3a617ef8e Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Tue, 13 Aug 2024 21:33:22 -0400
Subject: [PATCH] Add socket to panelStore

---
 extension/src/devpanel/index.tsx             |  4 +--
 extension/src/devpanel/store/panelReducer.ts | 26 ++++----------------
 extension/src/devpanel/store/panelStore.ts   | 14 ++++++++---
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/extension/src/devpanel/index.tsx b/extension/src/devpanel/index.tsx
index 9a331f3b..de4f6e4a 100644
--- a/extension/src/devpanel/index.tsx
+++ b/extension/src/devpanel/index.tsx
@@ -6,6 +6,7 @@ import { Persistor } from 'redux-persist';
 import {
   REMOVE_INSTANCE,
   StoreAction,
+  StoreState,
   UPDATE_STATE,
 } from '@redux-devtools/app';
 import App from '../app/App';
@@ -18,7 +19,6 @@ import {
   SplitUpdateStateRequest,
   UpdateStateRequest,
 } from '../background/store/apiMiddleware';
-import type { StoreStateWithoutSocket } from './store/panelReducer';
 import { PersistGate } from 'redux-persist/integration/react';
 
 const position = location.hash;
@@ -31,7 +31,7 @@ const messageStyle: CSSProperties = {
 
 let rendered: boolean | undefined;
 let currentRoot: Root | undefined;
-let store: Store<StoreStateWithoutSocket, StoreAction> | undefined;
+let store: Store<StoreState, StoreAction> | undefined;
 let persistor: Persistor | undefined;
 let bgConnection: chrome.runtime.Port;
 let naTimeout: NodeJS.Timeout;
diff --git a/extension/src/devpanel/store/panelReducer.ts b/extension/src/devpanel/store/panelReducer.ts
index a6b75a1a..a97e9636 100644
--- a/extension/src/devpanel/store/panelReducer.ts
+++ b/extension/src/devpanel/store/panelReducer.ts
@@ -1,45 +1,29 @@
 import { combineReducers, Reducer } from 'redux';
 import {
   connection,
-  ConnectionState,
   instances,
-  InstancesState,
   monitor,
-  MonitorState,
   notification,
-  NotificationState,
   reports,
-  ReportsState,
   section,
-  SectionState,
-  StateTreeSettings,
+  socket,
   stateTreeSettings,
   StoreAction,
+  StoreState,
   theme,
-  ThemeState,
 } from '@redux-devtools/app';
 
-export interface StoreStateWithoutSocket {
-  readonly section: SectionState;
-  readonly theme: ThemeState;
-  readonly connection: ConnectionState;
-  readonly monitor: MonitorState;
-  readonly instances: InstancesState;
-  readonly reports: ReportsState;
-  readonly notification: NotificationState;
-  readonly stateTreeSettings: StateTreeSettings;
-}
-
 const rootReducer: Reducer<
-  StoreStateWithoutSocket,
+  StoreState,
   StoreAction,
-  Partial<StoreStateWithoutSocket>
+  Partial<StoreState>
 > = combineReducers({
   instances,
   monitor,
   reports,
   notification,
   section,
+  socket,
   theme,
   connection,
   stateTreeSettings,
diff --git a/extension/src/devpanel/store/panelStore.ts b/extension/src/devpanel/store/panelStore.ts
index 018b7704..b17802e0 100644
--- a/extension/src/devpanel/store/panelStore.ts
+++ b/extension/src/devpanel/store/panelStore.ts
@@ -1,9 +1,13 @@
 import { createStore, applyMiddleware, Reducer, Store } from 'redux';
 import localForage from 'localforage';
 import { persistReducer, persistStore } from 'redux-persist';
-import { exportStateMiddleware, StoreAction } from '@redux-devtools/app';
+import {
+  exportStateMiddleware,
+  StoreAction,
+  StoreState,
+} from '@redux-devtools/app';
 import panelDispatcher from './panelSyncMiddleware';
-import rootReducer, { StoreStateWithoutSocket } from './panelReducer';
+import rootReducer from './panelReducer';
 
 const persistConfig = {
   key: 'redux-devtools',
@@ -11,8 +15,10 @@ const persistConfig = {
   storage: localForage,
 };
 
-const persistedReducer: Reducer<StoreStateWithoutSocket, StoreAction> =
-  persistReducer(persistConfig, rootReducer) as any;
+const persistedReducer: Reducer<StoreState, StoreAction> = persistReducer(
+  persistConfig,
+  rootReducer,
+) as any;
 
 export default function configureStore(
   position: string,