Added pivot model handling in OrderFieldRequestHandler

Author: toonvandenbos

dist/js/field.js

@@ -304,9 +304,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 
       Nova.request().post("/nova-vendor/michielkempen/nova-order-field/" + this.resourceName, {
         direction: direction,
-        field: this.field.attribute,
         resource: this.resourceName,
-        resourceId: this.resourceId
+        resourceId: this.resourceId,
+        viaResource: this.field.viaResource,
+        viaResourceId: this.field.viaResourceId,
+        viaRelationship: this.field.viaRelationship
       }).then(function () {
         _this.$toasted.show(_this.__("The new order has been set!"), {
           type: "success"

resources/js/components/IndexField.vue

@@ -63,9 +63,11 @@ export default {
           `/nova-vendor/michielkempen/nova-order-field/${this.resourceName}`,
           {
             direction: direction,
-            field: this.field.attribute,
             resource: this.resourceName,
-            resourceId: this.resourceId
+            resourceId: this.resourceId,
+            viaResource: this.field.viaResource || null,
+            viaResourceId: this.field.viaResourceId || null,
+            viaRelationship: this.field.viaRelationship || null
           }
         )
         .then(() => {

src/Http/OrderFieldRequestHandler.php

@@ -3,29 +3,56 @@
 namespace MichielKempen\NovaOrderField\Http;
 
 use Illuminate\Routing\Controller;
+use Illuminate\Database\Eloquent\Model;
 use Laravel\Nova\Http\Requests\NovaRequest;
 use Spatie\EloquentSortable\Sortable;
 
 class OrderFieldRequestHandler extends Controller
 {
     /**
+     * Handles incoming "change order" request
+     *
      * @param  NovaRequest $request
+     * @return void
      */
     public function __invoke(NovaRequest $request)
     {
-        $resourceId = $request->get('resourceId');
-        $model = $request->findModelOrFail($resourceId);
+        $resource = $request->resource();
 
-        if (!$model instanceof Sortable) {
-            abort(500, "Model should implement " . Sortable::class . " interface");
+        if($resource::canQueryPivotOrder() && $resource::orderedManyPivotModel($request)) {
+            $relationship = $request->viaRelationship;
+            
+            $pivot = $request->findParentModelOrFail()
+                ->$relationship()
+                ->find($request->resourceId)
+                ->pivot;
+
+            return $this->move($request->get('direction'), $pivot);
         }
 
-        $direction = $request->get('direction');
+        $this->move(
+            $request->get('direction'),
+            $request->findModelOrFail()
+        );
+    }
 
-        if($direction == 'up') {
-            $model->moveOrderUp();
-        } else {
-            $model->moveOrderDown();
+    /**
+     * Handles incoming "change order" request
+     *
+     * @param  string $direction
+     * @param  Model $model
+     * @return void
+     */
+    public function move($direction, Model $model)
+    {
+        if (!$model instanceof Sortable) {
+            abort(500, get_class($model) . ' should implement the ' . Sortable::class . ' interface.');
         }
-    }
+
+        if($direction == 'up') {
+            return $model->moveOrderUp();
+        } 
+
+        $model->moveOrderDown();
+    }    
 }

src/OrderField.php

@@ -48,9 +48,19 @@ protected function resolveAttribute($resource, $attribute)
         );
 
         if($pivot = $this->shouldResolveOnPivot($request, $resourceClass)) {
-            return data_get($pivot, $resourceClass::modelOrderByFieldAttribute($pivot));
+            $attribute = $resourceClass::modelOrderByFieldAttribute($pivot);
+
+            $this->withMeta([
+                'viaResource' => $request->viaResource,
+                'viaResourceId' => $request->viaResourceId,
+                'viaRelationship' => $request->viaRelationship,
+            ]);
+
+            return data_get($pivot, $attribute);
         }
 
+        $attribute = $resourceClass::modelOrderByFieldAttribute($resource);
+
         return data_get($resource, $attribute);
     }