Fix recent workspaces

Author: ioedeveloper

apps/remix-ide/src/app/files/workspaceFileProvider.js

@@ -25,8 +25,10 @@ export default class WorkspaceFileProvider extends FileProvider {
   }
 
   setWorkspace (workspace) {
-    if (!workspace) return
-    workspace = workspace.replace(/^\/|\/$/g, '') // remove first and last slash
+    const workspaceName = (workspace || {}).name ? workspace.name : workspace
+  
+    if (!workspaceName) return
+    workspace = workspaceName.replace(/^\/|\/$/g, '') // remove first and last slash
     this.workspace = workspace
   }
 

apps/remix-ide/src/app/panels/file-panel.js

@@ -211,15 +211,16 @@ export default class Filepanel extends ViewPlugin {
   }
 
   saveRecent(workspaceName) {
+    if (typeof workspaceName !== 'string') return
     if (workspaceName === 'code-sample') return
     if (!localStorage.getItem('recentWorkspaces')) {
       localStorage.setItem('recentWorkspaces', JSON.stringify([ { name: workspaceName, timestamp: Date.now() } ]))
     } else {
       let recents = JSON.parse(localStorage.getItem('recentWorkspaces'))
       // checking if we have a duplication
-      if (!recents.find((el) => typeof el === 'string' ? el === workspaceName : el.name === workspaceName)) {
+      if (!recents.find((el) => (el || {}).name ? el.name === workspaceName : el === workspaceName)) {
         recents = ([{ name: workspaceName, timestamp: Date.now() }, ...recents])
-        recents = recents.filter((el) => typeof el === 'string' ? el !== '' : el.name !== '')
+        recents = recents.filter((el) => (el || {}).name ? el.name !== '' : el !== '')
         localStorage.setItem('recentWorkspaces', JSON.stringify(recents))
       }
     }

libs/remix-ui/home-tab/src/lib/components/homeTabRecentWorkspaces.tsx

@@ -39,7 +39,7 @@ function HomeTabRecentWorkspaces({ plugin }: HomeTabFileProps) {
       if (!recents) {
         newRecents = []
       } else {
-        newRecents = recents.filter((el) => typeof el === 'string' ? el !== name : el.name !== name)
+        newRecents = recents.filter((el) => (el || {}).name ? el.name !== name : el !== name)
         localStorage.setItem('recentWorkspaces', JSON.stringify(newRecents))
       }
       setState((prevState) => {
@@ -100,15 +100,15 @@ function HomeTabRecentWorkspaces({ plugin }: HomeTabFileProps) {
         </label>
         <div className="d-flex flex-column pl-2">
           {
-            Array.isArray(state.recentWorkspaces) && state.recentWorkspaces.map((workspace, index) => {
-              const workspaceName = typeof workspace === 'string' ? workspace : workspace.name
-              const workspaceTimestamp = typeof workspace === 'string' ? null : workspace.timestamp
+            Array.isArray(state.recentWorkspaces) && state.recentWorkspaces.map((workspace: any, index) => {
+              const workspaceName = (workspace || {}).name ? workspace.name : workspace
+              const workspaceTimestamp = (workspace || {}).timestamp ? workspace.timestamp : null
 
               return index < 3 ? (
                 <div key={index} className="d-flex flex-row align-items-center mb-2">
                   { loadingWorkspace === workspace ? <i className="fad fa-spinner fa-spin mr-2"></i> : <i className="fas fa-folder-tree mr-2"></i> }
                   <div className="d-flex flex-row justify-content-between w-100 flex-wrap">
-                    <a className="cursor-pointer text-decoration-none d-inline-block" href="#" onClick={(e) => handleSwitchToRecentWorkspace(e, workspace)} key={index}>
+                    <a className="cursor-pointer text-decoration-none d-inline-block" href="#" onClick={(e) => handleSwitchToRecentWorkspace(e, workspaceName)} key={index}>
                       <span style={{ color: isDark ? 'white' : 'black' }}>{workspaceName}</span>
                     </a>
                     <span className="text-muted">created {getTimeAgo(workspaceTimestamp)}</span>