Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use client side filter on the CSV download (https://github.com/woocommerce/woocommerce-admin/pull/5787) 

* Use woocommerce_admin_report_table client side filter on the CSV download

* Remove duplicated applyFilters call

Co-authored-by: Rebecca Scott <me@becdetat.com>
This commit is contained in:
Bec Scott 2020-12-14 15:08:19 +10:00 committed by GitHub
parent 73377a08a3
commit 871bd1369e
2 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
plugins/woocommerce-admin/client/analytics/components/report-table/index.js
View File

@ -152,6 +152,32 @@ const ReportTable = ( props ) => {
} ) );
};
const applyTableFilters = ( data, totals, totalResults ) => {
const summary = getSummary ? getSummary( totals, totalResults ) : null;
/**
* Filter report table for the CSV download.
*
* Enables manipulation of data used to create the report CSV.
*
* @param {Object} reportTableData - data used to create the table.
* @param {string} reportTableData.endpoint - table api endpoint.
* @param {Array} reportTableData.headers - table headers data.
* @param {Array} reportTableData.rows - table rows data.
* @param {Object} reportTableData.totals - total aggregates for request.
* @param {Array} reportTableData.summary - summary numbers data.
* @param {Object} reportTableData.items - response from api requerst.
*/
return applyFilters( TABLE_FILTER, {
endpoint,
headers: getHeadersContent(),
rows: getRowsContent( data ),
totals,
summary,
items,
} );
};
const onClickDownload = () => {
const { createNotice, startExport, title } = props;
const params = Object.assign( {}, query );
@ -165,12 +191,11 @@ const ReportTable = ( props ) => {
}
if ( data && data.length === totalResults ) {
const { headers, rows } = applyTableFilters( data, totalResults );
downloadCSVFile(
generateCSVFileName( title, params ),
generateCSVDataFromTable(
getHeadersContent(),
getRowsContent( data )
)
generateCSVDataFromTable( headers, rows )
);
} else {
downloadType = 'email';
@ -308,29 +333,14 @@ const ReportTable = ( props ) => {
label: v,
} ) );
/**
* Filter report table.
*
* Enables manipulation of data used to create a report table.
*
* @param {Object} reportTableData - data used to create the table.
* @param {string} reportTableData.endpoint - table api endpoint.
* @param {Array} reportTableData.headers - table headers data.
* @param {Array} reportTableData.rows - table rows data.
* @param {Object} reportTableData.totals - total aggregates for request.
* @param {Array} reportTableData.summary - summary numbers data.
* @param {Object} reportTableData.items - response from api requerst.
*/
const filteredTableProps = applyFilters( TABLE_FILTER, {
endpoint,
headers: getHeadersContent(),
rows: getRowsContent( items.data ),
const { data } = items;
const applyTableFiltersResult = applyTableFilters(
data,
totals,
summary: getSummary ? getSummary( totals, totalResults ) : null,
items,
} );
let { headers, rows } = filteredTableProps;
const { summary } = filteredTableProps;
totalResults
);
let { headers, rows } = applyTableFiltersResult;
const { summary } = applyTableFiltersResult;
const onColumnsChange = ( shownColumns, toggledColumn ) => {
const columns = headers.map( ( header ) => header.key );

6
plugins/woocommerce-admin/client/analytics/report/downloads/table.js
View File

@ -19,7 +19,7 @@ import { getCurrentDates, defaultTableDateFormat } from '@woocommerce/date';
import ReportTable from '../../components/report-table';
import { CurrencyContext } from '../../../lib/currency-context';
class CouponsReportTable extends Component {
class DownloadsReportTable extends Component {
constructor() {
super();
@ -203,11 +203,11 @@ class CouponsReportTable extends Component {
}
}
CouponsReportTable.contextType = CurrencyContext;
DownloadsReportTable.contextType = CurrencyContext;
export default withSelect( ( select ) => {
const { woocommerce_default_date_range: defaultDateRange } = select(
SETTINGS_STORE_NAME
).getSetting( 'wc_admin', 'wcAdminSettings' );
return { defaultDateRange };
} )( CouponsReportTable );
} )( DownloadsReportTable );