diff --git a/src/components/header.jsx b/src/components/header.jsx index 2f00ace..14ca77a 100644 --- a/src/components/header.jsx +++ b/src/components/header.jsx @@ -78,8 +78,8 @@ const HeaderSearch = () => { {items} - - + + diff --git a/src/pages/files/add.jsx b/src/pages/files/add.jsx index 0022ff4..dd2f62c 100644 --- a/src/pages/files/add.jsx +++ b/src/pages/files/add.jsx @@ -29,7 +29,7 @@ const ModalAddFile = ({ opened, handler, addFiles }) => { API.upload(formData) .then((res) => { if (res.status === 200) { - validate(files); + validate(res.data); } }) .catch((err) => { diff --git a/src/pages/files/file-selector.jsx b/src/pages/files/file-selector.jsx index b0f9e79..2506043 100644 --- a/src/pages/files/file-selector.jsx +++ b/src/pages/files/file-selector.jsx @@ -10,29 +10,35 @@ const ModalFileSelector = ({ opened, handleClose, handleSubmit, ...props }) => { const [files, setFiles] = useState([]); const [showAdd, setShowAdd] = useState(false); const [search, setSearch] = useState(''); - let resfiless = []; + let resFiles = []; const toggleShowAdd = () => setShowAdd(!showAdd); - const clickHandler = (files) => { + const clickHandler = (file) => { if (props.multi) { // eslint-disable-next-line eqeqeq - const indexfiles = resfiless.findIndex((item) => item._id == files._id); - if (indexfiles === -1) { - resfiless.push(files); + const indexFile = resFiles.findIndex((item) => item.id == file.id); + if (indexFile === -1) { + resFiles.push(file); } else { - resfiless.splice(indexfiles, 1); + resFiles.splice(indexFile, 1); } } else { - handleSubmitLocal(files); + handleSubmitLocal(file); } }; - const handleSubmitLocal = (files) => { - handleSubmit(props.multi ? resfiless : files); + const handleSubmitLocal = (file) => { + handleSubmit(props.multi ? resFiles : file); handleClose(); }; + const addFiles = (objects) => { + for(let i = 0; i < objects.length; i++) { + setFiles((prev) => [...prev, objects[i]]); + } + } + useEffect(() => { API.getFiles() .then((res) => { @@ -41,7 +47,7 @@ const ModalFileSelector = ({ opened, handleClose, handleSubmit, ...props }) => { } }) .catch((err) => { - setNotification(true, err.response.data.error); + setNotification(true, err.message); }); return () => {}; @@ -57,7 +63,7 @@ const ModalFileSelector = ({ opened, handleClose, handleSubmit, ...props }) => { } }) .catch((err) => { - setNotification(true, err.response.data.error); + setNotification(true, err.message); }); } else if (search.length === 0) { API.getFiles() @@ -67,7 +73,7 @@ const ModalFileSelector = ({ opened, handleClose, handleSubmit, ...props }) => { } }) .catch((err) => { - setNotification(true, err.response.data.error); + setNotification(true, err.message); }); } }, [search]); @@ -94,8 +100,8 @@ const ModalFileSelector = ({ opened, handleClose, handleSubmit, ...props }) => { /> - {files.map((file) => ( - + {files.map((file, index) => ( + ))} @@ -118,7 +124,7 @@ const ModalFileSelector = ({ opened, handleClose, handleSubmit, ...props }) => { setFiles((prev) => [...prev, files])} + addFiles={(files) => addFiles(files)} /> )}