Merge pull request #694 from contactashish13/issue-691

Gutenberg: Make UI more intuitive when a chart is missing

Author: rodica-andronache

CHANGELOG.md

@@ -1,4 +1,14 @@
 
+ ### v3.4.3 - 2020-05-04 
+ **Changes:** 
+ * [Feat] Improved chart creation UX
+* [Feat] New option to control the number of charts per page in the Charts Library
+* [Feat] New option for filtering/ordering charts in the Charts Library
+* [Feat] Support for custom codes for the boolean data type in Table charts
+* [Fix] Support for displaying apostrophes in charts
+* [Fix] Visualizer button layout in the Classic block
+* [Fix] Bulk activation of plugin aborts activation of subsequent plugins
+ 
  ### v3.4.2 - 2020-02-17 
  **Changes:** 
  * New Cypress tests for the Gutenberg block

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'
+                });
+            }
 		}
 	}
 
@@ -92,6 +102,7 @@ class Editor extends Component {
 		});
 
 		let result = await apiFetch({ path: `wp/v2/visualizer/${id}` });
+        console.log( 'getChart', id, result );
 
 		this.setState({
 			route: 'chartSelect',
@@ -297,6 +308,7 @@ class Editor extends Component {
 		});
 
 		let result = await apiFetch({ path: `wp/v2/visualizer/${id}` });
+            console.log( 'getChartData', id, result );
 
 		let chart = { ...this.state.chart };
 
@@ -406,6 +418,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

@@ -162,6 +162,17 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 13. Bar chart
 
 ## Changelog ##
+### 3.4.3 - 2020-05-04  ###
+
+* [Feat] Improved chart creation UX
+* [Feat] New option to control the number of charts per page in the Charts Library
+* [Feat] New option for filtering/ordering charts in the Charts Library
+* [Feat] Support for custom codes for the boolean data type in Table charts
+* [Fix] Support for displaying apostrophes in charts
+* [Fix] Visualizer button layout in the Classic block
+* [Fix] Bulk activation of plugin aborts activation of subsequent plugins
+
+
 ### 3.4.2 - 2020-02-17  ###
 
 * New Cypress tests for the Gutenberg block
@@ -542,4 +553,4 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 * The bug with CSV file uploading was fixed.
 
 ### 1.0.0 ###
-* The first version of what wil be the best wp charts plugin.
+* The first version of what wil be the best wp charts plugin.

readme.md

@@ -162,6 +162,17 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 13. Bar chart
 
 == Changelog ==
+= 3.4.3 - 2020-05-04  = 
+
+* [Feat] Improved chart creation UX
+* [Feat] New option to control the number of charts per page in the Charts Library
+* [Feat] New option for filtering/ordering charts in the Charts Library
+* [Feat] Support for custom codes for the boolean data type in Table charts
+* [Fix] Support for displaying apostrophes in charts
+* [Fix] Visualizer button layout in the Classic block
+* [Fix] Bulk activation of plugin aborts activation of subsequent plugins
+
+
 = 3.4.2 - 2020-02-17  = 
 
 * New Cypress tests for the Gutenberg block

readme.txt

@@ -1 +1 @@
-{"index.php":"1c0c5ae1729bc8087c5c2bef281bd2e6"}
+{"index.php":"2701e13e479319c5fdcf252bd9f44f77"}