Move actions into context menu, add support for deleting a backup

Author: DaneEveritt

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

@@ -2,12 +2,16 @@
 
 namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 
+use Pterodactyl\Models\Backup;
 use Pterodactyl\Models\Server;
+use Illuminate\Http\JsonResponse;
+use Pterodactyl\Services\Backups\DeleteBackupService;
 use Pterodactyl\Services\Backups\InitiateBackupService;
 use Pterodactyl\Transformers\Api\Client\BackupTransformer;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Backups\GetBackupsRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Backups\StoreBackupRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Backups\DeleteBackupRequest;
 
 class BackupController extends ClientApiController
 {
@@ -16,16 +20,23 @@ class BackupController extends ClientApiController
      */
     private $initiateBackupService;
 
+    /**
+     * @var \Pterodactyl\Services\Backups\DeleteBackupService
+     */
+    private $deleteBackupService;
+
     /**
      * BackupController constructor.
      *
+     * @param \Pterodactyl\Services\Backups\DeleteBackupService $deleteBackupService
      * @param \Pterodactyl\Services\Backups\InitiateBackupService $initiateBackupService
      */
-    public function __construct(InitiateBackupService $initiateBackupService)
+    public function __construct(DeleteBackupService $deleteBackupService, InitiateBackupService $initiateBackupService)
     {
         parent::__construct();
 
         $this->initiateBackupService = $initiateBackupService;
+        $this->deleteBackupService = $deleteBackupService;
     }
 
     /**
@@ -50,7 +61,7 @@ public function index(GetBackupsRequest $request, Server $server)
      * @param \Pterodactyl\Models\Server $server
      * @return array
      *
-     * @throws \Exception
+     * @throws \Exception|\Throwable
      */
     public function store(StoreBackupRequest $request, Server $server)
     {
@@ -63,15 +74,36 @@ public function store(StoreBackupRequest $request, Server $server)
             ->toArray();
     }
 
-    public function view()
+    /**
+     * Returns information about a single backup.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Backups\GetBackupsRequest $request
+     * @param \Pterodactyl\Models\Server $server
+     * @param \Pterodactyl\Models\Backup $backup
+     * @return array
+     */
+    public function view(GetBackupsRequest $request, Server $server, Backup $backup)
     {
+        return $this->fractal->item($backup)
+            ->transformWith($this->getTransformer(BackupTransformer::class))
+            ->toArray();
     }
 
-    public function update()
+    /**
+     * Deletes a backup from the panel as well as the remote source where it is currently
+     * being stored.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Backups\DeleteBackupRequest $request
+     * @param \Pterodactyl\Models\Server $server
+     * @param \Pterodactyl\Models\Backup $backup
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Throwable
+     */
+    public function delete(DeleteBackupRequest $request, Server $server, Backup $backup)
     {
-    }
+        $this->deleteBackupService->handle($backup);
 
-    public function delete()
-    {
+        return JsonResponse::create([], JsonResponse::HTTP_NO_CONTENT);
     }
 }

app/Http/Requests/Api/Client/Servers/Backups/DeleteBackupRequest.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Client\Servers\Backups;
+
+use Pterodactyl\Models\Permission;
+use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
+
+class DeleteBackupRequest extends ClientApiRequest
+{
+    /**
+     * @return string
+     */
+    public function permission()
+    {
+        return Permission::ACTION_BACKUP_DELETE;
+    }
+}

app/Repositories/Wings/DaemonBackupRepository.php

