Skip to content

Dev #3279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bernardhanna merged 2 commits into from
Feb 5, 2026
Merged

Dev #3279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0a31f
tweaks
bernardhanna Feb 5, 2026
7f3447e
Merge pull request #3278 from codeeu/resource_feature
bernardhanna Feb 5, 2026
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
127 changes: 86 additions & 41 deletions app/Http/Controllers/BulkEventUploadController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Crypt;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Illuminate\View\View;
use Maatwebsite\Excel\Facades\Excel;

Expand Down Expand Up @@ -130,12 +131,6 @@ function ($attribute, $value, $fail) {
$request->session()->forget(self::SESSION_VALIDATION_MISSING);

$defaultCreatorEmail = $validated['default_creator_email'] ?? null;
$importPayload = Crypt::encryptString(json_encode([
'path' => $path,
'default_creator_email' => $defaultCreatorEmail,
'disk' => $tempDisk,
]));
$request->session()->put('bulk_upload_import_payload', $importPayload);

$result = new BulkEventImportResult;
$import = new GenericEventsImport($defaultCreatorEmail, $result, true);
Expand All @@ -162,8 +157,22 @@ function ($attribute, $value, $fail) {
}
ksort($rowStatuses);

$importToken = Str::random(64);
Cache::put('bulk_import_' . $importToken, [
'path' => $path,
'disk' => $tempDisk,
'default_creator_email' => $defaultCreatorEmail,
], now()->addHours(1));

$request->session()->put('bulk_upload_import_token', $importToken);
$request->session()->put('bulk_upload_import_payload', Crypt::encryptString(json_encode([
'path' => $path,
'default_creator_email' => $defaultCreatorEmail,
'disk' => $tempDisk,
])));

return redirect()->route('admin.bulk-upload.preview')
->with('bulk_upload_import_payload', $importPayload)
->with('bulk_upload_import_token', $importToken)
->with('bulk_upload_row_statuses', array_values($rowStatuses));
}

