Merge pull request marmelab#1384 from marmelab/fix-list-not-updating-…

…on-infinite-scroll [RFR] Fix infinite pagination not updating list component
dmolnarqu · Feb 26, 2018 · 7d698f4 · 7d698f4
2 parents e3a49fe + bca5abb
commit 7d698f4
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/src/javascripts/ng-admin/Crud/list/ListController.js b/src/javascripts/ng-admin/Crud/list/ListController.js
@@ -47,6 +47,7 @@ export default class ListController {
 
         const references = view.getReferences();
         let data;
+        const toAddToDatastore = [];
 
         let queryPromise = this.ReadQueries
             .getAll(view, page, this.search, this.sortField, this.sortDir)
@@ -63,20 +64,30 @@ export default class ListController {
                         [references[name].targetField()],
                         references[name].targetEntity().name(),
                         references[name].targetEntity().identifier().name()
-                    ).map(entry => dataStore.addEntry(references[name].targetEntity().uniqueId + '_values', entry));
+                    ).map(entry => {
+                        toAddToDatastore.push([
+                            references[name].targetEntity().uniqueId + '_values',
+                            entry
+                        ])
+                    });
                 }
-            })
+            });
         this.queryPromises.push(queryPromise);
         // make sure all preceding promises complete before loading data into store
         Promise.all(this.queryPromises)
             .then(() => {
-                view.mapEntries(data)
-                    .map(entry => {
-                        dataStore.fillReferencesValuesFromEntry(entry, references, true);
-                        dataStore.addEntry(this.entity.uniqueId, entry);
+                this.$scope.$apply(() => {
+                    toAddToDatastore.map((args) => {
+                        this.dataStore.addEntry(...args);
                     });
 
-                this.loadingPage = false;
+                    view.mapEntries(data)
+                        .map(entry => {
+                            this.dataStore.fillReferencesValuesFromEntry(entry, references, true);
+                            this.dataStore.addEntry(this.entity.uniqueId, entry);
+                        });
+                    this.loadingPage = false;
+                });
             });
     }