Merge branch '3.x' into fix-nested-repeaters

Author: Tofandel

CHANGELOG.md

@@ -254,7 +254,7 @@ return new class extends Migration
 ```
 
 This file will create the minimum required tables and columns that Twill uses to provide the CMS functionality. Later in
-the guide we may add some more fields to the database, but will will do that in a new migration.
+the guide we may add some more fields to the database, but we will do that in a new migration.
 
 Once you are more experienced with Twill, you may want to add fields at this moment, before you run the migrate command.
 That way, you do not have to immediately add a new migration file.

docs/content/2_guides/1_page-builder-with-blade/4_creating-the-page-module.md

@@ -66,7 +66,7 @@ const actions = {
       content_type: state.dataSources.selected.value,
       page: state.page,
       offset: state.offset,
-      filter: state.filter
+      filter: JSON.stringify(state.filter)
     }, resp => {
       commit(BUCKETS.UPDATE_BUCKETS_DATA, resp.source)
       commit(BUCKETS.UPDATE_BUCKETS_MAX_PAGE, resp.maxPage)

frontend/js/store/modules/buckets.js

@@ -231,7 +231,7 @@ const actions = {
         page: state.page,
         offset: state.offset,
         columns: getters.visibleColumnsNames,
-        filter: state.filter
+        filter: JSON.stringify(state.filter)
       }
 
       api.get(params, function (resp) {

frontend/js/store/modules/datatable.js

@@ -1,6 +1,6 @@
 {
   "name": "@area17/twill",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "private": true,
   "scripts": {
     "inspect": "vue-cli-service inspect --mode production",

package-lock.json

@@ -3,7 +3,6 @@
 namespace A17\Twill;
 
 use A17\Twill\Facades\TwillPermissions;
-use A17\Twill\Models\User;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Gate;
 
@@ -159,7 +158,7 @@ public function boot()
 
         $this->define('publish-user', function ($user) {
             return $this->authorize($user, function ($user) {
-                $editedUserObject = User::find(request('id'));
+                $editedUserObject = twillModel('user')::find(request('id'));
                 return $this->userHasRole(
                     $user,
                     [TwillPermissions::roles()::ADMIN]

package.json

@@ -104,7 +104,7 @@ protected function getBlocks(): Collection
             // We do not render this.
             unset($data['rules'], $data['rulesForTranslatedFields']);
 
-            $data['block class'] = $block::class !== 'A17\Twill\Services\Blocks\Block' ? get_class($block) : 'default';
+            $data['block class'] = $block::class !== Block::class ? get_class($block) : 'default';
 
             $list[] = $data;
         }

src/AuthServiceProvider.php

@@ -2,6 +2,7 @@
 
 use A17\Twill\Facades\TwillBlocks;
 use A17\Twill\Facades\TwillCapsules;
+use A17\Twill\Models\Model;
 use A17\Twill\Services\Blocks\Block;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
@@ -208,6 +209,7 @@ function fix_directory_separator($path)
 }
 
 if (! function_exists('twillModel')) {
+    /** @return class-string<Model>|Model It returns a class string but this is for the correct type hints */
     function twillModel($model): string
     {
         return config("twill.models.$model")

src/Commands/ListBlocks.php

@@ -9,7 +9,6 @@
 use A17\Twill\Models\Behaviors\HasSlug;
 use A17\Twill\Models\Contracts\TwillModelContract;
 use A17\Twill\Models\Contracts\TwillSchedulableModel;
-use A17\Twill\Models\Group;
 use A17\Twill\Repositories\ModuleRepository;
 use A17\Twill\Services\Breadcrumbs\Breadcrumbs;
 use A17\Twill\Services\Forms\Fields\BaseFormField;
@@ -2674,7 +2673,7 @@ protected function respondWithJson($message, $variant)
     protected function getGroupUserMapping()
     {
         if (config('twill.enabled.permissions-management')) {
-            return Group::with('users')->get()
+            return twillModel('group')::with('users')->get()
                 ->mapWithKeys(function ($group) {
                     return [$group->id => $group->users()->pluck('id')->toArray()];
                 })->toArray();