merge: dev into 056-remove-legacy-bulkops
This commit is contained in:
commit
1ed3b953da
@ -17,8 +17,6 @@
|
|||||||
use App\Support\OpsUx\OperationUxPresenter;
|
use App\Support\OpsUx\OperationUxPresenter;
|
||||||
use App\Support\OpsUx\OpsUxBrowserEvents;
|
use App\Support\OpsUx\OpsUxBrowserEvents;
|
||||||
use BackedEnum;
|
use BackedEnum;
|
||||||
use Filament\Actions\Action;
|
|
||||||
use Filament\Notifications\Notification;
|
|
||||||
use Filament\Pages\Page;
|
use Filament\Pages\Page;
|
||||||
use UnitEnum;
|
use UnitEnum;
|
||||||
|
|
||||||
|
|||||||
@ -105,7 +105,6 @@ protected function getActions(): array
|
|||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
OperationUxPresenter::queuedToast('policy.capture_snapshot')
|
OperationUxPresenter::queuedToast('policy.capture_snapshot')
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Actions\Action::make('view_run')
|
\Filament\Actions\Action::make('view_run')
|
||||||
|
|||||||
@ -459,9 +459,16 @@ public static function table(Table $table): Table
|
|||||||
->url(OperationRunLinks::view($opRun, $tenant)),
|
->url(OperationRunLinks::view($opRun, $tenant)),
|
||||||
])
|
])
|
||||||
->duration(8000)
|
->duration(8000)
|
||||||
->sendToDatabase($initiator)
|
->sendToDatabase($initiator);
|
||||||
->send();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OperationUxPresenter::queuedToast('policy_version.prune')
|
||||||
|
->actions([
|
||||||
|
Actions\Action::make('view_run')
|
||||||
|
->label('View run')
|
||||||
|
->url(OperationRunLinks::view($opRun, $tenant)),
|
||||||
|
])
|
||||||
|
->send();
|
||||||
})
|
})
|
||||||
->deselectRecordsAfterCompletion(),
|
->deselectRecordsAfterCompletion(),
|
||||||
|
|
||||||
@ -609,9 +616,16 @@ public static function table(Table $table): Table
|
|||||||
->url(OperationRunLinks::view($opRun, $tenant)),
|
->url(OperationRunLinks::view($opRun, $tenant)),
|
||||||
])
|
])
|
||||||
->duration(8000)
|
->duration(8000)
|
||||||
->sendToDatabase($initiator)
|
->sendToDatabase($initiator);
|
||||||
->send();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OperationUxPresenter::queuedToast('policy_version.force_delete')
|
||||||
|
->actions([
|
||||||
|
Actions\Action::make('view_run')
|
||||||
|
->label('View run')
|
||||||
|
->url(OperationRunLinks::view($opRun, $tenant)),
|
||||||
|
])
|
||||||
|
->send();
|
||||||
})
|
})
|
||||||
->deselectRecordsAfterCompletion(),
|
->deselectRecordsAfterCompletion(),
|
||||||
]),
|
]),
|
||||||
|
|||||||
@ -317,7 +317,6 @@ public function table(Table $table): Table
|
|||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
OperationUxPresenter::queuedToast((string) $opRun->type)
|
OperationUxPresenter::queuedToast((string) $opRun->type)
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Actions\Action::make('view_run')
|
\Filament\Actions\Action::make('view_run')
|
||||||
|
|||||||
@ -5,6 +5,7 @@
|
|||||||
use App\Jobs\ExecuteRestoreRunJob;
|
use App\Jobs\ExecuteRestoreRunJob;
|
||||||
use App\Models\OperationRun;
|
use App\Models\OperationRun;
|
||||||
use App\Models\RestoreRun;
|
use App\Models\RestoreRun;
|
||||||
|
use App\Services\BulkOperationService;
|
||||||
use App\Services\Intune\AuditLogger;
|
use App\Services\Intune\AuditLogger;
|
||||||
use App\Services\Intune\RestoreService;
|
use App\Services\Intune\RestoreService;
|
||||||
|
|
||||||
@ -34,6 +35,9 @@
|
|||||||
expect($operationRun)->not->toBeNull();
|
expect($operationRun)->not->toBeNull();
|
||||||
expect($operationRun?->status)->toBe('queued');
|
expect($operationRun?->status)->toBe('queued');
|
||||||
|
|
||||||
|
$this->mock(BulkOperationService::class, function ($mock): void {
|
||||||
|
$mock->shouldReceive('sanitizeFailureReason')->andReturnUsing(fn (string $message): string => $message);
|
||||||
|
});
|
||||||
// Simulate downstream code updating RestoreRun status via query builder (no model events).
|
// Simulate downstream code updating RestoreRun status via query builder (no model events).
|
||||||
$this->mock(RestoreService::class, function ($mock) use ($restoreRun): void {
|
$this->mock(RestoreService::class, function ($mock) use ($restoreRun): void {
|
||||||
$mock->shouldReceive('executeForRun')
|
$mock->shouldReceive('executeForRun')
|
||||||
@ -52,6 +56,7 @@
|
|||||||
$job->handle(
|
$job->handle(
|
||||||
app(RestoreService::class),
|
app(RestoreService::class),
|
||||||
app(AuditLogger::class),
|
app(AuditLogger::class),
|
||||||
|
app(BulkOperationService::class),
|
||||||
);
|
);
|
||||||
|
|
||||||
$operationRun = $operationRun?->fresh();
|
$operationRun = $operationRun?->fresh();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user