Merge branch 'main' into handle-uploads-inside-relationships

Author: pxpm

composer.json

@@ -37,7 +37,7 @@
     "require": {
         "laravel/framework": "^10.0",
         "prologue/alerts": "^1.0",
-        "backpack/basset": "^1.0.0",
+        "backpack/basset": "^1.1.1",
         "creativeorange/gravatar": "~1.0",
         "doctrine/dbal": "^3.0",
         "guzzlehttp/guzzle": "^7.0"

src/BackpackServiceProvider.php

@@ -23,7 +23,6 @@ class BackpackServiceProvider extends ServiceProvider
         \Backpack\CRUD\app\Console\Commands\Install::class,
         \Backpack\CRUD\app\Console\Commands\AddMenuContent::class,
         \Backpack\CRUD\app\Console\Commands\AddCustomRouteContent::class,
-        \Backpack\CRUD\app\Console\Commands\PublishAssets::class,
         \Backpack\CRUD\app\Console\Commands\Version::class,
         \Backpack\CRUD\app\Console\Commands\CreateUser::class,
         \Backpack\CRUD\app\Console\Commands\PublishBackpackMiddleware::class,
@@ -276,10 +275,13 @@ public function loadConfigs()
 
         // add the backpack_users password broker to the configuration
         $laravelAuthPasswordBrokers = app()->config['auth.passwords'];
+        $laravelFirstPasswordBroker = is_array($laravelAuthPasswordBrokers) && current($laravelAuthPasswordBrokers) ?
+                                        current($laravelAuthPasswordBrokers)['table'] :
+                                        '';
 
         $backpackPasswordBrokerTable = config('backpack.base.password_resets_table') ??
                                         config('auth.passwords.users.table') ??
-                                        current($laravelAuthPasswordBrokers)['table'];
+                                        $laravelFirstPasswordBroker;
 
         app()->config['auth.passwords'] = $laravelAuthPasswordBrokers +
         [

src/app/Console/Commands/Install.php

@@ -93,7 +93,7 @@ public function handle()
 
         // Install Backpack Basset
         $this->progressBlock('Installing Basset');
-        $this->executeArtisanProcess('basset:install --no-interaction');
+        $this->executeArtisanProcess('basset:install --no-check --no-interaction');
         $this->closeProgressBlock();
 
         // Optional commands
@@ -113,6 +113,8 @@ public function handle()
             $this->closeProgressBlock();
         }
 
+        //execute basset checks
+        $this->call('basset:check');
         // Done
         $url = Str::of(config('app.url'))->finish('/')->append('admin/');
         $this->infoBlock('Backpack installation complete.', 'done');

src/app/Console/Commands/PublishAssets.php

@@ -32,16 +32,18 @@ public function compactFakeFields($requestInput, $model = false, $fields = [])
 
         foreach ($fields as $field) {
             // compact fake fields
-            // cast the field name to array first, to account for array field names
-            // in fields that send multiple inputs and want them all saved to the database
-            foreach ((array) $field['name'] as $fieldName) {
+            // explode the comma delimited names, eg: start,end in a date_range:
+            $field['name'] = explode(',', $field['name']);
+            foreach ($field['name'] as $fieldName) {
                 $fakeFieldKey = isset($field['store_in']) ? $field['store_in'] : 'extras';
                 $isFakeField = $field['fake'] ?? false;
 
                 // field is represented by the subfields
                 if (isset($field['subfields']) && isset($field['model']) && $field['model'] === get_class($model)) {
                     foreach ($field['subfields'] as $subfield) {
-                        foreach ((array) $subfield['name'] as $subfieldName) {
+                        // explode the comma delimited names, eg: start,end in a date_range:
+                        $subfield['name'] = explode(',', $subfield['name']);
+                        foreach ($subfield['name'] as $subfieldName) {
                             $subfieldName = Str::afterLast($subfieldName, '.');
                             $isSubfieldFake = $subfield['fake'] ?? false;
                             $subFakeFieldKey = isset($subfield['store_in']) ? $subfield['store_in'] : 'extras';

src/app/Library/CrudPanel/Traits/FakeFields.php

@@ -131,4 +131,17 @@
         // 'resources/js/app.js',
     ],
 
+    'classes' => [
+        /**
+         * Use this as fallback config for themes to pass classes to the table displayed in List Operation
+         * It defaults to: "table table-striped table-hover nowrap rounded card-table table-vcenter card-table shadow-xs border-xs".
+         */
+        'table' => null,
+
+        /**
+         * Use this as fallback config for themes to pass classes to the table wrapper component displayed in List Operation.
+         */
+        'tableWrapper' => null,
+    ],
+
 ];

src/config/backpack/ui.php

@@ -518,4 +518,9 @@ form .select2.select2-container {
     justify-content: center;
     align-items: center;
     text-align: center;
+}
+
+/* Summernote */
+.note-editor.note-frame.fullscreen {
+    background-color: white;
 }

src/resources/assets/css/common.css

@@ -38,13 +38,13 @@
 @push('crud_fields_styles')
     @bassetBlock('backpack/crud/fields/color.css')
     <style>
-        [bp-field-name="color"] input[type="color"] {
+        [bp-field-type="color"] input[type="color"] {
             background-color: unset;
             border: 0;
             width: 1.8rem;
             height: 1.8rem;
         }
-        [bp-field-name="color"] .input-group-text {
+        [bp-field-type="color"] .input-group-text {
             padding: 0 0.4rem;
         }
     </style>

src/resources/views/crud/fields/color.blade.php

@@ -31,7 +31,7 @@
 {{-- FIELD CSS - will be loaded in the after_styles section --}}
 @push('crud_fields_styles')
     {{-- include summernote css --}}
-    @basset('https://unpkg.com/[email protected]/dist/summernote-bs4.min.css')
+    @basset('https://unpkg.com/[email protected]/dist/summernote-lite.min.css')
     @basset('https://unpkg.com/[email protected]/dist/font/summernote.woff2', false)
     @bassetBlock('backpack/crud/fields/checklist-field.css')
     <style type="text/css">
@@ -45,7 +45,7 @@
 {{-- FIELD JS - will be loaded in the after_scripts section --}}
 @push('crud_fields_scripts')
     {{-- include summernote js --}}
-    @basset('https://unpkg.com/[email protected]/dist/summernote.min.js')
+    @basset('https://unpkg.com/[email protected]/dist/summernote-lite.min.js')
     @bassetBlock('backpack/crud/fields/summernote-field.js')
     <script>
         function bpFieldInitSummernoteElement(element) {

src/resources/views/crud/fields/summernote.blade.php

@@ -348,16 +348,6 @@ functionsToRunOnDataTablesDrawEvent: [],
             localStorage.setItem('DataTables_crudTable_/{{$crud->getRoute()}}_pageLength', len);
         });
 
-        // make sure AJAX requests include XSRF token
-        $.ajaxPrefilter(function(options, originalOptions, xhr) {
-            var token = $('meta[name="csrf_token"]').attr('content');
-
-            if (token) {
-                return xhr.setRequestHeader('X-XSRF-TOKEN', token);
-            }
-        });
-
-
         $('#crudTable').on( 'page.dt', function () {
             localStorage.setItem('page_changed', true);
         });