JSON-API support

addon/mixins/controller-pagination.ts

@@ -18,6 +18,8 @@ export default function ControllerPaginationClass<T extends ConcreteSubclass<any
         hasMore: boolean = true;
         limit: number = 10;
         isLoadingPage = false;
+        pagingRootKey = 'page';
+        filterRootKey = 'filter';
 
         @or('isLoadingPage', 'isLoadingRoute') isLoadingModels!: boolean;
         @readOnly('model.length') offset: number | undefined;

addon/utils/query-params.ts

@@ -8,6 +8,8 @@ export interface PaginationController {
     limit: number;
     sort: string[];
     modelName: string;
+    pagingRootKey: string | null;
+    filterRootKey: string | null;
     [key: string]: any;
 }
 
@@ -32,8 +34,15 @@ export function buildQueryParams(
 ) {
     let list: any = controller[queryParamListName];
     let queryParams = getParamsObject(list, controller);
-    queryParams.offset = getWithDefault(controller, 'offset', offset);
-    queryParams.limit = getWithDefault(controller, 'limit', limit);
+    let pagingRoot = queryParams;
+
+    if(controller.pagingRootKey) {
+        queryParams[controller.pagingRootKey] = {};
+        pagingRoot = queryParams[controller.pagingRootKey];
+    }
+
+    pagingRoot.offset = getWithDefault(controller, 'offset', offset);
+    pagingRoot.limit = getWithDefault(controller, 'limit', limit);
     return removeEmptyQueryParams(queryParams);
 }
 
@@ -45,6 +54,12 @@ export function buildQueryParams(
  */
 export function getParamsObject(parameters: [], context: PaginationController) {
     let params: any = {};
+    let filterRoot = params;
+
+    if(context.filterRootKey) {
+        params[context.filterRootKey] = {};
+        filterRoot = params[context.filterRootKey];
+    }
 
     if(isArray(parameters)) {
         parameters.forEach((param: string) => {
@@ -61,8 +76,10 @@ export function getParamsObject(parameters: [], context: PaginationController) {
                 let serverDateFormat = getWithDefault(context, 'serverDateFormat', 'YYYY-MM-DDTHH:mm:ss');
                 value = moment(value).format(serverDateFormat);
             }
-            params[key] = value;
+            filterRoot[key] = value;
         });
+
+        filterRoot = removeEmptyQueryParams(filterRoot);
     }
 
     if(!isEmpty(get(context, 'sort'))) {

tests/dummy/app/controllers/application.ts

@@ -2,8 +2,10 @@ import Controller from '@ember/controller';
 import ControllerPagination from '@gavant/ember-pagination/mixins/controller-pagination';
 
 export default class Application extends ControllerPagination(Controller) {
-  // normal class body definition here
-
+    serverQueryParams = ['foo', 'bar', 'baz'];
+    foo = 123;
+    bar = true;
+    baz = null;
 }
 
 // DO NOT DELETE: this is how TypeScript knows how to look up your controllers.

tests/dummy/app/routes/application.ts

@@ -6,9 +6,4 @@ export default class Application extends RoutePagination(Route) {
         const params = this.getControllerParams();
         return this.store.query('customer', params);
     }
-
-    setupController(controller: any, model: any) {
-        console.log('This is a test');
-        super.setupController(controller, model);
-    }
 }