diff --git a/packages/component-wizard/src/components/FileItem.local.scss b/packages/component-wizard/src/components/FileItem.local.scss index 076d3f0412ba3073bfe818bb7d0f565bee5185d4..1b38d085bd39d8db7f5b2b346a70dd2c54a71fe6 100644 --- a/packages/component-wizard/src/components/FileItem.local.scss +++ b/packages/component-wizard/src/components/FileItem.local.scss @@ -16,9 +16,15 @@ align-items: center; display: flex; justify-content: center; - margin: 0 5px; + margin: 0 10px; + + a { + align-items: center; + display: flex; + } button { + background-color: transparent; border: none; cursor: pointer; diff --git a/packages/component-wizard/src/components/FileSection.js b/packages/component-wizard/src/components/FileSection.js index 1cc64ed29a8621113172382f1324369ad358e1a6..780fdc04bea1c4bc672a3c1ff95b1ec0d58fe539 100644 --- a/packages/component-wizard/src/components/FileSection.js +++ b/packages/component-wizard/src/components/FileSection.js @@ -23,16 +23,17 @@ const FileSection = ({ title, files, listId, + isOver, isLast, isFirst, addFile, + canDrop, + dropItems, moveItem, + isFileOver, removeFile, - connectDropTarget, - isOver, - canDrop, connectFileDrop, - isFileOver, + connectDropTarget, }) => connectFileDrop( connectDropTarget( @@ -55,6 +56,7 @@ const FileSection = ({ <SortableList beginDragProps={['id', 'index', 'name', 'listId']} dragHandle={DragHandle} + dropItem={dropItems} items={files} listId={listId} listItem={FileItem} diff --git a/packages/component-wizard/src/components/Files.js b/packages/component-wizard/src/components/Files.js index 4b8c301d372539e801faba5660b57e1a69000766..8961fcd532ec21d3ff875e7a38480f0bc32e7745 100644 --- a/packages/component-wizard/src/components/Files.js +++ b/packages/component-wizard/src/components/Files.js @@ -17,12 +17,14 @@ const Files = ({ moveItem, removeFile, changeList, + dropItems, ...rest }) => ( <div> <FileSection addFile={addFile('manuscripts')} changeList={changeList} + dropItems={dropItems} files={get(files, 'manuscripts') || []} isFirst listId="manuscripts" @@ -76,6 +78,13 @@ export default compose( }, }), withHandlers({ + dropItems: ({ files, updateFragment, project, version }) => () => { + updateFragment(project, { + submitted: new Date(), + ...version, + files, + }) + }, changeList: ({ files, setFiles, updateFragment, project, version }) => ( fromListId, toListId, @@ -121,8 +130,15 @@ export default compose( }) }) }, - moveItem: ({ setFiles, files }) => type => (dragIndex, hoverIndex) => { - setFiles(SortableList.moveItem(files[type], dragIndex, hoverIndex), type) + moveItem: ({ + setFiles, + files, + project, + version, + updateFragment, + }) => type => (dragIndex, hoverIndex) => { + const newFiles = SortableList.moveItem(files[type], dragIndex, hoverIndex) + setFiles(newFiles, type) }, removeFile: ({ setFiles, diff --git a/packages/component-wizard/src/redux/files.js b/packages/component-wizard/src/redux/files.js index 87d69a3bee570cf792245c1b9e8de2a649cd7f71..e00ea43403d63752310f6f68ee682b517944a453 100644 --- a/packages/component-wizard/src/redux/files.js +++ b/packages/component-wizard/src/redux/files.js @@ -48,7 +48,6 @@ const createFileData = (file, type) => { method: 'POST', headers: { Accept: 'text/plain', - 'Content-Type': 'multipart/form-data', }, body: data, }