Merge pull request #19 from VityaSchel/dev

Fixed bug with File Storage when filters won't work because react sucks
VityaSchel · Nov 1, 2021 · 38fc977 · 38fc977
2 parents a922590 + c36aff6
commit 38fc977
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/components/FileStorage/File.js b/src/components/FileStorage/File.js
@@ -1,7 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import styles from './styles.module.scss'
-import Grid from '@mui/material/Grid'
 import IconButton from '@mui/material/IconButton'
 import { MdInfoOutline, MdDelete, MdPlayCircleOutline } from 'react-icons/md'
 import { RiStopCircleLine } from 'react-icons/ri'

diff --git a/src/components/FileStorage/List.js b/src/components/FileStorage/List.js
@@ -1,7 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import styles from './styles.module.scss'
-import Grid from '@mui/material/Grid'
 import { getRecent } from 'localStorage/fileStorage'
 import File from './File'
 import Typography from '@mui/material/Typography'
@@ -17,36 +16,37 @@ const List = React.forwardRef((props, ref) => {
 
   React.useImperativeHandle(ref, () => ({
     reset() {
-      setOffset(0)
       setFetchedFiles([])
       setMappedFiles([])
       contentRef.current.scrollTop = 0
+      setOffset(0)
     }
   }))
 
-  React.useEffect(() => setOffset(0), [props.packs])
+  React.useEffect(() => setOffset(-1), [props.packs])
   React.useEffect(() => mapFiles(offset), [offset])
 
   const mapFiles = async offset => {
+    offset = Math.max(offset, 0)
     const newFiles = await getRecent(Object.keys(props.packs), offset)
     const newFetchedFiles = fetchedFiles.concat(newFiles)
     setFetchedFiles(newFetchedFiles)
 
-    const mappedFiles = []
+    const newMappedFiles = []
     let packSwitchUUID
     for (let file of newFetchedFiles) {
       if(packSwitchUUID !== file.packUUID){
         packSwitchUUID = file.packUUID
-        mappedFiles.push({
+        newMappedFiles.push({
           packName: props.packs[packSwitchUUID],
           files: [file]
         })
       } else {
-        mappedFiles[mappedFiles.length - 1].files.push(file)
+        newMappedFiles[newMappedFiles.length - 1].files.push(file)
       }
     }
 
-    setMappedFiles(mappedFiles)
+    setMappedFiles(newMappedFiles)
   }
 
   return (

diff --git a/src/components/FileStorage/Upload/UploadingFiles.js b/src/components/FileStorage/Upload/UploadingFiles.js
@@ -69,8 +69,7 @@ UploadingFiles.propTypes = {
   setStage: PropTypes.func,
   setTab: PropTypes.func,
   pack: PropTypes.object,
-  display: PropTypes.bool,
-  // setUploadingFileIndex: PropTypes.number,
+  display: PropTypes.bool
 }
 UploadingFiles.displayName = 'UploadingFiles'