Skip to content

Commit 8e36388

Browse files
Fix onboarding chart import issue #1051
1 parent 641df4b commit 8e36388

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

classes/Visualizer/Gutenberg/build/block.js

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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class ChartEditor extends Component {
8080

8181
<ButtonGroup>
8282
<Button
83-
isDefault
83+
variant="secondary"
8484
isLarge
8585
onClick={ this.props.toggleModal }
8686
>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ class ChartSelect extends Component {
5656
}
5757

5858
render() {
59-
60-
let chartVersion = 'undefined' !== typeof google ? google.visualization.Version : 'current';
59+
let chartVersion = 'undefined' !== typeof google.visualization ? google.visualization.Version : 'current';
6160

6261
let chart, footer;
6362

classes/Visualizer/Gutenberg/src/Components/Import/SQLEditor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class SQLEditor extends Component {
9797
<div className="visualizer-db-query-actions">
9898
<Button
9999
isLarge
100-
isDefault
100+
variant="secondary"
101101
isBusy={ this.state.isLoading }
102102
onClick={ this.onSave }
103103
>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ class SeriesSettings extends Component {
6262
.map( ( i, index ) => {
6363
i = parseInt( i ) + 1;
6464
let indexToFormat = parseInt( i );
65-
let label = series[i].label || '';
66-
let type = series[i].type || '';
65+
let label = 'object' === typeof series[i] ? series[i].label : '';
66+
let type = 'object' == typeof series[i] ? series[i].type : '';
6767
let timer = 0;
6868
if ( 'tabular' !== type ) {
6969
indexToFormat = index;

classes/Visualizer/Gutenberg/src/Editor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ class Editor extends Component {
587587
<ButtonGroup>
588588

589589
<Button
590-
isDefault
590+
variant="secondary"
591591
isLarge
592592
onClick={ () => {
593593
let route;
@@ -608,7 +608,7 @@ class Editor extends Component {
608608

609609
{ false === this.state.isModified ?
610610
<Button
611-
isDefault
611+
variant="secondary"
612612
isLarge
613613
className="visualizer-bttn-done"
614614
onClick={ () => {

0 commit comments

Comments
 (0)