Expand All @@ -172,29 +181,37 @@ function ($attribute, $value, $fail) {
*/
public function preview(Request $request): View|RedirectResponse
{
$importPayload = $request->session()->get('bulk_upload_import_payload');
$importToken = $request->session()->get('bulk_upload_import_token');
$rowStatuses = $request->session()->get('bulk_upload_row_statuses', []);

if ($importPayload === null || $importPayload === '') {
$filePath = $request->session()->get(self::SESSION_FILE_PATH);
$tempDisk = config('filesystems.bulk_upload_temp_disk', 'local');
if ($filePath) {
$importPayload = Crypt::encryptString(json_encode([
'path' => $filePath,
'default_creator_email' => $request->session()->get(self::SESSION_DEFAULT_CREATOR),
'disk' => $tempDisk,
]));
$request->session()->put('bulk_upload_import_payload', $importPayload);
if (empty($importToken)) {
$importPayload = $request->session()->get('bulk_upload_import_payload');
if ($importPayload === null || $importPayload === '') {
$filePath = $request->session()->get(self::SESSION_FILE_PATH);
$tempDisk = config('filesystems.bulk_upload_temp_disk', 'local');
if ($filePath) {
$importPayload = Crypt::encryptString(json_encode([
'path' => $filePath,
'default_creator_email' => $request->session()->get(self::SESSION_DEFAULT_CREATOR),
'disk' => $tempDisk,
]));
$request->session()->put('bulk_upload_import_payload', $importPayload);
}
}
}

if ($importPayload === null || $importPayload === '') {
return redirect()->route('admin.bulk-upload.index')
->withErrors(['import' => 'No validated file found. Please upload and validate a file first.']);
if ($importPayload === null || $importPayload === '') {
return redirect()->route('admin.bulk-upload.index')
->withErrors(['import' => 'No validated file found. Please upload and validate a file first.']);
}
return view('admin.bulk-upload.preview', [
'import_token' => '',
'import_payload' => $importPayload,
'row_statuses' => $rowStatuses,
]);
}

return view('admin.bulk-upload.preview', [
'import_payload' => $importPayload,
'import_token' => $importToken,
'import_payload' => '',
'row_statuses' => $rowStatuses,
]);
}
Expand All @@ -209,22 +226,34 @@ public function import(Request $request): View|RedirectResponse
$defaultCreatorEmail = null;
$tempDisk = config('filesystems.bulk_upload_temp_disk', 'local');

$payload = $request->input('import_payload');
if (empty($payload) || ! is_string($payload)) {
$payload = $request->session()->get('bulk_upload_import_payload');
$token = $request->input('import_token');
if (is_string($token) && $token !== '') {
$cached = Cache::get('bulk_import_' . $token);
if (is_array($cached) && ! empty($cached['path'])) {
$path = $cached['path'];
$tempDisk = $cached['disk'] ?? $tempDisk;
$defaultCreatorEmail = $cached['default_creator_email'] ?? null;
}
}
if (is_string($payload) && $payload !== '') {
try {
$decoded = json_decode(Crypt::decryptString($payload), true);
if (is_array($decoded) && ! empty($decoded['path'])) {
$path = $decoded['path'];
$defaultCreatorEmail = $decoded['default_creator_email'] ?? null;
if (! empty($decoded['disk'])) {
$tempDisk = $decoded['disk'];

if (! $path) {
$payload = $request->input('import_payload');
if (empty($payload) || ! is_string($payload)) {
$payload = $request->session()->get('bulk_upload_import_payload');
}
if (is_string($payload) && $payload !== '') {
try {
$decoded = json_decode(Crypt::decryptString($payload), true);
if (is_array($decoded) && ! empty($decoded['path'])) {
$path = $decoded['path'];
$defaultCreatorEmail = $decoded['default_creator_email'] ?? null;
if (! empty($decoded['disk'])) {
$tempDisk = $decoded['disk'];
}
}
} catch (\Throwable $e) {
// Fall back to session path
}
} catch (\Throwable $e) {
// Fall back to session path
}
}
if (! $path) {
Expand All @@ -233,10 +262,18 @@ public function import(Request $request): View|RedirectResponse
}

if (! $path || ! Storage::disk($tempDisk)->exists($path)) {
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_DEFAULT_CREATOR, self::SESSION_VALIDATION_PASSED, self::SESSION_VALIDATION_MISSING, 'bulk_upload_import_payload', 'bulk_upload_row_statuses']);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_DEFAULT_CREATOR, self::SESSION_VALIDATION_PASSED, self::SESSION_VALIDATION_MISSING, 'bulk_upload_import_payload', 'bulk_upload_import_token', 'bulk_upload_row_statuses']);
if (is_string($token ?? null) && $token !== '') {
Cache::forget('bulk_import_' . $token);
}

$message = 'No validated file found. Please upload and validate a file first.';
if ($path && ! Storage::disk($tempDisk)->exists($path)) {
$message .= ' If you use multiple servers, set BULK_UPLOAD_TEMP_DISK=s3 in .env so the file is stored in shared storage.';
}

return redirect()->route('admin.bulk-upload.index')
->withErrors(['import' => 'No validated file found. Please upload and validate a file first.']);
->withErrors(['import' => $message]);
}

try {
Expand All @@ -245,7 +282,11 @@ public function import(Request $request): View|RedirectResponse
Excel::import($import, $path, $tempDisk);

Storage::disk($tempDisk)->delete($path);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_DEFAULT_CREATOR, self::SESSION_VALIDATION_PASSED, self::SESSION_VALIDATION_MISSING, 'bulk_upload_import_payload', 'bulk_upload_row_statuses']);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_DEFAULT_CREATOR, self::SESSION_VALIDATION_PASSED, self::SESSION_VALIDATION_MISSING, 'bulk_upload_import_payload', 'bulk_upload_import_token', 'bulk_upload_row_statuses']);
$token = $request->input('import_token');
if (is_string($token) && $token !== '') {
Cache::forget('bulk_import_' . $token);
}

$this->clearMapCache();

Expand All @@ -257,7 +298,11 @@ public function import(Request $request): View|RedirectResponse
if (Storage::disk($tempDisk)->exists($path)) {
Storage::disk($tempDisk)->delete($path);
}
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_DEFAULT_CREATOR, self::SESSION_VALIDATION_PASSED, self::SESSION_VALIDATION_MISSING, 'bulk_upload_import_payload', 'bulk_upload_row_statuses']);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_DEFAULT_CREATOR, self::SESSION_VALIDATION_PASSED, self::SESSION_VALIDATION_MISSING, 'bulk_upload_import_payload', 'bulk_upload_import_token', 'bulk_upload_row_statuses']);
$token = $request->input('import_token');
if (is_string($token) && $token !== '') {
Cache::forget('bulk_import_' . $token);
}

return redirect()->route('admin.bulk-upload.index')
->withErrors(['import' => 'Import failed: '.$e->getMessage()]);
Expand Down
6 changes: 5 additions & 1 deletion resources/views/admin/bulk-upload/preview.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@

<form method="POST" action="{{ route('admin.bulk-upload.import') }}" class="inline" id="bulk-upload-import-form">
@csrf
<input type="hidden" name="import_payload" value="{{ $import_payload ?? '' }}">
@if(!empty($import_token))
<input type="hidden" name="import_token" value="{{ $import_token }}">
@else
<input type="hidden" name="import_payload" value="{{ $import_payload ?? '' }}">
@endif
<button type="submit" id="bulk-upload-import-btn" class="bg-primary cursor-pointer px-6 py-3 rounded-full font-semibold text-white hover:opacity-90 duration-300">Import</button>
</form>
<script>
Expand Down
Loading