allow a DS.RecordArray to be used with paginated routes

Gavant · Jul 10, 2019 · fc4def3 · fc4def3
1 parent 3583923
commit fc4def3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/addon/decorators/route-pagination.ts b/addon/decorators/route-pagination.ts
@@ -10,7 +10,10 @@ import { PaginationController, buildQueryParams } from '@gavant/ember-pagination
 export default function routePagination<T extends ConcreteSubclass<any>>(RouteSubclass: T) {
     class PaginationRoute extends RouteSubclass {
         setupController(controller: PaginationController, model: any) {
-            assert('Model is not an instanceof DS.AdapterPopulatedRecordArray. In order to use the RoutePaginationMixin, the model returned must be an instance of DS.AdapterPopulatedRecordArray which comes from using store.query', model instanceof DS.AdapterPopulatedRecordArray);
+            assert(
+                'Model is not an instanceof DS.AdapterPopulatedRecordArray. In order to use the RoutePaginationMixin, the model returned must be an instance of DS.AdapterPopulatedRecordArray or DS.RecordArray which comes from using store.query',
+                model instanceof DS.AdapterPopulatedRecordArray || model instanceof DS.RecordArray
+            );
 
             setProperties(controller, {
                 modelName: model.type.modelName,

diff --git a/addon/mixins/route-pagination.ts b/addon/mixins/route-pagination.ts
@@ -11,7 +11,11 @@ export default Mixin.create({
      * @param model - The result returned from a `store.query`
      */
     setupController(controller: PaginationController, model: any) {
-        assert('Model is not an instanceof DS.AdapterPopulatedRecordArray. In order to use the RoutePaginationMixin, the model returned must be an instance of DS.AdapterPopulatedRecordArray which comes from using store.query', model instanceof DS.AdapterPopulatedRecordArray);
+        assert(
+            'Model is not an instanceof DS.AdapterPopulatedRecordArray. In order to use the RoutePaginationMixin, the model returned must be an instance of DS.AdapterPopulatedRecordArray or DS.RecordArray which comes from using store.query',
+            model instanceof DS.AdapterPopulatedRecordArray || model instanceof DS.RecordArray
+        );
+
         setProperties(controller, {
             modelName: get(model, 'type.modelName'),
             metadata: get(model, 'meta'),