Skip to content

Commit abf88ef

Browse files
vytisbulkeviciusvytisbulkevicius
authored
release: fixes
- Fixed data tables horizontal scrolling issue - Added legend position default label text - Added tooltip default label text - Fixed Gutenberg block error - Fixed table chart rendering issue in Gutenberg block - Fixed compatibility issue with the FSE editor - Fixed compatibility issue with WP 5.6 - Fixed console error when importing charts from others - Fixed pagination enable/disable issue - Fixed editor rows limitation issue
2 parents b76319f + 2dc1f56 commit abf88ef

File tree

14 files changed

+173
-43
lines changed

14 files changed

+173
-43
lines changed

‎classes/Visualizer/Gutenberg/Block.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private function __construct() {
6767
* Enqueue front end and editor JavaScript and CSS
6868
*/
6969
public function enqueue_gutenberg_scripts() {
70-
global $wp_version;
70+
global $wp_version, $pagenow;
7171

7272
$blockPath = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/block.js';
7373
$handsontableJS = VISUALIZER_ABSURL . 'classes/Visualizer/Gutenberg/build/handsontable.js';
@@ -112,6 +112,7 @@ public function enqueue_gutenberg_scripts() {
112112
'sqlTable' => $table_col_mapping,
113113
'chartsPerPage' => defined( 'TI_CYPRESS_TESTING' ) ? 20 : 6,
114114
'proFeaturesLocked' => Visualizer_Module_Admin::proFeaturesLocked(),
115+
'isFullSiteEditor' => 'site-editor.php' === $pagenow,
115116
);
116117
wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array );
117118

@@ -351,7 +352,9 @@ public function get_visualizer_data( $post ) {
351352

352353
// faetch and update settings
353354
$data['visualizer-settings'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SETTINGS, true );
354-
355+
if ( empty( $data['visualizer-settings']['pagination'] ) ) {
356+
$data['visualizer-settings']['pageSize'] = '';
357+
}
355358
// handle series filter hooks
356359
$data['visualizer-series'] = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $post_id, Visualizer_Plugin::CF_SERIES, true ), $post_id, $data['visualizer-chart-type'] );
357360

@@ -367,6 +370,10 @@ public function get_visualizer_data( $post ) {
367370
$data['visualizer-data'] = $this->format_chart_data( $data['visualizer-data'], $data['visualizer-series'] );
368371
}
369372

