[WIP] Version 4.2

.github/workflows/testing.yml

@@ -16,24 +16,11 @@ jobs:
             # run all combinations of the following, to make sure they're working together
             matrix:
                 # os: [ubuntu-latest, macos-latest, windows-latest]
-                php: [7.2, 7.3, 7.4, 8.0]
+                php: [7.3, 7.4, 8.0]
                 dbal: [^2.5, ^3.0]
-                laravel: [6.*, 7.*, 8.*]
+                laravel: [8.*]
                 phpunit: [8.*, 9.*]
                 dependency-version: [stable] # to add: lowest
-                exclude:
-                    -   php: 7.2
-                        phpunit: 9.*
-                    -   laravel: 8.*
-                        php: 7.2
-                    -   laravel: 8.*
-                        phpunit: 8.*
-                    -   php: 7.2
-                        dbal: ^3.0
-                    -   dbal: ^3.0
-                        laravel: 6.*
-                    -   dbal: ^3.0
-                        laravel: 7.*
 
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, PHPUnit ${{ matrix.phpunit }}, DBAL ${{ matrix.dbal }} --prefer-${{ matrix.dependency-version }}
 

composer.json

@@ -32,7 +32,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "^8.0|^7.0|^6.0",
+        "laravel/framework": "^8.0",
         "prologue/alerts": "^0.4.1",
         "creativeorange/gravatar": "~1.0",
         "composer/package-versions-deprecated": "^1.8",

mix-manifest.json

