Merge branch 'development' into issue-602-1

Author: contactashish13

CHANGELOG.md

@@ -1,4 +1,12 @@
 
+ ### v3.3.4 - 2019-11-15 
+ **Changes:** 
+ * Fix issue with table chart not loading in the block editor
+ 
+ ### v3.3.3 - 2019-11-12 
+ **Changes:** 
+ * Tested upto WordPress 5.3
+ 
  ### v3.3.2 - 2019-10-03 
  **Changes:** 
  * Add support for Dataset schema

classes/Visualizer/Module/Admin.php

@@ -109,6 +109,7 @@ public function addSplChartSchedules( $feature, $chart_id, $plan ) {
 
 		switch ( $feature ) {
 			case 'json':
+			case 'csv':
 				// no more schedules if pro is already active.
 				if ( Visualizer_Module::is_pro() ) {
 					return;
@@ -117,11 +118,6 @@ public function addSplChartSchedules( $feature, $chart_id, $plan ) {
 			case 'wp':
 				// fall-through.
 			case 'db':
-				// fall-through.
-				break;
-			case 'csv':
-				// no support for live.
-				unset( $hours['0'] );
 				break;
 			default:
 				return;

classes/Visualizer/Module/Chart.php

@@ -69,6 +69,34 @@ public function __construct( Visualizer_Plugin $plugin ) {
 
 		$this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' );
 
+		$this->_addFilter( 'visualizer_get_sidebar', 'getSidebar', 10, 2 );
+
+	}
+
+	/**
+	 * Generates the HTML of the sidebar for the chart.
+	 *
+	 * @since ?
+	 *
+	 * @access public
+	 */
+	public function getSidebar( $sidebar, $chart_id ) {
+		$chart      = get_post( $chart_id );
+		$data          = $this->_getChartArray( $chart );
+		$sidebar       = '';
+		$sidebar_class = $this->load_chart_class_name( $chart_id );
+		if ( class_exists( $sidebar_class, true ) ) {
+			$sidebar           = new $sidebar_class( $data['settings'] );
+			$sidebar->__series = $data['series'];
+			$sidebar->__data   = $data['data'];
+		} else {
+			$sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
+			if ( $sidebar !== '' ) {
+				$sidebar->__series = $data['series'];
+				$sidebar->__data   = $data['data'];
+			}
+		}
+		return str_replace( "'", '"', $sidebar->__toString() );
 	}
 
 	/**

classes/Visualizer/Module/Setup.php

@@ -279,6 +279,17 @@ public function refresh_db_for_chart( $chart, $chart_id, $force = false ) {
 				$source     = new Visualizer_Source_Json( array( 'url' => $url, 'root' => $root, 'paging' => $paging ) );
 				$source->refresh( $series );
 				break;
+			case 'Visualizer_Source_Csv_Remote':
+				// check if its a live-data chart or a cached-data chart.
+				if ( ! $force ) {
+					$hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
+					if ( ! empty( $hours ) ) {
+						// cached, bail!
+						return $chart;
+					}
+				}
+				do_action( 'visualizer_schedule_import' );
+				return get_post( $chart_id );
 			default:
 				return $chart;
 		}

classes/Visualizer/Render/Page/Update.php

@@ -52,6 +52,9 @@ protected function _toHTML() {
 				echo 'win.visualizer.charts.canvas.settings = ', $this->settings, ';';
 			}
 			echo 'win.updateChartPreview();';
+
+			echo $this->updateEditorAndSettings();
+
 			echo '}';
 
 			do_action( 'visualizer_add_update_hook', $this->series, $this->data );
@@ -70,4 +73,21 @@ protected function _toHTML() {
 		echo '</html>';
 	}
 
+
+	/**
+	 * Update the hidden content in the LHS and the advanced settings
+	 */
+	private function updateEditorAndSettings() {
+		$editor = '';
+		if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
+			ob_start();
+			Visualizer_Render_Layout::show( 'simple-editor-screen', $this->id );
+			$editor = ob_get_clean();
+		}
+
+		$sidebar = apply_filters( 'visualizer_get_sidebar', '', $this->id );
+
+		return 'win.updateHTML(\'' . json_encode( $editor ) . '\', \'' . json_encode( $sidebar ) . '\');';
+	}
+
 }

cypress/integration/free-sources.js

@@ -140,9 +140,9 @@ describe('Test Free - sources', function() {
 
                     cy.wrap($body).find('.json-table tbody tr td select').each( function( el, index ) {
                         if(index === 0){
-                            cy.wrap(el).select('date');
+                            cy.wrap(el).select('date', {force: true});
                         }else{
-                            cy.wrap(el).select('number');
+                            cy.wrap(el).select('number', {force: true});
                         }
                     });
                     cy.wrap($body).find('#json-chart-button').click().then( () => {

js/frame.js

@@ -69,7 +69,7 @@
         });
 
         // collapse other open sections of this group
-        $('.viz-group-title').click(function () {
+        $(document).on('click', '.viz-group-title', function () {
             var parent = $(this).parent();
 
             if (parent.hasClass('open')) {
@@ -89,7 +89,7 @@
         });
 
         // collapse other open subsections of this section
-        $('.viz-section-title').click(function () {
+        $(document).on('click', '.viz-section-title', function () {
             var grandparent = $(this).parent().parent();
             grandparent.find('.viz-section-title.open ~ .viz-section-items').hide();
             grandparent.find('.viz-section-title.open').removeClass('open');
@@ -124,11 +124,11 @@
             $('#canvas').unlock();
         });
 
-        $('.viz-section-title').click(function () {
+        $(document).on('click', '.viz-section-title', function () {
             $(this).toggleClass('open').parent().find('.viz-section-items').toggle();
         });
 
-        $('.more-info').click(function () {
+        $(document).on('click', '.more-info', function () {
             $(this).parent().find('.viz-section-description:first').toggle();
             return false;
         });

js/preview.js

@@ -4,6 +4,22 @@
 	var timeout;
 
 	$(document).ready(function() {
+        // when data is impported using csv/url, update the hidden data and the advanced settings sidebar.
+        window.updateHTML = function( editor, sidebar ) {
+            $('.viz-simple-editor').remove();
+            $('#content').append(editor);
+            $('#settings-form .viz-group').remove();
+            $('#settings-form').append(sidebar);
+
+            $('#settings-form .control-text').change(updateChart).keyup(updateChart);
+            $('#settings-form .control-select, #settings-form .control-checkbox, #settings-form .control-check').change(updateChart);
+            $('#settings-form .color-picker-hex').wpColorPicker({
+                change: updateChart,
+                clear: updateChart
+            });
+            $('#settings-form textarea[name="manual"]').change(validateJSON).keyup(validateJSON);
+        };
+
         $('#settings-button').click(function() {
 			$('#settings-form').submit();
 		});

readme.md

@@ -159,6 +159,16 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 13. Bar chart
 
 ## Changelog ##
+### 3.3.4 - 2019-11-15  ###
+
+* Fix issue with table chart not loading in the block editor
+
+
+### 3.3.3 - 2019-11-12  ###
+
+* Tested upto WordPress 5.3
+
+
 ### 3.3.2 - 2019-10-03  ###
 
 * Add support for Dataset schema

readme.txt

@@ -161,8 +161,18 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 12. Bar settings, Series settings
 13. Bar chart
 
-## Changelog ##
-### 3.3.2 - 2019-10-03  ###
+== Changelog ==
+= 3.3.4 - 2019-11-15  = 
+
+* Fix issue with table chart not loading in the block editor
+
+
+= 3.3.3 - 2019-11-12  = 
+
+* Tested upto WordPress 5.3
+
+
+= 3.3.2 - 2019-10-03  = 
 
 * Add support for Dataset schema
 * Horizontal Axis formatting should apply to tooltips