fix

Author: yann300

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

@@ -200,7 +200,7 @@ class FileProvider {
    */
   copyFolderToJson (path) {
     return new Promise((resolve, reject) => {
-      let json = {}
+      const json = {}
       path = this.removePrefix(path)
       if (window.remixFileSystem.existsSync(path)) {
         try {

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

@@ -20,15 +20,15 @@ class WorkspaceFileProvider extends FileProvider {
 
   removePrefix (path) {
     path = super.removePrefix(path)
-    return this.scopeWorkspace(path)
+    return '.workspaces/' + this.scopeWorkspace(path)
   }
 
   resolveDirectory (path, callback) {
     super.resolveDirectory(path, (error, files) => {
       if (error) return callback(error)
-      let unscoped = {}
+      const unscoped = {}
       for (const file in files) {
-          unscoped[file.replace(this.workspace + '/', '')] = files[file]
+        unscoped[file.replace('.workspaces/' + this.workspace + '/', '')] = files[file]
       }
       callback(null, unscoped)
     })

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

@@ -105,17 +105,20 @@ module.exports = class Filepanel extends ViewPlugin {
 
   refreshWorkspacesList () {
     if (!document.getElementById('workspacesSelect')) return
-    this._deps.fileProviders.browser.resolveDirectory('/', (error, fileTree) => {
+    this._deps.fileProviders.browser.resolveDirectory('/.workspaces', (error, fileTree) => {
       if (error) console.error(error)
       const items = fileTree
       items[this.LOCALHOST] = { isLocalHost: true }
       ReactDOM.render(
         (
           Object.keys(items)
             .filter((item) => fileTree[item].isDirectory || fileTree[item].isLocalHost)
-            .map((folder) => <option selected={this.currentWorkspace === folder} value={folder}>{folder}</option>)), document.getElementById('workspacesSelect')
+            .map((folder) => {
+              folder = folder.replace('.workspaces/', '')
+              return <option selected={this.currentWorkspace === folder} value={folder}>{folder}</option>
+            })), document.getElementById('workspacesSelect')
       )
-      if (!this.currentWorkspace) this.setWorkspace(Object.keys(fileTree)[0])
+      if (!this.currentWorkspace) this.setWorkspace(Object.keys(fileTree)[0].replace('.workspaces/', ''))
     })
   }
 
@@ -149,12 +152,11 @@ module.exports = class Filepanel extends ViewPlugin {
   }
 
   setWorkspace (name) {
+    this.currentWorkspace = name
     if (name === this.LOCALHOST) {
-      this.currentWorkspace = name
       this.call('manager', 'activatePlugin', 'remixd')
     } else {
       this._deps.fileProviders.workspace.setWorkspace(name)
-      this.currentWorkspace = name
       this.call('manager', 'deactivatePlugin', 'remixd')
     }
     this.renderComponent()
@@ -176,7 +178,7 @@ module.exports = class Filepanel extends ViewPlugin {
 
   renameWorkspace () {
     modalDialog.prompt('Rename Workspace', 'Please choose a name for the workspace', this.currentWorkspace, async (value) => {
-      await this._deps.fileManager.rename('browser/' + this.currentWorkspace, 'browser/' + value)
+      await this._deps.fileManager.rename('browser/.workspaces/' + this.currentWorkspace, 'browser/workspaces/' + value)
       setTimeout(async () => {
         this.setWorkspace(value)
       }, 2000)
@@ -186,7 +188,7 @@ module.exports = class Filepanel extends ViewPlugin {
   async createWorkspace () {
     const workspace = `workspace_${Date.now()}`
     modalDialog.prompt('New Workspace', 'Please choose a name for the workspace', workspace, (value) => {
-      this._deps.fileProviders.browser.createDir(value, async () => {
+      this._deps.fileProviders.browser.createDir('.workspaces/' + value, async () => {
         this.setWorkspace(value)
         setTimeout(async () => {
           for (const file in examples) {
@@ -200,7 +202,7 @@ module.exports = class Filepanel extends ViewPlugin {
   deleteCurrentWorkspace () {
     if (!this.currentWorkspace) return
     modalDialog.confirm('Delete Workspace', 'Please confirm workspace deletion', () => {
-      this._deps.fileProviders.browser.remove(this.currentWorkspace)
+      this._deps.fileProviders.browser.remove('.workspaces/' + this.currentWorkspace)
       this.currentWorkspace = null
       this.renderComponent()
     })

apps/remix-ide/src/migrateFileSystem.js

@@ -28,10 +28,11 @@ export async function migrateToWorkspace (fileManager) {
   if (fileStorageBrowserWorkspace.get(flag) === 'done') return
   const files = await browserProvider.copyFolderToJson('/')
   console.log(files)
-  await browserProvider.remove('/')
-  workspaceProvider.setWorkspace('workspace_1')
-  await fileManager.mkdir('workspace_1')
-  await populateWorkspace('workspace_1', files, fileManager)
+  const workspaceName = 'workspace_1'
+  const workspacePath = 'browser/.workspaces/' + workspaceName
+  workspaceProvider.setWorkspace(workspaceName)
+  await fileManager.mkdir(workspacePath)
+  await populateWorkspace(workspacePath, files, fileManager)
   fileStorageBrowserWorkspace.set(flag, 'done')
 }