Code cleanup for file manager

This commit is contained in:
Dane Everitt 2020-07-18 10:45:41 -07:00
parent d644758986
commit ff9f893dc3
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 6 additions and 13 deletions

View file

@ -30,10 +30,6 @@ export default () => {
const setSelectedFiles = ServerContext.useStoreActions(actions => actions.files.setSelectedFiles);
useEffect(() => {
// We won't automatically mutate the store when the component re-mounts, otherwise because of
// my (horrible) programming this fires off way more than we intend it to.
mutate();
setSelectedFiles([]);
setDirectory(hash.length > 0 ? hash : '/');
}, [ hash ]);

View file

@ -18,7 +18,6 @@ const Row = styled.div`
const FileObjectRow = ({ file }: { file: FileObject }) => {
const directory = ServerContext.useStoreState(state => state.files.directory);
const setDirectory = ServerContext.useStoreActions(actions => actions.files.setDirectory);
const history = useHistory();
const match = useRouteMatch();
@ -31,9 +30,7 @@ const FileObjectRow = ({ file }: { file: FileObject }) => {
// Just trust me future me, leave this be.
if (!file.isFile) {
e.preventDefault();
history.push(`#${cleanDirectoryPath(`${directory}/${file.name}`)}`);
setDirectory(`${directory}/${file.name}`);
}
};

View file

@ -2,18 +2,18 @@ import useSWR from 'swr';
import loadDirectory, { FileObject } from '@/api/server/files/loadDirectory';
import { cleanDirectoryPath } from '@/helpers';
import useServer from '@/plugins/useServer';
import { useLocation } from 'react-router';
import { ServerContext } from '@/state/server';
export default () => {
const { uuid } = useServer();
const { hash } = useLocation();
const directory = ServerContext.useStoreState(state => state.files.directory);
return useSWR<FileObject[]>(
`${uuid}:files:${hash}`,
() => loadDirectory(uuid, cleanDirectoryPath(hash)),
`${uuid}:files:${directory}`,
() => loadDirectory(uuid, cleanDirectoryPath(directory)),
{
revalidateOnMount: false,
revalidateOnMount: true,
refreshInterval: 0,
}
},
);
};