fix some bugs

src/components/Docs/DocsFilters.js

@@ -17,7 +17,7 @@ import {
 } from "../../store/actions/files/fileActions";
 import { useParams } from "react-router-dom";
 
-const DocsFilters = ({ open, handleClose, setPage }) => {
+const DocsFilters = ({ open, handleClose, setPage, setFile }) => {
   const dispatch = useDispatch();
   const { filters } = useSelector((s) => s.fileFilters);
   let { id } = useParams();
@@ -49,6 +49,7 @@ const DocsFilters = ({ open, handleClose, setPage }) => {
           extensions: extFilters,
           tags: tagFilters,
           content: filters.content === undefined ? "" : filters.content,
+          onSuccess:() => setFile(null)
         },
         apiSuccess: handleClose,
       })
@@ -158,6 +159,7 @@ DocsFilters.propTypes = {
   open: PropType.any,
   handleClose: PropType.func,
   setPage: PropType.func,
+  setFile:PropType.func
 };
 
 export default DocsFilters;

src/pages/FilesPage/FileTable.js

@@ -49,6 +49,26 @@ const FileTable = ({ trigger }) => {
   const dispatch = useDispatch();
   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(() => {
     if (trigger) {
       handleChangeVisibility();
@@ -57,12 +77,11 @@ const FileTable = ({ trigger }) => {
 
   const handleToggleFiltersDrawer = () => {
     setToggleFiltersDrawer((oldState) => !oldState);
-    setFile(null);
   };
 
   useEffect(() => {
     handleFilters(page);
-  }, [file]);
+  }, [page]);
 
   useEffect(() => {
     dispatch(getFileFiltersReq());
@@ -78,9 +97,10 @@ const FileTable = ({ trigger }) => {
         },
       })
     );
-  }, [id]);
+  }, [id, page]);
 
   const handleChange = (_, value) => {
+    setFile(null);
     handleFilters(value);
     setPage(value);
   };
@@ -131,6 +151,11 @@ const FileTable = ({ trigger }) => {
     if (file !== null && stream_id === file.streamId) {
       setFile(null);
     }
+    // setTotalCount(
+    //   parseInt(data.total) <= PAGE_SIZE_FILES
+    //     ? 1
+    //     : Math.ceil(parseInt(data.total) / PAGE_SIZE_FILES)
+    // );
   };
 
   const handleKeyDown = (event) => {
@@ -299,6 +324,7 @@ const FileTable = ({ trigger }) => {
         open={toggleFiltersDrawer}
         handleClose={handleToggleFiltersDrawer}
         setPage={setPage}
+        setFile={setFile}
       />
 
       <div
@@ -357,7 +383,13 @@ const FileTable = ({ trigger }) => {
         }}
       >
         <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
               className={"usersTable-users mini"}
               style={{
@@ -450,7 +482,7 @@ const FileTable = ({ trigger }) => {
                 ))}
               </tbody>
             </table>
-            {file && (
+            {file !== null ? (
               <div
                 style={{
                   width: "500px",
@@ -464,15 +496,13 @@ const FileTable = ({ trigger }) => {
                   onError={onError}
                 />
               </div>
+            ) : (
+              ""
             )}
           </div>
           <Pagination
             size={"small"}
-            count={
-              parseInt(data.total) <= PAGE_SIZE_FILES
-                ? 1
-                : Math.ceil(parseInt(data.total) / PAGE_SIZE_FILES)
-            }
+            count={getTotalNumberOfPages(data)}
             color="primary"
             className="candidates-pagination"
             onChange={handleChange}

src/pages/FilesPage/FilesPage.js

@@ -116,6 +116,7 @@ FilesPage.propTypes = {
       pathname: PropTypes.string,
     }),
   }),
+  setFile:PropTypes.func
 };
 
 export default FilesPage;

src/pages/FilesPage/FilesViewPage.js

@@ -57,7 +57,6 @@ const FilesViewPage = ({ history }) => {
 
   const handleToggleFiltersDrawer = () => {
     setToggleFiltersDrawer((oldState) => !oldState);
-    setFile(null);
   };
 
   useEffect(() => {

src/store/saga/filesSaga.js

@@ -52,6 +52,9 @@ export function* getAll({ payload }) {
     yield call(addHeaderToken, JwtToken);
     const result = yield call(getAllFilesReq, payload.payload);
     yield put(getFileSuccess(result.data));
+    if (payload.payload.onSuccess) {
+      yield call(payload.payload.onSuccess);
+    }
     if (payload.apiSuccess) yield call(payload.apiSuccess);
   } catch (error) {
     if (error.response && error.response.data) {