@raphiniert/ra-data-postgrest 1.1.4 → 1.1.8

package/CHANGELOG.md

@@ -2,12 +2,30 @@
 
 Find all notable changes of this project in this file.
 
-## v1.1.4 - 2021-01-16
-### fixed
+## v1.1.8 - 2022-01-07
+- required re-release as I missed to transpile all and upload the features of 1.1.7 to npm.
+
+## v1.1.7 - 2022-01-07
+### Fixes
+- fixed bad behaivor with compound keys while using field named `id` [issue #27](https://github.com/raphiniert-com/ra-data-postgrest/issues/27) and [issue #19](https://github.com/raphiniert-com/ra-data-postgrest/pull/19) - @[kenfehling](https://github.com/kenfehling)
+
+### New feature
+- added rpc filter support, which is explained [here](https://github.com/raphiniert-com/ra-data-postgrest#special-filter-feature-rpc-functions) - @[TheRealAstroboy](https://github.com/TheRealAstroboy)
+
+
+## v1.1.6 - 2021-01-16
+### Fixes
+- fixed eq. prefix for non-compound keys [issue #23](https://github.com/raphiniert-com/ra-data-postgrest/issues/23) - @[andymed-jlp](https://github.com/andymed-jlp)
+
+## v1.1.5 - 2021-01-16
+### Fixes
 - fixed query string generation of rpc endpoints [issue #22](https://github.com/raphiniert-com/ra-data-postgrest/issues/22)
 
 ### Breaking changes
-- Support was dropped for generating the query string given many ids in case of an rpc endpoint. If your application has some psql functions which parse the standard input, I recommend to rework your db design. Query strings of single rpc calls now drop the operator (`eq.`) and are generated properly.
+- Support was dropped for generating the query string given many ids in case of an rpc endpoint. If your application has some psql functions which parse the standard input, I recommend to rework your db design. If this change causes strong damage to your application, please contact me in order to find a proper generic solution. Query strings of single rpc calls now drop the operator (`eq.`) and are generated properly.
+
+## v1.1.4 - 2021-01-16
+- deployment error
 
 ## v1.1.3 - 2020-11-30
 ### Fixes

package/README.md

@@ -135,6 +135,19 @@ The dataProvider is designed to enable you to specify the comparator in your rea
 
 One can simply append the comparator with an `@` to the source. In this example the field `post_title` would be filtered with `ilike` whereas `post_author` would be filtered using `eq` which is the default if no special comparator is specified.
 
+### Special Filter Feature (RPC Functions)
+The dataProvider is designed to enable you to use Get RPC functions:
+
+```GET /rpc/add_them?post_author=Herbert HTTP/1.1```
+The function parameter names match the query parameters ```&post_author=Herbert``` if you end the field with an `@` (neither default comparator nor special comparator)
+
+```jsx
+<Filter {...props}>
+  <TextInput label="Search" source="post_title" alwaysOn />
+  <TextInput label="Search" source="post_author@" alwaysOn />
+  // some more filters
+</Filter>
+```
 
 ### Compound primary keys
 If one has data resources without primary keys named `id`, one will have to define this specifically. Also, if there is a primary key, which is defined over multiple columns:

package/esm/dataProvider/index.d.ts

@@ -1,3 +1,9 @@
+import { fetchUtils, DataProvider } from 'ra-core';
 declare type PrimaryKey = Array<string>;
-declare const _default: (apiUrl: any, httpClient?: any, defaultListOp?: string, primaryKeys?: Map<string, PrimaryKey>) => any;
+declare const _default: (apiUrl: any, httpClient?: (url: any, options?: fetchUtils.Options) => Promise<{
+    status: number;
+    headers: Headers;
+    body: string;
+    json: any;
+}>, defaultListOp?: string, primaryKeys?: Map<string, PrimaryKey>) => DataProvider;
 export default _default;

package/esm/dataProvider/index.js

@@ -72,7 +72,8 @@ function parseFilters(filter, defaultListOp) {
             values = [filter[key]];
         }
         values.forEach(function (value) {
-            var op = operation.includes('like') ? operation + ".*" + value + "*" : operation + "." + value;
+            // if operator is intentionally blank, rpc syntax 
+            var op = operation.includes('like') ? operation + ".*" + value + "*" : operation.length == 0 ? "" + value : operation + "." + value;
             if (result[splitKey[0]] === undefined) {
                 // first operator for the key, we add it to the dict
                 result[splitKey[0]] = op;
@@ -111,7 +112,7 @@ var encodeId = function (data, primaryKey) {
     }
 };
 var dataWithId = function (data, primaryKey) {
-    if (primaryKey === ['id'] || (data && data.id)) {
+    if (primaryKey === ['id']) {
         return data;
     }
     return Object.assign(data, {
@@ -150,7 +151,7 @@ var getQuery = function (primaryKey, ids, resource) {
                 return "and=(" + primaryKey.map(function (key, i) { return key + ".eq." + primaryKeyParams_1[i]; }).join(',') + ")";
         }
         else {
-            return stringify((_b = {}, _b[primaryKey[0]] = "" + id, _b));
+            return stringify((_b = {}, _b[primaryKey[0]] = "eq." + id, _b));
         }
     }
 };
@@ -238,7 +239,7 @@ export default (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
             var _c = params.sort, field = _c.field, order = _c.order;
             var parsedFilter = parseFilters(params.filter, defaultListOp);
             var primaryKey = getPrimaryKey(resource, primaryKeys);
-            var query = __assign((_a = {}, _a[params.target] = "eq." + params.id, _a.order = getOrderBy(field, order, primaryKey), _a.offset = (page - 1) * perPage, _a.limit = perPage, _a), parsedFilter);
+            var query = params.target ? __assign((_a = {}, _a[params.target] = "eq." + params.id, _a.order = getOrderBy(field, order, primaryKey), _a.offset = (page - 1) * perPage, _a.limit = perPage, _a), parsedFilter) : __assign({ order: getOrderBy(field, order, primaryKey), offset: (page - 1) * perPage, limit: perPage }, parsedFilter);
             // add header that Content-Range is in returned header
             var options = {
                 headers: new Headers({

package/lib/authProvider/index.js

@@ -47,7 +47,7 @@ exports.default = {
     checkError: function (error) {
         var status = error.status;
         if (status === 401 || status === 403) {
-            localStorage.removeItem('token');
+            localStorage.removeItem('me');
             return Promise.reject();
         }
         return Promise.resolve();

package/lib/dataProvider/index.d.ts

@@ -1,8 +1,9 @@
 import { fetchUtils, DataProvider } from 'ra-core';
+declare type PrimaryKey = Array<string>;
 declare const _default: (apiUrl: any, httpClient?: (url: any, options?: fetchUtils.Options) => Promise<{
     status: number;
     headers: Headers;
     body: string;
     json: any;
-}>, defaultListOp?: string) => DataProvider;
+}>, defaultListOp?: string, primaryKeys?: Map<string, PrimaryKey>) => DataProvider;
 export default _default;

package/lib/dataProvider/index.js

@@ -10,6 +10,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var query_string_1 = require("query-string");
 var ra_core_1 = require("ra-core");
@@ -18,7 +29,7 @@ var ra_core_1 = require("ra-core");
  *
  * This REST dialect uses postgrest syntax
  *
- * @see https://postgrest.org/en/v6.0/api.html#embedded-filters
+ * @see https://postgrest.org/en/stable/api.html#embedded-filters
  *
  * @example
  *
@@ -34,7 +45,7 @@ var ra_core_1 = require("ra-core");
  *
  * @example
  *
- * import React from 'react';
+ * import * as React from 'react';
  * import { Admin, Resource } from 'react-admin';
  * import postgrestRestProvider from '@raphiniert/ra-data-postgrest';
  *
@@ -54,21 +65,130 @@ function parseFilters(filter, defaultListOp) {
         // key: the name of the object key
         var splitKey = key.split('@');
         var operation = splitKey.length == 2 ? splitKey[1] : defaultListOp;
-        var value = filter[key];
-        result[splitKey[0]] =
-            operation.includes('like') ? operation + ".*" + value + "*" : operation + "." + value;
+        var values;
+        if (operation.includes('like')) {
+            // we split the search term in words
+            values = filter[key].trim().split(' ');
+        }
+        else {
+            values = [filter[key]];
+        }
+        values.forEach(function (value) {
+            // if operator is intentionally blank, rpc syntax 
+            var op = operation.includes('like') ? operation + ".*" + value + "*" : operation.length == 0 ? "" + value : operation + "." + value;
+            if (result[splitKey[0]] === undefined) {
+                // first operator for the key, we add it to the dict
+                result[splitKey[0]] = op;
+            }
+            else {
+                if (!Array.isArray(result[splitKey[0]])) {
+                    // second operator, we transform to an array
+                    result[splitKey[0]] = [result[splitKey[0]], op];
+                }
+                else {
+                    // third and subsequent, we add to array
+                    result[splitKey[0]].push(op);
+                }
+            }
+        });
     });
     return result;
 }
-exports.default = (function (apiUrl, httpClient, defaultListOp) {
+var getPrimaryKey = function (resource, primaryKeys) {
+    return primaryKeys.get(resource) || ['id'];
+};
+var decodeId = function (id, primaryKey) {
+    if (isCompoundKey(primaryKey)) {
+        return JSON.parse(id.toString());
+    }
+    else {
+        return [id.toString()];
+    }
+};
+var encodeId = function (data, primaryKey) {
+    if (isCompoundKey(primaryKey)) {
+        return JSON.stringify(primaryKey.map(function (key) { return data[key]; }));
+    }
+    else {
+        return data[primaryKey[0]];
+    }
+};
+var dataWithId = function (data, primaryKey) {
+    if (primaryKey === ['id']) {
+        return data;
+    }
+    return Object.assign(data, {
+        id: encodeId(data, primaryKey)
+    });
+};
+var isCompoundKey = function (primaryKey) {
+    return primaryKey.length > 1;
+};
+var getQuery = function (primaryKey, ids, resource) {
+    var _a, _b;
+    if (Array.isArray(ids) && ids.length > 1) {
+        // no standardized query with multiple ids possible for rpc endpoints which are api-exposed database functions
+        if (resource.startsWith('rpc/')) {
+            console.error('PostgREST\'s rpc endpoints are not intended to be handled as views. Therefore, no query generation for multiple key values implemented!');
+            return;
+        }
+        if (isCompoundKey(primaryKey)) {
+            return "or=(\n          " + ids.map(function (id) {
+                var primaryKeyParams = decodeId(id, primaryKey);
+                return "and(" + primaryKey.map(function (key, i) { return key + ".eq." + primaryKeyParams[i]; }).join(',') + ")";
+            }) + "\n        )";
+        }
+        else {
+            return query_string_1.stringify((_a = {}, _a[primaryKey[0]] = "in.(" + ids.join(',') + ")", _a));
+        }
+    }
+    else {
+        // if ids is one Identifier
+        var id = ids.toString();
+        var primaryKeyParams_1 = decodeId(id, primaryKey);
+        if (isCompoundKey(primaryKey)) {
+            if (resource.startsWith('rpc/'))
+                return "" + primaryKey.map(function (key, i) { return key + "=" + primaryKeyParams_1[i]; }).join('&');
+            else
+                return "and=(" + primaryKey.map(function (key, i) { return key + ".eq." + primaryKeyParams_1[i]; }).join(',') + ")";
+        }
+        else {
+            return query_string_1.stringify((_b = {}, _b[primaryKey[0]] = "eq." + id, _b));
+        }
+    }
+};
+var getKeyData = function (primaryKey, data) {
+    var _a;
+    if (isCompoundKey(primaryKey)) {
+        return primaryKey.reduce(function (keyData, key) {
+            var _a;
+            return (__assign(__assign({}, keyData), (_a = {}, _a[key] = data[key], _a)));
+        }, {});
+    }
+    else {
+        return _a = {}, _a[primaryKey[0]] = data[primaryKey[0]], _a;
+    }
+};
+var getOrderBy = function (field, order, primaryKey) {
+    if (field == 'id') {
+        return primaryKey.map(function (key) { return (key + "." + order.toLowerCase()); }).join(',');
+    }
+    else {
+        return field + "." + order.toLowerCase();
+    }
+};
+var defaultPrimaryKeys = new Map();
+exports.default = (function (apiUrl, httpClient, defaultListOp, primaryKeys) {
     if (httpClient === void 0) { httpClient = ra_core_1.fetchUtils.fetchJson; }
     if (defaultListOp === void 0) { defaultListOp = 'eq'; }
+    if (primaryKeys === void 0) { primaryKeys = defaultPrimaryKeys; }
     return ({
         getList: function (resource, params) {
+            var primaryKey = getPrimaryKey(resource, primaryKeys);
             var _a = params.pagination, page = _a.page, perPage = _a.perPage;
             var _b = params.sort, field = _b.field, order = _b.order;
             var parsedFilter = parseFilters(params.filter, defaultListOp);
-            var query = __assign({ order: field + "." + order.toLowerCase(), offset: (page - 1) * perPage, limit: page * perPage - 1 }, parsedFilter);
+            var query = __assign({ order: getOrderBy(field, order, primaryKey), offset: (page - 1) * perPage, limit: perPage }, parsedFilter);
             // add header that Content-Range is in returned header
             var options = {
                 headers: new Headers({
@@ -83,7 +203,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp) {
                     throw new Error("The Content-Range header is missing in the HTTP Response. The postgREST data provider expects \n          responses for lists of resources to contain this header with the total number of results to build \n          the pagination. If you are using CORS, did you declare Content-Range in the Access-Control-Expose-Headers header?");
                 }
                 return {
-                    data: json,
+                    data: json.map(function (obj) { return dataWithId(obj, primaryKey); }),
                     total: parseInt(headers
                         .get('content-range')
                         .split('/')
@@ -92,21 +212,27 @@ exports.default = (function (apiUrl, httpClient, defaultListOp) {
             });
         },
         getOne: function (resource, params) {
-            return httpClient(apiUrl + "/" + resource + "?id=eq." + params.id, {
+            var id = params.id;
+            var primaryKey = getPrimaryKey(resource, primaryKeys);
+            var query = getQuery(primaryKey, id, resource);
+            var url = apiUrl + "/" + resource + "?" + query;
+            return httpClient(url, {
                 headers: new Headers({ 'accept': 'application/vnd.pgrst.object+json' }),
             }).then(function (_a) {
                 var json = _a.json;
                 return ({
-                    data: json,
+                    data: dataWithId(json, primaryKey),
                 });
             });
         },
         getMany: function (resource, params) {
-            var ids = params.ids.join(",");
-            var url = apiUrl + "/" + resource + "?id=in.(" + ids + ")";
+            var ids = params.ids;
+            var primaryKey = getPrimaryKey(resource, primaryKeys);
+            var query = getQuery(primaryKey, ids, resource);
+            var url = apiUrl + "/" + resource + "?" + query;
             return httpClient(url).then(function (_a) {
                 var json = _a.json;
-                return ({ data: json });
+                return ({ data: json.map(function (data) { return dataWithId(data, primaryKey); }) });
             });
         },
         getManyReference: function (resource, params) {
@@ -114,7 +240,8 @@ exports.default = (function (apiUrl, httpClient, defaultListOp) {
             var _b = params.pagination, page = _b.page, perPage = _b.perPage;
             var _c = params.sort, field = _c.field, order = _c.order;
             var parsedFilter = parseFilters(params.filter, defaultListOp);
-            var query = __assign((_a = {}, _a[params.target] = "eq." + params.id, _a.order = field + "." + order.toLowerCase(), _a.offset = (page - 1) * perPage, _a.limit = page * perPage - 1, _a), parsedFilter);
+            var primaryKey = getPrimaryKey(resource, primaryKeys);
+            var query = params.target ? __assign((_a = {}, _a[params.target] = "eq." + params.id, _a.order = getOrderBy(field, order, primaryKey), _a.offset = (page - 1) * perPage, _a.limit = perPage, _a), parsedFilter) : __assign({ order: getOrderBy(field, order, primaryKey), offset: (page - 1) * perPage, limit: perPage }, parsedFilter);
             // add header that Content-Range is in returned header
             var options = {
                 headers: new Headers({
@@ -129,7 +256,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp) {
                     throw new Error("The Content-Range header is missing in the HTTP Response. The postgREST data provider expects \n          responses for lists of resources to contain this header with the total number of results to build \n          the pagination. If you are using CORS, did you declare Content-Range in the Access-Control-Expose-Headers header?");
                 }
                 return {
-                    data: json,
+                    data: json.map(function (data) { return dataWithId(data, primaryKey); }),
                     total: parseInt(headers
                         .get('content-range')
                         .split('/')
@@ -138,34 +265,53 @@ exports.default = (function (apiUrl, httpClient, defaultListOp) {
             });
         },
         update: function (resource, params) {
-            return httpClient(apiUrl + "/" + resource + "?id=eq." + params.id, {
+            var id = params.id, data = params.data;
+            var primaryKey = getPrimaryKey(resource, primaryKeys);
+            var query = getQuery(primaryKey, id, resource);
+            var primaryKeyData = getKeyData(primaryKey, data);
+            var url = apiUrl + "/" + resource + "?" + query;
+            var body = JSON.stringify(__assign(__assign({}, data), primaryKeyData));
+            return httpClient(url, {
                 method: 'PATCH',
                 headers: new Headers({
                     'Accept': 'application/vnd.pgrst.object+json',
                     'Prefer': 'return=representation',
                     'Content-Type': 'application/json'
                 }),
-                body: JSON.stringify(params.data),
+                body: body,
             }).then(function (_a) {
                 var json = _a.json;
-                return ({ data: json });
+                return ({ data: dataWithId(json, primaryKey) });
             });
         },
         updateMany: function (resource, params) {
-            return httpClient(apiUrl + "/" + resource + "?id=in.(" + params.ids.join(',') + ")", {
+            var ids = params.ids;
+            var primaryKey = getPrimaryKey(resource, primaryKeys);
+            var query = getQuery(primaryKey, ids, resource);
+            var body = JSON.stringify(params.data.map(function (obj) {
+                var id = obj.id, data = __rest(obj, ["id"]);
+                var primaryKeyData = getKeyData(primaryKey, data);
+                return __assign(__assign({}, data), primaryKeyData);
+            }));
+            var url = apiUrl + "/" + resource + "?" + query;
+            return httpClient(url, {
                 method: 'PATCH',
                 headers: new Headers({
                     'Prefer': 'return=representation',
                     'Content-Type': 'application/json',
                 }),
-                body: JSON.stringify(params.data),
+                body: body,
             }).then(function (_a) {
                 var json = _a.json;
-                return ({ data: json.map(function (data) { return data.id; }) });
+                return ({
+                    data: json.map(function (data) { return encodeId(data, primaryKey); })
+                });
             });
         },
         create: function (resource, params) {
-            return httpClient(apiUrl + "/" + resource, {
+            var primaryKey = getPrimaryKey(resource, primaryKeys);
+            var url = apiUrl + "/" + resource;
+            return httpClient(url, {
                 method: 'POST',
                 headers: new Headers({
                     'Accept': 'application/vnd.pgrst.object+json',
@@ -175,14 +321,17 @@ exports.default = (function (apiUrl, httpClient, defaultListOp) {
                 body: JSON.stringify(params.data),
             }).then(function (_a) {
                 var json = _a.json;
-                console.log(json);
-                return {
-                    data: __assign(__assign({}, params.data), { id: json.id }),
-                };
+                return ({
+                    data: __assign(__assign({}, params.data), { id: encodeId(json, primaryKey) })
+                });
             });
         },
         delete: function (resource, params) {
-            return httpClient(apiUrl + "/" + resource + "?id=eq." + params.id, {
+            var id = params.id;
+            var primaryKey = getPrimaryKey(resource, primaryKeys);
+            var query = getQuery(primaryKey, id, resource);
+            var url = apiUrl + "/" + resource + "?" + query;
+            return httpClient(url, {
                 method: 'DELETE',
                 headers: new Headers({
                     'Accept': 'application/vnd.pgrst.object+json',
@@ -191,11 +340,15 @@ exports.default = (function (apiUrl, httpClient, defaultListOp) {
                 }),
             }).then(function (_a) {
                 var json = _a.json;
-                return ({ data: json });
+                return ({ data: dataWithId(json, primaryKey) });
             });
         },
         deleteMany: function (resource, params) {
-            return httpClient(apiUrl + "/" + resource + "?id=in.(" + params.ids.join(',') + ")", {
+            var ids = params.ids;
+            var primaryKey = getPrimaryKey(resource, primaryKeys);
+            var query = getQuery(primaryKey, ids, resource);
+            var url = apiUrl + "/" + resource + "?" + query;
+            return httpClient(url, {
                 method: 'DELETE',
                 headers: new Headers({
                     'Prefer': 'return=representation',
@@ -203,7 +356,7 @@ exports.default = (function (apiUrl, httpClient, defaultListOp) {
                 }),
             }).then(function (_a) {
                 var json = _a.json;
-                return ({ data: json.json().map(function (data) { return data.id; }) });
+                return ({ data: json.map(function (data) { return encodeId(data, primaryKey); }) });
             });
         },
     });

package/lib/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.authProvider = void 0;
 var dataProvider_1 = __importDefault(require("./dataProvider"));
 var authProvider_1 = __importDefault(require("./authProvider"));
 exports.authProvider = authProvider_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@raphiniert/ra-data-postgrest",
-    "version": "1.1.4",
+    "version": "1.1.8",
     "description": "postgREST data provider for react-admin",
     "main": "lib/index.js",
     "module": "esm/index.js",
@@ -36,6 +36,6 @@
         "typescript": "^3.9.5"
     },
     "peerDependencies": {
-        "ra-core": "^3.8.4"
+        "ra-core": "^3.19.6"
     }
 }

package/src/dataProvider/index.ts

@@ -53,7 +53,9 @@ function parseFilters(filter, defaultListOp) {
     }
 
     values.forEach(value => {
-      let op = operation.includes('like') ? `${operation}.*${value}*` : `${operation}.${value}`;
+      // if operator is intentionally blank, rpc syntax 
+      let op = operation.includes('like') ? `${operation}.*${value}*` : operation.length == 0 ? `${value}` : `${operation}.${value}`;
+
       if (result[splitKey[0]] === undefined) {
         // first operator for the key, we add it to the dict
         result[splitKey[0]] = op;
@@ -99,7 +101,7 @@ const encodeId = (data: any, primaryKey: PrimaryKey): Identifier => {
 }
 
 const dataWithId = (data: any, primaryKey: PrimaryKey) => {
-  if (primaryKey === ['id'] || (data && data.id)) {
+  if (primaryKey === ['id']) {
     return data;
   }
 
@@ -143,7 +145,7 @@ const getQuery = (primaryKey : PrimaryKey, ids: Identifier | Array<Identifier>,
       else
         return `and=(${primaryKey.map((key : string, i: any) => `${key}.eq.${primaryKeyParams[i]}`).join(',')})`;
     } else {
-      return stringify({ [primaryKey[0]]: `${id}` });
+      return stringify({ [primaryKey[0]]: `eq.${id}` });
     }
   }
 }
@@ -251,12 +253,17 @@ export default (apiUrl, httpClient = fetchUtils.fetchJson, defaultListOp = 'eq',
     const parsedFilter = parseFilters(params.filter, defaultListOp);
     const primaryKey = getPrimaryKey(resource, primaryKeys);
 
-    const query = {
+    const query = params.target ? {
       [params.target]: `eq.${params.id}`,
       order: getOrderBy(field, order, primaryKey),
       offset: (page - 1) * perPage,
       limit: perPage,
       ...parsedFilter,
+    }:{
+      order: getOrderBy(field, order, primaryKey),
+      offset: (page - 1) * perPage,
+      limit: perPage,
+      ...parsedFilter,
     };
 
     // add header that Content-Range is in returned header