mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-15 17:24:10 +00:00
Refactor FileDisk system with per-disk unique names and disk assignments UI
Major changes to the file disk subsystem:
- Each FileDisk now gets a unique Laravel disk name (disk_{id}) instead
of temp_{driver}, fixing the bug where multiple local disks with
different roots overwrote each other's config.
- Move disk registration logic from FileDisk model to FileDiskService
(registerDisk, getDiskName). Model keeps only getDecodedCredentials
and a deprecated setConfig() wrapper.
- Add Disk Assignments admin UI (File Disk tab) with three purpose
dropdowns: Media Storage, PDF Storage, Backup Storage. Stored as
settings (media_disk_id, pdf_disk_id, backup_disk_id).
- Backup tab now uses the assigned backup disk instead of a per-backup
dropdown. BackupsController refactored to use BackupService which
centralizes disk resolution. Removed stale 4-second cache.
- Add local_public disk to config/filesystems.php so system disks
are properly defined.
- Local disk roots stored relative to storage/app/ with hint text
in the admin modal explaining the convention.
- Fix BaseModal watchEffect -> watch to prevent infinite request
loops on the File Disk page.
- Fix string/number comparison for disk purpose IDs from settings.
- Add safeguards: prevent deleting disks with files, warn on
purpose change, prevent deleting system disks.
This commit is contained in:
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\DiskEnvironmentRequest;
|
||||
use App\Http\Resources\FileDiskResource;
|
||||
use App\Models\FileDisk;
|
||||
use App\Models\Setting;
|
||||
use App\Services\FileDiskService;
|
||||
use Illuminate\Auth\Access\AuthorizationException;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
@@ -91,8 +92,10 @@ class DiskController extends Controller
|
||||
$diskData = [];
|
||||
switch ($disk) {
|
||||
case 'local':
|
||||
// Path is relative to storage/app/.
|
||||
// e.g., "backups" resolves to storage/app/backups/ at runtime.
|
||||
$diskData = [
|
||||
'root' => config('filesystems.disks.local.root'),
|
||||
'root' => '',
|
||||
];
|
||||
|
||||
break;
|
||||
@@ -216,11 +219,50 @@ class DiskController extends Controller
|
||||
],
|
||||
];
|
||||
|
||||
$default = config('filesystems.default');
|
||||
$defaultDisk = FileDisk::where('set_as_default', true)->first();
|
||||
|
||||
return response()->json([
|
||||
'drivers' => $drivers,
|
||||
'default' => $default,
|
||||
'default' => $defaultDisk?->driver ?? 'local',
|
||||
]);
|
||||
}
|
||||
|
||||
public function getDiskPurposes(): JsonResponse
|
||||
{
|
||||
$this->authorize('manage file disk');
|
||||
|
||||
$defaultDisk = FileDisk::where('set_as_default', true)->first();
|
||||
$defaultId = $defaultDisk?->id;
|
||||
|
||||
return response()->json([
|
||||
'media_disk_id' => Setting::getSetting('media_disk_id') ?? $defaultId,
|
||||
'pdf_disk_id' => Setting::getSetting('pdf_disk_id') ?? $defaultId,
|
||||
'backup_disk_id' => Setting::getSetting('backup_disk_id') ?? $defaultId,
|
||||
]);
|
||||
}
|
||||
|
||||
public function updateDiskPurposes(Request $request): JsonResponse
|
||||
{
|
||||
$this->authorize('manage file disk');
|
||||
|
||||
$request->validate([
|
||||
'media_disk_id' => 'nullable|exists:file_disks,id',
|
||||
'pdf_disk_id' => 'nullable|exists:file_disks,id',
|
||||
'backup_disk_id' => 'nullable|exists:file_disks,id',
|
||||
]);
|
||||
|
||||
if ($request->has('media_disk_id')) {
|
||||
Setting::setSetting('media_disk_id', $request->media_disk_id);
|
||||
}
|
||||
|
||||
if ($request->has('pdf_disk_id')) {
|
||||
Setting::setSetting('pdf_disk_id', $request->pdf_disk_id);
|
||||
}
|
||||
|
||||
if ($request->has('backup_disk_id')) {
|
||||
Setting::setSetting('backup_disk_id', $request->backup_disk_id);
|
||||
}
|
||||
|
||||
return response()->json(['success' => true]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user