Urls

conedevelopment · Aug 17, 2022 · a353f90 · a353f90
1 parent 2f3cecb
commit a353f90
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 2 deletions.
diff --git a/src/Extracts/Extract.php b/src/Extracts/Extract.php
@@ -194,6 +194,7 @@ public function mapItems(ExtractRequest $request): array
                     ->latest()
                     ->paginate($request->input('per_page'))
                     ->withQueryString()
+                    ->setPath($this->getUri())
                     ->through(function (Model $model) use ($request): array {
                         return (new ModelResource($model))->toDisplay(
                             $request, $this->resolveFields($request)->available($request, $model)

diff --git a/src/Fields/Media.php b/src/Fields/Media.php
@@ -234,6 +234,7 @@ public function mapItems(ResourceRequest $request, Model $model): array
                     ->latest()
                     ->paginate($request->input('per_page'))
                     ->withQueryString()
+                    ->setPath($this->getUri())
                     ->through(function (Model $related) use ($request, $model): array {
                         return $this->mapOption($request, $model, $related);
                     })

diff --git a/src/Http/Controllers/NotificationsController.php b/src/Http/Controllers/NotificationsController.php
@@ -4,6 +4,7 @@
 
 use Cone\Root\Http\Requests\RootRequest;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\URL;
 
 class NotificationsController extends Controller
 {
@@ -20,6 +21,7 @@ public function index(RootRequest $request): JsonResponse
                                 ->filter($request)
                                 ->latest()
                                 ->paginate($request->input('per_page'))
+                                ->setPath(URL::route('root.api.notifications.index', [], false))
                                 ->withQueryString();
 
         return new JsonResponse(array_merge($notifications->toArray(), [

diff --git a/src/Http/Controllers/RelationController.php b/src/Http/Controllers/RelationController.php
@@ -29,6 +29,7 @@ public function __invoke(ResourceRequest $request): JsonResponse
                             }
                         })
                         ->paginate()
+                        ->setPath($field->getUri())
                         ->through(static function (Model $related) use ($request, $model, $field): array {
                             return $field->mapOption($request, $model, $related);
                         });

diff --git a/src/Resources/Resource.php b/src/Resources/Resource.php
@@ -326,6 +326,7 @@ public function mapItems(ResourceRequest $request): array
                     ->latest()
                     ->paginate($request->input('per_page'))
                     ->withQueryString()
+                    ->setPath($this->getUri())
                     ->through(function (Model $model) use ($request): array {
                         return $this->mapItem($request, $model)->toDisplay(
                             $request, $this->resolveFields($request)->available($request, $model)

diff --git a/src/Root.php b/src/Root.php
@@ -15,7 +15,7 @@ abstract class Root
      *
      * @var string
      */
-    public const VERSION = '0.8.2';
+    public const VERSION = '0.8.3';
 
     /**
      * The registered callbacks.

diff --git a/src/Traits/AsSubResource.php b/src/Traits/AsSubResource.php
@@ -61,6 +61,7 @@ public function mapItems(ResourceRequest $request, Model $model): array
 
         $items = $relation->paginate($request->input('per_page'))
                         ->withQueryString()
+                        ->setPath($this->getUri())
                         ->through(function (Model $related) use ($request, $model): array {
                             return $this->mapItem($request, $model, $related)->toDisplay(
                                 $request, $this->resolveFields($request)->available($request, $model, $related)

diff --git a/tests/Http/Controllers/NotificationsControllerTest.php b/tests/Http/Controllers/NotificationsControllerTest.php
@@ -22,7 +22,7 @@ public function a_notifications_controller_has_index()
         $this->actingAs($this->admin)
             ->get('/root/api/notifications')
             ->assertOk()
-            ->assertJson($this->admin->notifications()->paginate()->toArray());
+            ->assertJson($this->admin->notifications()->paginate()->setPath('/root/api/notifications')->toArray());
     }
 
     /** @test */

diff --git a/tests/Http/Controllers/RelationControllerTest.php b/tests/Http/Controllers/RelationControllerTest.php
@@ -38,6 +38,7 @@ public function a_relation_controller_has_index()
         $results = $this->field
                         ->resolveQuery($this->request, $model)
                         ->paginate()
+                        ->setPath('/root/posts/fields/author')
                         ->through(function ($related) use ($model): array {
                             return $this->field->mapOption($this->request, $model, $related);
                         });