mirror of
https://github.com/filamentphp/filament.git
synced 2026-09-24 15:42:09 +08:00
refactor & cs
This commit is contained in:
@@ -6,7 +6,7 @@ use Closure;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Actions\ImportAction;
|
||||
use Filament\Actions\Imports\Events\ImportCompleted;
|
||||
use Filament\Actions\Imports\Events\ImportInitiated;
|
||||
use Filament\Actions\Imports\Events\ImportStarted;
|
||||
use Filament\Actions\Imports\ImportColumn;
|
||||
use Filament\Actions\Imports\Importer;
|
||||
use Filament\Actions\Imports\Jobs\ImportCsv;
|
||||
@@ -253,7 +253,7 @@ trait CanImportRecords
|
||||
options: $options,
|
||||
);
|
||||
|
||||
event(new ImportInitiated($import, $columnMap, $options));
|
||||
event(new ImportStarted($import, $columnMap, $options));
|
||||
|
||||
Bus::batch($importJobs->all())
|
||||
->allowFailures()
|
||||
@@ -387,7 +387,7 @@ trait CanImportRecords
|
||||
{
|
||||
/** @phpstan-ignore-next-line */
|
||||
$fileDisk = invade($file)->disk;
|
||||
|
||||
|
||||
$filePath = $file->getRealPath();
|
||||
|
||||
if (config("filesystems.disks.{$fileDisk}.driver") !== 's3') {
|
||||
|
||||
+2
-3
@@ -6,7 +6,7 @@ use Filament\Actions\Imports\Models\Import;
|
||||
use Illuminate\Foundation\Events\Dispatchable;
|
||||
use Throwable;
|
||||
|
||||
class ImportCsvProcessed
|
||||
class ImportChunkProcessed
|
||||
{
|
||||
use Dispatchable;
|
||||
|
||||
@@ -22,8 +22,7 @@ class ImportCsvProcessed
|
||||
protected int $processedRows,
|
||||
protected int $successfulRows,
|
||||
protected array $exceptions,
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
public function getImport(): Import
|
||||
{
|
||||
@@ -17,8 +17,7 @@ class ImportCompleted
|
||||
protected Import $import,
|
||||
protected array $columnMap,
|
||||
protected array $options,
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
public function getImport(): Import
|
||||
{
|
||||
|
||||
+2
-3
@@ -5,7 +5,7 @@ namespace Filament\Actions\Imports\Events;
|
||||
use Filament\Actions\Imports\Models\Import;
|
||||
use Illuminate\Foundation\Events\Dispatchable;
|
||||
|
||||
class ImportInitiated
|
||||
class ImportStarted
|
||||
{
|
||||
use Dispatchable;
|
||||
|
||||
@@ -17,8 +17,7 @@ class ImportInitiated
|
||||
protected Import $import,
|
||||
protected array $columnMap,
|
||||
protected array $options,
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
public function getImport(): Import
|
||||
{
|
||||
@@ -4,7 +4,7 @@ namespace Filament\Actions\Imports\Jobs;
|
||||
|
||||
use Carbon\CarbonInterface;
|
||||
use Exception;
|
||||
use Filament\Actions\Imports\Events\ImportCsvProcessed;
|
||||
use Filament\Actions\Imports\Events\ImportChunkProcessed;
|
||||
use Filament\Actions\Imports\Exceptions\RowImportFailedException;
|
||||
use Filament\Actions\Imports\Importer;
|
||||
use Filament\Actions\Imports\Models\FailedImportRow;
|
||||
@@ -111,13 +111,13 @@ class ImportCsv implements ShouldQueue
|
||||
|
||||
$this->import->save();
|
||||
|
||||
event(new ImportCsvProcessed(
|
||||
event(new ImportChunkProcessed(
|
||||
$this->import,
|
||||
$this->columnMap,
|
||||
$this->options,
|
||||
$processedRows,
|
||||
$successfulRows,
|
||||
$exceptions
|
||||
$exceptions,
|
||||
));
|
||||
|
||||
$this->handleExceptions($exceptions);
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
namespace Filament\Widgets\StatsOverviewWidget;
|
||||
|
||||
use Closure;
|
||||
use Filament\Support\Enums\IconPosition;
|
||||
use Filament\Support\Concerns\Macroable;
|
||||
use Filament\Support\Enums\IconPosition;
|
||||
use Illuminate\Contracts\Support\Htmlable;
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Support\Str;
|
||||
@@ -14,7 +14,7 @@ use Illuminate\View\ComponentAttributeBag;
|
||||
class Stat extends Component implements Htmlable
|
||||
{
|
||||
use Macroable;
|
||||
|
||||
|
||||
/**
|
||||
* @var array<float> | null
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user