@@ -1,7 +1,7 @@
 {
     "/src/public/packages/backpack/base/js/bundle.js": "/src/public/packages/backpack/base/js/bundle.js",
-    "/src/public/packages/backpack/base/css/blue-bundle.css": "/src/public/packages/backpack/base/css/blue-bundle.css",
     "/src/public/packages/backpack/base/css/bundle.css": "/src/public/packages/backpack/base/css/bundle.css",
+    "/src/public/packages/backpack/base/css/blue-bundle.css": "/src/public/packages/backpack/base/css/blue-bundle.css",
     "/src/public/packages/@digitallyhappy/backstrap/css/blue.css": "/src/public/packages/@digitallyhappy/backstrap/css/blue.css",
     "/src/public/packages/@digitallyhappy/backstrap/css/blue.css.map": "/src/public/packages/@digitallyhappy/backstrap/css/blue.css.map",
     "/src/public/packages/@digitallyhappy/backstrap/css/blue.min.css": "/src/public/packages/@digitallyhappy/backstrap/css/blue.min.css",
@@ -16,6 +16,7 @@
     "/src/public/packages/source-sans-pro/source-sans-pro.css": "/src/public/packages/source-sans-pro/source-sans-pro.css",
     "/src/public/packages/source-sans-pro/source-sans-variable.css": "/src/public/packages/source-sans-pro/source-sans-variable.css",
     "/src/public/packages/animate.css/animate.min.css": "/src/public/packages/animate.css/animate.min.css",
+    "/src/public/packages/animate.css/animate.compat.css": "/src/public/packages/animate.css/animate.compat.css",
     "/src/public/packages/noty/noty.css": "/src/public/packages/noty/noty.css",
     "/src/public/packages/noty/noty.css.map": "/src/public/packages/noty/noty.css.map",
     "/src/public/packages/noty/noty.js": "/src/public/packages/noty/noty.js",
@@ -79,28 +80,31 @@
     "/src/public/packages/simplemde/dist/simplemde.min.js": "/src/public/packages/simplemde/dist/simplemde.min.js",
     "/src/public/packages/easymde/dist/easymde.min.css": "/src/public/packages/easymde/dist/easymde.min.css",
     "/src/public/packages/easymde/dist/easymde.min.js": "/src/public/packages/easymde/dist/easymde.min.js",
-    "/src/public/packages/summernote/dist/summernote-0.8.18-dist.zip": "/src/public/packages/summernote/dist/summernote-0.8.18-dist.zip",
+    "/src/public/packages/summernote/dist/summernote-0.8.20-dist.zip": "/src/public/packages/summernote/dist/summernote-0.8.20-dist.zip",
     "/src/public/packages/summernote/dist/summernote-bs4.css": "/src/public/packages/summernote/dist/summernote-bs4.css",
+    "/src/public/packages/summernote/dist/summernote-bs4.css.map": "/src/public/packages/summernote/dist/summernote-bs4.css.map",
     "/src/public/packages/summernote/dist/summernote-bs4.js": "/src/public/packages/summernote/dist/summernote-bs4.js",
     "/src/public/packages/summernote/dist/summernote-bs4.js.map": "/src/public/packages/summernote/dist/summernote-bs4.js.map",
     "/src/public/packages/summernote/dist/summernote-bs4.min.css": "/src/public/packages/summernote/dist/summernote-bs4.min.css",
     "/src/public/packages/summernote/dist/summernote-bs4.min.js": "/src/public/packages/summernote/dist/summernote-bs4.min.js",
-    "/src/public/packages/summernote/dist/summernote-bs4.min.js.LICENSE.txt": "/src/public/packages/summernote/dist/summernote-bs4.min.js.LICENSE.txt",
-    "/src/public/packages/summernote/dist/summernote-bs4.min.js.map": "/src/public/packages/summernote/dist/summernote-bs4.min.js.map",
+    "/src/public/packages/summernote/dist/summernote-bs5.css": "/src/public/packages/summernote/dist/summernote-bs5.css",
+    "/src/public/packages/summernote/dist/summernote-bs5.css.map": "/src/public/packages/summernote/dist/summernote-bs5.css.map",
+    "/src/public/packages/summernote/dist/summernote-bs5.js": "/src/public/packages/summernote/dist/summernote-bs5.js",
+    "/src/public/packages/summernote/dist/summernote-bs5.js.map": "/src/public/packages/summernote/dist/summernote-bs5.js.map",
+    "/src/public/packages/summernote/dist/summernote-bs5.min.css": "/src/public/packages/summernote/dist/summernote-bs5.min.css",
+    "/src/public/packages/summernote/dist/summernote-bs5.min.js": "/src/public/packages/summernote/dist/summernote-bs5.min.js",
     "/src/public/packages/summernote/dist/summernote-lite.css": "/src/public/packages/summernote/dist/summernote-lite.css",
+    "/src/public/packages/summernote/dist/summernote-lite.css.map": "/src/public/packages/summernote/dist/summernote-lite.css.map",
     "/src/public/packages/summernote/dist/summernote-lite.js": "/src/public/packages/summernote/dist/summernote-lite.js",
     "/src/public/packages/summernote/dist/summernote-lite.js.map": "/src/public/packages/summernote/dist/summernote-lite.js.map",
     "/src/public/packages/summernote/dist/summernote-lite.min.css": "/src/public/packages/summernote/dist/summernote-lite.min.css",
     "/src/public/packages/summernote/dist/summernote-lite.min.js": "/src/public/packages/summernote/dist/summernote-lite.min.js",
-    "/src/public/packages/summernote/dist/summernote-lite.min.js.LICENSE.txt": "/src/public/packages/summernote/dist/summernote-lite.min.js.LICENSE.txt",
-    "/src/public/packages/summernote/dist/summernote-lite.min.js.map": "/src/public/packages/summernote/dist/summernote-lite.min.js.map",
     "/src/public/packages/summernote/dist/summernote.css": "/src/public/packages/summernote/dist/summernote.css",
+    "/src/public/packages/summernote/dist/summernote.css.map": "/src/public/packages/summernote/dist/summernote.css.map",
     "/src/public/packages/summernote/dist/summernote.js": "/src/public/packages/summernote/dist/summernote.js",
     "/src/public/packages/summernote/dist/summernote.js.map": "/src/public/packages/summernote/dist/summernote.js.map",
     "/src/public/packages/summernote/dist/summernote.min.css": "/src/public/packages/summernote/dist/summernote.min.css",
     "/src/public/packages/summernote/dist/summernote.min.js": "/src/public/packages/summernote/dist/summernote.min.js",
-    "/src/public/packages/summernote/dist/summernote.min.js.LICENSE.txt": "/src/public/packages/summernote/dist/summernote.min.js.LICENSE.txt",
-    "/src/public/packages/summernote/dist/summernote.min.js.map": "/src/public/packages/summernote/dist/summernote.min.js.map",
     "/src/public/packages/tinymce/CHANGELOG.md": "/src/public/packages/tinymce/CHANGELOG.md",
     "/src/public/packages/tinymce/README.md": "/src/public/packages/tinymce/README.md",
     "/src/public/packages/tinymce/bower.json": "/src/public/packages/tinymce/bower.json",
@@ -137,5 +141,6 @@
     "/src/public/packages/datatables.net-responsive/package.json": "/src/public/packages/datatables.net-responsive/package.json",
     "/src/public/packages/datatables.net-responsive-bs4/License.txt": "/src/public/packages/datatables.net-responsive-bs4/License.txt",
     "/src/public/packages/datatables.net-responsive-bs4/Readme.md": "/src/public/packages/datatables.net-responsive-bs4/Readme.md",
-    "/src/public/packages/datatables.net-responsive-bs4/package.json": "/src/public/packages/datatables.net-responsive-bs4/package.json"
+    "/src/public/packages/datatables.net-responsive-bs4/package.json": "/src/public/packages/datatables.net-responsive-bs4/package.json",
+    "/src/public/packages/URI.js/URI.min.js": "/src/public/packages/URI.js/URI.min.js"
 }

package.json

@@ -22,8 +22,8 @@
     },
     "dependencies": {
         "@coreui/coreui": "^2.1.16",
-        "@digitallyhappy/backstrap": "^0.3.4",
-        "animate.css": "^3.7.2",
+        "@digitallyhappy/backstrap": "^0.4.0",
+        "animate.css": "^4.1.1",
         "bootstrap": "^4.6.0",
         "bootstrap-colorpicker": "^3.4.0",
         "bootstrap-datepicker": "^1.9.0",
@@ -59,6 +59,7 @@
         "source-sans-pro": "^3.6",
         "summernote": "^0.8.20",
         "sweetalert": "^2.1.2",
-        "tinymce": "^5.10.0"
+        "tinymce": "^5.10.0",
+        "urijs": "^1.19.6"
     }
 }

