From 80282ace5e47f52952fea07b326f8c2257f3a1c1 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Wed, 25 Oct 2023 12:19:43 +0200
Subject: [PATCH] restore electron recent folders

---
 apps/remixdesktop/src/plugins/ripgrepPlugin.ts            | 2 --
 .../search/src/lib/components/results/SearchHelper.ts     | 1 -
 .../workspace/src/lib/components/file-explorer-menu.tsx   | 8 ++++++--
 libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx    | 3 +++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/remixdesktop/src/plugins/ripgrepPlugin.ts b/apps/remixdesktop/src/plugins/ripgrepPlugin.ts
index 34b4f4bb87..426f5a00f9 100644
--- a/apps/remixdesktop/src/plugins/ripgrepPlugin.ts
+++ b/apps/remixdesktop/src/plugins/ripgrepPlugin.ts
@@ -48,7 +48,6 @@ export class RipgrepPluginClient extends ElectronBasePluginClient {
 
   async glob(path: string, pattern: string, options?: any) {
     path = convertPathToPosix(this.fixPath(path))
-    console.log('path', path, this.workingDir)
 
     return new Promise((c, e) => {
       // replace packed app path with unpacked app path for release on windows
@@ -62,7 +61,6 @@ export class RipgrepPluginClient extends ElectronBasePluginClient {
 
       const stream = byline(rg.stdout.setEncoding('utf8'))
       stream.on('data', (rgresult: string) => {
-        console.log('rgresult', rgresult)
         let pathWithoutWorkingDir = rgresult.replace(
           convertPathToPosix(this.workingDir),
           ''
diff --git a/libs/remix-ui/search/src/lib/components/results/SearchHelper.ts b/libs/remix-ui/search/src/lib/components/results/SearchHelper.ts
index f7aceba759..22e94e05f7 100644
--- a/libs/remix-ui/search/src/lib/components/results/SearchHelper.ts
+++ b/libs/remix-ui/search/src/lib/components/results/SearchHelper.ts
@@ -10,7 +10,6 @@ export const getDirectory = async (dir: string, plugin: any) => {
 
     const files = await plugin.call('ripgrep', 'glob', dir, '**/*')
     // only get path property of files
-    console.log(files)
     result = files.map(x => x.path)
   } else {
 
diff --git a/libs/remix-ui/workspace/src/lib/components/file-explorer-menu.tsx b/libs/remix-ui/workspace/src/lib/components/file-explorer-menu.tsx
index 89d777f6fd..d7355da3e4 100644
--- a/libs/remix-ui/workspace/src/lib/components/file-explorer-menu.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/file-explorer-menu.tsx
@@ -1,11 +1,13 @@
 import {CustomTooltip} from '@remix-ui/helper'
-import React, {useState, useEffect} from 'react' //eslint-disable-line
+import React, {useState, useEffect, useContext} from 'react' //eslint-disable-line
 import {FormattedMessage} from 'react-intl'
 import {Placement} from 'react-bootstrap/esm/Overlay'
 import {FileExplorerMenuProps} from '../types'
+import { FileSystemContext } from '../contexts'
 const _paq = (window._paq = window._paq || [])
 
 export const FileExplorerMenu = (props: FileExplorerMenuProps) => {
+  const global = useContext(FileSystemContext)
   const [state, setState] = useState({
     menuItems: [
       {
@@ -66,7 +68,9 @@ export const FileExplorerMenu = (props: FileExplorerMenuProps) => {
   }, [])
 
   return (
+    (!global.fs.browser.isSuccessfulWorkspace ? null :
     <>
+      
       <span data-id="spanContaining" className="pl-0 pb-1 w-50">
         {state.menuItems.map(({action, title, icon, placement}, index) => {
           if (action === 'uploadFile') {
@@ -166,7 +170,7 @@ export const FileExplorerMenu = (props: FileExplorerMenuProps) => {
           }
         })}
       </span>
-    </>
+    </>)
   )
 }
 
diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index c1d5aecc6b..53a6122793 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -921,6 +921,7 @@ export function Workspace() {
                   </span>
                 </div>
                 <div className='mx-2'>
+                {!isElectron() ? (
                   <Dropdown id="workspacesSelect" data-id="workspacesSelect" onToggle={toggleDropdown} show={showDropdown}>
                     <Dropdown.Toggle
                       as={CustomToggle}
@@ -987,10 +988,12 @@ export function Workspace() {
                       )}
                     </Dropdown.Menu>
                   </Dropdown>
+                                  ):null}
                 </div>
               </div>
             </header>
           </div>
+          <ElectronMenu></ElectronMenu>     
           <div
             className="h-100 remixui_fileExplorerTree"
             onFocus={() => {