PRs

.github/workflows/phpstan.yml

@@ -16,7 +16,8 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          extensions: pdo_sqlite
+          php-version: '8.2'
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -13,13 +13,16 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.2, 8.1]
-        laravel: [10.*]
+        php: [8.2, 8.4]
+        laravel: [11.*, 12.*]
         stability: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 10.*
-            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
             carbon: ^2.63
+          - laravel: 12.*
+            testbench: 10.*
+            carbon: ^3.8.4
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -28,16 +28,15 @@
         "symfony/yaml": "^7.0"
     },
     "require-dev": {
+        "larastan/larastan": "^3.0",
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^8.0",
-        "nunomaduro/larastan": "^2.0.1",
         "orchestra/testbench": "^9.0|^10.0",
-        "pestphp/pest": "^2.0",
-        "pestphp/pest-plugin-arch": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0"
+        "pestphp/pest": "^3.0",
+        "pestphp/pest-plugin-arch": "^3.0",
+        "pestphp/pest-plugin-laravel": "^3.0",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -72,8 +71,7 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "pestphp/pest-plugin": true,
-            "phpstan/extension-installer": true
+            "pestphp/pest-plugin": true
         }
     },
     "extra": {

config/filament-knowledge-base.php

@@ -1,11 +1,19 @@
 <?php
 
 // config for Guava/KnowledgeBasePanel
+use Guava\FilamentKnowledgeBase\Enums\NodeType;
+
 return [
     'flatfile-model' => \Guava\FilamentKnowledgeBase\Models\FlatfileNode::class,
 
     'cache' => [
         'prefix' => env('FILAMENT_KB_CACHE_PREFIX', 'filament_kb_'),
-        'ttl' => env('FILAMENT_KB_CACHE_TTL', 'forever'),
+        'ttl' => env('FILAMENT_KB_CACHE_TTL', 86400),
+    ],
+
+    'icons' => [
+        NodeType::Documentation->value => 'heroicon-o-document',
+        NodeType::Link->value => 'heroicon-o-link',
+        NodeType::Group->value => null,
     ],
 ];

docs/v2/introduction.md

@@ -57,7 +57,7 @@ And lastly, add the following to your custom filament theme to correctly build t
 ```css
 @plugin "@tailwindcss/typography";
 @source '../../../../vendor/guava/filament-knowledge-base/src/**/*';
-@source '../../../../vendor/guava/filament-knowledge-base/resources/view/**/*';
+@source '../../../../vendor/guava/filament-knowledge-base/resources/views/**/*';
 ```
 
 > [!IMPORTANT]

phpstan.neon.dist

@@ -1,6 +1,6 @@
 includes:
     - phpstan-baseline.neon
-    - ./vendor/nunomaduro/larastan/extension.neon
+    - vendor/larastan/larastan/extension.neon
 
 parameters:
     level: 4
@@ -11,5 +11,3 @@ parameters:
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
-

resources/lang/fr/translations.php

@@ -6,6 +6,6 @@
     'open-documentation' => 'Ouvrir la documentation',
     'close' => 'Fermer',
     'back-to-default-panel' => 'Retour',
-    'url-copied' => 'URL copiée dans votre presse-papiers.',
-    'code-copied' => 'Code copié dans votre presse-papiers.',
+    'url-copied' => 'URL copiée dans votre presse-papier.',
+    'code-copied' => 'Code copié dans votre presse-papier.',
 ];

resources/lang/it/translations.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'knowledge-base' => 'Documentazione',
+    'help' => 'Aiuto',
+    'open-documentation' => 'Apri documentazione',
+    'close' => 'Chiudi',
+    'back-to-default-panel' => 'Indietro',
+    'url-copied' => 'La URL è stata copiata nei tuoi appunti.',
+    'code-copied' => 'Il codice è stato copiato nei tuoi appunti.',
+];

src/Actions/Forms/Components/HelpAction.php

