Fix maExportToCsvButton does not return entries references and empty …

…data when filters contains boolean field
marmelab · May 22, 2015 · cf23b15 · cf23b15
1 parent d50933b
commit cf23b15
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 23 deletions.
diff --git a/src/javascripts/ng-admin/Crud/button/maExportToCsvButton.js b/src/javascripts/ng-admin/Crud/button/maExportToCsvButton.js
@@ -9,7 +9,8 @@ define(function () {
             scope: {
                 entity: '&',
                 label: '@',
-                datastore: '&'
+                datastore: '&',
+                search: '&'
             },
             template: '<button ng-if="has_export" class="btn btn-default" ng-click="exportToCsv()"><span class="glyphicon glyphicon-download" aria-hidden="true"></span>&nbsp;{{ ::label }}</button>',
             link: function(scope) {
@@ -25,27 +26,78 @@ define(function () {
                         exportFields = listView.fields();
                     }
                     exportView.fields(exportFields);
+                    exportView.filters(listView.filters());
                 }
                 scope.has_export = exportView.fields().length > 0;
                 var formatEntry = entryFormatter.getFormatter(exportView.fields());
 
                 scope.exportToCsv = function () {
+                    var rawEntries;
+                    var nonOptimizedReferencedData;
+                    var optimizedReferencedData;
 
-                    ReadQueries.getAll(exportView, -1, true, $stateParams.search, $stateParams.sortField, $stateParams.sortDir).then(function (response) {
-                        var results = [];
-                        var entries = scope.datastore.mapEntries(scope.entity.name(), exportView.identifier(), exportView.fields(), response.data);
-                        for (var i = entries.length - 1; i >= 0; i--) {
-                            results[i] = formatEntry(entries[i]);
-                        }
-                        var csv = Papa.unparse(results);
-                        var fakeLink = document.createElement('a');
-
-                        fakeLink.setAttribute('href', 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(csv));
-                        fakeLink.setAttribute('download', scope.entity.name() + '.csv');
-                        fakeLink.click();
-                    }, function (error) {
-                        notification.log(error.message, {addnCls: 'humane-flatty-error'});
-                    });
+                    ReadQueries.getAll(exportView, -1, scope.search(), $stateParams.sortField, $stateParams.sortDir)
+                        .then(function (response) {
+                            rawEntries = response.data;
+
+                            return rawEntries;
+                        }, function (error) {
+                            notification.log(error.message, {addnCls: 'humane-flatty-error'});
+                        })
+                        .then(function (rawEntries) {
+                            nonOptimizedReferencedData = ReadQueries.getFilteredReferenceData(exportView.getNonOptimizedReferences(), rawEntries);
+
+                            return rawEntries;
+                        })
+                        .then(function (rawEntries) {
+                            optimizedReferencedData = ReadQueries.getOptimizedReferencedData(exportView.getOptimizedReferences(), rawEntries);
+
+                            return rawEntries;
+                        })
+                        .then(function (rawEntries) {
+                            var references = exportView.getReferences(),
+                                referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData),
+                                referencedEntries;
+
+                            for (var name in referencedData) {
+                                referencedEntries = scope.datastore.mapEntries(
+                                    references[name].targetEntity().name(),
+                                    references[name].targetEntity().identifier(),
+                                    [references[name].targetField()],
+                                    referencedData[name]
+                                );
+
+                                scope.datastore.setEntries(
+                                    references[name].targetEntity().uniqueId + '_values',
+                                    referencedEntries
+                                );
+                            }
+
+                            return rawEntries;
+                        })
+                        .then(function (rawEntries) {
+                            var entries = scope.datastore.mapEntries(
+                                exportView.entity.name(),
+                                exportView.identifier(),
+                                exportView.getFields(),
+                                rawEntries
+                            );
+
+                            // shortcut to diplay collection of entry with included referenced values
+                            scope.datastore.fillReferencesValuesFromCollection(entries, exportView.getReferences(), true);
+
+                            var results = [];
+                            for (var i = entries.length - 1; i >= 0; i--) {
+                                results[i] = formatEntry(entries[i]);
+                            }
+                            var csv = Papa.unparse(results);
+                            var fakeLink = document.createElement('a');
+
+                            fakeLink.setAttribute('href', 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(csv));
+                            fakeLink.setAttribute('download', scope.entity.name() + '.csv');
+                            fakeLink.click();
+                        })
+                        ;
                 };
             },
         };

