Merge 99e1551 into ce1345a

Author: nikolaTrichkovski

app/services/accounts.js

@@ -3,6 +3,7 @@ import { computed } from '@ember/object';
 import { reads } from '@ember/object/computed';
 import { task } from 'ember-concurrency';
 import config from 'travis/config/environment';
+import fetchAll from 'travis/utils/fetch-all';
 import { sortBy } from 'lodash';
 
 const { billingEndpoint } = config;
@@ -28,8 +29,9 @@ export default Service.extend({
   }),
 
   fetchOrganizations: task(function* () {
-    const orgs = yield this.store.query('organization', {});
-    return orgs;
+    const allOrgs = yield fetchAll(this.store, 'organization', { include: '' });
+
+    return allOrgs;
   }).keepLatest(),
 
   fetchSubscriptions: task(function* () {

app/utils/fetch-all.js

@@ -1,12 +1,19 @@
+export default async function fetchAll(store, type, query = {}) {
+  let allRecords = [];
+  let currentQuery = Object.assign({}, query);
+  let hasNextPage = true;
 
-let fetchAll = function (store, type, query) {
-  return store.query(type, query).then((collection) => {
-    let nextPage = collection.get('meta.pagination.next');
+  while (hasNextPage) {
+    const collection = await store.query(type, currentQuery);
+    allRecords = allRecords.concat(collection.toArray());
+
+    const nextPage = collection.get('meta.pagination.next');
     if (nextPage) {
-      let { limit, offset } = nextPage;
-      return fetchAll(store, type, Object.assign(query, { limit, offset }));
+      currentQuery = { ...currentQuery, ...nextPage };
+    } else {
+      hasNextPage = false;
     }
-  });
-};
+  }
 
-export default fetchAll;
+  return allRecords;
+}