Simplify AttachFile workflow.

sciencefair-land · Apr 23, 2020 · 4bc7fa6 · 4bc7fa6
1 parent dda2ee6
commit 4bc7fa6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/src/components/AttachFileModal.js b/src/components/AttachFileModal.js
@@ -1,6 +1,6 @@
 import {
   Component, $$, Form, FormRow, Modal, domHelpers,
-  MultiSelect, AssetModal, HorizontalStack
+  MultiSelect, HorizontalStack, getFilenameAndExtension
 } from 'substance'
 
 export default class AttachFileModal extends Component {
@@ -91,18 +91,14 @@ export default class AttachFileModal extends Component {
     if (option.id === '#create') {
       this.send('requestFileSelect', { multiple: false }).then(files => {
         if (files.length > 0) {
+          const { archive, api } = this.context
           const file = files[0]
-          return this.send('requestModal', () => {
-            return $$(AssetModal, { file })
-          }).then(modal => {
-            if (!modal) return
-            const api = this.context.api
-            const { filename } = modal.state.data
-            const fileNode = api.addFile(filename, file)
-            const selectedFiles = this.state.selectedFiles
-            selectedFiles.push(fileNode)
-            this.extendState({ selectedFiles })
-          })
+          const filename = archive.getUniqueFileName(file.name)
+          const [basename] = getFilenameAndExtension(filename)
+          const fileNode = api.addFile(filename, file, { select: false, title: basename })
+          const selectedFiles = this.state.selectedFiles
+          selectedFiles.push(fileNode)
+          this.extendState({ selectedFiles })
         }
       })
     }

diff --git a/src/model/SmartFigureApi.js b/src/model/SmartFigureApi.js
@@ -71,11 +71,11 @@ export default class SmartFigureApi extends BasicEditorApi {
     this.editorSession.updateNodeStates([[panel.id, {}]])
   }
 
-  addFile (fileName, file) {
-    return this.insertFileAfter(fileName, file)
+  addFile (fileName, file, options) {
+    return this.insertFileAfter(fileName, file, null, options)
   }
 
-  insertFileAfter (fileName, file, currentFileId) {
+  insertFileAfter (fileName, file, currentFileId, options = {}) {
     const doc = this.getDocument()
     const root = doc.root
     let insertPos = root.files.length
@@ -92,11 +92,14 @@ export default class SmartFigureApi extends BasicEditorApi {
       const newFileNode = documentHelpers.createNodeFromJson(tx, {
         type: 'file',
         src: assetId,
+        title: options.title || '',
         legend: [{ type: 'paragraph' }]
       })
       newNodeId = newFileNode.id
       documentHelpers.insertAt(tx, [root.id, 'files'], insertPos, newFileNode.id)
-      this._selectItem(tx, newFileNode)
+      if (options.select !== false) {
+        this._selectItem(tx, newFileNode)
+      }
     })
     return doc.get(newNodeId)
   }