Merge branch 'master' into feature/third-party-integrations

Author: navneetrai

README.md

@@ -4,6 +4,7 @@
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/kirschbaum-development/nova-inline-relationship.svg)](https://packagist.org/packages/kirschbaum-development/nova-inline-relationship)
 [![Total Downloads](https://img.shields.io/packagist/dt/kirschbaum-development/nova-inline-relationship.svg)](https://packagist.org/packages/kirschbaum-development/nova-inline-relationship)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/56297e6b77604f37a505edf234ca2a4b)](https://www.codacy.com/manual/Kirschbaum/nova-inline-relationship?utm_source=github.com&utm_medium=referral&utm_content=kirschbaum-development/nova-inline-relationship&utm_campaign=Badge_Grade)
 [![Actions Status](https://github.com/kirschbaum-development/nova-inline-relationship/workflows/CI/badge.svg)](https://github.com/kirschbaum-development/nova-inline-relationship/actions)
 
 Nova Inline Relationship allows you to manage (add/edit/update/delete/reorder) an object's relationships directly from the parent object's create/edit screens. By presenting relationships as inline properties you can provide content editors with a streamlined and efficient workflow for managing complex data.

resources/js/field.js

@@ -1,7 +1,7 @@
-Nova.booting((Vue, router, store) => {
-    Vue.component('index-nova-inline-relationship', require('./components/IndexField'))
-    Vue.component('detail-nova-inline-relationship', require('./components/DetailField'))
-    Vue.component('form-nova-inline-relationship', require('./components/FormField'))
+Nova.booting(Vue => {
+    Vue.component('index-nova-inline-relationship', require('./components/IndexField'));
+    Vue.component('detail-nova-inline-relationship', require('./components/DetailField'));
+    Vue.component('form-nova-inline-relationship', require('./components/FormField'));
 
-    Vue.config.devtools = true
-})
+    Vue.config.devtools = true;
+});

src/Exceptions/IncorrectRelationshipFormat.php

@@ -14,6 +14,9 @@ class IncorrectRelationshipFormat extends InvalidArgumentException
      */
     public static function create(string $key, string $value)
     {
-        return new static(sprintf('Incorrect relationship attribute value (%s) for a key (%s). Please make sure that array returned by getPropertyMap function is in the following format: "relationship.attribute".', $key, $value));
+        return new static(
+            "Incorrect relationship attribute value [{$value}] for a key [{$key}]. Please make sure that array " .
+            "returned by getPropertyMap function is in the following format: \"relationship.attribute\"."
+        );
     }
 }

src/Exceptions/InvalidRelationshipName.php

@@ -14,6 +14,9 @@ class InvalidRelationshipName extends InvalidArgumentException
      */
     public static function create(string $key, string $value)
     {
-        return new static(sprintf('Invalid relationship name (%s) for a key (%s) in array returned by getPropertyMap function. Please make sure that this relationship is defined on the model.', $value, $key));
+        return new static(
+            "Invalid relationship name [{$value}] for a key [{$key}] in array returned by getPropertyMap function. " .
+            "Please make sure that this relationship is defined on the model."
+        );
     }
 }

src/Exceptions/UnsupportedNestedRelationship.php

@@ -14,6 +14,10 @@ class UnsupportedNestedRelationship extends InvalidArgumentException
      */
     public static function create(string $key, string $value)
     {
-        return new static(sprintf('Unsupported nested relationship attribute value (%s) for a key (%s). Please make sure that array returned by getPropertyMap function is in the following format: "relationship.attribute" and is only one level deep.', $key, $value));
+        return new static(
+            "Unsupported nested relationship attribute value [{$value}] for a key [{$key}]. Please make sure that " .
+            "array returned by getPropertyMap function is in the following format: \"relationship.attribute\" and is " .
+            "only one level deep."
+        );
     }
 }

src/Exceptions/UnsupportedRelationshipType.php

@@ -14,6 +14,6 @@ class UnsupportedRelationshipType extends InvalidArgumentException
      */
     public static function create(string $type, string $key)
     {
-        return new static(sprintf('Unsupported Inline Relationship type (%s) for an attribute (%s).', $type, $key));
+        return new static("Unsupported Inline Relationship type [{$type}] for an attribute [{$key}].");
     }
 }

src/NovaInlineRelationship.php

@@ -208,7 +208,9 @@ public function getDuplicateRequest(NovaRequest $request, array $item): NovaInli
         });
 
         // Create a New Request
