Merge branch 'develop' of github.com:pterodactyl/panel into develop

Author: DaneEveritt

app/Http/Controllers/Api/Client/Servers/BackupController.php

@@ -213,7 +213,7 @@ public function restore(Request $request, Server $server, Backup $backup): JsonR
             // actions against it via the Panel API.
             $server->update(['status' => Server::STATUS_RESTORING_BACKUP]);
 
-            $this->repository->setServer($server)->restore($backup, $url ?? null, $request->input('truncate') === 'true');
+            $this->repository->setServer($server)->restore($backup, $url ?? null, $request->input('truncate'));
         });
 
         return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);

resources/scripts/api/server/backups/index.ts

@@ -1,5 +1,7 @@
 import http from '@/api/http';
 
-export const restoreServerBackup = async (uuid: string, backup: string): Promise<void> => {
-    await http.post(`/api/client/servers/${uuid}/backups/${backup}/restore`);
+export const restoreServerBackup = async (uuid: string, backup: string, truncate?: boolean): Promise<void> => {
+    await http.post(`/api/client/servers/${uuid}/backups/${backup}/restore`, {
+        truncate,
+    });
 };

resources/scripts/components/server/backups/BackupContextMenu.tsx

@@ -25,6 +25,7 @@ export default ({ backup }: Props) => {
     const setServerFromState = ServerContext.useStoreActions(actions => actions.server.setServerFromState);
     const [ modal, setModal ] = useState('');
     const [ loading, setLoading ] = useState(false);
+    const [ truncate, setTruncate ] = useState(false);
     const { clearFlashes, clearAndAddHttpError } = useFlash();
     const { mutate } = getServerBackups();
 
@@ -62,7 +63,7 @@ export default ({ backup }: Props) => {
     const doRestorationAction = () => {
         setLoading(true);
         clearFlashes('backups');
-        restoreServerBackup(uuid, backup.uuid)
+        restoreServerBackup(uuid, backup.uuid, truncate)
             .then(() => setServerFromState(s => ({
                 ...s,
                 status: 'restoring_backup',
@@ -108,6 +109,8 @@ export default ({ backup }: Props) => {
                             css={tw`text-red-500! w-5! h-5! mr-2`}
                             id={'restore_truncate'}
                             value={'true'}
+                            checked={truncate}
+                            onChange={() => setTruncate(s => !s)}
                         />
                         Remove all files and folders before restoring this backup.
                     </label>