Merge branch 'develop'

* develop:
  hotfix: Navigation page have error with contentPicker

Author: cklei-carly

src/Filament/Forms/Components/ContentTree/Filter/WithoutGlobalScope.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace SolutionForest\InspireCms\Filament\Forms\Components\ContentTree\Filter;
+
+class WithoutGlobalScope extends BaseFilter
+{
+    public function __construct(
+        protected string $scopeClass,
+    ) {}
+
+    public function toLivewire()
+    {
+        return [
+            'scopeClass' => $this->scopeClass,
+        ];
+    }
+
+    public static function fromLivewire($value)
+    {
+        return new static($value['scopeClass']);
+    }
+
+    public function applyToQuery($query)
+    {
+        $query->withoutGlobalScope($this->scopeClass);
+
+        return $query;
+    }
+}

src/Filament/Resources/NavigationResource.php

@@ -10,6 +10,7 @@
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletingScope;
 use SolutionForest\InspireCms\Base\Enums\NavigationType;
 use SolutionForest\InspireCms\Facades\InspireCms;
 use SolutionForest\InspireCms\Filament\Clusters\Settings;
@@ -209,7 +210,7 @@ protected static function getContentFormComponent()
                     null;
             })
             // display deleted content
-            ->where(new ContentPickerFilters\BuilderFilter('withTrashed'));
+            ->where(new ContentPickerFilters\WithoutGlobalScope(SoftDeletingScope::class));
     }
 
     /**