1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-25 21:06:42 +07:00

removing uploaded files

This commit is contained in:
Fedor Katurov 2019-10-16 12:46:52 +07:00
parent 38a4c8e6a6
commit 770f3cb2aa
11 changed files with 137 additions and 31 deletions

View file

@ -9,6 +9,7 @@ import assocPath from 'ramda/es/assocPath';
import append from 'ramda/es/append';
import { selectUploads } from '~/redux/uploads/selectors';
import { connect } from 'react-redux';
import { MAX_NODE_FILES } from '~/redux/node/constants';
const mapStateToProps = state => {
const { statuses, files } = selectUploads(state);
@ -41,6 +42,11 @@ const EditorUploadButtonUnconnected: FC<IProps> = ({
const onUpload = useCallback(
(uploads: File[]) => {
const current = temp.length + data.files.length;
const limit = MAX_NODE_FILES - current;
if (current >= MAX_NODE_FILES) return;
const items: IFileWithUUID[] = Array.from(uploads).map(
(file: File): IFileWithUUID => ({
file,
@ -51,12 +57,12 @@ const EditorUploadButtonUnconnected: FC<IProps> = ({
})
);
const temps = items.map(file => file.temp_id);
const temps = items.map(file => file.temp_id).slice(0, limit);
setTemp([...temp, ...temps]);
uploadUploadFiles(items);
},
[setTemp, uploadUploadFiles, temp]
[setTemp, uploadUploadFiles, temp, data]
);
const onFileAdd = useCallback(

View file

@ -7,6 +7,9 @@ import { IUploadStatus } from '~/redux/uploads/reducer';
import { getURL } from '~/utils/dom';
import assocPath from 'ramda/es/assocPath';
import { moveArrItem } from '~/utils/fn';
import omit from 'ramda/es/omit';
import remove from 'ramda/es/remove';
import reject from 'ramda/es/reject';
interface IProps {
data: INode;
@ -19,13 +22,23 @@ const SortableItem = SortableElement(({ children }) => (
));
const SortableList = SortableContainer(
({ items, locked }: { items: IFile[]; locked: IUploadStatus[] }) => (
({
items,
locked,
onDrop,
}: {
items: IFile[];
locked: IUploadStatus[];
onDrop: (file_id: IFile['id']) => void;
}) => (
<div className={styles.grid}>
{items.map((file, index) => (
<SortableItem key={file.id} index={index} collection={0}>
<ImageUpload id={file.id} thumb={getURL(file)} />
</SortableItem>
))}
{items
.filter(file => file && file.id)
.map((file, index) => (
<SortableItem key={file.id} index={index} collection={0}>
<ImageUpload id={file.id} thumb={getURL(file)} onDrop={onDrop} />
</SortableItem>
))}
{locked.map((item, index) => (
<SortableItem key={item.temp_id} index={index} collection={1} disabled>
@ -44,8 +57,18 @@ const ImageGrid: FC<IProps> = ({ data, setData, locked }) => {
[data, setData]
);
const onDrop = useCallback(
(file_id: IFile['id']) => {
setData(
assocPath(['files'], reject(el => !el || !el.id || el.id === file_id, data.files), data)
);
},
[setData, data]
);
return (
<SortableList
onDrop={onDrop}
onSortEnd={onMove}
axis="xy"
items={data.files}