Merge pull request #2363 from ethereum/kuku

Various Fixes File explorer

src/app/files/file-explorer.js

@@ -211,7 +211,8 @@ function fileExplorer (localRegistry, files, menuItems) {
     if (key === self.files.type) return
     MENU_HANDLE && MENU_HANDLE.hide(null, true)
     let actions = {}
-    if (!self.files.readonly) {
+    const provider = self._deps.fileManager.fileProviderOf(key)
+    if (!provider.isReadOnly(key)) {
       actions['Rename'] = () => {
         if (self.files.readonly) { return tooltip('cannot rename file. ' + self.files.type + ' is a read only explorer') }
         var name = label.querySelector('span[data-path="' + key + '"]')
@@ -219,15 +220,20 @@ function fileExplorer (localRegistry, files, menuItems) {
       }
       actions['Delete'] = () => {
         if (self.files.readonly) { return tooltip('cannot delete file. ' + self.files.type + ' is a read only explorer') }
-        modalDialogCustom.confirm('Delete a file', 'Are you sure you want to delete this file?', () => { files.remove(key) }, () => {})
+        modalDialogCustom.confirm(
-      }
+          'Delete a file', 'Are you sure you want to delete this file?',
+          () => { files.remove(key) },
+          () => {}
+        )
       }
-    if (self.files.type !== 'browser') {
+    } else {
-      actions['Copy to Browser explorer'] = () => {
+      actions['Delete from remix'] = () => {
-        files.get(key, (error, content) => {
+        modalDialogCustom.confirm(
-          if (error) return tooltip(error)
+          'Delete from remix',
-          self._deps.fileManager.setFile(`browser/${label.innerText}`, content)
+          'Are you sure you want to delete this file from remix?',
-        })
+          () => { files.remove(key) },
+          () => {}
+        )
       }
     }
     MENU_HANDLE = contextMenu(event, actions)
@@ -245,13 +251,13 @@ function fileExplorer (localRegistry, files, menuItems) {
 
   // register to main app, trigger when the current file in the editor changed
   self._deps.fileManager.events.on('currentFileChanged', (newFile) => {
-    const explorer = self._deps.fileManager.fileProviderOf(newFile)
+    const provider = self._deps.fileManager.fileProviderOf(newFile)
     if (self.focusElement && self.focusPath !== newFile) {
       self.focusElement.classList.remove('bg-secondary')
       self.focusElement = null
       self.focusPath = null
     }
-    if (explorer && (explorer.type === files.type)) {
+    if (provider && (provider.type === files.type)) {
       self.focusElement = self.treeView.labelAt(newFile)
       if (self.focusElement) {
         self.focusElement.classList.add('bg-secondary')
@@ -350,7 +356,7 @@ fileExplorer.prototype.init = function () {
 fileExplorer.prototype.publishToGist = function () {
   modalDialogCustom.confirm(
     'Create a public gist',
-    'Are you sure you want to publish all your files anonymously as a public gist on github.com?',
+    'Are you sure you want to publish all your files in browser directory anonymously as a public gist on github.com? Note: this will not include directories.',
     () => { this.toGist() }
   )
 }

src/app/files/fileProvider.js

@@ -6,6 +6,8 @@ class FileProvider {
   constructor (name) {
     this.event = new EventManager()
     this.type = name
+    this.normalizedNames = {} // contains the raw url associated with the displayed path
+    this.readonlyItems = ['browser']
   }
 
   exists (path, cb) {
@@ -23,6 +25,7 @@ class FileProvider {
 
   get (path, cb) {
     cb = cb || function () {}
+    if (this.normalizedNames[path]) path = this.normalizedNames[path] // ensure we actually use the normalized path from here
     var unprefixedpath = this.removePrefix(path)
     var exists = window.remixFileSystem.existsSync(unprefixedpath)
     if (!exists) return cb(null, null)
@@ -33,6 +36,10 @@ class FileProvider {
 
   set (path, content, cb) {
     cb = cb || function () {}
+    if (this.isReadOnly(path)) {
+      cb(new Error('It is not possible to modify a readonly item'))
+      return false
+    }
     var unprefixedpath = this.removePrefix(path)
     var exists = window.remixFileSystem.existsSync(unprefixedpath)
     if (!exists && unprefixedpath.indexOf('/') !== -1) {
@@ -63,15 +70,26 @@ class FileProvider {
     return true
   }
 
-  addReadOnly (path, content) {
+  addReadOnly (path, content, url) {
+    this.readonlyItems.push(this.type + '/' + path)
+    if (!url) this.normalizedNames[url] = path
     return this.set(path, content)
   }
 
   isReadOnly (path) {
-    return false
+    return this.readonlyItems.includes(path)
+  }
+
+  _removeFromReadonlyList (path) {
+    const indexToRemove = this.readonlyItems.indexOf(path)
+    if (indexToRemove !== -1) {
+      this.readonlyItems.splice(indexToRemove, 1)
+    }
   }
 
   remove (path) {
+    this._removeFromReadonlyList(path)
+
     var unprefixedpath = this.removePrefix(path)
     if (!this._exists(unprefixedpath)) {
       return false

src/app/ui/landing-page/landing-page.js

@@ -110,12 +110,10 @@ export class LandingPage extends ViewPlugin {
               if (error) {
                 modalDialogCustom.alert(error)
               } else {
-                if (fileProviders[type]) {
+                fileProviders['browser'].addReadOnly(type + '/' + cleanUrl, content, url)
-                  fileProviders[type].addReadOnly(cleanUrl, content, url)
                 globalRegistry.get('verticalicon').api.select('fileExplorers')
               }
             }
-            }
           )
         }
       })