Skip to content
Merged
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
1 change: 1 addition & 0 deletions src/Override/DefaultOverride.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public function recordRequest($request): bool
'_debugbar*',
'__clockwork*',
'_ignition/*',
'*livewire.min.js*'
];

foreach ($ignore as $ignored ) {
Expand Down
34 changes: 23 additions & 11 deletions src/Recorders/RequestRecorder.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use BinaryBuilds\LaritorClient\Helpers\DataHelper;
use BinaryBuilds\LaritorClient\Helpers\FilterHelper;
use Illuminate\Foundation\Http\Events\RequestHandled;
use Illuminate\Support\Str;

class RequestRecorder extends Recorder
{
Expand Down Expand Up @@ -92,7 +93,7 @@ private function getContext($request)
{
$context = [];

if (ltrim($request->path(), '/') === 'livewire/update') {
if ($this->isLivewireUpdateRequest($request)) {
$components = $request->input('components', []);
if (is_array($components)) {
foreach ($components as $component) {
Expand Down Expand Up @@ -178,19 +179,22 @@ private function getAuthenticatedUser()

private function getUrl($request)
{
if (ltrim($request->path(), '/') === 'livewire/update') {
if ($this->isLivewireUpdateRequest($request)) {
$url = '';
$fragments = parse_url($request->headers->get('referer'));
if (isset($fragments['path'])) {
$url = rtrim($fragments['path'], '/');
}
$referer = $request->headers->get('referer');
if ($referer) {
$fragments = parse_url($referer);
if (isset($fragments['path'])) {
$url = rtrim($fragments['path'], '/');
}

if (config('laritor.requests.query_string') && isset($fragments['query'])) {
$url .= '?' . $fragments['query'];
}
if (config('laritor.requests.query_string') && isset($fragments['query'])) {
$url .= '?' . $fragments['query'];
}

if ($url) {
return $url;
if ($url) {
return $url;
}
}
}

Expand All @@ -203,4 +207,12 @@ private function getUrl($request)

return $request->path().$query;
}

public function isLivewireUpdateRequest($request): bool
{
$route = $request->route() ? $request->route()->getName() : '';

return ($route && Str::endsWith($route, 'livewire.update')) ||
preg_match('#^livewire(?:-[^/]+)?/update$#', ltrim($request->path(), '/')) === 1;
}
}