add Filament v2 support

Author: danilopolani

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
-## 1.0.0 - 201X-XX-XX
+## 2.0.0 - 2022-06-18
+
+**Changed**
+- Filament v2 support
+
+## 1.0.0 - 2021-08-08
 
 - Initial release

README.md

@@ -3,7 +3,7 @@
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/nop-app/filament.svg?style=flat-square)](https://packagist.org/packages/nop-app/filament)
 [![Total Downloads](https://img.shields.io/packagist/dt/nop-app/filament.svg?style=flat-square)](https://packagist.org/packages/nop-app/filament)
 
-Integrate Nop with [Filament](https://filamentadmin.com). The package will enable Nop on all the edit pages of your Filament admin dashboard, e.g. `/admin/resources/projects/<id>/edit`, preventing multiple users to access the same page simultaneously.
+Integrate Nop with [Filament](https://filamentadmin.com). The package will enable Nop on all the edit pages of your Filament admin dashboard, e.g. `/admin/projects/<id>/edit`, preventing multiple users to access the same page simultaneously.
 
 ## Installation
 
@@ -13,18 +13,10 @@ Install the package via composer:
 composer require nop-app/filament
 ```
 
-Then publish the package config file and assets as well:
+Then publish the package config file:
 
 ```bash
 php artisan vendor:publish --tag=nop-config
-php artisan vendor:publish --tag=nop-assets
-```
-
-### Upgrade
-When upgrading, you may want to republish the assets:
-
-```bash
-php artisan vendor:publish --tag=nop-assets --force
 ```
 
 ## Configuration

composer.json

@@ -17,25 +17,15 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
-        "filament/filament": "^1.6",
-        "illuminate/support": "^8.0",
-        "spatie/laravel-package-tools": "^1.5"
-    },
-    "require-dev": {
-        "orchestra/testbench": "^6.0",
-        "phpunit/phpunit": "^9.0"
+        "php": "^8.0",
+        "filament/filament": "^2.13",
+        "illuminate/support": "^9.0"
     },
     "autoload": {
         "psr-4": {
             "Nop\\Filament\\": "src"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Nop\\Filament\\Tests\\": "tests"
-        }
-    },
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"

config/nop.php

@@ -34,8 +34,8 @@
     */
     'enabled_routes' => [
         // This route enables all resources of your admin
-        // E.g. /admin/resources/<resource name>/<id or uuid>/edit
-        'admin/resources/[a-z-_]+/[0-9a-z-]+/edit',
+        // E.g. /admin/<resource name>/<id or uuid>/edit
+        'admin/[a-z-_]+/[0-9a-z-]+/edit',
     ],
 
 

package.json

@@ -15,5 +15,6 @@
     },
     "scripts": {
         "build": "npx mix --production"
-    }
+    },
+    "dependencies": {}
 }

resources/dist/app.js

@@ -2,7 +2,7 @@
     const script = document.createElement('script');
     script.type = 'text/javascript';
     script.onload = function () {
-        Nop.init(window.filamentConfig.nop);
+        Nop.init(window.filamentData.nop);
     };
     script.src = 'https://nop.is/js/sdk.js';
 

resources/js/app.js

@@ -2,52 +2,53 @@
 
 namespace Nop\Filament;
 
-use Filament\Filament;
+use Filament\PluginServiceProvider;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
-use Spatie\LaravelPackageTools\Package;
-use Spatie\LaravelPackageTools\PackageServiceProvider;
 
-class NopServiceProvider extends PackageServiceProvider
+class NopServiceProvider extends PluginServiceProvider
 {
-    public function configurePackage(Package $package): void
-    {
-        $package
-            ->name('nop')
-            ->hasAssets()
-            ->hasConfigFile();
-    }
+    public static string $name = 'nop';
 
-    public function bootingPackage()
-    {
-        Filament::serving(function () {
-            Filament::registerScript($this->package->name, '/vendor/' . $this->package->name . '/app.js');
+    protected array $scripts = [
+        'nop-scripts' => __DIR__ . '/../resources/dist/app.js',
+    ];
 
-            $userName = null;
+    /**
+     * Provide data to the page scripts.
+     *
+     * @return array
+     */
+    protected function getScriptData(): array
+    {
+        $userName = null;
 
-            if (($userNameField = Config::get('nop.user_name_field')) && Auth::check()) {
-                $userName = Auth::user()->$userNameField;
-            }
+        if (($userNameField = Config::get('nop.user_name_field')) && Auth::check()) {
+            $userName = Auth::user()->$userNameField;
+        }
 
-            Filament::provideToScript([
-                'nop' => Config::get('nop.settings') + [
-                    'enabled' => Config::get('nop.enabled', false) && $this->routeEnabled(),
-                    'token' => Config::get('nop.token'),
-                    'user' => $userName,
-                ],
-            ]);
-        });
+        return [
+            'nop' => Config::get('nop.settings') + [
+                'enabled' => Config::get('nop.enabled', false) && $this->isRouteEnabled(),
+                'token' => Config::get('nop.token'),
+                'user' => $userName,
+            ],
+        ];
     }
 
     /**
      * Check if the current route is enabled.
      *
      * @return bool
      */
-    protected function routeEnabled(): bool
+    protected function isRouteEnabled(): bool
     {
+        /** @var \Illuminate\Http\Request $request */
+        $request = App::make('request');
+
         foreach (Config::get('nop.enabled_routes') as $pattern) {
-            if (preg_match('#^' . $pattern . '$#i', request()->path())) {
+            if (preg_match('#^' . $pattern . '$#i', $request->path())) {
                 return true;
             }
         }