Softdeletes in Expiry

Author: AzGasim

config/expiry.php

@@ -56,7 +56,9 @@
                 'all' => [
                     'label' => 'trans//core::core.all',
                     'icon' => 'gmdi-filter-list',
-                    'query' => [],
+                    'query' => [
+                        ['field' => 'deleted_at', 'operator' => '=', 'value' => null],
+                    ],
                 ],
                 'documents' => [
                     'label' => 'trans//core::core.documents',
@@ -67,6 +69,7 @@
                             'operator' => '=',
                             'value' => 'Documents',
                         ],
+                        ['field' => 'deleted_at', 'operator' => '=', 'value' => null],
                     ],
                     'visible' => in_array(rtrim(env('APP_URL'), '/'), [
                         config('app.url'),
@@ -81,6 +84,7 @@
                             'operator' => '=',
                             'value' => 'Articles',
                         ],
+                        ['field' => 'deleted_at', 'operator' => '=', 'value' => null],
                     ],
                     'visible' => in_array(rtrim(env('APP_URL'), '/'), [
                         config('app.url'),
@@ -95,6 +99,7 @@
                             'operator' => '=',
                             'value' => 'Tasks',
                         ],
+                        ['field' => 'deleted_at', 'operator' => '=', 'value' => null],
                     ],
                     'visible' => in_array(rtrim(env('APP_URL'), '/'), [
                         config('app.url'),
@@ -109,6 +114,7 @@
                             'operator' => '=',
                             'value' => 'No assignee',
                         ],
+                        ['field' => 'deleted_at', 'operator' => '=', 'value' => null],
                     ],
                     'visible' => in_array(rtrim(env('APP_URL'), '/'), [
                         config('app.url'),
@@ -123,6 +129,7 @@
                             'operator' => '=',
                             'value' => 'No expiry date',
                         ],
+                        ['field' => 'deleted_at', 'operator' => '=', 'value' => null],
                     ],
                     'visible' => in_array(rtrim(env('APP_URL'), '/'), [
                         config('app.url'),

packages/expiry/src/Models/Expiry.php

@@ -5,14 +5,13 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection;
+use Moox\Core\Traits\SoftDelete\SingleSoftDeleteInModel;
 use Moox\Press\QueryBuilder\UserQueryBuilder;
 
 class Expiry extends Model
 {
-    use HasFactory;
-    use SoftDeletes;
+    use HasFactory, SingleSoftDeleteInModel;
 
     protected $fillable = [
         'title',

packages/expiry/src/Resources/ExpiryResource.php

@@ -11,14 +11,15 @@
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Moox\Core\Traits\Base\BaseInResource;
+use Moox\Core\Traits\SoftDelete\SingleSoftDeleteInResource;
 use Moox\Core\Traits\Tabs\TabsInResource;
 use Moox\Expiry\Actions\CustomExpiryAction;
 use Moox\Expiry\Models\Expiry;
 use Moox\Expiry\Resources\ExpiryResource\Pages;
 
 class ExpiryResource extends Resource
 {
-    use BaseInResource, TabsInResource;
+    use BaseInResource, SingleSoftDeleteInResource, TabsInResource;
 
     protected static ?string $model = Expiry::class;
 

packages/expiry/src/Resources/ExpiryResource/Pages/ListExpiries.php

@@ -5,13 +5,14 @@
 use Filament\Actions\Action;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
+use Moox\Core\Traits\SoftDelete\SingleSoftDeleteInListPage;
 use Moox\Core\Traits\Tabs\TabsInListPage;
 use Moox\Expiry\Models\Expiry;
 use Moox\Expiry\Resources\ExpiryResource;
 
 class ListExpiries extends ListRecords
 {
-    use TabsInListPage;
+    use SingleSoftDeleteInListPage, TabsInListPage;
 
     protected static string $resource = ExpiryResource::class;