Merge pull request #689 from ethereum/fixFileManagerAPI

Fix removePrefix from fileProvider

apps/remix-ide-e2e/src/tests/fileExplorer.test.ts

@@ -105,7 +105,8 @@ module.exports = {
     .waitForElementVisible('*[key="browser/fileExplorer.test.js"]')
     .waitForElementVisible('*[key="browser/generalSettings.test.js"]')
     .end()
-  },
+  },  
 
   tearDown: sauce
 }
+

apps/remix-ide-e2e/src/tests/fileManager_api.test.ts

@@ -87,7 +87,15 @@ module.exports = {
     .addFile('removeFile.js', { content: executeRemove })
     .executeScript(`remix.exeCurrent()`)
     .pause(2000)
-    .waitForElementNotPresent('[data-id="treeViewLibrowser/old_contract.sol"]')
+    .waitForElementNotPresent('[data-id="treeViewLibrowser/old_contract.sol"]')    
+  },
+
+  'Should execute `remove` api from file manager external api on a folder': function (browser: NightwatchBrowser) {
+    browser
+    .addFile('test_jsRemoveFolder.js', { content: executeRemoveOnFolder })
+    .executeScript('remix.exeCurrent()')
+    .pause(2000)
+    .waitForElementNotPresent('*[key="browser/tests"]')
     .end()
   },
 
@@ -189,3 +197,11 @@ const executeRemove = `
 
   run()
 `
+
+const executeRemoveOnFolder = `(async () => {
+  try {      
+      await remix.call('fileManager', 'remove', 'browser')
+  } catch (e) {
+      console.log(e.message)
+  }
+})()`

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

@@ -170,7 +170,7 @@ class FileProvider {
             const items = window.remixFileSystem.readdirSync(path)
             if (items.length !== 0) {
               items.forEach((item, index) => {
-                const curPath = `${path}/${item}`
+                const curPath = `${path}${path.endsWith('/') ? '' : '/'}${item}`
                 if (window.remixFileSystem.statSync(curPath).isDirectory()) { // delete folder
                   this.remove(curPath)
                 } else { // delete file
@@ -238,6 +238,7 @@ class FileProvider {
 
   removePrefix (path) {
     path = path.indexOf(this.type) === 0 ? path.replace(this.type, '') : path
+    if (path === '') return '/'
     return path
   }
 

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

@@ -166,6 +166,7 @@ module.exports = class RemixDProvider {
   removePrefix (path) {
     path = path.indexOf(this.type) === 0 ? path.replace(this.type, '') : path
     if (path[0] === '/') return path.substring(1)
+    if (path === '') return '/'
     return path
   }
 

libs/remixd/src/utils.ts

@@ -11,9 +11,7 @@ import * as pathModule from 'path'
  */
 function absolutePath (path: string, sharedFolder:string): string {
   path = normalizePath(path)
-  if (path.indexOf(sharedFolder) !== 0) {
+  path = pathModule.resolve(sharedFolder, path)
-    path = pathModule.resolve(sharedFolder, path)
-  }
   return path
 }
 
@@ -34,6 +32,7 @@ function normalizePath (path: string): string {
   if (process.platform === 'win32') {
     return path.replace(/\\/g, '/')
   }
+  if (path === '/') path = './'
   return path
 }