Merge pull request #61 from uptick/fix/no-backslashes-allowed

UP-1895 Documents - no more backslash havoc

Author: jlo-1

demo-site/nested-editable.js

@@ -54,34 +54,28 @@ class NestedEditableDemo extends React.Component {
     })
   }
   handleCreateFiles = (files, prefix) => {
-    this.setState(state => {
+    this.setState(prevState => {
       const newFiles = files.map((file) => {
         let newKey = prefix
         if (prefix !== '' && prefix.substring(prefix.length - 1, prefix.length) !== '/') {
           newKey += '/'
         }
+        const invalidChar = ['/', '\\']
+        if (invalidChar.some(char => file.name.indexOf(char) !== -1)) return
         newKey += file.name
         return {
           key: newKey,
           size: file.size,
           modified: +Moment(),
         }
       })
-
       const uniqueNewFiles = []
-      newFiles.map((newFile) => {
-        let exists = false
-        state.files.map((existingFile) => {
-          if (existingFile.key === newFile.key) {
-            exists = true
-          }
-        })
-        if (!exists) {
-          uniqueNewFiles.push(newFile)
-        }
+      newFiles.forEach((newFile) => {
+        const exists = prevState.files.some(existingFile => (existingFile.key === newFile.key))
+        if (!exists) uniqueNewFiles.push(newFile)
       })
-      state.files = state.files.concat(uniqueNewFiles)
-      return state
+      const updatedFiles = [...prevState.files, uniqueNewFiles]
+      return { files: updatedFiles }
     })
   }
   handleRenameFolder = (oldKey, newKey) => {

src/base-file.js

@@ -65,7 +65,6 @@ class BaseFile extends React.Component {
 
   handleFileClick = (event) => {
     event && event.preventDefault()
-
     this.props.browserProps.preview({
       url: this.props.url,
       name: this.getName(),
@@ -109,15 +108,14 @@ class BaseFile extends React.Component {
       // })
       return
     }
-    if (newName.indexOf('/') !== -1) {
-      // todo: move to props handler
-      // window.notify({
-      //   style: 'error',
-      //   title: 'Invalid new file name',
-      //   body: 'File names cannot contain forward slashes.',
-      // })
-      return
-    }
+    const invalidChar = ['/', '\\']
+    if (invalidChar.some(char => newName.indexOf(char) !== -1)) return
+    // todo: move to props handler
+    // window.notify({
+    //   style: 'error',
+    //   title: 'Invalid new file name',
+    //   body: 'File names cannot contain forward slashes.',
+    // })
     let newKey = newName
     const slashIndex = this.props.fileKey.lastIndexOf('/')
     if (slashIndex !== -1) {

src/base-folder.js

@@ -80,7 +80,7 @@ class BaseFolder extends React.Component {
   }
   handleNewNameChange = (event) => {
     const newName = this.newNameRef.value
-    this.setState({newName: newName})
+    this.setState({ newName: newName })
   }
   handleRenameSubmit = (event) => {
     event.preventDefault()
@@ -97,15 +97,15 @@ class BaseFolder extends React.Component {
       // })
       return
     }
-    if (newName.indexOf('/') !== -1) {
-      // todo: move to props handler
-      // window.notify({
-      //   style: 'error',
-      //   title: 'Invalid new folder name',
-      //   body: 'Folder names cannot contain forward slashes.',
-      // })
-      return
-    }
+    const invalidChar = ['/', '\\']
+    if (invalidChar.some(char => newName.indexOf(char) !== -1)) return
+    // todo: move to props handler
+    // window.notify({
+    //   style: 'error',
+    //   title: 'Invalid new folder name',
+    //   body: 'Folder names cannot contain forward slashes.',
+    // })
+
     let newKey = this.props.fileKey.substr(0, this.props.fileKey.substr(0, this.props.fileKey.length - 1).lastIndexOf('/'))
     if (newKey.length) {
       newKey += '/'