Fix file conflict #930

Author: girishpanchal30

classes/Visualizer/Gutenberg/build/block.js

@@ -18,6 +18,8 @@ const {
 	TextControl
 } = wp.components;
 
+import { getColorCode } from '../../utils.js';
+
 class HorizontalAxisSettings extends Component {
 	constructor() {
 		super( ...arguments );
@@ -85,9 +87,9 @@ class HorizontalAxisSettings extends Component {
 						label={ __( 'Base Line Color' ) }
 					>
 						<ColorPalette
-							value={ settings.hAxis.baselineColor }
+							value={ settings.vAxis.baselineColor }
 							onChange={ e => {
-								settings.hAxis.baselineColor = e;
+								settings.vAxis.baselineColor = getColorCode( e );
 								this.props.edit( settings );
 							} }
 						/>
@@ -100,7 +102,7 @@ class HorizontalAxisSettings extends Component {
 							value={ settings.hAxis.textStyle.color || settings.hAxis.textStyle }
 							onChange={ e => {
 								settings.hAxis.textStyle = {};
-								settings.hAxis.textStyle.color = e;
+								settings.hAxis.textStyle.color = getColorCode( e );
 								this.props.edit( settings );
 							} }
 						/>

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

@@ -18,6 +18,8 @@ const {
 	TextControl
 } = wp.components;
 
+import { getColorCode } from '../../utils.js';
+
 class VerticalAxisSettings extends Component {
 	constructor() {
 		super( ...arguments );
@@ -85,9 +87,9 @@ class VerticalAxisSettings extends Component {
 						label={ __( 'Base Line Color' ) }
 					>
 						<ColorPalette
-							value={ settings.vAxis.baselineColor }
+							value={ settings.hAxis.baselineColor }
 							onChange={ e => {
-								settings.vAxis.baselineColor = e;
+								settings.hAxis.baselineColor = getColorCode( e );
 								this.props.edit( settings );
 							} }
 						/>
@@ -100,7 +102,7 @@ class VerticalAxisSettings extends Component {
 							value={ settings.vAxis.textStyle.color || settings.vAxis.textStyle }
 							onChange={ e => {
 								settings.vAxis.textStyle = {};
-								settings.vAxis.textStyle.color = e;
+								settings.vAxis.textStyle.color = getColorCode( e );
 								this.props.edit( settings );
 							} }
 						/>

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

@@ -178,3 +178,14 @@ export const getFormatterForGoogle = ( dataType ) => {
     }
     return null;
 };
+
+export const getColorCode = ( color ) => {
+	if ( -1 === color.indexOf( '#' ) ) {
+		let getCssVar = color.match( /\((.*)\)/ ).pop();
+		if ( getCssVar ) {
+			let style = getComputedStyle( document.body );
+			return style.getPropertyValue( getCssVar );
+		}
+	}
+	return color;
+};

classes/Visualizer/Gutenberg/src/utils.js

@@ -67,6 +67,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		$this->_addFilter( Visualizer_Plugin::FILTER_UNDO_REVISIONS, 'undoRevisions', 10, 2 );
 		$this->_addFilter( Visualizer_Plugin::FILTER_HANDLE_REVISIONS, 'handleExistingRevisions', 10, 2 );
 		$this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_DATA_AS, 'getDataAs', 10, 3 );
+		$this->_addFilter( Visualizer_Plugin::FILTER_CHART_TITLE, 'filterChartTitle', 10, 2 );
 		register_shutdown_function( array($this, 'onShutdown') );
 
 	}
@@ -791,4 +792,21 @@ public function _getImage( $chart = null ) {
 			'csv'  => $image,
 		);
 	}
+
+	/**
+	 * Filter chart title.
+	 *
+	 * @access public
+	 * @param string $post_title Post title.
+	 * @param int    $post_id Post ID.
+	 * @return string
+	 */
+	public function filterChartTitle( $post_title, $post_id ) {
+		$post_type = get_post_type( $post_id );
+		$post_title     = trim( $post_title );
+		if ( 'visualizer' === $post_type && 'Visualization' === $post_title ) {
+			return sprintf( '%s #%d', $post_title, $post_id );
+		}
+		return $post_title;
+	}
 }

classes/Visualizer/Module.php

@@ -1245,15 +1245,16 @@ public function cloneChart() {
 							'vaction' => false,
 						),
 						admin_url( 'admin.php' )
-					)
+					),
+					null,
+					'db'
 				);
 			}
 		}
 
 		if ( defined( 'WP_TESTS_DOMAIN' ) ) {
 			wp_die();
 		}
-
 		wp_redirect( $redirect );
 		exit;
 	}

classes/Visualizer/Module/Chart.php

@@ -341,6 +341,8 @@ public function renderChart( $atts ) {
 			$attributes['data-lazy-limit'] = $atts['lazy'];
 		}
 
+		$attributes = apply_filters( 'visualizer_container_attributes', $attributes, $chart->ID );
+
 		$chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
 
 		// Get and update settings.

classes/Visualizer/Module/Frontend.php

@@ -90,6 +90,7 @@ class Visualizer_Plugin {
 	const FILTER_HANDLE_REVISIONS = 'visualizer-handle-revisions';
 	const FILTER_GET_CHART_DATA_AS = 'visualizer-get-chart-data-as';
 	const FILTER_HANDLE_CACHE_EXPIRATION_TIME = 'visualizer-handle-expiration-time';
+	const FILTER_CHART_TITLE = 'the_title';
 
 	const CF_DB_SCHEDULE = 'visualizer-db-schedule';
 	const CF_DB_QUERY = 'visualizer-db-query';

classes/Visualizer/Plugin.php

@@ -242,7 +242,7 @@ protected function _renderHorizontalAxisSettings() {
 				esc_html__( 'Specify 0 to disable the minor gridlines.', 'visualizer' ),
 				0,
 				'number',
-				array( 'min' => 0, 'max' => 1, 'step' => 1 )
+				array( 'min' => 0, 'step' => 1 )
 			);
 
 			self::_renderColorPickerItem(
@@ -358,7 +358,7 @@ protected function _renderVerticalAxisSettings() {
 				esc_html__( 'Specify 0 to disable the minor gridlines.', 'visualizer' ),
 				0,
 				'number',
-				array( 'min' => 0, 'max' => 1, 'step' => 1 )
+				array( 'min' => 0, 'step' => 1 )
 			);
 
 			self::_renderColorPickerItem(