diff --git a/src/javascripts/ng-admin/Crud/list/ListController.js b/src/javascripts/ng-admin/Crud/list/ListController.js
@@ -17,6 +17,7 @@ define(function () {
         this.actions = view.actions();
         this.batchActions = view.batchActions();
         this.loadingPage = false;
+        this.search = $stateParams.search;
         this.filters = view.filters();
         this.hasFilters = Object.keys(this.filters).length > 0;
         this.dataStore = dataStore;
@@ -40,13 +41,12 @@ define(function () {
         }
 
         var progression = this.progression,
-            self = this,
-            filters = this.$stateParams.search;
+            self = this;
 
         progression.start();
 
         this.ReadQueries
-            .getAll(this.view, page, true, filters, this.sortField, this.sortDir)
+            .getAll(this.view, page, true, this.search, this.sortField, this.sortDir)
             .then(function (nextData) {
                 progression.done();
                 self.entries = self.entries.concat(nextData.entries);

diff --git a/src/javascripts/ng-admin/Crud/list/list.html b/src/javascripts/ng-admin/Crud/list/list.html
@@ -1,9 +1,9 @@
 <div class="row list-header">
     <div class="col-lg-12">
-        <ma-view-actions override="::listController.actions" selection="listController.selection" batch-buttons="::listController.batchActions" entity="::listController.entity" datastore="::listController.dataStore">
+        <ma-view-actions override="::listController.actions" selection="listController.selection" batch-buttons="::listController.batchActions" entity="::listController.entity" datastore="::listController.dataStore" search="::listController.search">
             <ma-view-batch-actions buttons="::batchButtons()" selection="selection" entity="::entity"></ma-view-batch-actions>
             <ma-create-button ng-if="::entity.creationView().enabled" entity="::entity"></ma-create-button>
-            <ma-export-to-csv-button entity="::entity" datastore="::datastore"></ma-export-to-csv-button>
+            <ma-export-to-csv-button entity="::entity" search="::search" datastore="::datastore"></ma-export-to-csv-button>
         </ma-view-actions>
 
         <div class="page-header">

diff --git a/src/javascripts/ng-admin/Crud/misc/ViewActions.js b/src/javascripts/ng-admin/Crud/misc/ViewActions.js
@@ -17,7 +17,8 @@ define(function (require) {
                 'entity': '=',
                 'selection': '=',
                 batchButtons: '&',
-                datastore: '='
+                datastore: '=',
+                search: '='
             },
             template: viewActionsTemplate,
             link: function($scope, element, attrs, controller, transcludeFn) {

diff --git a/src/javascripts/ng-admin/Crud/misc/view-actions.html b/src/javascripts/ng-admin/Crud/misc/view-actions.html
@@ -6,6 +6,6 @@
     <ma-show-button ng-switch-when="show" entry="entry" entity="entity"></ma-show-button>
     <ma-edit-button ng-switch-when="edit" entry="entry" entity="entity"></ma-edit-button>
     <ma-delete-button ng-switch-when="delete" entry="entry" entity="entity"></ma-delete-button>
-    <ma-export-to-csv-button ng-switch-when="export" entry="entry" entity="entity"></ma-export-to-csv-button>
+    <ma-export-to-csv-button ng-switch-when="export" datastore="datastore" entity="entity" search="search"></ma-export-to-csv-button>
     <span ng-switch-default><span compile="button"></span></span>
 </span>