Merge branch 'master' into fix-enum-sqlite

Author: promatik

.gitignore

@@ -24,3 +24,4 @@ src/public/packages/nestedSortable/package.json
 src/public/packages/source-sans-pro/package.json
 src/public/packages/tinymce/package.json
 src/public/packages/tinymce/composer.json
+

package-lock.json

@@ -12,11 +12,11 @@
     "devDependencies": {
         "cross-env": "^7.0.3",
         "css-loader": "^5.2.6",
-        "laravel-mix": "^6.0.19",
+        "laravel-mix": "^6.0.27",
         "lodash": "^4.17.21",
         "pace": "0.0.4",
-        "resolve-url-loader": "^2.3.2",
-        "sass": "^1.35.1",
+        "resolve-url-loader": "^4.0.0",
+        "sass": "^1.37.0",
         "sass-loader": "^9.0.3",
         "vue-template-compiler": "^2.6.14"
     },
@@ -25,7 +25,7 @@
         "@digitallyhappy/backstrap": "^0.3.4",
         "animate.css": "^3.7.2",
         "bootstrap": "^4.6.0",
-        "bootstrap-colorpicker": "^3.3.0",
+        "bootstrap-colorpicker": "^3.4.0",
         "bootstrap-datepicker": "^1.9.0",
         "bootstrap-daterangepicker": "^3.1.0",
         "bootstrap-iconpicker": "^1.8.2",
@@ -49,7 +49,7 @@
         "noty": "^3.2.0-beta",
         "pace-js": "^1.2.4",
         "pc-bootstrap4-datetimepicker": "^4.17.51",
-        "perfect-scrollbar": "^1.5.0",
+        "perfect-scrollbar": "^1.5.2",
         "places.js": "^1.19.0",
         "popper.js": "^1.16.1",
         "select2": "^4.0.13",

package.json

@@ -25,9 +25,11 @@ public function create($data)
     {
         $data = $this->decodeJsonCastedAttributes($data);
         $data = $this->compactFakeFields($data);
+        $data = $this->changeBelongsToNamesFromRelationshipToForeignKey($data);
 
         // omit the n-n relationships when updating the eloquent item
         $nn_relationships = Arr::pluck($this->getRelationFieldsWithPivot(), 'name');
+
         $item = $this->model->create(Arr::except($data, $nn_relationships));
 
         // if there are any relationships available, also sync those
@@ -237,25 +239,4 @@ private function getRelationDataFromFormData($data)
 
         return $relationData;
     }
-
-    public function getOnlyRelationEntity($relation_field)
-    {
-        $entity_array = explode('.', $relation_field['entity']);
-
-        $relation_model = $this->getRelationModel($relation_field['entity'], -1);
-
-        $related_method = Arr::last($entity_array);
-
-        if (! method_exists($relation_model, $related_method)) {
-            if (count($entity_array) <= 1) {
-                return $relation_field['entity'];
-            } else {
-                array_pop($entity_array);
-            }
-
-            return implode('.', $entity_array);
-        }
-
-        return $relation_field['entity'];
-    }
 }

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

@@ -151,24 +151,6 @@ protected function makeSureFieldHasEntity($field)
         return $field;
     }
 
