1.24.0

Author: craigAtCD

src/Contracts/Parser.php

@@ -15,6 +15,8 @@ trait Parser
      */
     protected static $uriParser;
 
+    protected $originalQueryParams;
+
     protected function getUriParser($request)
     {
         if (is_null(self::$uriParser)) {
@@ -32,6 +34,8 @@ protected function getUriParser($request)
      */
     protected function addCustomParams($request, array $extraParams = []): void
     {
+        $this->originalQueryParams = $request->query();
+
         $all = $request->all();
         $new = Helpers::array_merge_request($all, $extraParams);
         $request->replace($new);

src/Http/Api/Controller.php

@@ -84,7 +84,7 @@ public function handleIndexAction($request, array $extraParams = [])
         $fields = $this->parseFieldParams();
         $limit = $this->parseLimitParams();
 
-        $items = $limit > 0 ? $this->repository->paginate($limit, $fields) : $this->repository->get($fields);
+        $items = $limit > 0 ? $this->repository->paginate($limit, $fields)->appends($this->originalQueryParams) : $this->repository->get($fields);
 
         return $this->handleIndexResponse($items);
     }
@@ -95,7 +95,7 @@ public function handleIndexActionRaw($request, array $extraParams = [])
         $fields = $this->parseFieldParams();
         $limit = $this->parseLimitParams();
 
-        $items = $limit > 0 ? $this->repository->paginateRaw($limit, $fields) : $this->repository->getRaw($fields);
+        $items = $limit > 0 ? $this->repository->paginateRaw($limit, $fields)->appends($this->originalQueryParams) : $this->repository->getRaw($fields);
 
         return $this->handleIndexResponse($items);
     }