@@ -8,12 +8,12 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\HtmlString;
 
 class HelpAction extends Action
 {
     protected static function getContentView(Documentable $documentable): HtmlString
     {
         $html = $documentable->getSimpleHtml();
         $articleClass = KnowledgeBase::plugin()->getArticleClass();
 
         $classes = Arr::toCssClasses([
             'gu-kb-article-modal',
@@ -31,26 +31,26 @@
         return new HtmlString(\Str::replace($replacementStringId, $html, $parsed));
     }
 
-    public static function forDocumentable(Documentable | string $documentable): static
+    public static function forDocumentable(Documentable | string $documentable, ?string $panelId = null): static
     {
-        $documentable = KnowledgeBase::documentable($documentable);
+        $documentable = KnowledgeBase::documentable($documentable, $panelId);
 
         return static::make("help.{$documentable->getId()}")
             ->label($documentable->getTitle())
-//            ->icon($documentable->getIcon())
+            //            ->icon($documentable->getIcon())
             ->icon('heroicon-o-question-mark-circle')
             ->when(
                 KnowledgeBase::companion()->hasModalPreviews(),
                 fn (HelpAction $action) => $action
                     ->modalContent(fn () => static::getContentView($documentable))
                     ->modalHeading($documentable->getTitle())
                     ->modalSubmitAction(false)
                     ->modalCancelActionLabel(__('filament-knowledge-base::translations.close'))
                     ->when(
                         KnowledgeBase::companion()->hasSlideOverPreviews(),
                         fn (HelpAction $action) => $action->slideOver()
                     ),
                 fn (HelpAction $action) => $action->url($documentable->getUrl())
             )
         ;
     }

src/Actions/HelpAction.php

@@ -9,7 +9,10 @@
 
 class HelpAction extends Action
 {
-    protected function setUp(): void {}
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
 
     public function generic(): HelpAction
     {
@@ -21,20 +24,27 @@ public function generic(): HelpAction
         ;
     }
 
-    public static function forDocumentable(Documentable | string $documentable): HelpAction
+    public static function forDocumentable(Documentable | string $documentable, ?string $panelId = null): HelpAction
     {
-        $documentable = KnowledgeBase::documentable($documentable);
+        $documentable = KnowledgeBase::documentable($documentable, $panelId);
 
         return static::make("help.{$documentable->getId()}")
             ->label($documentable->getTitle())
             ->icon($documentable->getIcon())
             ->when(
                 KnowledgeBase::companion()->hasModalPreviews(),
                 fn (HelpAction $action) => $action
-                    ->modal()
-                    ->modalContent(new HtmlString('test'))
-                    ->action(fn () => dd('test'))
-//                    ->alpineClickHandler('$dispatch(\"open-modal\", {id: "' . $documentable->getId() . '"})')
+                    ->modalHeading(function () use ($documentable) {
+                        return new HtmlString("<h3 class='text-lg font-medium'>{$documentable->getTitle()}</h3>");
+                    })
+                    ->modalContent(function () use ($documentable) {
+                        $content = data_get($documentable->getData(), 'content', '');
+                        $body = new HtmlString("<div class='prose dark:prose-invert'>{$content}</div>");
+
+                        return $body;
+                    })
+                    ->modalCancelActionLabel(__('filament-knowledge-base::translations.close'))
+                    ->modalSubmitAction(false)
                     ->when(
                         KnowledgeBase::companion()->hasSlideOverPreviews(),
                         fn (HelpAction $action) => $action->slideOver()

src/Actions/Tables/Components/HelpAction.php

@@ -31,13 +31,13 @@ protected static function getContentView(Documentable $documentable): HtmlString
         return new HtmlString(\Str::replace($replacementStringId, $html, $parsed));
     }
 
-    public static function forDocumentable(Documentable | string $documentable): static
+    public static function forDocumentable(Documentable | string $documentable, ?string $panelId = null): static
     {
-        $documentable = KnowledgeBase::documentable($documentable);
+        $documentable = KnowledgeBase::documentable($documentable, $panelId);
 
         return static::make("help.{$documentable->getId()}")
             ->label($documentable->getTitle())
-//            ->icon($documentable->getIcon())
+            //            ->icon($documentable->getIcon())
             ->icon('heroicon-o-question-mark-circle')
             ->when(
                 KnowledgeBase::companion()->hasModalPreviews(),