Merge branch 'main' into we-need-more-tests

# Conflicts:
#	tests/Unit/CrudPanel/CrudPanelFiltersTest.php

Author: pxpm

package-lock.json

@@ -16,9 +16,9 @@
         "lodash": "^4.17.21",
         "pace": "0.0.4",
         "resolve-url-loader": "^4.0.0",
-        "sass": "^1.55.0",
+        "sass": "^1.56.1",
         "sass-loader": "^9.0.3",
-        "vue-template-compiler": "^2.7.8"
+        "vue-template-compiler": "^2.7.14"
     },
     "dependencies": {
         "@coreui/coreui": "^2.1.16",
@@ -29,10 +29,10 @@
         "bootstrap-datepicker": "^1.9.0",
         "bootstrap-daterangepicker": "^3.1.0",
         "bootstrap-iconpicker": "^1.8.2",
-        "ckeditor4": "^4.20.0",
+        "ckeditor4": "^4.20.1",
         "cropperjs": "^1.5.12",
-        "datatables.net": "^1.12.1",
-        "datatables.net-bs4": "^1.12.1",
+        "datatables.net": "^1.13.1",
+        "datatables.net-bs4": "^1.13.1",
         "datatables.net-fixedheader": "^3.2.4",
         "datatables.net-fixedheader-bs4": "^3.2.4",
         "datatables.net-responsive": "^2.3.0",

package.json

@@ -30,8 +30,10 @@ class BackpackServiceProvider extends ServiceProvider
 
     // Indicates if loading of the provider is deferred.
     protected $defer = false;
+
     // Where the route file lives, both inside the package and in the app (if overwritten).
     public $routeFilePath = '/routes/backpack/base.php';
+
     // Where custom routes can be written, and will be registered by Backpack.
     public $customRoutesFilePath = '/routes/backpack/custom.php';
 
@@ -40,7 +42,7 @@ class BackpackServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot(\Illuminate\Routing\Router $router)
+    public function boot(Router $router)
     {
         $this->loadViewsWithFallbacks();
         $this->loadTranslationsFrom(realpath(__DIR__.'/resources/lang'), 'backpack');
@@ -259,8 +261,8 @@ public function loadConfigs()
             'backpack' => [
                 'provider'  => 'backpack',
                 'table'     => 'password_resets',
-                'expire'   => 60,
-                'throttle' => config('backpack.base.password_recovery_throttle_notifications'),
+                'expire'    => config('backpack.base.password_recovery_token_expiration', 60),
+                'throttle'  => config('backpack.base.password_recovery_throttle_notifications'),
             ],
         ];
 

src/BackpackServiceProvider.php

@@ -63,8 +63,8 @@ public function __construct($options, $values, $logic, $fallbackLogic)
             $this->fallbackLogic = $fallbackLogic;
         }
 
-        if (\Request::has($this->name)) {
-            $this->currentValue = \Request::input($this->name);
+        if ($this->crud()->getRequest()->has($this->name)) {
+            $this->currentValue = $this->crud()->getRequest()->input($this->name);
         }
     }
 
@@ -76,7 +76,7 @@ public function __construct($options, $values, $logic, $fallbackLogic)
      */
     public function isActive()
     {
-        if (\Request::has($this->name)) {
+        if ($this->crud()->getRequest()->has($this->name)) {
             return true;
         }
 

src/app/Library/CrudPanel/CrudFilter.php

@@ -236,6 +236,10 @@
     // password reset, before they can try again for the same email?
     'password_recovery_throttle_notifications' => 600, // time in seconds
 
+    // How much time should the token sent to the user email be considered valid?
+    // After this time expires, user needs to request a new reset token.
+    'password_recovery_token_expiration' => 60, // time in minutes
+
     // Backpack will prevent an IP from trying to reset the password too many times,
     // so that a malicious actor cannot try too many emails, too see if they have
     // accounts or to increase the AWS/SendGrid/etc bill.

src/config/backpack/base.php

@@ -3,6 +3,7 @@
 namespace Backpack\CRUD\Tests\Unit\CrudPanel;
 
 use Backpack\CRUD\app\Library\CrudPanel\CrudFilter;
+use Backpack\CRUD\Tests\Unit\Models\User;
 use Config;
 
 /**
@@ -42,6 +43,18 @@ public function testItCanClearFilters()
         $this->crudPanel->clearFilters();
         $this->assertCount(0, $this->crudPanel->filters());
     }
+    
+    public function testItCanCheckIfFilterIsActiveFromRequest()
+    {
+        $this->crudPanel->setModel(User::class);
+        $request = request()->create('/admin/users', 'GET', ['my_custom_filter' => 'foo']);
+        $request->setRouteResolver(function () use ($request) {
+            return (new Route('GET', 'admin/users', ['UserCrudController', 'index']))->bind($request);
+        });
+        $this->crudPanel->setRequest($request);
+
+        $isActive = CrudFilter::name('my_custom_filter')->isActive();
+        $this->assertTrue($isActive);
 
     public function testItCanCreateAFilterFluently()
     {