[RFR] Fix dashboard not retrieve entity references

src/javascripts/ng-admin/Main/component/service/PanelBuilder.js

@@ -36,7 +36,62 @@ PanelBuilder.prototype.getPanelsData = function (sortField, sortDir) {
             dashboardSortField = sortField;
             dashboardSortDir = sortDir;
         }
-        promises.push(self.ReadQueries.getAll(dashboardView, 1, {}, dashboardSortField, dashboardSortDir));
+        promises.push((function (dashboardView, dashboardSortField, dashboardSortDir) {
+            var rawEntries, nonOptimizedReferencedData, optimizedReferencedData;
+
+            return self.ReadQueries
+                .getAll(dashboardView, 1, {}, dashboardSortField, dashboardSortDir)
+                .then(function (response) {
+                    rawEntries = response.data;
+
+                    return rawEntries;
+                })
+                .then(function (rawEntries) {
+                    return self.ReadQueries.getFilteredReferenceData(dashboardView.getNonOptimizedReferences(), rawEntries);
+                })
+                .then(function (nonOptimizedReference) {
+                    nonOptimizedReferencedData = nonOptimizedReference;
+
+                    return self.ReadQueries.getOptimizedReferencedData(dashboardView.getOptimizedReferences(), rawEntries);
+                })
+                .then(function (optimizedReference) {
+                    optimizedReferencedData = optimizedReference;
+
+                    var references = dashboardView.getReferences(),
+                        referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData),
+                        referencedEntries;
+
+                    for (var name in referencedData) {
+                        referencedEntries = dataStore.mapEntries(
+                            references[name].targetEntity().name(),
+                            references[name].targetEntity().identifier(),
+                            [references[name].targetField()],
+                            referencedData[name]
+                        );
+
+                        dataStore.setEntries(
+                            references[name].targetEntity().uniqueId + '_values',
+                            referencedEntries
+                        );
+                    }
+                })
+                .then(function () {
+                    var entries = dataStore.mapEntries(
+                        dashboardView.entity.name(),
+                        dashboardView.identifier(),
+                        dashboardView.getFields(),
+                        rawEntries
+                    );
+
+
+                    // shortcut to diplay collection of entry with included referenced values
+                    dataStore.fillReferencesValuesFromCollection(entries, dashboardView.getReferences(), true);
+
+                    return {
+                        entries: entries
+                    };
+                });
+        })(dashboardView, dashboardSortField, dashboardSortDir));
     }
 
     return this.$q.all(promises).then(function (responses) {
@@ -59,7 +114,7 @@ PanelBuilder.prototype.getPanelsData = function (sortField, sortDir) {
                 fields: fields,
                 entity: entity,
                 perPage: view.perPage(),
-                entries: dataStore.mapEntries(entity.name(), entity.identifier(), fields, response.data),
+                entries: response.entries,
                 sortField: view.getSortFieldName(),
                 sortDir: view.sortDir()
             });

src/javascripts/test/unit/Main/component/service/PanelBuilderSpec.js

@@ -12,7 +12,7 @@ describe("PanelBuilder", function () {
     describe('getPanelsData', function() {
 
         it('should retrieve panels', function (done) {
-            var entity = new Entity(),
+            var entity = new Entity('myEntity'),
                 view1 = new DashboardView('view1')
                     .title('dashboard1')
                     .setEntity(entity)
@@ -84,8 +84,15 @@ function getPanelBuilder(dashboardViews, responses) {
             }
         };
     };
-    var retrieveQueries = { getAll: function() {} };
+    var location = { search: function() { return {}; } };
+    var readQueries = {
+        getAll: function() {
+            return mixins.buildPromise({ data: [] });
+        },
+        getFilteredReferenceData: function() { return {}; },
+        getOptimizedReferencedData: function() { return {}; }
+    };
     var AdminDescription = { getDataStore: function() { return new DataStore(); } };
 
-    return new PanelBuilder(q, retrieveQueries, Configuration, AdminDescription);
+    return new PanelBuilder(q, readQueries, Configuration, AdminDescription);
 }