add indent

Author: dblythy

src/dashboard/Data/Browser/Browser.react.js

@@ -1257,7 +1257,7 @@ class Browser extends DashboardView {
     });
   }
 
-  async confirmExportSelectedRows(rows, type) {
+  async confirmExportSelectedRows(rows, type, indentation) {
     this.setState({ rowsToExport: null, exporting: true, exportingCount: 0 });
     const className = this.props.params.className;
     const query = new Parse.Query(className);
@@ -1297,7 +1297,7 @@ class Browser extends DashboardView {
                 return json;
               }),
               null,
-              2
+              indentation ? 2 : null,
             ),
           ],
           { type: "application/json" }
@@ -1379,10 +1379,9 @@ class Browser extends DashboardView {
       this.setState({ exporting: false, exportingCount: objects.length });
     } else {
       let batch = [];
-      let completion = null;
-      query.each(
+      query.eachBatch(
         (obj) => {
-          batch.push(obj);
+          batch.push(...obj);
           if (batch.length % 10 === 0) {
             this.setState({ exportingCount: batch.length });
           }
@@ -1394,12 +1393,11 @@ class Browser extends DashboardView {
             processObjects(batch);
             batch = [];
           }
-          clearTimeout(completion);
-          completion = setTimeout(() => {
+          if (obj.length !== 100) {
             processObjects(batch);
             batch = [];
             this.setState({ exporting: false, exportingCount: 0 });
-          }, 5000);
+          }
         },
         { useMasterKey: true }
       );
@@ -1817,7 +1815,7 @@ class Browser extends DashboardView {
           className={className}
           selection={this.state.rowsToExport}
           onCancel={this.cancelExportSelectedRows}
-          onConfirm={(type) => this.confirmExportSelectedRows(this.state.rowsToExport, type)}
+          onConfirm={(type, indentation) => this.confirmExportSelectedRows(this.state.rowsToExport, type, indentation)}
         />
       );
     }

src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js

@@ -5,20 +5,22 @@
  * This source code is licensed under the license found in the LICENSE file in
  * the root directory of this source tree.
  */
-import Modal     from 'components/Modal/Modal.react';
-import React     from 'react';
+import Modal       from 'components/Modal/Modal.react';
+import React       from 'react';
 import Dropdown    from 'components/Dropdown/Dropdown.react';
 import Field       from 'components/Field/Field.react';
 import Label       from 'components/Label/Label.react';
 import Option      from 'components/Dropdown/Option.react';
+import Toggle      from 'components/Toggle/Toggle.react';
 
 export default class ExportSelectedRowsDialog extends React.Component {
   constructor() {
     super();
 
     this.state = {
       confirmation: '',
-      exportType: '.csv'
+      exportType: '.csv',
+      indentation: true,
     };
   }
 
@@ -38,7 +40,7 @@ export default class ExportSelectedRowsDialog extends React.Component {
         confirmText='Export'
         cancelText='Cancel'
         onCancel={this.props.onCancel}
-        onConfirm={() => this.props.onConfirm(this.state.exportType)}>
+        onConfirm={() => this.props.onConfirm(this.state.exportType, this.state.indentation)}>
         <Field
           label={<Label text='Select export type' />}
           input={
@@ -49,6 +51,10 @@ export default class ExportSelectedRowsDialog extends React.Component {
                 <Option value='.json'>.json</Option>
             </Dropdown>
           } />
+        {this.state.exportType === '.json' && <Field
+          label={<Label text='Indentation' />}
+          input={<Toggle value={this.state.indentation} type={Toggle.Types.YES_NO} onChange={(indentation) => {this.setState({indentation})}} />} />
+          }
       </Modal>
     );
   }