Skip to content

Commit 8f0eda2

Browse files
committed
Fix all screens on the panel unintentionally loading the root directory for a server
1 parent 52588be commit 8f0eda2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

resources/scripts/components/server/InstallListener.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import useWebsocketEvent from '@/plugins/useWebsocketEvent';
22
import { ServerContext } from '@/state/server';
33
import { SocketEvent } from '@/components/server/events';
4-
import useFileManagerSwr from '@/plugins/useFileManagerSwr';
4+
import { mutate } from 'swr';
5+
import { getDirectorySwrKey } from '@/plugins/useFileManagerSwr';
56

67
const InstallListener = () => {
78
const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
89
const getServer = ServerContext.useStoreActions(actions => actions.server.getServer);
9-
const { mutate } = useFileManagerSwr();
1010
const setServerFromState = ServerContext.useStoreActions(actions => actions.server.setServerFromState);
1111

1212
useWebsocketEvent(SocketEvent.BACKUP_RESTORE_COMPLETED, () => {
13-
mutate(undefined);
13+
mutate(getDirectorySwrKey(uuid, '/'), undefined);
1414
setServerFromState(s => ({ ...s, status: null }));
1515
});
1616

resources/scripts/plugins/useFileManagerSwr.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ import loadDirectory, { FileObject } from '@/api/server/files/loadDirectory';
33
import { cleanDirectoryPath } from '@/helpers';
44
import { ServerContext } from '@/state/server';
55

6+
export const getDirectorySwrKey = (uuid: string, directory: string): string => `${uuid}:files:${directory}`;
7+
68
export default () => {
79
const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
810
const directory = ServerContext.useStoreState(state => state.files.directory);
911

1012
return useSWR<FileObject[]>(
11-
`${uuid}:files:${directory}`,
13+
getDirectorySwrKey(uuid, directory),
1214
() => loadDirectory(uuid, cleanDirectoryPath(directory)),
1315
{
1416
focusThrottleInterval: 30000,

0 commit comments

Comments
 (0)