Merge pull request #1052 from Codeinwp/bugfix/1051

Fixed onboarding chart import issue

Author: vytisbulkevicius

classes/Visualizer/Gutenberg/build/block.js

@@ -80,7 +80,7 @@ class ChartEditor extends Component {
 
 				<ButtonGroup>
 					<Button
-						isDefault
+						variant="secondary"
 						isLarge
 						onClick={ this.props.toggleModal }
 					>

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

@@ -56,8 +56,7 @@ class ChartSelect extends Component {
 	}
 
 	render() {
-
-		let chartVersion = 'undefined' !== typeof google ? google.visualization.Version : 'current';
+		let chartVersion = 'undefined' !== typeof google.visualization ? google.visualization.Version : 'current';
 
 		let chart, footer;
 

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

@@ -97,7 +97,7 @@ class SQLEditor extends Component {
 				<div className="visualizer-db-query-actions">
 					<Button
 						isLarge
-						isDefault
+						variant="secondary"
 						isBusy={ this.state.isLoading }
 						onClick={ this.onSave }
 					>

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

@@ -62,8 +62,8 @@ class SeriesSettings extends Component {
 					.map( ( i, index ) => {
 						i = parseInt( i ) + 1;
                         let indexToFormat = parseInt( i );
-                        let label = series[i].label || '';
-                        let type = series[i].type || '';
+                        let label = 'object' === typeof series[i] ? series[i].label : '';
+                        let type = 'object' == typeof series[i] ? series[i].type : '';
                         let timer = 0;
                         if ( 'tabular' !== type ) {
                             indexToFormat = index;

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

@@ -587,7 +587,7 @@ class Editor extends Component {
 						<ButtonGroup>
 
 							<Button
-								isDefault
+								variant="secondary"
 								isLarge
 								onClick={ () => {
 									let route;
@@ -608,7 +608,7 @@ class Editor extends Component {
 
 									{ false === this.state.isModified ?
 										<Button
-											isDefault
+											variant="secondary"
 											isLarge
                                             className="visualizer-bttn-done"
 											onClick={ () => {

classes/Visualizer/Gutenberg/src/Editor.js

@@ -212,12 +212,13 @@ private function setup_wizard_import_chart() {
 			'message' => __( 'Something went wrong while importing the chart', 'visualizer' ),
 		);
 
+		$data     = $source->getData();
 		$args     = array(
 			'post_type'    => Visualizer_Plugin::CPT_VISUALIZER,
 			'post_title'   => 'Visualization',
 			'post_author'  => get_current_user_id(),
 			'post_status'  => 'publish',
-			'post_content' => $source->getData(),
+			'post_content' => $data,
 		);
 		$chart_id = wp_insert_post( $args );
 
@@ -232,8 +233,10 @@ private function setup_wizard_import_chart() {
 			update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $series );
 			update_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
 
+			$data           = maybe_unserialize( $data );
 			$setting_series = array();
-			foreach ( $series as $s ) {
+			$setting_slices = array();
+			foreach ( $data as $s ) {
 				$setting_series[] = array(
 					'visibleInLegend' => '',
 					'lineWidth'       => '',
@@ -243,6 +246,10 @@ private function setup_wizard_import_chart() {
 					'color'           => '',
 					'role'            => '',
 				);
+				$setting_slices[] = array(
+					'offset' => 0,
+					'color'  => '',
+				);
 			}
 			update_post_meta(
 				$chart_id,
@@ -289,7 +296,7 @@ private function setup_wizard_import_chart() {
 					),
 					'focusTarget'     => 'datum',
 					'series'          => $setting_series,
-					'slices'          => array(),
+					'slices'          => $setting_slices,
 					'vAxis'           => array(
 						'title'          => '',
 						'textPosition'   => '',