-    protected function makeSureFieldHasRelationshipData($field)
-    {
-        // only do this if "entity" is defined on the field
-        if (! isset($field['entity'])) {
-            return $field;
-        }
-
-        $extraFieldAttributes = $this->inferFieldAttributesFromRelationship($field);
-
-        if (! empty($extraFieldAttributes)) {
-            $field = array_merge($field, $extraFieldAttributes);
-        } else {
-            abort(500, 'Unable to process relationship data: '.$field['name']);
-        }
-
-        return $field;
-    }
-
     protected function overwriteFieldNameFromEntity($field)
     {
         // if the entity doesn't have a dot, it means we don't need to overwrite the name

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

@@ -3,6 +3,7 @@
 namespace Backpack\CRUD\app\Library\CrudPanel\Traits;
 
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 trait Relationships
 {
@@ -15,33 +16,19 @@ trait Relationships
     public function getRelationInstance($field)
     {
         $entity = $this->getOnlyRelationEntity($field);
-        $entity_array = explode('.', $entity);
-        $relation_model = $this->getRelationModel($entity);
-
-        $related_method = Arr::last($entity_array);
-        if (count(explode('.', $entity)) == count(explode('.', $field['entity']))) {
-            $relation_model = $this->getRelationModel($entity, -1);
-        }
-        $relation_model = new $relation_model();
-
-        //if counts are diferent means that last element of entity is the field in relation.
-        if (count(explode('.', $entity)) != count(explode('.', $field['entity']))) {
-            if (in_array($related_method, $relation_model->getFillable())) {
-                if (count($entity_array) > 1) {
-                    $related_method = $entity_array[(count($entity_array) - 2)];
-                    $relation_model = $this->getRelationModel($entity, -2);
-                } else {
-                    $relation_model = $this->model;
-                }
-            }
-        }
-        if (count($entity_array) == 1) {
-            if (method_exists($this->model, $related_method)) {
-                return $this->model->{$related_method}();
+        $possible_method = Str::before($entity, '.');
+        $model = $this->model;
+
+        if (method_exists($model, $possible_method)) {
+            $parts = explode('.', $entity);
+            // here we are going to iterate through all relation parts to check
+            foreach ($parts as $i => $part) {
+                $relation = $model->$part();
+                $model = $relation->getRelated();
             }
-        }
 
-        return $relation_model->{$related_method}();
+            return $relation;
+        }
     }
 
     /**
@@ -70,6 +57,41 @@ public function inferRelationTypeFromRelationship($field)
         return Arr::last(explode('\\', get_class($relation)));
     }
 
+    public function getOnlyRelationEntity($relation_field)
+    {
+        $relation_model = $this->getRelationModel($relation_field['entity'], -1);
+        $related_method = Str::afterLast($relation_field['entity'], '.');
+
+        if (! method_exists($relation_model, $related_method)) {
+            return Str::beforeLast($relation_field['entity'], '.');
+        }
+
+        return $relation_field['entity'];
+    }
+
+    /**
+     * Get the fields for relationships, according to the relation type. It looks only for direct
+     * relations - it will NOT look through relationships of relationships.
+     *
+     * @param string|array $relation_types Eloquent relation class or array of Eloquent relation classes. Eg: BelongsTo
+     *
+     * @return array The fields with corresponding relation types.
+     */
+    public function getFieldsWithRelationType($relation_types): array
+    {
+        $relation_types = (array) $relation_types;
+
+        return collect($this->fields())
+            ->where('model')
+            ->whereIn('relation_type', $relation_types)
+            ->filter(function ($item) {
+                $related_model = get_class($this->model->{Str::before($item['entity'], '.')}()->getRelated());
+
+                return Str::contains($item['entity'], '.') && $item['model'] !== $related_model ? false : true;
+            })
+            ->toArray();
+    }
+
     /**
      * Parse the field name back to the related entity after the form is submited.
      * Its called in getAllFieldNames().
@@ -96,6 +118,21 @@ public function parseRelationFieldNamesFromHtml($fields)
         return $fields;
     }
 
+    protected function changeBelongsToNamesFromRelationshipToForeignKey($data)
+    {
+        $belongs_to_fields = $this->getFieldsWithRelationType('BelongsTo');
+
+        foreach ($belongs_to_fields as $relation_field) {
+            $relation = $this->getRelationInstance($relation_field);
+            if (Arr::has($data, $relation->getRelationName())) {
+                $data[$relation->getForeignKeyName()] = Arr::get($data, $relation->getRelationName());
+                unset($data[$relation->getRelationName()]);
+            }
+        }
+
+        return $data;
+    }
+
     /**
      * Based on relation type returns the default field type.
      *

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

@@ -26,6 +26,8 @@ public function update($id, $data)
         $data = $this->compactFakeFields($data);
         $item = $this->model->findOrFail($id);
 
+        $data = $this->changeBelongsToNamesFromRelationshipToForeignKey($data);
+
         $this->createRelations($item, $data);
 
         // omit the n-n relationships when updating the eloquent item

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

@@ -4,41 +4,15 @@
 
 use Cviebrock\EloquentSluggable\Sluggable as OriginalSluggable;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
 
 trait Sluggable
 {
     use OriginalSluggable;
 
-    /**
-     * Hook into the Eloquent model events to create or
-     * update the slug as required.
-     */
-    public static function bootSluggable()
-    {
-        static::observe(app(SluggableObserver::class));
-    }
-
-    /**
-     * Clone the model into a new, non-existing instance.
-     *
-     * @param array|null $except
-     *
-     * @return Model
-     */
-    public function replicate(array $except = null): Model
-    {
-        $instance = parent::replicate($except);
-        (new SlugService())->slug($instance, true);
-
-        return $instance;
-    }
-
     /**
      * Query scope for finding "similar" slugs, used to determine uniqueness.
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param \Illuminate\Database\Eloquent\Model   $model
      * @param string                                $attribute
      * @param array                                 $config
      * @param string                                $slug

src/app/Models/Traits/SpatieTranslatable/Sluggable.php

@@ -21,32 +21,4 @@ public function scopeWhereSlug(Builder $scope, string $slug): Builder
     {
         return $scope->where($this->getSlugKeyName().'->'.$this->getLocale(), $slug);
     }
-
-    /**
-     * Find a model by its primary slug.
-     *
-     * @param string $slug
-     * @param array  $columns
-     *
-     * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|static[]|static|null
-     */
-    public static function findBySlug(string $slug, array $columns = ['*'])
-    {
-        return static::whereSlug($slug)->first($columns);
-    }
-
-    /**
-     * Find a model by its primary slug or throw an exception.
-     *
-     * @param string $slug
-     * @param array  $columns
-     *
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     *
-     * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection
-     */
-    public static function findBySlugOrFail(string $slug, array $columns = ['*'])
-    {
-        return static::whereSlug($slug)->firstOrFail($columns);
-    }
 }