373+
if ( ! isset( $data['visualizer-settings']['hAxis']['format'] ) ) {
374+
$data['visualizer-settings']['hAxis']['format'] = '';
375+
}
376+
370377
$data['visualizer-data-exploded'] = '';
371378
// handle annotations for google charts
372379
if ( 'GoogleCharts' === $library ) {

‎classes/Visualizer/Gutenberg/build/block.js

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

‎classes/Visualizer/Gutenberg/build/handsontable.css

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

‎classes/Visualizer/Gutenberg/src/Components/ChartEditor.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class ChartEditor extends Component {
5757
colHeaders={ true }
5858
allowInvalid={ false }
5959
className="htEditor"
60+
height="auto"
6061
cells={ ( row, col, prop ) => {
6162
let cellProperties;
6263
if ( 1 === row ) {

‎classes/Visualizer/Gutenberg/src/Components/ChartRender.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class ChartRender extends Component {
6262
}
6363

6464
if ( this.props.chart['visualizer-series'] && 0 <= [ 'date', 'datetime', 'timeofday' ].indexOf( this.props.chart['visualizer-series'][0].type ) ) {
65-
if ( this.props.chart['visualizer-settings'] && '' == this.props.chart['visualizer-settings'].hAxis.format ) {
65+
if ( this.props.chart['visualizer-settings'] && ( this.props.chart['visualizer-settings'].hAxis && '' == this.props.chart['visualizer-settings'].hAxis.format ) ) {
6666
this.props.chart['visualizer-settings'].hAxis.format = 'YYYY-MM-dd';
6767
}
6868
}

‎classes/Visualizer/Gutenberg/src/Components/Import/ChartImport.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ class ChartImport extends Component {
3434

3535
charts = charts.map( ( i, index ) => {
3636
let label = i['chart_data']['visualizer-settings'].title ? i['chart_data']['visualizer-settings'].title : `#${i.id}`;
37-
37+
if ( 'object' === typeof label ) {
38+
label = `#${i.id}`;
39+
}
3840
if ( 0 === index ) {
3941
id = i.id;
4042
}

‎classes/Visualizer/Gutenberg/src/Components/Sidebar/SeriesSettings.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class SeriesSettings extends Component {
6060

6161
{ Object.keys( settings.series )
6262
.map( ( i, index ) => {
63+
i = parseInt( i ) + 1;
6364
let indexToFormat = parseInt( i );
6465
let label = series[i].label || '';
6566
let type = series[i].type || '';

‎classes/Visualizer/Gutenberg/src/Components/Sidebar/TableSettings.js

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,27 +150,29 @@ class TableSettings extends Component {
150150
<SelectControl
151151
label={ __( 'Enable Pagination' ) }
152152
help={ __( 'To enable paging through the data.' ) }
153-
value={ settings.page ? settings.page : 'disable' }
153+
value={ settings.pagination ? settings.pagination : 0 }
154154
options={ [
155-
{ label: __( 'Enable' ), value: 'enable' },
156-
{ label: __( 'Disable' ), value: 'disable' }
155+
{ label: __( 'Enable' ), value: 1 },
156+
{ label: __( 'Disable' ), value: 0 }
157157
] }
158158
onChange={ e => {
159-
settings.page = e;
159+
settings.pagination = e;
160160
this.props.edit( settings );
161161
} }
162162
/>
163163

164-
<TextControl
165-
label={ __( 'Number of rows per page' ) }
166-
help={ __( 'The number of rows in each page, when paging is enabled.' ) }
167-
type="number"
168-
value={ settings.pageSize }
169-
onChange={ e => {
170-
settings.pageSize = e;
171-
this.props.edit( settings );
172-
} }
173-
/>
164+
{ '1' === settings.pagination && (
165+
<TextControl
166+
label={ __( 'Number of rows per page' ) }
167+
help={ __( 'The number of rows in each page, when paging is enabled.' ) }
168+
type="number"
169+
value={ settings.pageSize }
170+
onChange={ e => {
171+
settings.pageSize = e;
172+
this.props.edit( settings );
173+
} }
174+
/>
175+
) }
174176

175177
<SelectControl
176178
label={ __( 'Disable Sort' ) }

‎classes/Visualizer/Gutenberg/src/Editor.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ class Editor extends Component {
124124

125125
editSettings( settings ) {
126126
let chart = { ...this.state.chart };
127+
if ( '1' !== settings.pagination ) {
128+
delete settings.pageSize;
129+
}
127130
chart['visualizer-settings'] = settings;
128131
this.setState({
129132
chart,
@@ -466,6 +469,18 @@ class Editor extends Component {
466469
);
467470
}
468471

472+
if ( '1' === visualizerLocalize.isFullSiteEditor ) {
473+
return (
474+
<Notice
475+
status="error"
476+
isDismissible={ false }
477+
>
478+
<Dashicon icon="chart-pie" />
479+
{ __( 'Visualizer block charts are currently not available for selection here, you must visit the library, get the shortcode, and add the chart here in a shortcode tag.' ) }
480+
</Notice>
481+
);
482+
}
483+
469484
if ( 'renderChart' === this.state.route && null !== this.state.chart ) {
470485
return (
471486
<ChartRender

‎classes/Visualizer/Module.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,9 @@ private function _getCSV( $rows, $filename, $enclose ) {
272272
// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
273273
$fp = function_exists( 'tmpfile' ) ? @tmpfile() : null;
274274
if ( null === $fp ) {
275+
if ( ! function_exists( 'wp_tempnam' ) ) {
276+
require_once ABSPATH . 'wp-admin/includes/file.php';
277+
}
275278
$fp = fopen( wp_tempnam(), 'w+' );
276279
}
277280
if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) {
@@ -628,7 +631,7 @@ protected function get_inline_custom_css( $id, $settings ) {
628631
}
629632

630633
$img_path = VISUALIZER_ABSURL . 'images';
631-
$css .= ".locker,.locker-loader{position:absolute;top:0;left:0;width:100%;height:100%}.locker{z-index:1000;opacity:.8;background-color:#fff;-ms-filter:\"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)\";filter:alpha(opacity=80)}.locker-loader{z-index:1001;background:url($img_path/ajax-loader.gif) no-repeat center center}.dt-button{display:none!important}.visualizer-front-container.visualizer-lazy-render{content-visibility: auto;}.google-visualization-controls-categoryfilter label.google-visualization-controls-label {vertical-align: middle;}.google-visualization-controls-categoryfilter li.goog-inline-block {margin: 0 0.2em;}.google-visualization-controls-categoryfilter li {padding: 0 0.2em;}";
634+
$css .= ".locker,.locker-loader{position:absolute;top:0;left:0;width:100%;height:100%}.locker{z-index:1000;opacity:.8;background-color:#fff;-ms-filter:\"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)\";filter:alpha(opacity=80)}.locker-loader{z-index:1001;background:url($img_path/ajax-loader.gif) no-repeat center center}.dt-button{display:none!important}.visualizer-front-container.visualizer-lazy-render{content-visibility: auto;}.google-visualization-controls-categoryfilter label.google-visualization-controls-label {vertical-align: middle;}.google-visualization-controls-categoryfilter li.goog-inline-block {margin: 0 0.2em;}.google-visualization-controls-categoryfilter li {padding: 0 0.2em;}.visualizer-front-container .dataTables_scrollHeadInner{margin: 0 auto;}";
632635
$css .= '</style>';
633636

634637
$arguments = array( $css, $settings );

0 commit comments

Comments
 (0)