Skip to content

Commit 7668aed

Browse files
load all charts in one page
1 parent 1e6b6d1 commit 7668aed

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

classes/Visualizer/Gutenberg/Block.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public function enqueue_gutenberg_scripts() {
102102
'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(),
103103
'adminPage' => menu_page_url( 'visualizer', false ),
104104
'sqlTable' => $table_col_mapping,
105+
'chartsPerPage' => defined( 'TI_CYPRESS_TESTING' ) ? 20 : 6,
105106
);
106107
wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array );
107108

classes/Visualizer/Gutenberg/build/block.css

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

classes/Visualizer/Gutenberg/build/block.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

classes/Visualizer/Gutenberg/src/Components/Charts.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,23 @@ class Charts extends Component {
4444
}
4545

4646
async componentDidMount() {
47+
const perPage = visualizerLocalize.chartsPerPage;
4748

4849
// Fetch review again if block loaded after saving.
49-
let result = await apiFetch({ path: 'wp/v2/visualizer/?per_page=6&meta_key=visualizer-chart-library&meta_value=ChartJS' });
50+
let result = await apiFetch({ path: 'wp/v2/visualizer/?per_page=' + perPage + '&meta_key=visualizer-chart-library&meta_value=ChartJS' });
5051
this.setState({ charts: result });
5152
}
5253

5354
async loadMoreCharts() {
5455
const offset = ( this.state.charts ).length;
5556
let chartsLoaded = this.state.chartsLoaded;
57+
const perPage = visualizerLocalize.chartsPerPage;
5658

5759
this.setState({ isBusy: true });
5860

59-
let result = await apiFetch({ path: `wp/v2/visualizer/?per_page=6&meta_key=visualizer-chart-library&meta_value=ChartJS&offset=${ offset }` });
61+
let result = await apiFetch({ path: `wp/v2/visualizer/?per_page=${ perPage }&meta_key=visualizer-chart-library&meta_value=ChartJS&offset=${ offset }` });
6062

61-
if ( 6 > result.length ) {
63+
if ( perPage > result.length ) {
6264
chartsLoaded = true;
6365
}
6466

0 commit comments

Comments
 (0)