mirror of
https://github.com/vitodeploy/vito.git
synced 2025-07-03 06:56:15 +00:00
#591 - storage-providers
This commit is contained in:
@ -5,6 +5,7 @@
|
|||||||
use App\Models\Project;
|
use App\Models\Project;
|
||||||
use App\Models\StorageProvider;
|
use App\Models\StorageProvider;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
use Illuminate\Validation\ValidationException;
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
@ -17,6 +18,8 @@ class CreateStorageProvider
|
|||||||
*/
|
*/
|
||||||
public function create(User $user, Project $project, array $input): StorageProvider
|
public function create(User $user, Project $project, array $input): StorageProvider
|
||||||
{
|
{
|
||||||
|
Validator::make($input, self::rules($input))->validate();
|
||||||
|
|
||||||
$storageProvider = new StorageProvider([
|
$storageProvider = new StorageProvider([
|
||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
'provider' => $input['provider'],
|
'provider' => $input['provider'],
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
use App\Models\Project;
|
use App\Models\Project;
|
||||||
use App\Models\StorageProvider;
|
use App\Models\StorageProvider;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
|
||||||
class EditStorageProvider
|
class EditStorageProvider
|
||||||
{
|
{
|
||||||
@ -12,6 +13,8 @@ class EditStorageProvider
|
|||||||
*/
|
*/
|
||||||
public function edit(StorageProvider $storageProvider, Project $project, array $input): StorageProvider
|
public function edit(StorageProvider $storageProvider, Project $project, array $input): StorageProvider
|
||||||
{
|
{
|
||||||
|
Validator::make($input, self::rules())->validate();
|
||||||
|
|
||||||
$storageProvider->profile = $input['name'];
|
$storageProvider->profile = $input['name'];
|
||||||
$storageProvider->project_id = isset($input['global']) && $input['global'] ? null : $project->id;
|
$storageProvider->project_id = isset($input['global']) && $input['global'] ? null : $project->id;
|
||||||
|
|
||||||
|
@ -53,8 +53,6 @@ public function create(Request $request, Project $project): StorageProviderResou
|
|||||||
{
|
{
|
||||||
$this->authorize('create', StorageProvider::class);
|
$this->authorize('create', StorageProvider::class);
|
||||||
|
|
||||||
$this->validate($request, CreateStorageProvider::rules($request->all()));
|
|
||||||
|
|
||||||
/** @var User $user */
|
/** @var User $user */
|
||||||
$user = auth()->user();
|
$user = auth()->user();
|
||||||
$storageProvider = app(CreateStorageProvider::class)->create($user, $project, $request->all());
|
$storageProvider = app(CreateStorageProvider::class)->create($user, $project, $request->all());
|
||||||
@ -85,8 +83,6 @@ public function update(Request $request, Project $project, StorageProvider $stor
|
|||||||
|
|
||||||
$this->validateRoute($project, $storageProvider);
|
$this->validateRoute($project, $storageProvider);
|
||||||
|
|
||||||
$this->validate($request, EditStorageProvider::rules());
|
|
||||||
|
|
||||||
$storageProvider = app(EditStorageProvider::class)->edit($storageProvider, $project, $request->all());
|
$storageProvider = app(EditStorageProvider::class)->edit($storageProvider, $project, $request->all());
|
||||||
|
|
||||||
return new StorageProviderResource($storageProvider);
|
return new StorageProviderResource($storageProvider);
|
||||||
|
73
app/Http/Controllers/StorageProviderController.php
Normal file
73
app/Http/Controllers/StorageProviderController.php
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
|
use App\Actions\StorageProvider\CreateStorageProvider;
|
||||||
|
use App\Actions\StorageProvider\DeleteStorageProvider;
|
||||||
|
use App\Actions\StorageProvider\EditStorageProvider;
|
||||||
|
use App\Http\Resources\StorageProviderResource;
|
||||||
|
use App\Models\StorageProvider;
|
||||||
|
use Illuminate\Http\RedirectResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\ResourceCollection;
|
||||||
|
use Inertia\Inertia;
|
||||||
|
use Inertia\Response;
|
||||||
|
use Spatie\RouteAttributes\Attributes\Delete;
|
||||||
|
use Spatie\RouteAttributes\Attributes\Get;
|
||||||
|
use Spatie\RouteAttributes\Attributes\Middleware;
|
||||||
|
use Spatie\RouteAttributes\Attributes\Patch;
|
||||||
|
use Spatie\RouteAttributes\Attributes\Post;
|
||||||
|
use Spatie\RouteAttributes\Attributes\Prefix;
|
||||||
|
|
||||||
|
#[Prefix('settings/storage-providers')]
|
||||||
|
#[Middleware(['auth'])]
|
||||||
|
class StorageProviderController extends Controller
|
||||||
|
{
|
||||||
|
#[Get('/', name: 'storage-providers')]
|
||||||
|
public function index(): Response
|
||||||
|
{
|
||||||
|
$this->authorize('viewAny', StorageProvider::class);
|
||||||
|
|
||||||
|
return Inertia::render('storage-providers/index', [
|
||||||
|
'storageProviders' => StorageProviderResource::collection(StorageProvider::getByProjectId(user()->current_project_id)->simplePaginate(config('web.pagination_size'))),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Get('/json', name: 'storage-providers.json')]
|
||||||
|
public function json(): ResourceCollection
|
||||||
|
{
|
||||||
|
$this->authorize('viewAny', StorageProvider::class);
|
||||||
|
|
||||||
|
return StorageProviderResource::collection(StorageProvider::getByProjectId(user()->current_project_id)->get());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Post('/', name: 'storage-providers.store')]
|
||||||
|
public function store(Request $request): RedirectResponse
|
||||||
|
{
|
||||||
|
$this->authorize('create', StorageProvider::class);
|
||||||
|
|
||||||
|
app(CreateStorageProvider::class)->create(user(), user()->currentProject, $request->all());
|
||||||
|
|
||||||
|
return back()->with('success', 'Storage provider created.');
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Patch('/{storageProvider}', name: 'storage-providers.update')]
|
||||||
|
public function update(Request $request, StorageProvider $storageProvider): RedirectResponse
|
||||||
|
{
|
||||||
|
$this->authorize('update', $storageProvider);
|
||||||
|
|
||||||
|
app(EditStorageProvider::class)->edit($storageProvider, user()->currentProject, $request->all());
|
||||||
|
|
||||||
|
return back()->with('success', 'Storage provider updated.');
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Delete('{storageProvider}', name: 'storage-providers.destroy')]
|
||||||
|
public function destroy(StorageProvider $storageProvider): RedirectResponse
|
||||||
|
{
|
||||||
|
$this->authorize('delete', $storageProvider);
|
||||||
|
|
||||||
|
app(DeleteStorageProvider::class)->delete($storageProvider);
|
||||||
|
|
||||||
|
return to_route('storage-providers')->with('success', 'Storage provider deleted.');
|
||||||
|
}
|
||||||
|
}
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use Database\Factories\StorageProviderFactory;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
@ -17,7 +18,7 @@
|
|||||||
*/
|
*/
|
||||||
class StorageProvider extends AbstractModel
|
class StorageProvider extends AbstractModel
|
||||||
{
|
{
|
||||||
/** @use HasFactory<\Database\Factories\StorageProviderFactory> */
|
/** @use HasFactory<StorageProviderFactory> */
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
|
@ -536,6 +536,27 @@
|
|||||||
\App\Enums\StorageProvider::LOCAL => \App\StorageProviders\Local::class,
|
\App\Enums\StorageProvider::LOCAL => \App\StorageProviders\Local::class,
|
||||||
\App\Enums\StorageProvider::S3 => \App\StorageProviders\S3::class,
|
\App\Enums\StorageProvider::S3 => \App\StorageProviders\S3::class,
|
||||||
],
|
],
|
||||||
|
'storage_providers_custom_fields' => [
|
||||||
|
\App\Enums\StorageProvider::DROPBOX => ['token'],
|
||||||
|
\App\Enums\StorageProvider::FTP => [
|
||||||
|
'host',
|
||||||
|
'port',
|
||||||
|
'path',
|
||||||
|
'username',
|
||||||
|
'password',
|
||||||
|
'ssl',
|
||||||
|
'passive',
|
||||||
|
],
|
||||||
|
\App\Enums\StorageProvider::S3 => [
|
||||||
|
'api_url',
|
||||||
|
'key',
|
||||||
|
'secret',
|
||||||
|
'region',
|
||||||
|
'bucket',
|
||||||
|
'path',
|
||||||
|
],
|
||||||
|
\App\Enums\StorageProvider::LOCAL => ['path'],
|
||||||
|
],
|
||||||
|
|
||||||
'ssl_types' => [
|
'ssl_types' => [
|
||||||
\App\Enums\SslType::LETSENCRYPT,
|
\App\Enums\SslType::LETSENCRYPT,
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { type BreadcrumbItem, type NavItem } from '@/types';
|
import { type BreadcrumbItem, type NavItem } from '@/types';
|
||||||
import { CloudIcon, CodeIcon, ListIcon, UserIcon, UsersIcon } from 'lucide-react';
|
import { CloudIcon, CodeIcon, DatabaseIcon, ListIcon, UserIcon, UsersIcon } from 'lucide-react';
|
||||||
import { ReactNode } from 'react';
|
import { ReactNode } from 'react';
|
||||||
import Layout from '@/layouts/app/layout';
|
import Layout from '@/layouts/app/layout';
|
||||||
|
|
||||||
@ -29,6 +29,11 @@ const sidebarNavItems: NavItem[] = [
|
|||||||
href: route('source-controls'),
|
href: route('source-controls'),
|
||||||
icon: CodeIcon,
|
icon: CodeIcon,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: 'Storage Providers',
|
||||||
|
href: route('storage-providers'),
|
||||||
|
icon: DatabaseIcon,
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
export default function SettingsLayout({ children, breadcrumbs }: { children: ReactNode; breadcrumbs?: BreadcrumbItem[] }) {
|
export default function SettingsLayout({ children, breadcrumbs }: { children: ReactNode; breadcrumbs?: BreadcrumbItem[] }) {
|
||||||
|
@ -111,12 +111,13 @@ export default function ConnectServerProvider({
|
|||||||
</FormField>
|
</FormField>
|
||||||
{page.props.configs.server_providers_custom_fields[form.data.provider]?.map((item: string) => (
|
{page.props.configs.server_providers_custom_fields[form.data.provider]?.map((item: string) => (
|
||||||
<FormField key={item}>
|
<FormField key={item}>
|
||||||
<Label htmlFor={item}>{item}</Label>
|
<Label htmlFor={item} className="capitalize">
|
||||||
|
{item.replaceAll('_', ' ')}
|
||||||
|
</Label>
|
||||||
<Input
|
<Input
|
||||||
type="text"
|
type="text"
|
||||||
name={item}
|
name={item}
|
||||||
id={item}
|
id={item}
|
||||||
placeholder={item}
|
|
||||||
value={(form.data[item as keyof ServerProviderForm] as string) ?? ''}
|
value={(form.data[item as keyof ServerProviderForm] as string) ?? ''}
|
||||||
onChange={(e) => form.setData(item as keyof ServerProviderForm, e.target.value)}
|
onChange={(e) => form.setData(item as keyof ServerProviderForm, e.target.value)}
|
||||||
/>
|
/>
|
||||||
|
185
resources/js/pages/storage-providers/components/columns.tsx
Normal file
185
resources/js/pages/storage-providers/components/columns.tsx
Normal file
@ -0,0 +1,185 @@
|
|||||||
|
import { ColumnDef } from '@tanstack/react-table';
|
||||||
|
import DateTime from '@/components/date-time';
|
||||||
|
import { StorageProvider } from '@/types/storage-provider';
|
||||||
|
import { Badge } from '@/components/ui/badge';
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogClose,
|
||||||
|
DialogContent,
|
||||||
|
DialogDescription,
|
||||||
|
DialogFooter,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
DialogTrigger,
|
||||||
|
} from '@/components/ui/dialog';
|
||||||
|
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { useForm } from '@inertiajs/react';
|
||||||
|
import { LoaderCircleIcon, MoreVerticalIcon } from 'lucide-react';
|
||||||
|
import FormSuccessful from '@/components/form-successful';
|
||||||
|
import { FormEvent, useState } from 'react';
|
||||||
|
import InputError from '@/components/ui/input-error';
|
||||||
|
import { Form, FormField, FormFields } from '@/components/ui/form';
|
||||||
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
|
|
||||||
|
function Edit({ storageProvider }: { storageProvider: StorageProvider }) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const form = useForm({
|
||||||
|
name: storageProvider.name,
|
||||||
|
global: storageProvider.global,
|
||||||
|
});
|
||||||
|
|
||||||
|
const submit = (e: FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
form.patch(route('storage-providers.update', storageProvider.id));
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={setOpen}>
|
||||||
|
<DialogTrigger asChild>
|
||||||
|
<DropdownMenuItem onSelect={(e) => e.preventDefault()}>Edit</DropdownMenuItem>
|
||||||
|
</DialogTrigger>
|
||||||
|
<DialogContent>
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>Edit {storageProvider.name}</DialogTitle>
|
||||||
|
<DialogDescription className="sr-only">Edit storage provider</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<Form id="edit-storage-provider-form" className="p-4" onSubmit={submit}>
|
||||||
|
<FormFields>
|
||||||
|
<FormField>
|
||||||
|
<Label htmlFor="name">Name</Label>
|
||||||
|
<Input type="text" id="name" name="name" value={form.data.name} onChange={(e) => form.setData('name', e.target.value)} />
|
||||||
|
<InputError message={form.errors.name} />
|
||||||
|
</FormField>
|
||||||
|
<FormField>
|
||||||
|
<div className="flex items-center space-x-3">
|
||||||
|
<Checkbox id="global" name="global" checked={form.data.global} onClick={() => form.setData('global', !form.data.global)} />
|
||||||
|
<Label htmlFor="global">Is global (accessible in all projects)</Label>
|
||||||
|
</div>
|
||||||
|
<InputError message={form.errors.global} />
|
||||||
|
</FormField>
|
||||||
|
</FormFields>
|
||||||
|
</Form>
|
||||||
|
<DialogFooter>
|
||||||
|
<DialogClose asChild>
|
||||||
|
<Button variant="outline">Cancel</Button>
|
||||||
|
</DialogClose>
|
||||||
|
<Button form="edit-storage-provider-form" disabled={form.processing} onClick={submit}>
|
||||||
|
{form.processing && <LoaderCircleIcon className="animate-spin" />}
|
||||||
|
<FormSuccessful successful={form.recentlySuccessful} />
|
||||||
|
Save
|
||||||
|
</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Delete({ storageProvider }: { storageProvider: StorageProvider }) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const form = useForm();
|
||||||
|
|
||||||
|
const submit = () => {
|
||||||
|
form.delete(route('storage-providers.destroy', storageProvider.id), {
|
||||||
|
onSuccess: () => {
|
||||||
|
setOpen(false);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={setOpen}>
|
||||||
|
<DialogTrigger asChild>
|
||||||
|
<DropdownMenuItem variant="destructive" onSelect={(e) => e.preventDefault()}>
|
||||||
|
Delete
|
||||||
|
</DropdownMenuItem>
|
||||||
|
</DialogTrigger>
|
||||||
|
<DialogContent>
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>Delete {storageProvider.name}</DialogTitle>
|
||||||
|
<DialogDescription className="sr-only">Delete storage provider</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<div className="space-y-2 p-4">
|
||||||
|
<p>
|
||||||
|
Are you sure you want to delete <strong>{storageProvider.name}</strong>?
|
||||||
|
</p>
|
||||||
|
<InputError message={form.errors.provider} />
|
||||||
|
</div>
|
||||||
|
<DialogFooter>
|
||||||
|
<DialogClose asChild>
|
||||||
|
<Button variant="outline">Cancel</Button>
|
||||||
|
</DialogClose>
|
||||||
|
<Button variant="destructive" disabled={form.processing} onClick={submit}>
|
||||||
|
{form.processing && <LoaderCircleIcon className="animate-spin" />}
|
||||||
|
<FormSuccessful successful={form.recentlySuccessful} />
|
||||||
|
Delete
|
||||||
|
</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export const columns: ColumnDef<StorageProvider>[] = [
|
||||||
|
{
|
||||||
|
accessorKey: 'id',
|
||||||
|
header: 'ID',
|
||||||
|
enableColumnFilter: true,
|
||||||
|
enableSorting: true,
|
||||||
|
enableHiding: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
accessorKey: 'provider',
|
||||||
|
header: 'Provider',
|
||||||
|
enableColumnFilter: true,
|
||||||
|
enableSorting: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
accessorKey: 'name',
|
||||||
|
header: 'Name',
|
||||||
|
enableColumnFilter: true,
|
||||||
|
enableSorting: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
accessorKey: 'global',
|
||||||
|
header: 'Global',
|
||||||
|
enableColumnFilter: true,
|
||||||
|
enableSorting: true,
|
||||||
|
cell: ({ row }) => {
|
||||||
|
return <div>{row.original.global ? <Badge variant="success">yes</Badge> : <Badge variant="danger">no</Badge>}</div>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
accessorKey: 'created_at',
|
||||||
|
header: 'Created at',
|
||||||
|
enableColumnFilter: true,
|
||||||
|
enableSorting: true,
|
||||||
|
cell: ({ row }) => {
|
||||||
|
return <DateTime date={row.original.created_at} />;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'actions',
|
||||||
|
enableColumnFilter: false,
|
||||||
|
enableSorting: false,
|
||||||
|
cell: ({ row }) => {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center justify-end">
|
||||||
|
<DropdownMenu modal={false}>
|
||||||
|
<DropdownMenuTrigger asChild>
|
||||||
|
<Button variant="ghost" className="h-8 w-8 p-0">
|
||||||
|
<span className="sr-only">Open menu</span>
|
||||||
|
<MoreVerticalIcon />
|
||||||
|
</Button>
|
||||||
|
</DropdownMenuTrigger>
|
||||||
|
<DropdownMenuContent align="end">
|
||||||
|
<Edit storageProvider={row.original} />
|
||||||
|
<DropdownMenuSeparator />
|
||||||
|
<Delete storageProvider={row.original} />
|
||||||
|
</DropdownMenuContent>
|
||||||
|
</DropdownMenu>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
@ -0,0 +1,150 @@
|
|||||||
|
import { LoaderCircle } from 'lucide-react';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogClose,
|
||||||
|
DialogContent,
|
||||||
|
DialogDescription,
|
||||||
|
DialogFooter,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
DialogTrigger,
|
||||||
|
} from '@/components/ui/dialog';
|
||||||
|
import { useForm, usePage } from '@inertiajs/react';
|
||||||
|
import { FormEventHandler, ReactNode, useEffect, useState } from 'react';
|
||||||
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
||||||
|
import InputError from '@/components/ui/input-error';
|
||||||
|
import { Form, FormField, FormFields } from '@/components/ui/form';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { SharedData } from '@/types';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
|
|
||||||
|
type StorageProviderForm = {
|
||||||
|
provider: string;
|
||||||
|
name: string;
|
||||||
|
global: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function ConnectStorageProvider({
|
||||||
|
providers,
|
||||||
|
defaultProvider,
|
||||||
|
onProviderAdded,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
providers: string[];
|
||||||
|
defaultProvider?: string;
|
||||||
|
onProviderAdded?: () => void;
|
||||||
|
children: ReactNode;
|
||||||
|
}) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
|
||||||
|
const page = usePage<SharedData>();
|
||||||
|
|
||||||
|
const form = useForm<Required<StorageProviderForm>>({
|
||||||
|
provider: 's3',
|
||||||
|
name: '',
|
||||||
|
global: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
const submit: FormEventHandler = (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
form.post(route('storage-providers.store'), {
|
||||||
|
onSuccess: () => {
|
||||||
|
setOpen(false);
|
||||||
|
if (onProviderAdded) {
|
||||||
|
onProviderAdded();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
form.setData('provider', defaultProvider ?? 's3');
|
||||||
|
}, [defaultProvider]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={setOpen}>
|
||||||
|
<DialogTrigger asChild>{children}</DialogTrigger>
|
||||||
|
<DialogContent className="max-h-screen overflow-y-auto sm:max-w-xl">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>Connect to storage provider</DialogTitle>
|
||||||
|
<DialogDescription className="sr-only">Connect to a new storage provider</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<Form id="create-storage-provider-form" onSubmit={submit} className="p-4">
|
||||||
|
<FormFields>
|
||||||
|
<FormField>
|
||||||
|
<Label htmlFor="provider">Provider</Label>
|
||||||
|
<Select
|
||||||
|
value={form.data.provider}
|
||||||
|
onValueChange={(value) => {
|
||||||
|
form.setData('provider', value);
|
||||||
|
form.clearErrors();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<SelectTrigger id="provider">
|
||||||
|
<SelectValue placeholder="Select a provider" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectGroup>
|
||||||
|
{providers.map((provider) => (
|
||||||
|
<SelectItem key={provider} value={provider}>
|
||||||
|
{provider}
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectGroup>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
<InputError message={form.errors.provider} />
|
||||||
|
</FormField>
|
||||||
|
<FormField>
|
||||||
|
<Label htmlFor="name">Name</Label>
|
||||||
|
<Input
|
||||||
|
type="text"
|
||||||
|
name="name"
|
||||||
|
id="name"
|
||||||
|
placeholder="Name"
|
||||||
|
value={form.data.name}
|
||||||
|
onChange={(e) => form.setData('name', e.target.value)}
|
||||||
|
/>
|
||||||
|
<InputError message={form.errors.name} />
|
||||||
|
</FormField>
|
||||||
|
{page.props.configs.storage_providers_custom_fields[form.data.provider]?.map((item: string) => (
|
||||||
|
<FormField key={item}>
|
||||||
|
<Label htmlFor={item} className="capitalize">
|
||||||
|
{item.replaceAll('_', ' ')}
|
||||||
|
</Label>
|
||||||
|
<Input
|
||||||
|
type="text"
|
||||||
|
name={item}
|
||||||
|
id={item}
|
||||||
|
value={(form.data[item as keyof StorageProviderForm] as string) ?? ''}
|
||||||
|
onChange={(e) => form.setData(item as keyof StorageProviderForm, e.target.value)}
|
||||||
|
/>
|
||||||
|
<InputError message={form.errors[item as keyof StorageProviderForm]} />
|
||||||
|
</FormField>
|
||||||
|
))}
|
||||||
|
<FormField>
|
||||||
|
<div className="flex items-center space-x-3">
|
||||||
|
<Checkbox id="global" name="global" checked={form.data.global} onClick={() => form.setData('global', !form.data.global)} />
|
||||||
|
<Label htmlFor="global">Is global (accessible in all projects)</Label>
|
||||||
|
</div>
|
||||||
|
<InputError message={form.errors.global} />
|
||||||
|
</FormField>
|
||||||
|
</FormFields>
|
||||||
|
</Form>
|
||||||
|
<DialogFooter>
|
||||||
|
<DialogClose asChild>
|
||||||
|
<Button type="button" variant="outline">
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
</DialogClose>
|
||||||
|
<Button type="button" onClick={submit} disabled={form.processing}>
|
||||||
|
{form.processing && <LoaderCircle className="animate-spin" />}
|
||||||
|
Connect
|
||||||
|
</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
41
resources/js/pages/storage-providers/index.tsx
Normal file
41
resources/js/pages/storage-providers/index.tsx
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
import SettingsLayout from '@/layouts/settings/layout';
|
||||||
|
import { Head, usePage } from '@inertiajs/react';
|
||||||
|
import Container from '@/components/container';
|
||||||
|
import Heading from '@/components/heading';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import React from 'react';
|
||||||
|
import ConnectStorageProvider from '@/pages/storage-providers/components/connect-storage-provider';
|
||||||
|
import { DataTable } from '@/components/data-table';
|
||||||
|
import { columns } from '@/pages/storage-providers/components/columns';
|
||||||
|
import { StorageProvider } from '@/types/storage-provider';
|
||||||
|
|
||||||
|
type Page = {
|
||||||
|
storageProviders: {
|
||||||
|
data: StorageProvider[];
|
||||||
|
};
|
||||||
|
configs: {
|
||||||
|
storage_providers: string[];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function StorageProviders() {
|
||||||
|
const page = usePage<Page>();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SettingsLayout>
|
||||||
|
<Head title="Storage Providers" />
|
||||||
|
<Container className="max-w-5xl">
|
||||||
|
<div className="flex items-start justify-between">
|
||||||
|
<Heading title="Storage Providers" description="Here you can manage all of the storage provider connectinos" />
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<ConnectStorageProvider providers={page.props.configs.storage_providers}>
|
||||||
|
<Button>Connect</Button>
|
||||||
|
</ConnectStorageProvider>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<DataTable columns={columns} data={page.props.storageProviders.data} />
|
||||||
|
</Container>
|
||||||
|
</SettingsLayout>
|
||||||
|
);
|
||||||
|
}
|
4
resources/js/types/index.d.ts
vendored
4
resources/js/types/index.d.ts
vendored
@ -37,6 +37,10 @@ export interface Configs {
|
|||||||
source_control_providers_custom_fields: {
|
source_control_providers_custom_fields: {
|
||||||
[provider: string]: string[];
|
[provider: string]: string[];
|
||||||
};
|
};
|
||||||
|
storage_providers: string[];
|
||||||
|
storage_providers_custom_fields: {
|
||||||
|
[provider: string]: string[];
|
||||||
|
};
|
||||||
operating_systems: string[];
|
operating_systems: string[];
|
||||||
service_versions: {
|
service_versions: {
|
||||||
[service: string]: string[];
|
[service: string]: string[];
|
||||||
|
11
resources/js/types/storage-provider.d.ts
vendored
Normal file
11
resources/js/types/storage-provider.d.ts
vendored
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
export interface StorageProvider {
|
||||||
|
id: number;
|
||||||
|
project_id?: number;
|
||||||
|
global: boolean;
|
||||||
|
name: string;
|
||||||
|
provider: string;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
|
||||||
|
[key: string]: unknown;
|
||||||
|
}
|
@ -132,7 +132,7 @@ public function test_edit_source_control(string $provider, ?string $url, array $
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array<string, array<int, mixed>>
|
* @return array<int, mixed>
|
||||||
*/
|
*/
|
||||||
public static function data(): array
|
public static function data(): array
|
||||||
{
|
{
|
||||||
|
@ -7,11 +7,9 @@
|
|||||||
use App\Models\Backup;
|
use App\Models\Backup;
|
||||||
use App\Models\Database;
|
use App\Models\Database;
|
||||||
use App\Models\StorageProvider as StorageProviderModel;
|
use App\Models\StorageProvider as StorageProviderModel;
|
||||||
use App\Web\Pages\Settings\StorageProviders\Index;
|
|
||||||
use App\Web\Pages\Settings\StorageProviders\Widgets\StorageProvidersList;
|
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
use Illuminate\Support\Facades\Http;
|
use Illuminate\Support\Facades\Http;
|
||||||
use Livewire\Livewire;
|
use Inertia\Testing\AssertableInertia;
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
|
||||||
class StorageProvidersTest extends TestCase
|
class StorageProvidersTest extends TestCase
|
||||||
@ -19,6 +17,8 @@ class StorageProvidersTest extends TestCase
|
|||||||
use RefreshDatabase;
|
use RefreshDatabase;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @param array<string, mixed> $input
|
||||||
|
*
|
||||||
* @dataProvider createData
|
* @dataProvider createData
|
||||||
*/
|
*/
|
||||||
public function test_create(array $input): void
|
public function test_create(array $input): void
|
||||||
@ -33,9 +33,7 @@ public function test_create(array $input): void
|
|||||||
FTP::fake();
|
FTP::fake();
|
||||||
}
|
}
|
||||||
|
|
||||||
Livewire::test(Index::class)
|
$this->post(route('storage-providers.store'), $input);
|
||||||
->callAction('connect', $input)
|
|
||||||
->assertSuccessful();
|
|
||||||
|
|
||||||
if ($input['provider'] === StorageProvider::FTP) {
|
if ($input['provider'] === StorageProvider::FTP) {
|
||||||
FTP::assertConnected($input['host']);
|
FTP::assertConnected($input['host']);
|
||||||
@ -52,29 +50,14 @@ public function test_see_providers_list(): void
|
|||||||
{
|
{
|
||||||
$this->actingAs($this->user);
|
$this->actingAs($this->user);
|
||||||
|
|
||||||
/** @var StorageProviderModel $provider */
|
StorageProviderModel::factory()->create([
|
||||||
$provider = StorageProviderModel::factory()->create([
|
|
||||||
'user_id' => $this->user->id,
|
'user_id' => $this->user->id,
|
||||||
'provider' => StorageProvider::DROPBOX,
|
'provider' => StorageProvider::DROPBOX,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->get(Index::getUrl())
|
$this->get(route('storage-providers'))
|
||||||
->assertSuccessful()
|
->assertSuccessful()
|
||||||
->assertSee($provider->profile);
|
->assertInertia(fn (AssertableInertia $page) => $page->component('storage-providers/index'));
|
||||||
|
|
||||||
/** @var StorageProviderModel $provider */
|
|
||||||
$provider = StorageProviderModel::factory()->create([
|
|
||||||
'user_id' => $this->user->id,
|
|
||||||
'provider' => StorageProvider::S3,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$this->get(Index::getUrl())
|
|
||||||
->assertSuccessful()
|
|
||||||
->assertSee($provider->profile);
|
|
||||||
|
|
||||||
$this->get(Index::getUrl())
|
|
||||||
->assertSuccessful()
|
|
||||||
->assertSee($provider->profile);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_delete_provider(): void
|
public function test_delete_provider(): void
|
||||||
@ -85,9 +68,7 @@ public function test_delete_provider(): void
|
|||||||
'user_id' => $this->user->id,
|
'user_id' => $this->user->id,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
Livewire::test(StorageProvidersList::class)
|
$this->delete(route('storage-providers.destroy', ['storageProvider' => $provider->id]));
|
||||||
->callTableAction('delete', $provider->id)
|
|
||||||
->assertSuccessful();
|
|
||||||
|
|
||||||
$this->assertDatabaseMissing('storage_providers', [
|
$this->assertDatabaseMissing('storage_providers', [
|
||||||
'id' => $provider->id,
|
'id' => $provider->id,
|
||||||
@ -112,9 +93,10 @@ public function test_cannot_delete_provider(): void
|
|||||||
'storage_id' => $provider->id,
|
'storage_id' => $provider->id,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
Livewire::test(StorageProvidersList::class)
|
$this->delete(route('storage-providers.destroy', ['storageProvider' => $provider->id]))
|
||||||
->callTableAction('delete', $provider->id)
|
->assertSessionHasErrors([
|
||||||
->assertNotified('This storage provider is being used by a backup.');
|
'provider' => 'This storage provider is being used by a backup.',
|
||||||
|
]);
|
||||||
|
|
||||||
$this->assertDatabaseHas('storage_providers', [
|
$this->assertDatabaseHas('storage_providers', [
|
||||||
'id' => $provider->id,
|
'id' => $provider->id,
|
||||||
@ -123,6 +105,8 @@ public function test_cannot_delete_provider(): void
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @TODO: complete FTP tests
|
* @TODO: complete FTP tests
|
||||||
|
*
|
||||||
|
* @return array<int, mixed>
|
||||||
*/
|
*/
|
||||||
public static function createData(): array
|
public static function createData(): array
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user