Skip to content

fix: catch invalid Google Charts format patterns and show i18n error #1272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HardeepAsrani wants to merge 1 commit into
base: development
Choose a base branch
from
+32 −19
Open

fix: catch invalid Google Charts format patterns and show i18n error #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions classes/Visualizer/Module/Chart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,12 +876,13 @@ private function _handleDataAndSettingsPage() {
'visualizer',
array(
'l10n' => array(
'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
'loading' => esc_html__( 'Loading...', 'visualizer' ),
'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
'select_columns' => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ),
'save_settings' => __( 'You have modified the chart\'s settings. To modify the source/data again, you must save this chart and reopen it for editing. If you continue without saving the chart, you may lose your changes.', 'visualizer' ),
'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
'loading' => esc_html__( 'Loading...', 'visualizer' ),
'json_error' => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
'select_columns' => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ),
'save_settings' => __( 'You have modified the chart\'s settings. To modify the source/data again, you must save this chart and reopen it for editing. If you continue without saving the chart, you may lose your changes.', 'visualizer' ),
'copied' => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
'invalid_format' => esc_html__( 'This format pattern is not supported in the series settings field. Use the Manual Configuration option instead.', 'visualizer' ),
),
'charts' => array(
'canvas' => $data,
Expand Down Expand Up @@ -1405,7 +1406,8 @@ private function _handleDataPage() {
array(
'l10n' => array(
'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
'loading' => esc_html__( 'Loading...', 'visualizer' ),
'loading' => esc_html__( 'Loading...', 'visualizer' ),
'invalid_format' => esc_html__( 'This format pattern is not supported in the series settings field. To display percentages, use the Manual Configuration option instead.', 'visualizer' ),
),
'charts' => array(
'canvas' => $data,
Expand Down
35 changes: 23 additions & 12 deletions js/render-google.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,19 +449,30 @@ var isResizeRequest = false;
}

var formatter = null;
switch (type) {
case 'number':
formatter = new gv.NumberFormat({pattern: format});
break;
case 'date':
case 'datetime':
case 'timeofday':
formatter = new gv.DateFormat({pattern: format});
break;
}
var $formatInput = $('input.control-text[name*="[format]"]').filter(function() {
return $(this).val() === format;
});
try {
switch (type) {
case 'number':
formatter = new gv.NumberFormat({pattern: format});
break;
case 'date':
case 'datetime':
case 'timeofday':
formatter = new gv.DateFormat({pattern: format});
break;
}

if (formatter) {
formatter.format(table, index);
if (formatter) {
formatter.format(table, index);
$formatInput.nextAll('.visualizer-format-error').remove();
}
} catch (e) {
if ($formatInput.length) {
$formatInput.nextAll('.visualizer-format-error').remove();
$('<p class="visualizer-format-error" style="color:#cc0000;margin:4px 0 0"></p>').text(visualizer.l10n.invalid_format).insertAfter($formatInput);
}
}

var arr = id.split('-');
Expand Down
Loading