2743229cc4
- Fix currentTeam() to return null instead of crashing when no session - Fix role() to use $this->currentTeam() instead of global helper - Add roleInTeam() method for explicit team context - Remove unused otherTeams() method - Fix InviteLink authorization bypass when role() returns null - Fix confirmEmailChange() null safety for currentTeam() - Fix ActivityMonitor to handle null currentTeam with fallback chain 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
109 lines
3.3 KiB
PHP
109 lines
3.3 KiB
PHP
<?php
|
|
|
|
namespace App\Livewire;
|
|
|
|
use App\Models\User;
|
|
use Livewire\Component;
|
|
use Spatie\Activitylog\Models\Activity;
|
|
|
|
class ActivityMonitor extends Component
|
|
{
|
|
public ?string $header = null;
|
|
|
|
public $activityId = null;
|
|
|
|
public $eventToDispatch = 'activityFinished';
|
|
|
|
public $eventData = null;
|
|
|
|
public $isPollingActive = false;
|
|
|
|
public bool $fullHeight = false;
|
|
|
|
public $activity;
|
|
|
|
public bool $showWaiting = true;
|
|
|
|
public static $eventDispatched = false;
|
|
|
|
protected $listeners = ['activityMonitor' => 'newMonitorActivity'];
|
|
|
|
public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished', $eventData = null, $header = null)
|
|
{
|
|
// Reset event dispatched flag for new activity
|
|
self::$eventDispatched = false;
|
|
|
|
$this->activityId = $activityId;
|
|
$this->eventToDispatch = $eventToDispatch;
|
|
$this->eventData = $eventData;
|
|
|
|
// Update header if provided
|
|
if ($header !== null) {
|
|
$this->header = $header;
|
|
}
|
|
|
|
$this->hydrateActivity();
|
|
|
|
$this->isPollingActive = true;
|
|
}
|
|
|
|
public function hydrateActivity()
|
|
{
|
|
if ($this->activityId === null) {
|
|
$this->activity = null;
|
|
|
|
return;
|
|
}
|
|
|
|
$this->activity = Activity::find($this->activityId);
|
|
}
|
|
|
|
public function updatedActivityId($value)
|
|
{
|
|
if ($value) {
|
|
$this->hydrateActivity();
|
|
$this->isPollingActive = true;
|
|
self::$eventDispatched = false;
|
|
}
|
|
}
|
|
|
|
public function polling()
|
|
{
|
|
$this->hydrateActivity();
|
|
$exit_code = data_get($this->activity, 'properties.exitCode');
|
|
if ($exit_code !== null) {
|
|
$this->isPollingActive = false;
|
|
if ($exit_code === 0) {
|
|
if ($this->eventToDispatch !== null) {
|
|
if (str($this->eventToDispatch)->startsWith('App\\Events\\')) {
|
|
$causer_id = data_get($this->activity, 'causer_id');
|
|
$user = User::find($causer_id);
|
|
if ($user) {
|
|
$teamId = data_get($this->activity, 'properties.team_id')
|
|
?? $user->currentTeam()?->id
|
|
?? $user->teams->first()?->id;
|
|
if ($teamId && ! self::$eventDispatched) {
|
|
if (filled($this->eventData)) {
|
|
$this->eventToDispatch::dispatch($teamId, $this->eventData);
|
|
} else {
|
|
$this->eventToDispatch::dispatch($teamId);
|
|
}
|
|
self::$eventDispatched = true;
|
|
}
|
|
}
|
|
|
|
return;
|
|
}
|
|
if (! self::$eventDispatched) {
|
|
if (filled($this->eventData)) {
|
|
$this->dispatch($this->eventToDispatch, $this->eventData);
|
|
} else {
|
|
$this->dispatch($this->eventToDispatch);
|
|
}
|
|
self::$eventDispatched = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|