Skip to content

Dev #3266

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 3, 2026
Merged

Dev #3266

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d37525b
upload feature for bulk resoource upload
bernardhanna Feb 3, 2026
5d3d344
Merge pull request #3265 from codeeu/resource_feature
bernardhanna Feb 3, 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
31 changes: 19 additions & 12 deletions app/Http/Controllers/ResourcesImportController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,21 @@ function ($attribute, $value, $fail) {
->withInput();
}

$tempDisk = config('filesystems.resources_import_temp_disk', 'local');
$oldPath = $request->session()->get(self::SESSION_FILE_PATH);
if ($oldPath && Storage::exists($oldPath)) {
Storage::delete($oldPath);
if ($oldPath && Storage::disk($tempDisk)->exists($oldPath)) {
Storage::disk($tempDisk)->delete($oldPath);
}
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS]);

$path = $file->storeAs('temp', 'resources_import_'.time().'.'.$extension);
$path = $file->storeAs('temp', 'resources_import_'.time().'.'.$extension, $tempDisk);

try {
$import = new ResourcesPreviewImport;
Excel::import($import, $path, 'local');
Excel::import($import, $path, $tempDisk);
$rows = $import->data;
} catch (\Throwable $e) {
Storage::delete($path);
Storage::disk($tempDisk)->delete($path);

return redirect()->route('admin.resources-import.index')
->withErrors(['file' => 'Could not parse file: '.$e->getMessage()])
Expand All @@ -96,14 +97,14 @@ function ($attribute, $value, $fail) {

$headerCheck = ResourcesUploadValidator::validateRequiredColumnsFromRows($rows);
if (! $headerCheck['valid']) {
Storage::delete($path);
Storage::disk($tempDisk)->delete($path);

return redirect()->route('admin.resources-import.index')
->withErrors(['file' => 'Missing required column(s): '.implode(', ', $headerCheck['missing']).'. Please add a header row with at least "name_of_the_resource".'])
->withInput();
}
if (empty($rows)) {
Storage::delete($path);
Storage::disk($tempDisk)->delete($path);

return redirect()->route('admin.resources-import.index')
->withErrors(['file' => 'The file has no data rows.'])
Expand Down Expand Up @@ -133,9 +134,11 @@ public function preview(Request $request): View|RedirectResponse
}

$path = $request->session()->get(self::SESSION_FILE_PATH);
$tempDisk = config('filesystems.resources_import_temp_disk', 'local');
$importPayload = $path ? Crypt::encryptString(json_encode([
'path' => $path,
'focus' => $focus,
'disk' => $tempDisk,
])) : '';

return view('admin.resources-import.preview', [
Expand All @@ -153,6 +156,7 @@ public function import(Request $request): RedirectResponse
{
$path = null;
$focus = false;
$tempDisk = config('filesystems.resources_import_temp_disk', 'local');

$payload = $request->input('import_payload');
if (is_string($payload) && $payload !== '') {
Expand All @@ -161,6 +165,9 @@ public function import(Request $request): RedirectResponse
if (is_array($decoded) && ! empty($decoded['path'])) {
$path = $decoded['path'];
$focus = (bool) ($decoded['focus'] ?? false);
if (! empty($decoded['disk'])) {
$tempDisk = $decoded['disk'];
}
}
} catch (\Throwable $e) {
// Invalid or expired payload, fall back to session
Expand All @@ -172,7 +179,7 @@ public function import(Request $request): RedirectResponse
$focus = $request->session()->get(self::SESSION_FOCUS, false);
}

if (! $path || ! Storage::exists($path)) {
if (! $path || ! Storage::disk($tempDisk)->exists($path)) {
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS]);

return redirect()->route('admin.resources-import.index')
Expand Down Expand Up @@ -212,9 +219,9 @@ public function import(Request $request): RedirectResponse
try {
$result = new ResourcesImportResult;
$import = new ResourcesImport(null, null, $focus, $overrides, $result);
Excel::import($import, $path, 'local');
Excel::import($import, $path, $tempDisk);

Storage::delete($path);
Storage::disk($tempDisk)->delete($path);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS]);

$request->session()->flash('resources_import_report_created', $result->created);
Expand All @@ -223,8 +230,8 @@ public function import(Request $request): RedirectResponse

return redirect()->route('admin.resources-import.report');
} catch (\Throwable $e) {
if (Storage::exists($path)) {
Storage::delete($path);
if (Storage::disk($tempDisk)->exists($path)) {
Storage::disk($tempDisk)->delete($path);
}
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS]);

Expand Down
Loading