-        $newRequest = NovaInlineRelationshipRequest::createFrom($request)->duplicate($item, array_merge($request->all(), $item));
+        $newRequest = NovaInlineRelationshipRequest::createFrom($request)
+            ->duplicate($item, array_merge($request->all(), $item));
+
         // Update List of converted Files
         $newRequest->updateConvertedFiles($files);
 
@@ -244,12 +246,13 @@ public function getValueFromField(Field $field, NovaInlineRelationshipRequest $r
     protected function resolveResourceFields($resource, $attribute, $properties)
     {
         $this->rules = [$this->getRelationshipRule($attribute, $properties)];
+        $modelKey = optional($this->value)->first() ?? $resource->{$attribute}()->getRelated()->newInstance();
 
         $this->withMeta([
             'defaults' => $this->getDefaultsFromProperties($properties)->all(),
             'settings' => $properties->all(),
             'models' => $this->modelIds(),
-            'modelKey' => Str::plural(Str::kebab(class_basename(optional($this->value)->first() ?? $resource->{$attribute}()->getRelated()->newInstance()))),
+            'modelKey' => Str::plural(Str::kebab(class_basename($modelKey))),
             'singularLabel' => Str::title(Str::singular($this->name)),
             'pluralLabel' => Str::title(Str::plural($this->name)),
             'singular' => $this->isSingularRelationship($resource, $attribute),
@@ -326,7 +329,9 @@ protected function setMetaFromClass(array $item, $attrib, $value = null)
     protected function fillAttributeFromRequest(NovaRequest $request, $requestAttribute, $model, $attribute)
     {
         if ($request->exists($requestAttribute)) {
-            $response = is_array($request[$requestAttribute]) ? $request[$requestAttribute] : json_decode($request[$requestAttribute], true);
+            $response = is_array($request[$requestAttribute])
+                ? $request[$requestAttribute]
+                : json_decode($request[$requestAttribute], true);
 
             $properties = $this->getPropertiesFromResource($model, $attribute);
 
@@ -482,7 +487,10 @@ protected function getResourceResponse(NovaRequest $request, $response, Collecti
                     $field = $this->getResourceField($properties->get($key), $key);
                     $newRequest = $this->getDuplicateRequest($request, $item);
 
-                    return $this->getValueFromField($field, $newRequest, $key) ?? ((($field instanceof File) && ! empty($value)) ? $value : null);
+                    return $this->getValueFromField($field, $newRequest, $key)
+                        ?? ($field instanceof File) && ! empty($value)
+                            ? $value
+                            : null;
                 }
 
                 return $value;

src/NovaInlineRelationshipRequest.php

@@ -12,8 +12,14 @@ class NovaInlineRelationshipRequest extends NovaRequest
     /**
      * {@inheritdoc}
      */
-    public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
-    {
+    public function duplicate(
+        array $query = null,
+        array $request = null,
+        array $attributes = null,
+        array $cookies = null,
+        array $files = null,
+        array $server = null
+    ) {
         return parent::duplicate($query, $request, $attributes, $cookies, $files, $server);
     }
 

tests/TestCase.php

@@ -183,11 +183,9 @@ protected function createNovaRequestMock()
     /**
      * Load package service provider.
      *
-     * @param Application $app
-     *
      * @return array
      */
-    protected function getPackageProviders($app)
+    protected function getPackageProviders()
     {
         return [NovaInlineRelationshipServiceProvider::class];
     }

tests/Unit/HasOneTest.php

@@ -111,8 +111,6 @@ public function testFillAttributeForDelete()
         $newEmployee = Employee::create(['name' => 'Test']);
         $newEmployee->profile()->save(Profile::make(['phone' => '123123123']));
 
-        $id = $newEmployee->fresh()->profile->id;
-
         $updateRequest = [
             'name' => 'Test 2',
             'profile' => [