@@ -39,22 +39,19 @@ public function backup(Backup $backup): ResponseInterface
     }
 
     /**
-     * Returns a stream of a backup's contents from the Wings instance so that we
-     * do not need to send the user directly to the Daemon.
+     * Deletes a backup from the daemon.
      *
-     * @param string $backup
+     * @param \Pterodactyl\Models\Backup $backup
      * @return \Psr\Http\Message\ResponseInterface
-     *
      * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
-    public function getBackup(string $backup): ResponseInterface
+    public function delete(Backup $backup): ResponseInterface
     {
         Assert::isInstanceOf($this->server, Server::class);
 
         try {
-            return $this->getHttpClient()->get(
-                sprintf('/api/servers/%s/backup/%s', $this->server->uuid, $backup),
-                ['stream' => true]
+            return $this->getHttpClient()->delete(
+                sprintf('/api/servers/%s/backup/%s', $this->server->uuid, $backup->uuid)
             );
         } catch (TransferException $exception) {
             throw new DaemonConnectionException($exception);

app/Services/Backups/DeleteBackupService.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Pterodactyl\Services\Backups;
+
+use Pterodactyl\Models\Backup;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Repositories\Eloquent\BackupRepository;
+use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
+
+class DeleteBackupService
+{
+    /**
+     * @var \Pterodactyl\Repositories\Eloquent\BackupRepository
+     */
+    private $repository;
+
+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonBackupRepository
+     */
+    private $daemonBackupRepository;
+
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    private $connection;
+
+    /**
+     * DeleteBackupService constructor.
+     *
+     * @param \Illuminate\Database\ConnectionInterface $connection
+     * @param \Pterodactyl\Repositories\Eloquent\BackupRepository $repository
+     * @param \Pterodactyl\Repositories\Wings\DaemonBackupRepository $daemonBackupRepository
+     */
+    public function __construct(
+        ConnectionInterface $connection,
+        BackupRepository $repository,
+        DaemonBackupRepository $daemonBackupRepository
+    ) {
+        $this->repository = $repository;
+        $this->daemonBackupRepository = $daemonBackupRepository;
+        $this->connection = $connection;
+    }
+
+    /**
+     * Deletes a backup from the system.
+     *
+     * @param \Pterodactyl\Models\Backup $backup
+     * @throws \Throwable
+     */
+    public function handle(Backup $backup)
+    {
+        $this->connection->transaction(function () use ($backup) {
+            $this->daemonBackupRepository->setServer($backup->server)->delete($backup);
+
+            $this->repository->delete($backup->id);
+        });
+    }
+}

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

@@ -0,0 +1,9 @@
+import http from '@/api/http';
+
+export default (uuid: string, backup: string): Promise<void> => {
+    return new Promise((resolve, reject) => {
+        http.delete(`/api/client/servers/${uuid}/backups/${backup}`)
+            .then(() => resolve())
+            .catch(reject);
+    });
+};

resources/scripts/components/elements/DropdownMenu.tsx

@@ -0,0 +1,87 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { CSSTransition } from 'react-transition-group';
+import styled from 'styled-components';
+
+interface Props {
+    children: React.ReactNode;
+    renderToggle: (onClick: (e: React.MouseEvent<any, MouseEvent>) => void) => React.ReactChild;
+}
+
+export const DropdownButtonRow = styled.button<{ danger?: boolean }>`
+    ${tw`p-2 flex items-center rounded w-full text-neutral-500`};
+    transition: 150ms all ease;
+
+    &:hover {
+        ${props => props.danger
+            ? tw`text-red-700 bg-red-100`
+            : tw`text-neutral-700 bg-neutral-100`
+        };
+    }
+`;
+
+const DropdownMenu = ({ renderToggle, children }: Props) => {
+    const menu = useRef<HTMLDivElement>(null);
+    const [ posX, setPosX ] = useState(0);
+    const [ visible, setVisible ] = useState(false);
+
+    const onClickHandler = (e: React.MouseEvent<any, MouseEvent>) => {
+        e.preventDefault();
+
+        !visible && setPosX(e.clientX);
+        setVisible(s => !s);
+    };
+
+    const windowListener = (e: MouseEvent) => {
+        if (e.button === 2 || !visible || !menu.current) {
+            return;
+        }
+
+        if (e.target === menu.current || menu.current.contains(e.target as Node)) {
+            return;
+        }
+
+        if (e.target !== menu.current && !menu.current.contains(e.target as Node)) {
+            setVisible(false);
+        }
+    };
+
+    useEffect(() => {
+        if (!visible || !menu.current) {
+            return;
+        }
+
+        document.addEventListener('click', windowListener);
+        menu.current.setAttribute(
+            'style', `left: ${Math.round(posX - menu.current.clientWidth)}px`,
+        );
+
+        return () => {
+            document.removeEventListener('click', windowListener);
+        }
+    }, [ visible ]);
+
+    return (
+        <div>
+            {renderToggle(onClickHandler)}
+            <CSSTransition
+                timeout={250}
+                in={visible}
+                unmountOnExit={true}
+                classNames={'fade'}
+            >
+                <div
+                    ref={menu}
+                    onClick={e => {
+                        e.stopPropagation();
+                        setVisible(false);
+                    }}
+                    className={'absolute bg-white p-2 rounded border border-neutral-700 shadow-lg text-neutral-500 min-w-48'}
+                >
+                    {children}
+                </div>
+            </CSSTransition>
+        </div>
+    );
+};
+
+export default DropdownMenu;