StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Continue with file manager code cleanup

Browse source
This commit is contained in:
Dane Everitt 2020-07-10 22:38:07 -07:00
parent 2692e98cd8
commit 5da9824fb7
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 89 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/scripts/components/server/files/FileManagerContainer.tsx
View file

@ -4,7 +4,7 @@ import { CSSTransition } from 'react-transition-group';
import Spinner from '@/components/elements/Spinner';
import FileObjectRow from '@/components/server/files/FileObjectRow';
import FileManagerBreadcrumbs from '@/components/server/files/FileManagerBreadcrumbs';
import loadDirectory, { FileObject } from '@/api/server/files/loadDirectory';
import { FileObject } from '@/api/server/files/loadDirectory';
import NewDirectoryButton from '@/components/server/files/NewDirectoryButton';
import { Link, useLocation } from 'react-router-dom';
import Can from '@/components/elements/Can';
@ -12,10 +12,9 @@ import PageContentBlock from '@/components/elements/PageContentBlock';
import ServerError from '@/components/screens/ServerError';
import tw from 'twin.macro';
import Button from '@/components/elements/Button';
import useSWR from 'swr';
import useServer from '@/plugins/useServer';
import { cleanDirectoryPath } from '@/helpers';
import { ServerContext } from '@/state/server';
import useFileManagerSwr from '@/plugins/useFileManagerSwr';
const sortFiles = (files: FileObject[]): FileObject[] => {
return files.sort((a, b) => a.name.localeCompare(b.name))
@ -23,15 +22,11 @@ const sortFiles = (files: FileObject[]): FileObject[] => {
};
export default () => {
const { id } = useServer();
const { hash } = useLocation();
const { id, uuid } = useServer();
const { data: files, error, mutate } = useFileManagerSwr();
const setDirectory = ServerContext.useStoreActions(actions => actions.files.setDirectory);
const { data: files, error, mutate } = useSWR(
`${uuid}:files:${hash}`,
() => loadDirectory(uuid, cleanDirectoryPath(window.location.hash)),
);
useEffect(() => {
setDirectory(hash.length > 0 ? hash : '/');
}, [ hash ]);