Fixed memory leak and localhost-workspace switch bug

libs/remix-ui/file-explorer/src/lib/actions/fileSystem.ts

@@ -237,7 +237,6 @@ export const init = (provider, workspaceName: string, plugin, registry) => (disp
       fetchDirectory(provider, workspaceName)(dispatch)
     })
     dispatch(fetchProviderSuccess(provider))
-    dispatch(setCurrentWorkspace(workspaceName))
   } else {
     dispatch(fetchProviderError('No provider available'))
   }

libs/remix-ui/file-explorer/src/lib/file-explorer.tsx

@@ -126,10 +126,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
   const editRef = useRef(null)
 
   useEffect(() => {
-    if (props.filesProvider) {
-      init(props.filesProvider, props.name, props.plugin, props.registry)(dispatch)
-    }
-  }, [props.filesProvider, props.name])
+    init(props.filesProvider, props.name, props.plugin, props.registry)(dispatch)
+  }, [])
 
   useEffect(() => {
     const provider = fileSystem.provider.provider

libs/remix-ui/file-explorer/src/lib/reducers/fileSystem.ts

@@ -9,7 +9,6 @@ export const fileSystemInitialState = {
   files: {
     files: [],
     expandPath: [],
-    workspaceName: null,
     blankPath: null,
     isRequesting: false,
     isSuccessful: false,
@@ -83,7 +82,7 @@ export const fileSystemReducer = (state = fileSystemInitialState, action: Action
         ...state,
         files: {
           ...state.files,
-          files: resolveDirectory(state.files.workspaceName, action.payload.path, state.files.files, action.payload.files),
+          files: resolveDirectory(state.provider.provider, action.payload.path, state.files.files, action.payload.files),
           isRequesting: false,
           isSuccessful: true,
           error: null
@@ -135,21 +134,12 @@ export const fileSystemReducer = (state = fileSystemInitialState, action: Action
         }
       }
     }
-    case 'SET_CURRENT_WORKSPACE': {
-      return {
-        ...state,
-        files: {
-          ...state.files,
-          workspaceName: action.payload
-        }
-      }
-    }
     case 'ADD_INPUT_FIELD': {
       return {
         ...state,
         files: {
           ...state.files,
-          files: addInputField(state.files.workspaceName, action.payload.path, state.files.files, action.payload.files),
+          files: addInputField(state.provider.provider, action.payload.path, state.files.files, action.payload.files),
           blankPath: action.payload.path,
           isRequesting: false,
           isSuccessful: true,
@@ -162,7 +152,7 @@ export const fileSystemReducer = (state = fileSystemInitialState, action: Action
         ...state,
         files: {
           ...state.files,
-          files: removeInputField(state.files.workspaceName, state.files.blankPath, state.files.files),
+          files: removeInputField(state.provider.provider, state.files.blankPath, state.files.files),
           blankPath: null,
           isRequesting: false,
           isSuccessful: true,
@@ -175,7 +165,7 @@ export const fileSystemReducer = (state = fileSystemInitialState, action: Action
         ...state,
         files: {
           ...state.files,
-          files: fileAdded(state.files.workspaceName, action.payload.path, state.files.files, action.payload.files),
+          files: fileAdded(state.provider.provider, action.payload.path, state.files.files, action.payload.files),
           expandPath: [...new Set([...state.files.expandPath, action.payload.path])],
           isRequesting: false,
           isSuccessful: true,
@@ -188,7 +178,7 @@ export const fileSystemReducer = (state = fileSystemInitialState, action: Action
         ...state,
         files: {
           ...state.files,
-          files: folderAdded(state.files.workspaceName, action.payload.path, state.files.files, action.payload.files),
+          files: folderAdded(state.provider.provider, action.payload.path, state.files.files, action.payload.files),
           expandPath: [...new Set([...state.files.expandPath, action.payload.path])],
           isRequesting: false,
           isSuccessful: true,
@@ -201,7 +191,7 @@ export const fileSystemReducer = (state = fileSystemInitialState, action: Action
         ...state,
         files: {
           ...state.files,
-          files: fileRemoved(state.files.workspaceName, action.payload.path, action.payload.removePath, state.files.files),
+          files: fileRemoved(state.provider.provider, action.payload.path, action.payload.removePath, state.files.files),
           isRequesting: false,
           isSuccessful: true,
           error: null
@@ -213,7 +203,7 @@ export const fileSystemReducer = (state = fileSystemInitialState, action: Action
         ...state,
         files: {
           ...state.files,
-          files: fileRenamed(state.files.workspaceName, action.payload.path, action.payload.removePath, state.files.files, action.payload.files),
+          files: fileRenamed(state.provider.provider, action.payload.path, action.payload.removePath, state.files.files, action.payload.files),
           isRequesting: false,
           isSuccessful: true,
           error: null
@@ -244,7 +234,9 @@ export const fileSystemReducer = (state = fileSystemInitialState, action: Action
   }
 }
 
-const resolveDirectory = (root, path: string, files, content) => {
+const resolveDirectory = (provider, path: string, files, content) => {
+  const root = provider.workspace || provider.type
+
   if (path === root) return { [root]: { ...content[root], ...files[root] } }
   const pathArr: string[] = path.split('/').filter(value => value)
 
@@ -287,14 +279,18 @@ const removePath = (root, path: string, pathName, files) => {
   return files
 }
 
-const addInputField = (root, path: string, files, content) => {
+const addInputField = (provider, path: string, files, content) => {
+  const root = provider.workspace || provider.type || ''
+
   if (path === root) return { [root]: { ...content[root], ...files[root] } }
-  const result = resolveDirectory(root, path, files, content)
+  const result = resolveDirectory(provider, path, files, content)
 
   return result
 }
 
-const removeInputField = (root, path: string, files) => {
+const removeInputField = (provider, path: string, files) => {
+  const root = provider.workspace || provider.type || ''
+
   if (path === root) {
     delete files[root][path + '/' + 'blank']
     return files
@@ -302,15 +298,17 @@ const removeInputField = (root, path: string, files) => {
   return removePath(root, path, path + '/' + 'blank', files)
 }
 
-const fileAdded = (root, path: string, files, content) => {
-  return resolveDirectory(root, path, files, content)
+const fileAdded = (provider, path: string, files, content) => {
+  return resolveDirectory(provider, path, files, content)
 }
 
-const folderAdded = (root, path: string, files, content) => {
-  return resolveDirectory(root, path, files, content)
+const folderAdded = (provider, path: string, files, content) => {
+  return resolveDirectory(provider, path, files, content)
 }
 
-const fileRemoved = (root, path: string, removedPath: string, files) => {
+const fileRemoved = (provider, path: string, removedPath: string, files) => {
+  const root = provider.workspace || provider.type || ''
+
   if (path === root) {
     delete files[root][removedPath]
 
@@ -319,7 +317,9 @@ const fileRemoved = (root, path: string, removedPath: string, files) => {
   return removePath(root, path, extractNameFromKey(removedPath), files)
 }
 
-const fileRenamed = (root, path: string, removePath: string, files, content) => {
+const fileRenamed = (provider, path: string, removePath: string, files, content) => {
+  const root = provider.workspace || provider.type || ''
+
   if (path === root) {
     const allFiles = { [root]: { ...content[root], ...files[root] } }
 

libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@@ -97,10 +97,10 @@ export const Workspace = (props: WorkspaceProps) => {
       props.fileManager.setMode('browser')
     }
   }
-  props.localhost.event.off('disconnected', localhostDisconnect)
-  props.localhost.event.on('disconnected', localhostDisconnect)
 
   useEffect(() => {
+    props.localhost.event.off('disconnected', localhostDisconnect)
+    props.localhost.event.on('disconnected', localhostDisconnect)
     props.localhost.event.on('connected', () => {
       remixdExplorer.show()
       setWorkspace(LOCALHOST)
@@ -253,18 +253,18 @@ export const Workspace = (props: WorkspaceProps) => {
   const remixdExplorer = {
     hide: async () => {
       // If 'connect to localhost' is clicked from home tab, mode is not 'localhost'
-      if (props.fileManager.mode === 'localhost') {
-        await setWorkspace(NO_WORKSPACE)
-        props.fileManager.setMode('browser')
-        setState(prevState => {
-          return { ...prevState, hideRemixdExplorer: true, loadingLocalhost: false }
-        })
-      } else {
-        // Hide spinner in file explorer
-        setState(prevState => {
-          return { ...prevState, loadingLocalhost: false }
-        })
-      }
+      // if (props.fileManager.mode === 'localhost') {
+      await setWorkspace(NO_WORKSPACE)
+      props.fileManager.setMode('browser')
+      setState(prevState => {
+        return { ...prevState, hideRemixdExplorer: true, loadingLocalhost: false }
+      })
+      // } else {
+      //   // Hide spinner in file explorer
+      //   setState(prevState => {
+      //     return { ...prevState, loadingLocalhost: false }
+      //   })
+      // }
     },
     show: () => {
       props.fileManager.setMode('localhost')