Merge branch 'development' of https://github.com/codeinwp/visualizer into issue-688

Author: contactashish13

classes/Visualizer/Gutenberg/build/block.js

@@ -29,6 +29,7 @@ const {
 	ButtonGroup,
 	Dashicon,
 	Placeholder,
+	Notice,
 	Spinner
 } = wp.components;
 
@@ -78,11 +79,20 @@ class Editor extends Component {
 
 		// Fetch review again if block loaded after saving.
 		if ( this.props.attributes.id ) {
-			let result = await apiFetch({ path: `wp/v2/visualizer/${this.props.attributes.id}` });
-
-			this.setState({
-				chart: result['chart_data']
-			});
+			let result = await apiFetch({ path: `wp/v2/visualizer/${this.props.attributes.id}` }).catch( function( error ) {
+            });
+
+            if ( result ) {
+                this.setState({
+                    chart: result['chart_data']
+                });
+            } else {
+
+                // if the chart is not found.
+                this.setState({
+                    route: 'error'
+                });
+            }
 		}
 	}
 
@@ -311,10 +321,11 @@ class Editor extends Component {
 		});
 	}
 
-	editChartData( chartData, type ) {
+	editChartData( chartData, source ) {
 		let chart = { ...this.state.chart };
 		let series = [];
 		let settings = { ...chart['visualizer-settings'] };
+        let type = chart['visualizer-chart-type'];
 		chartData[0].map( ( i, index ) => {
 			series[index] = {
 				label: i,
@@ -327,17 +338,17 @@ class Editor extends Component {
 		let map = series;
 		let fieldName = 'series';
 
-		if ( 'pie' === chart['visualizer-chart-type']) {
+		if ( 'pie' === type ) {
 			map = chartData;
 			fieldName = 'slices';
 		}
 
 		map.map( ( i, index ) => {
-			if ( 'pie' !== chart['visualizer-chart-type'] && 0 === index ) {
+			if ( 'pie' !== type && 0 === index ) {
 				return;
 			}
 
-			const seriesIndex = 'pie' !== chart['visualizer-chart-type'] ? index - 1 : index;
+			const seriesIndex = 'pie' !== type ? index - 1 : index;
 
 			if ( settings[fieldName][seriesIndex] === undefined ) {
 				settings[fieldName][seriesIndex] = {};
@@ -346,11 +357,11 @@ class Editor extends Component {
 		});
 
 		settings[fieldName] = settings[fieldName].filter( ( i, index ) => {
-			const length = 'pie' !== chart['visualizer-chart-type'] ? map.length - 1 : map.length;
+			const length = -1 >= [ 'pie', 'tabular', 'dataTable' ].indexOf( type ) ? map.length - 1 : map.length;
 			return index < length;
 		});
 
-		chart['visualizer-source'] = type;
+		chart['visualizer-source'] = source;
 		chart['visualizer-default-data'] = 0;
 		chart['visualizer-data'] = chartData;
 		chart['visualizer-series'] = series;
@@ -409,6 +420,18 @@ class Editor extends Component {
 	}
 
 	render() {
+		if ( 'error' === this.state.route ) {
+			return (
+				<Notice
+					status="error"
+					isDismissible={ false }
+				>
+                        <Dashicon icon="chart-pie" />
+                        { __( 'This chart is not available; it might have been deleted. Please delete this block and resubmit your chart.' ) }
+				</Notice>
+			);
+		}
+
 		if ( 'renderChart' === this.state.route && null !== this.state.chart ) {
 			return (
 				<ChartRender

classes/Visualizer/Gutenberg/src/Editor.js

@@ -375,7 +375,7 @@ public function renderChart( $atts ) {
 					'map_api_key'   => get_option( 'visualizer-map-api-key' ),
 					'rest_url'      => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
 					'i10n'          => array(
-						'copied'        => __( 'Copied!', 'visualizer' ),
+						'copied'        => __( 'The data has been copied to your clipboard. Hit Ctrl-V/Cmd-V in your spreadsheet editor to paste the data.', 'visualizer' ),
 					),
 					'page_type' => 'frontend',
 					'is_front'  => true,

classes/Visualizer/Module/Frontend.php

@@ -6,6 +6,9 @@
 
     function initActionsButtons(v) {
         if($('a.visualizer-action[data-visualizer-type=copy]').length > 0) {
+            $('a.visualizer-action[data-visualizer-type=copy]').on('click', function(e) {
+                e.preventDefault();
+            });
             var clipboard = new Clipboard('a.visualizer-action[data-visualizer-type=copy]'); // jshint ignore:line
             clipboard.on('success', function(e) {
                 window.alert(v.i10n['copied']);
@@ -88,24 +91,23 @@
             document.body.dispatchEvent(event);
         };
 
-        // facade loads N times in the library (where N = the number of different chart libraries supported)
+        // facade loads N times in the library and front end (where N = the number of different chart libraries supported)
         // so all charts are also loaded N times
         // this will ensure that no matter how many times facade is loaded, it initializes all charts only once.
         // fixed as part of the issue to add annotations.
-        if(visualizer.page_type === 'library'){
-            if(localStorage.getItem( 'viz-facade-loaded' ) === '1'){
-                // prevent library from hanging.
-                setTimeout( function(){
-                    localStorage.removeItem( 'viz-facade-loaded' );
-                }, 2000);
-                return;
-            }
-            localStorage.setItem( 'viz-facade-loaded', '1');
-            // remove the flag so that repeated loading of the library does not cause problems.
+        if(localStorage.getItem( 'viz-facade-loaded' ) === '1'){
+            // prevent library from hanging.
             setTimeout( function(){
                 localStorage.removeItem( 'viz-facade-loaded' );
             }, 2000);
+            return;
         }
+        localStorage.setItem( 'viz-facade-loaded', '1');
+        // remove the flag so that repeated loading of the library does not cause problems.
+        setTimeout( function(){
+            localStorage.removeItem( 'viz-facade-loaded' );
+        }, 2000);
+        
         $('body').trigger('visualizer:render:chart:start', visualizer);
         initActionsButtons(visualizer);
         registerDefaultActions();