Merge pull request #5 from Codeinwp/3.3.0

3.3.0

Author: HardeepAsrani

.travis.yml

@@ -1,21 +1,23 @@
 language: php
-php:
-- '7.1'
-- '7.0'
-- '5.6'
-- '5.5'
-- '5.4'
 sudo: false
 matrix:
   fast_finish: true
   include:
-  - php: '5.6'
-    install: true
-    before_script: chmod +x bin/wraith.sh
-    env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
-    script: "./bin/wraith.sh"
-  - php: '5.3'
-    dist: precise
+    - php: 7.2
+    - php: 7.1
+    - php: 7.0
+    - php: '5.6'
+      install: true
+      before_script: chmod +x bin/wraith.sh
+      env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
+      script: "./bin/wraith.sh"
+    - php: 5.5
+      env: WP_VERSION=5.1
+    - php: 5.4
+      env: WP_VERSION=5.1
+    - php: 5.3
+      env: WP_VERSION=5.1
+      dist: precise
   allow_failures:
     - env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
 branches:

classes/Visualizer/Gutenberg/Block.php

@@ -194,6 +194,8 @@ public function get_visualizer_data( $post ) {
 
 		$data['visualizer-chart-type'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_TYPE, true );
 
+		$data['visualizer-chart-library'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
+
 		$data['visualizer-source'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SOURCE, true );
 
 		$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );

classes/Visualizer/Gutenberg/build/block.css

@@ -102,6 +102,16 @@ class Charts extends Component {
 											chart = `${ startCase( data['visualizer-chart-type']) }Chart`;
 										}
 
+										if ( data['visualizer-chart-library']) {
+											if ( 'ChartJS' === data['visualizer-chart-library']) {
+												return;
+											}
+										}
+
+										if ( 'dataTable' === chart ) {
+											return;
+										}
+
 										return (
 											<div className="visualizer-settings__charts-single">
 

classes/Visualizer/Gutenberg/build/block.js

@@ -28,6 +28,7 @@ const {
 	Button,
 	ButtonGroup,
 	Dashicon,
+	Notice,
 	Placeholder,
 	Spinner
 } = wp.components;
@@ -351,6 +352,13 @@ class Editor extends Component {
 				{ 'home' === this.state.route && (
 					<div className="visualizer-settings__content">
 
+						<Notice
+							status="warning"
+							isDismissible={ false }
+						>
+							{ __( 'Right now the Visualizer block does not support display/editing of Table chart. It will be added in the next release. We recommend you to use shortcode if you want to display that particular chart type.' ) }
+						</Notice>
+
 						<div className="visualizer-settings__content-description">
 							{ __( 'Make a new chart or display an existing one?' ) }
 						</div>

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

@@ -206,7 +206,19 @@ public function _getDataAs( $chart_id, $type ) {
 				}
 			}
 
-			$filename   = isset( $settings['title'] ) && ! empty( $settings['title'] ) ? $settings['title'] : 'visualizer#' . $chart_id;
+			$title       = 'visualizer#' . $chart_id;
+			if ( ! empty( $settings['title'] ) ) {
+				$title  = $settings['title'];
+			}
+			// for ChartJS, title is an array.
+			if ( is_array( $title ) && isset( $title['text'] ) ) {
+				$title = $title['text'];
+			}
+			if ( empty( $title ) ) {
+				$title  = 'visualizer#' . $chart_id;
+			}
+
+			$filename   = $title;
 
 			switch ( $type ) {
 				case 'csv':
@@ -476,21 +488,39 @@ protected function get_user_customization_js() {
 	 * Load the class for the given chart's chart type so that its assets can be loaded.
 	 */
 	protected function load_chart_type( $chart_id ) {
-		$type   = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
-		$name   = 'Visualizer_Render_Sidebar_Type_' . ucwords( $type );
+		$name   = $this->load_chart_class_name( $chart_id );
 		$class  = null;
 		if ( class_exists( $name ) || true === apply_filters( 'visualizer_load_chart', false, $name ) ) {
 			$class  = new $name;
 		}
 
 		if ( is_null( $class ) && VISUALIZER_PRO ) {
 			// lets see if this type exists in pro. New Lite(3.1.0+) & old Pro(1.8.0-).
-			$class  = apply_filters( 'visualizer_pro_chart_type_sidebar', null, array( 'type' => $type, 'settings' => get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) ) );
+			$type   = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
+			$class  = apply_filters( 'visualizer_pro_chart_type_sidebar', null, array( 'id' => $chart_id, 'type' => $type, 'settings' => get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) ) );
 		}
 
 		return is_null( $class ) ? null : $class->getLibrary();
 	}
 
+	/**
+	 * Returns the class name for the given chart's chart type.
+	 */
+	protected function load_chart_class_name( $chart_id ) {
+		$type   = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
+		$lib    = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
+
+		// backward compatibility.
+		if ( empty( $lib ) ) {
+			$lib = 'GoogleCharts';
+			if ( 'dataTable' === $type ) {
+				$lib = 'DataTable';
+			}
+		}
+		$name   = 'Visualizer_Render_Sidebar_Type_' . $lib . '_' . ucwords( $type );
+		return $name;
+	}
+
 	/**
 	 * Generates the inline CSS to apply to the chart and adds these classes to the settings.
 	 *

classes/Visualizer/Gutenberg/src/Editor.js

@@ -64,9 +64,32 @@ public static function is_amp() {
 	}
 
 	/**
-	 * Loads the alterview view of the chart.
+	 * Loads the alternate view of the chart.
 	 */
 	public function get_chart( $chart, $data, $series, $settings ) {
+		// let's check if there is a view parameter in the GET request.
+		$view   = isset( $_GET['view'] ) ? $_GET['view'] : null;
+
+		if ( ! empty( $view ) ) {
+			// attachmend id?
+			if ( is_numeric( $view ) ) {
+				$view = wp_get_attachment_url( $view );
+			}
+
+			$attributes = wp_check_filetype( $view );
+			if ( $attributes && false !== strpos( $attributes['type'], 'image/' ) ) {
+				// absolute url or relative?
+				if ( 0 !== strpos( $view, 'http' ) ) {
+					$view = site_url( $view );
+				}
+				$view = '<img src="' . $view . '">';
+			}
+
+			if ( ! empty( $view ) ) {
+				return $view;
+			}
+		}
+
 		$view = apply_filters( 'visualizer_amp_view', null, $chart, $data, $series, $settings );
 		if ( ! is_null( $view ) ) {
 			return $view;