Dzenis Hadzifejzovic пре 2 година
родитељ
комит
edbc155229

+ 3
- 1
src/components/Docs/DocsFilters.js Прегледај датотеку

} from "../../store/actions/files/fileActions"; } from "../../store/actions/files/fileActions";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";


const DocsFilters = ({ open, handleClose, setPage }) => {
const DocsFilters = ({ open, handleClose, setPage, setFile }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { filters } = useSelector((s) => s.fileFilters); const { filters } = useSelector((s) => s.fileFilters);
let { id } = useParams(); let { id } = useParams();
extensions: extFilters, extensions: extFilters,
tags: tagFilters, tags: tagFilters,
content: filters.content === undefined ? "" : filters.content, content: filters.content === undefined ? "" : filters.content,
onSuccess:() => setFile(null)
}, },
apiSuccess: handleClose, apiSuccess: handleClose,
}) })
open: PropType.any, open: PropType.any,
handleClose: PropType.func, handleClose: PropType.func,
setPage: PropType.func, setPage: PropType.func,
setFile:PropType.func
}; };


export default DocsFilters; export default DocsFilters;

+ 40
- 10
src/pages/FilesPage/FileTable.js Прегледај датотеку

const dispatch = useDispatch(); const dispatch = useDispatch();
const history = useHistory(); const history = useHistory();


useEffect(() => {
console.log("TAKOOOOOOOOOO", data);
if (data !== null && data.data !== undefined) {
console.log("dasdadasdas", data);
if (data.data.length === 0) {
setPage(getTotalNumberOfPages(data) - 1);
}
}
}, [data]);

const getTotalNumberOfPages = (data) => {
return parseInt(data.total) <= PAGE_SIZE_FILES
? 1
: Math.ceil(parseInt(data.total) / PAGE_SIZE_FILES);
};

useEffect(() => {
setFile(null);
}, [id]);

useEffect(() => { useEffect(() => {
if (trigger) { if (trigger) {
handleChangeVisibility(); handleChangeVisibility();


const handleToggleFiltersDrawer = () => { const handleToggleFiltersDrawer = () => {
setToggleFiltersDrawer((oldState) => !oldState); setToggleFiltersDrawer((oldState) => !oldState);
setFile(null);
}; };


useEffect(() => { useEffect(() => {
handleFilters(page); handleFilters(page);
}, [file]);
}, [page]);


useEffect(() => { useEffect(() => {
dispatch(getFileFiltersReq()); dispatch(getFileFiltersReq());
}, },
}) })
); );
}, [id]);
}, [id, page]);


const handleChange = (_, value) => { const handleChange = (_, value) => {
setFile(null);
handleFilters(value); handleFilters(value);
setPage(value); setPage(value);
}; };
if (file !== null && stream_id === file.streamId) { if (file !== null && stream_id === file.streamId) {
setFile(null); setFile(null);
} }
// setTotalCount(
// parseInt(data.total) <= PAGE_SIZE_FILES
// ? 1
// : Math.ceil(parseInt(data.total) / PAGE_SIZE_FILES)
// );
}; };


const handleKeyDown = (event) => { const handleKeyDown = (event) => {
open={toggleFiltersDrawer} open={toggleFiltersDrawer}
handleClose={handleToggleFiltersDrawer} handleClose={handleToggleFiltersDrawer}
setPage={setPage} setPage={setPage}
setFile={setFile}
/> />


<div <div
}} }}
> >
<div className="table-cont"> <div className="table-cont">
<div style={{ display: "flex", height: "300px", width: "calc(100% - 144px)" }}>
<div
style={{
display: "flex",
height: "300px",
width: "calc(100% - 144px)",
}}
>
<table <table
className={"usersTable-users mini"} className={"usersTable-users mini"}
style={{ style={{
))} ))}
</tbody> </tbody>
</table> </table>
{file && (
{file !== null ? (
<div <div
style={{ style={{
width: "500px", width: "500px",
onError={onError} onError={onError}
/> />
</div> </div>
) : (
""
)} )}
</div> </div>
<Pagination <Pagination
size={"small"} size={"small"}
count={
parseInt(data.total) <= PAGE_SIZE_FILES
? 1
: Math.ceil(parseInt(data.total) / PAGE_SIZE_FILES)
}
count={getTotalNumberOfPages(data)}
color="primary" color="primary"
className="candidates-pagination" className="candidates-pagination"
onChange={handleChange} onChange={handleChange}

+ 1
- 0
src/pages/FilesPage/FilesPage.js Прегледај датотеку

pathname: PropTypes.string, pathname: PropTypes.string,
}), }),
}), }),
setFile:PropTypes.func
}; };


export default FilesPage; export default FilesPage;

+ 0
- 1
src/pages/FilesPage/FilesViewPage.js Прегледај датотеку



const handleToggleFiltersDrawer = () => { const handleToggleFiltersDrawer = () => {
setToggleFiltersDrawer((oldState) => !oldState); setToggleFiltersDrawer((oldState) => !oldState);
setFile(null);
}; };


useEffect(() => { useEffect(() => {

+ 3
- 0
src/store/saga/filesSaga.js Прегледај датотеку

yield call(addHeaderToken, JwtToken); yield call(addHeaderToken, JwtToken);
const result = yield call(getAllFilesReq, payload.payload); const result = yield call(getAllFilesReq, payload.payload);
yield put(getFileSuccess(result.data)); yield put(getFileSuccess(result.data));
if (payload.payload.onSuccess) {
yield call(payload.payload.onSuccess);
}
if (payload.apiSuccess) yield call(payload.apiSuccess); if (payload.apiSuccess) yield call(payload.apiSuccess);
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {

Loading…
Откажи
Сачувај