Export files are generated depending on visible columns of data brows…

…er and they include _id. (#415)
appbaseio · Sep 10, 2021 · 3ac8a47 · 3ac8a47
1 parent 1fe9000
commit 3ac8a47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/browser/src/components/DataBrowser/ExportData.js b/packages/browser/src/components/DataBrowser/ExportData.js
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { unparse } from 'papaparse';
 import { saveAs } from 'file-saver';
 
-import { getIndexTypeMap } from '../../reducers/mappings';
+import { getIndexTypeMap, getVisibleColumns } from '../../reducers/mappings';
 import { getUrl } from '../../reducers/app';
 import { getVersion } from '../../reducers/version';
 import { addDataRequest } from '../../actions';
@@ -54,6 +54,7 @@ type Props = {
 	indexTypeMap: any,
 	stats: any,
 	query: any,
+	visibleColumns: any,
 };
 
 type State = {
@@ -204,9 +205,14 @@ class ExportData extends Component<Props, State> {
 			selectedType,
 			applyCurrentQuery,
 		} = this.state;
+		let visibleColumns = this.props.visibleColumns;
+		visibleColumns.push("_id");
 		const res = await this.fetchData();
 		const flattenData = res.map(item => flatten(item));
-		const newData = unparse(flattenData);
+		const newData = unparse({
+			fields: visibleColumns,
+			data: flattenData
+		});
 		const file = new File(
 			[newData],
 			`data_${selectedIndex}${
@@ -470,6 +476,7 @@ const mapStateToProps = state => ({
 	indexTypeMap: getIndexTypeMap(state),
 	stats: getStats(state),
 	query: getQuery(state),
+	visibleColumns: getVisibleColumns(state),
 });
 
 const mapDispatchToProps = {

diff --git a/packages/browser/src/utils/exportData.js b/packages/browser/src/utils/exportData.js
@@ -80,6 +80,7 @@ export const searchAfter = async (
 			const lastObject = exportData[exportData.length - 1];
 			exportData = exportData.map(value => {
 				const item = Object.assign(value._source);
+				item['_id'] = value._id;
 				return item;
 			});