Skip to content
Merged

Dev #3251

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions app/Http/Controllers/BulkEventUploadController.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ public function import(Request $request): View|RedirectResponse

$this->clearMapCache();

return view('admin.bulk-upload.report', [
'created' => $result->created,
'failures' => $result->failures,
]);
$request->session()->flash('bulk_upload_report_created', $result->created);
$request->session()->flash('bulk_upload_report_failures', $result->failures);

return redirect()->route('admin.bulk-upload.report');
} catch (\Throwable $e) {
if (Storage::exists($path)) {
Storage::delete($path);
Expand All @@ -156,6 +156,26 @@ public function import(Request $request): View|RedirectResponse
}
}

/**
* Show the import report (GET). Data is flashed from import() redirect.
* Refreshing this page will redirect back to index as flash data is gone.
*/
public function report(Request $request): View|RedirectResponse
{
$created = $request->session()->get('bulk_upload_report_created');
$failures = $request->session()->get('bulk_upload_report_failures');

if ($created === null && $failures === null) {
return redirect()->route('admin.bulk-upload.index')
->with('info', 'Report no longer available. Run an import to see a new report.');
}

return view('admin.bulk-upload.report', [
'created' => $created ?? [],
'failures' => $failures ?? [],
]);
}

/**
* Clear map cache so new/updated events appear on the map immediately.
*/
Expand Down
6 changes: 6 additions & 0 deletions resources/views/admin/bulk-upload/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
</div>
@endif

@if (session('info'))
<div class="mb-4 p-4 rounded bg-blue-50 border border-blue-200 text-blue-800">
{{ session('info') }}
</div>
@endif

@if ($errors->any())
<div class="mb-4 p-4 rounded bg-red-50 border border-red-200">
<ul class="list-disc list-inside text-red-700">
Expand Down
1 change: 1 addition & 0 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
Route::get('/admin/bulk-upload', [BulkEventUploadController::class, 'index'])->name('admin.bulk-upload.index');
Route::post('/admin/bulk-upload/validate', [BulkEventUploadController::class, 'validateUpload'])->name('admin.bulk-upload.validate');
Route::post('/admin/bulk-upload/import', [BulkEventUploadController::class, 'import'])->name('admin.bulk-upload.import');
Route::get('/admin/bulk-upload/report', [BulkEventUploadController::class, 'report'])->name('admin.bulk-upload.report');
});

//redirects start
Expand Down
Loading