src/app/Http/Controllers/Operations/FetchOperation.php

@@ -61,16 +61,6 @@ private function fetch($arg)
         $config['searchable_attributes'] = $config['searchable_attributes'] ?? $model_instance->identifiableAttribute();
         $config['query'] = isset($config['query']) && is_callable($config['query']) ? $config['query']($model_instance) : $model_instance; // if a closure that has been passed as "query", use the closure - otherwise use the model
 
-        // FetchOperation is aware of an optional parameter 'keys' that will fetch you the entity/entities that match the provided keys
-        if (request()->has('keys')) {
-            $array_keys = request()->get('keys');
-            if (is_array($array_keys)) {
-                return $model_instance->whereIn($model_instance->getKeyName(), $array_keys)->get();
-            } else {
-                return $model_instance->where($model_instance->getKeyName(), $array_keys)->get();
-            }
-        }
-
         // FetchOperation sends an empty query to retrieve the default entry for select when field is not nullable.
         // Also sends an empty query in case we want to load all entities to emulate non-ajax fields
         // when using InlineCreate.

src/app/Http/Controllers/Operations/ReorderOperation.php

@@ -80,7 +80,7 @@ public function saveReorder()
     {
         $this->crud->hasAccessOrFail('reorder');
 
-        $all_entries = \Request::input('tree');
+        $all_entries = json_decode(\Request::input('tree'), true);
 
         if (count($all_entries)) {
             $count = $this->crud->updateTreeOrder($all_entries);

src/app/Http/Controllers/Operations/ShowOperation.php

@@ -47,8 +47,8 @@ protected function setupShowDefaults()
                 'redirect' => function ($crud, $request, $itemId = null) {
                     $itemId = $itemId ?: $request->input('id');
                     $redirectUrl = $crud->route.'/'.$itemId.'/show';
-                    if ($request->has('locale')) {
-                        $redirectUrl .= '?locale='.$request->input('locale');
+                    if ($request->has('_locale')) {
+                        $redirectUrl .= '?_locale='.$request->input('_locale');
                     }
 
                     return $redirectUrl;

src/app/Http/Controllers/Operations/UpdateOperation.php

@@ -40,9 +40,9 @@ protected function setupUpdateDefaults()
 
             if ($this->crud->getModel()->translationEnabled()) {
                 $this->crud->addField([
-                    'name' => 'locale',
+                    'name' => '_locale',
                     'type' => 'hidden',
-                    'value' => request()->input('locale') ?? app()->getLocale(),
+                    'value' => request()->input('_locale') ?? app()->getLocale(),
                 ]);
             }
 
@@ -90,8 +90,10 @@ public function update()
         // execute the FormRequest authorization and validation, if one is required
         $request = $this->crud->validateRequest();
         // update the row in the db
-        $item = $this->crud->update($request->get($this->crud->model->getKeyName()),
-                            $this->crud->getStrippedSaveRequest());
+        $item = $this->crud->update(
+            $request->get($this->crud->model->getKeyName()),
+            $this->crud->getStrippedSaveRequest()
+        );
         $this->data['entry'] = $this->crud->entry = $item;
 
         // show a success message

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

@@ -156,7 +156,7 @@ public function enableBulkActions()
         $this->addColumn([
             'type'            => 'checkbox',
             'name'            => 'bulk_actions',
-            'label'           => ' <input type="checkbox" class="crud_bulk_actions_main_checkbox" style="width: 16px; height: 16px;" />',
+            'label'           => ' <span style="display:flex"><input type="checkbox" class="crud_bulk_actions_main_checkbox" style="width: 16px; height: 16px; margin: 2px 0;" /></span>',
             'priority'        => 0,
             'searchLogic'     => false,
             'orderable'       => false,
@@ -166,20 +166,6 @@ public function enableBulkActions()
             'visibleInShow'   => false,
             'hasActions'      => true,
         ])->makeFirstColumn();
-
-        $this->addColumn([
-            'type'            => 'custom_html',
-            'name'            => 'blank_first_column',
-            'label'           => ' ',
-            'priority'        => 0,
-            'searchLogic'     => false,
-            'orderable'       => false,
-            'visibleInTabel'  => true,
-            'visibleInModal'  => false,
-            'visibleInExport' => false,
-            'visibleInShow'   => false,
-            'hasActions'      => true,
-        ])->makeFirstColumn();
     }
 
     /**
@@ -190,7 +176,6 @@ public function disableBulkActions()
         $this->setOperationSetting('bulkActions', false);
 
         $this->removeColumn('bulk_actions');
-        $this->removeColumn('blank_first_column');
     }
 
     /**