Merge pull request #45 from lara-zeus/update-configration

update configuration

Author: atmonshi

.phpunit.cache/test-results

@@ -0,0 +1 @@
+{"version":"pest_2.36.0","defects":[],"times":{"P\\Tests\\ExampleTest::__pest_evaluable_it_can_test":0.005}}

composer.json

@@ -24,6 +24,7 @@
     ],
     "require": {
         "php": "^8.1",
+        "lara-zeus/filament-plugin-tools": "^1.0",
         "lara-zeus/core": "^3.1"
     },
     "require-dev": {

composer.lock

@@ -6,8 +6,11 @@ parameters:
     paths:
         - src
         - database
-        - tests
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
+
+    ignoreErrors:
+        -
+            identifier: missingType.iterableValue
+        -
+            identifier: missingType.generics

phpstan.neon.dist

@@ -25,7 +25,7 @@ public function renderWidget(array $data): string | View
 
         if ($widgetClass instanceof Widget) {
             $view = app('dynamic-dashboardTheme') . '.widgets.filament';
-            //return Blade::render('');
+            // return Blade::render('');
         }
 
         $data = array_merge($data, $this->viewData($data));

src/Concerns/InteractWithWidgets.php

@@ -6,45 +6,9 @@
 
 trait Configuration
 {
-    /**
-     * you can overwrite any model and use your own
-     */
-    protected array $models = [];
-
-    /**
-     * set the default upload options.
-     */
     protected Closure | string $defaultLayout = 'new-page';
 
-    protected Closure | string $uploadDisk = 'public';
-
-    protected Closure | string $uploadDirectory = 'layouts';
-
-    protected Closure | string $navigationGroupLabel = 'Dynamic Dashboard';
-
-    protected Closure | bool $hideLayoutResource = false;
-
-    public function models(array $models): static
-    {
-        $this->models = $models;
-
-        return $this;
-    }
-
-    public function getModels(): array
-    {
-        return $this->models;
-    }
-
-    public static function getModel(string $model): string
-    {
-        return array_merge(
-            config('zeus-dynamic-dashboard.models'),
-            (new static)::get()->getModels()
-        )[$model];
-    }
-
-    public function defaultLayout(Closure | string $layout): static
+    public function setDefaultLayout(Closure | string $layout): static
     {
         $this->defaultLayout = $layout;
 
@@ -55,52 +19,4 @@ public function getDefaultLayout(): Closure | string
     {
         return $this->evaluate($this->defaultLayout);
     }
-
-    public function uploadDisk(Closure | string $disk): static
-    {
-        $this->uploadDisk = $disk;
-
-        return $this;
-    }
-
-    public function getUploadDisk(): Closure | string
-    {
-        return $this->evaluate($this->uploadDisk);
-    }
-
-    public function uploadDirectory(Closure | string $dir): static
-    {
-        $this->uploadDirectory = $dir;
-
-        return $this;
-    }
-
-    public function getUploadDirectory(): Closure | string
-    {
-        return $this->evaluate($this->uploadDirectory);
-    }
-
-    public function navigationGroupLabel(Closure | string $lable): static
-    {
-        $this->navigationGroupLabel = $lable;
-
-        return $this;
-    }
-
-    public function getNavigationGroupLabel(): Closure | string
-    {
-        return $this->evaluate($this->navigationGroupLabel);
-    }
-
-    public function hideLayoutResource(Closure | bool $condition = true): static
-    {
-        $this->hideLayoutResource = $condition;
-
-        return $this;
-    }
-
-    public function isLayoutResourceHidden(): Closure | bool
-    {
-        return $this->evaluate($this->hideLayoutResource);
-    }
 }

src/Configuration.php

@@ -2,15 +2,26 @@
 
 namespace LaraZeus\DynamicDashboard;
 
+use Closure;
 use Filament\Contracts\Plugin;
 use Filament\Panel;
 use Filament\Support\Concerns\EvaluatesClosures;
 use LaraZeus\DynamicDashboard\Filament\Resources\LayoutResource;
+use LaraZeus\FilamentPluginTools\Concerns\CanHideResources;
+use LaraZeus\FilamentPluginTools\Concerns\HasModels;
+use LaraZeus\FilamentPluginTools\Concerns\HasNavigationGroupLabel;
+use LaraZeus\FilamentPluginTools\Concerns\HasUploads;
 
 final class DynamicDashboardPlugin implements Plugin
 {
+    use CanHideResources;
     use Configuration;
     use EvaluatesClosures;
+    use HasModels;
+    use HasNavigationGroupLabel;
+    use HasUploads;
+
+    protected Closure | string $navigationGroupLabel = 'Dynamic Dashboard';
 
     public function getId(): string
     {

src/DynamicDashboardPlugin.php

@@ -21,7 +21,7 @@ class LayoutResource extends Resource
 
     public static function shouldRegisterNavigation(): bool
     {
-        return ! DynamicDashboardPlugin::get()->isLayoutResourceHidden();
+        return DynamicDashboardPlugin::get()->isResourceVisible(static::class);
     }
 
     public static function getModel(): string

src/Filament/Resources/LayoutResource.php

@@ -45,7 +45,6 @@ public function form(): Builder\Block
     public function viewData(array $data): array
     {
         return [
-            // @phpstan-ignore-next-line
             'faqs' => ($data['faq_cat'] !== null) ? config('zeus-sky.models.Faq')::withAnyTags([$data['faq_cat']], 'faq')->get() : null,
         ];
     }

src/Widgets/Classes/FaqWidget.php

@@ -45,7 +45,6 @@ public function form(): Builder\Block
     public function viewData(array $data): array
     {
         return [
-            // @phpstan-ignore-next-line
             'library' => ($data['library_slug'] !== null) ? config('zeus-sky.models.Library')::withAnyTags([$data['library_slug']], 'library')->get() : null,
         ];
     }

src/Widgets/Classes/LibraryWidget.php

@@ -48,7 +48,6 @@ public function form(): Builder\Block
     public function viewData(array $data): array
     {
         return [
-            // @phpstan-ignore-next-line
             'menu' => ($data['menu_slug'] !== null) ? config('zeus-sky.models.Navigation')::fromHandle($data['menu_slug']) : null,
         ];
     }

src/Widgets/Classes/MenuWidget.php

@@ -49,7 +49,6 @@ public function form(): Builder\Block
                                     ->default('desc'),
 
                                 Select::make('category')
-                                    // @phpstan-ignore-next-line
                                     ->options(config('zeus-sky.models.Tag')::query()
                                         ->withType('category')
                                         ->pluck('name', 'id')),
@@ -64,11 +63,9 @@ public function form(): Builder\Block
 
     public function viewData(array $data): array
     {
-        // @phpstan-ignore-next-line
         $posts = config('zeus-sky.models.Post')::query();
 
         if ($data['category'] !== null) {
-            // @phpstan-ignore-next-line
             $category = config('zeus-sky.models.Tag')::where('type', 'category')->find($data['category']);
             if ($category !== null) {
                 $posts = $category->postsPublished();