Fix file conflict #1023 #1021

Author: girishpanchal30

classes/Visualizer/Gutenberg/Block.php

@@ -352,7 +352,9 @@ public function get_visualizer_data( $post ) {
 
 		// faetch and update settings
 		$data['visualizer-settings'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SETTINGS, true );
-
+		if ( empty( $data['visualizer-settings']['pagination'] ) ) {
+			$data['visualizer-settings']['pageSize'] = '';
+		}
 		// handle series filter hooks
 		$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'] );
 

classes/Visualizer/Gutenberg/build/block.js

@@ -62,7 +62,7 @@ class ChartRender extends Component {
         }
 
 		if ( this.props.chart['visualizer-series'] && 0 <= [ 'date', 'datetime', 'timeofday' ].indexOf( this.props.chart['visualizer-series'][0].type ) ) {
-			if ( this.props.chart['visualizer-settings'] && '' == this.props.chart['visualizer-settings'].hAxis.format ) {
+			if ( this.props.chart['visualizer-settings'] && ( this.props.chart['visualizer-settings'].hAxis && '' == this.props.chart['visualizer-settings'].hAxis.format ) ) {
 				this.props.chart['visualizer-settings'].hAxis.format = 'YYYY-MM-dd';
 			}
 		}

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

@@ -34,7 +34,9 @@ class ChartImport extends Component {
 
 		charts = charts.map( ( i, index ) => {
 			let label = i['chart_data']['visualizer-settings'].title ? i['chart_data']['visualizer-settings'].title : `#${i.id}`;
-
+			if ( 'object' === typeof label ) {
+				label = `#${i.id}`;
+			}
 			if ( 0 === index ) {
 				id = i.id;
 			}

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

@@ -60,6 +60,7 @@ class SeriesSettings extends Component {
 
 				{ Object.keys( settings.series )
 					.map( ( i, index ) => {
+						i = parseInt( i ) + 1;
                         let indexToFormat = parseInt( i );
                         let label = series[i].label || '';
                         let type = series[i].type || '';

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

@@ -150,27 +150,29 @@ class TableSettings extends Component {
 						<SelectControl
 							label={ __( 'Enable Pagination' ) }
 							help={ __( 'To enable paging through the data.' ) }
-							value={ settings.page ? settings.page : 'disable' }
+							value={ settings.pagination ? settings.pagination : 0 }
 							options={ [
-								{ label: __( 'Enable' ), value: 'enable' },
-								{ label: __( 'Disable' ), value: 'disable' }
+								{ label: __( 'Enable' ), value: 1 },
+								{ label: __( 'Disable' ), value: 0 }
 							] }
 							onChange={ e => {
-								settings.page = e;
+								settings.pagination = e;
 								this.props.edit( settings );
 							} }
 						/>
 
-						<TextControl
-							label={ __( 'Number of rows per page' ) }
-							help={ __( 'The number of rows in each page, when paging is enabled.' ) }
-							type="number"
-							value={ settings.pageSize }
-							onChange={ e => {
-								settings.pageSize = e;
-								this.props.edit( settings );
-							} }
-						/>
+						{ '1' === settings.pagination && (
+							<TextControl
+								label={ __( 'Number of rows per page' ) }
+								help={ __( 'The number of rows in each page, when paging is enabled.' ) }
+								type="number"
+								value={ settings.pageSize }
+								onChange={ e => {
+									settings.pageSize = e;
+									this.props.edit( settings );
+								} }
+							/>
+						) }
 
 						<SelectControl
 							label={ __( 'Disable Sort' ) }

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

@@ -124,6 +124,9 @@ class Editor extends Component {
 
 	editSettings( settings ) {
 		let chart = { ...this.state.chart };
+		if ( '1' !== settings.pagination ) {
+			delete settings.pageSize;
+		}
 		chart['visualizer-settings'] = settings;
 		this.setState({
 			chart,