Skip to content

Dev #3281

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 #3281

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
2c99750
tweaks
bernardhanna Feb 5, 2026
f97e0d5
Merge pull request #3280 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
90 changes: 67 additions & 23 deletions app/Http/Controllers/ResourcesImportController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
use App\Services\ResourcesUploadValidator;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
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 @@ -111,9 +113,18 @@ function ($attribute, $value, $fail) {
->withInput();
}

$focus = (bool) $request->boolean('focus');
$request->session()->put(self::SESSION_FILE_PATH, $path);
$request->session()->put(self::SESSION_ROWS, $rows);
$request->session()->put(self::SESSION_FOCUS, (bool) $request->boolean('focus'));
$request->session()->put(self::SESSION_FOCUS, $focus);

$importToken = Str::random(64);
Cache::put('resources_import_' . $importToken, [
'path' => $path,
'disk' => $tempDisk,
'focus' => $focus,
], now()->addHours(1));
$request->session()->put('resources_import_token', $importToken);

return redirect()->route('admin.resources-import.preview');
}
Expand All @@ -127,23 +138,28 @@ public function preview(Request $request): View|RedirectResponse
$focus = $request->session()->get(self::SESSION_FOCUS, false);

if (! is_array($rows) || empty($rows)) {
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS]);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS, 'resources_import_token']);

return redirect()->route('admin.resources-import.index')
->with('info', 'No preview data found. Please upload and verify a file first.');
}

$importToken = $request->session()->get('resources_import_token');
$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,
])) : '';
$importPayload = '';
if (empty($importToken) && $path) {
$importPayload = Crypt::encryptString(json_encode([
'path' => $path,
'focus' => $focus,
'disk' => $tempDisk,
]));
}

return view('admin.resources-import.preview', [
'rows' => $rows,
'focus' => $focus,
'import_token' => $importToken ?? '',
'import_payload' => $importPayload,
]);
}
Expand All @@ -158,32 +174,54 @@ public function import(Request $request): RedirectResponse
$focus = false;
$tempDisk = config('filesystems.resources_import_temp_disk', 'local');

$payload = $request->input('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'];
$focus = (bool) ($decoded['focus'] ?? false);
if (! empty($decoded['disk'])) {
$tempDisk = $decoded['disk'];
$token = $request->input('import_token');
if (is_string($token) && $token !== '') {
$cached = Cache::get('resources_import_' . $token);
if (is_array($cached) && ! empty($cached['path'])) {
$path = $cached['path'];
$tempDisk = $cached['disk'] ?? $tempDisk;
$focus = (bool) ($cached['focus'] ?? false);
}
}

if (! $path) {
$payload = $request->input('import_payload');
if (empty($payload) || ! is_string($payload)) {
$payload = $request->session()->get('resources_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'];
$focus = (bool) ($decoded['focus'] ?? false);
if (! empty($decoded['disk'])) {
$tempDisk = $decoded['disk'];
}
}
} catch (\Throwable $e) {
// Fall back to session
}
} catch (\Throwable $e) {
// Invalid or expired payload, fall back to session
}
}

if (! $path) {
$path = $request->session()->get(self::SESSION_FILE_PATH);
$focus = $request->session()->get(self::SESSION_FOCUS, false);
}

if (! $path || ! Storage::disk($tempDisk)->exists($path)) {
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS]);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS, 'resources_import_token']);
if (is_string($token ?? null) && $token !== '') {
Cache::forget('resources_import_' . $token);
}

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

return redirect()->route('admin.resources-import.index')
->withErrors(['import' => 'No verified file found. Please upload and verify a file first.']);
->withErrors(['import' => $message]);
}
$edits = $request->input('edits', []);
if (! is_array($edits)) {
Expand Down Expand Up @@ -222,7 +260,10 @@ public function import(Request $request): RedirectResponse
Excel::import($import, $path, $tempDisk);

Storage::disk($tempDisk)->delete($path);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS]);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS, 'resources_import_token']);
if (is_string($token = $request->input('import_token')) && $token !== '') {
Cache::forget('resources_import_' . $token);
}

$request->session()->flash('resources_import_report_created', $result->created);
$request->session()->flash('resources_import_report_updated', $result->updated);
Expand All @@ -233,7 +274,10 @@ public function import(Request $request): RedirectResponse
if (Storage::disk($tempDisk)->exists($path)) {
Storage::disk($tempDisk)->delete($path);
}
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS]);
$request->session()->forget([self::SESSION_FILE_PATH, self::SESSION_ROWS, self::SESSION_FOCUS, 'resources_import_token']);
if (is_string($token = $request->input('import_token')) && $token !== '') {
Cache::forget('resources_import_' . $token);
}

return redirect()->route('admin.resources-import.preview')
->withErrors(['import' => 'Import failed: '.$e->getMessage()]);
Expand Down
6 changes: 5 additions & 1 deletion app/Imports/ResourcesImport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,14 @@ protected function processRow(array $row, int $rowIndex): ?Model
}

$item = ResourceItem::where('name', $name)->where('source', $source)->first();
if (! $item) {
$item = ResourceItem::where('name', $name)->first();
}
if ($item) {
$item->fill($itemAttributes);
$hadChanges = $item->isDirty();
$item->save();
if ($this->result) {
if ($this->result && $hadChanges) {
$this->result->addUpdated($item);
}
} else {
Expand Down
6 changes: 5 additions & 1 deletion resources/views/admin/resources-import/preview.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@

<form id="resources-import-form" method="POST" action="{{ route('admin.resources-import.import') }}" class="codeweek-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

<div class="overflow-x-auto mb-4">
<table class="w-full border-collapse border border-gray-300">
Expand Down
Loading