opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-09-24 15:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.x' of https://github.com/filamentphp/filament into 4.x

Browse Source
This commit is contained in:
Dan Harrin
2025-09-11 12:44:06 +01:00
parent 6ca325c89f 909591eca0
commit 119cac03ff
2 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/actions/src/Concerns/CanExportRecords.php
+21 -12
View File
@@ -156,13 +156,16 @@ trait CanExportRecords
$maxRows = $action->getMaxRows() ?? $totalRows;
if ($maxRows < $totalRows) {
Notification::make()
->title(__('filament-actions::export.notifications.max_rows.title'))
->body(trans_choice('filament-actions::export.notifications.max_rows.body', $maxRows, [
'count' => Number::format($maxRows),
]))
->danger()
->send();
$action->failureNotification(
Notification::make()
->title(__('filament-actions::export.notifications.max_rows.title'))
->body(trans_choice('filament-actions::export.notifications.max_rows.body', $maxRows, [
'count' => Number::format($maxRows),
]))
->danger(),
);
$action->failure();
return;
}
@@ -270,17 +273,23 @@ trait CanExportRecords
->dispatch();
if (
(filled($jobConnection) && ($jobConnection !== 'sync')) ||
(blank($jobConnection) && (config('queue.default') !== 'sync'))
($jobConnection === 'sync')
|| (blank($jobConnection) && (config('queue.default') === 'sync'))
) {
$action->successNotification(null);
$action->successNotificationTitle(null);
return;
}
$action->successNotification(
Notification::make()
->title($action->getSuccessNotificationTitle())
->body(trans_choice('filament-actions::export.notifications.started.body', $export->total_rows, [
'count' => Number::format($export->total_rows),
]))
->success()
->send();
}
->success(),
);
});
$this->defaultColor('gray');
packages/actions/src/ImportAction.php
+22 -13
View File
@@ -202,13 +202,16 @@ class ImportAction extends Action
$maxRows = $action->getMaxRows() ?? $totalRows;
if ($maxRows < $totalRows) {
Notification::make()
->title(__('filament-actions::import.notifications.max_rows.title'))
->body(trans_choice('filament-actions::import.notifications.max_rows.body', $maxRows, [
'count' => Number::format($maxRows),
]))
->danger()
->send();
$action->failureNotification(
Notification::make()
->title(__('filament-actions::import.notifications.max_rows.title'))
->body(trans_choice('filament-actions::import.notifications.max_rows.body', $maxRows, [
'count' => Number::format($maxRows),
]))
->danger(),
);
$action->failure();
return;
}
@@ -311,7 +314,7 @@ class ImportAction extends Action
)
->when(
($jobConnection === 'sync') ||
(blank($jobConnection) && (config('queue.default') === 'sync')),
(blank($jobConnection) && (config('queue.default') === 'sync')),
fn (Notification $notification) => $notification
->persistent()
->send(),
@@ -321,17 +324,23 @@ class ImportAction extends Action
->dispatch();
if (
(filled($jobConnection) && ($jobConnection !== 'sync')) ||
(blank($jobConnection) && (config('queue.default') !== 'sync'))
($jobConnection === 'sync')
|| (blank($jobConnection) && (config('queue.default') === 'sync'))
) {
$action->successNotification(null);
$action->successNotificationTitle(null);
return;
}
$action->successNotification(
Notification::make()
->title($action->getSuccessNotificationTitle())
->body(trans_choice('filament-actions::import.notifications.started.body', $import->total_rows, [
'count' => Number::format($import->total_rows),
]))
->success()
->send();
}
->success(),
);
});
$this->registerModalActions([