fixing issue with dashboard csv download (#42964)

* fixing issue with dashboard csv download * fixing test fixture to match new sort storage format for saved searches * fixing sort in additional fixtures
elastic · Aug 9, 2019 · 5e76040 · 5e76040
1 parent f411470
commit 5e76040
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/...acy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts b/...acy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
@@ -101,9 +101,11 @@ export async function generateCsvSearch(
     payloadQuery
   );
 
-  const [savedSortField, savedSortOrder] = savedSearchObjectAttr.sort;
-  const sortConfig = [...payloadSort, { [savedSortField]: { order: savedSortOrder } }];
-
+  const savedSortConfigs = savedSearchObjectAttr.sort;
+  const sortConfig = [...payloadSort];
+  savedSortConfigs.forEach(([savedSortField, savedSortOrder]) => {
+    sortConfig.push({ [savedSortField]: { order: savedSortOrder } });
+  });
   const scriptFieldsConfig = indexPatternFields
     .filter((f: IndexPatternField) => f.scripted)
     .reduce((accum: any, curr: IndexPatternField) => {
@@ -137,7 +139,6 @@ export async function generateCsvSearch(
       sort: sortConfig,
     },
   };
-
   const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
   const callCluster = (...params: any[]) => callWithRequest(req, ...params);
   const config = server.config();

diff --git a/x-pack/test/functional/es_archives/reporting/hugedata/data.json.gz b/x-pack/test/functional/es_archives/reporting/hugedata/data.json.gz
diff --git a/x-pack/test/functional/es_archives/reporting/logs/data.json.gz b/x-pack/test/functional/es_archives/reporting/logs/data.json.gz
diff --git a/x-pack/test/functional/es_archives/reporting/nanos/data.json.gz b/x-pack/test/functional/es_archives/reporting/nanos/data.json.gz
diff --git a/x-pack/test/functional/es_archives/reporting/sales/data.json.gz b/x-pack/test/functional/es_archives/reporting/sales/data.json.gz
diff --git a/x-pack/test/functional/es_archives/reporting/scripted_small/data.json.gz b/x-pack/test/functional/es_archives/reporting/scripted_small/data.json.gz