Merge pull request #462 from contactashish13/issue-459

Better error messages for invalid CSVs/URLs

Author: contactashish13

classes/Visualizer/Module/Chart.php

@@ -131,7 +131,7 @@ public function getJsonRoots() {
 
 		$roots = $source->fetchRoots();
 		if ( empty( $roots ) ) {
-			wp_send_json_error();
+			wp_send_json_error( array( 'msg' => $source->get_error() ) );
 		}
 
 		wp_send_json_success( array( 'url' => $params['url'], 'roots' => $roots ) );
@@ -159,7 +159,7 @@ public function getJsonData() {
 
 		$data   = $source->parse();
 		if ( empty( $data ) ) {
-			wp_send_json_error();
+			wp_send_json_error( array( 'msg' => esc_html__( 'Unable to fetch data from the endpoint. Please try again.', 'visualizer' ) ) );
 		}
 
 		$data   = Visualizer_Render_Layout::show( 'editor-table', $data, $chart_id, 'viz-json-table', false, false );
@@ -964,7 +964,7 @@ public function uploadData() {
 		} elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) {
 			$source = $this->handleTabularData();
 		} else {
-			$render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
+			$render->message = esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' );
 		}
 		if ( $source ) {
 			if ( $source->fetch() ) {
@@ -996,7 +996,10 @@ public function uploadData() {
 				$render->series = json_encode( $source->getSeries() );
 				$render->settings = json_encode( $settings );
 			} else {
-				$render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
+				$render->message = $source->get_error();
+				if ( empty( $render->message ) ) {
+					$render->message = esc_html__( 'CSV file is broken or invalid. Please try again.', 'visualizer' );
+				}
 			}
 		}
 		$render->render();

classes/Visualizer/Render/Page/Data.php

@@ -182,10 +182,10 @@ class="visualizer-select">
 								</li>
 
 								<li class="viz-subsection">
-								<span class="viz-section-title visualizer_source_json"><?php _e( 'Import from JSON/REST', 'visualizer' ); ?>
+								<span class="viz-section-title visualizer_source_json"><?php _e( 'Import from JSON', 'visualizer' ); ?>
 									<span class="dashicons dashicons-lock"></span></span>
 									<div class="viz-section-items section-items">
-										<p class="viz-group-description"><?php _e( 'You can choose here to import/synchronize your chart data with a remote JSON/REST source. For more info check <a href="https://docs.themeisle.com/article/1052-how-to-generate-charts-from-json-data-rest-endpoints" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
+										<p class="viz-group-description"><?php _e( 'You can choose here to import/synchronize your chart data with a remote JSON source. For more info check <a href="https://docs.themeisle.com/article/1052-how-to-generate-charts-from-json-data-rest-endpoints" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
 										<form id="vz-import-json" action="<?php echo $upload_link; ?>" method="post" target="thehole" enctype="multipart/form-data">
 											<div class="remote-file-section">
 													<?php

classes/Visualizer/Source/Csv.php

@@ -77,20 +77,18 @@ private function _fetchSeries( &$handle ) {
 			$types = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
 		}
 
+		$labels = array_filter( $labels );
+		$types = array_filter( $types );
+
 		if ( ! $labels || ! $types ) {
+			$this->_error = esc_html__( 'File should have a heading row (1st row) and a data type row (2nd row). Please try again.', 'visualizer' );
 			return false;
 		}
 
-		// if no types were setup, re read labels and empty types array
 		$types = array_map( 'trim', $types );
 		if ( ! self::_validateTypes( $types ) ) {
-			// re open the file
-			fclose( $handle );
-			$handle = $this->_get_file_handle();
-
-			// re read the labels and empty types array
-			$labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
-			$types = array();
+			$this->_error = esc_html__( 'Invalid data types detected in the data type row (2nd row). Please try again.', 'visualizer' );
+			return false;
 		}
 
 		for ( $i = 0, $len = count( $labels ); $i < $len; $i++ ) {
@@ -134,6 +132,7 @@ protected function _get_file_handle( $filename = false ) {
 	public function fetch() {
 		// if filename is empty return false
 		if ( empty( $this->_filename ) ) {
+			$this->_error = esc_html__( 'No file provided. Please try again.', 'visualizer' );
 			return false;
 		}
 

classes/Visualizer/Source/Json.php

@@ -107,7 +107,12 @@ public function fetchRoots() {
 		if ( false !== $roots ) {
 			return $roots;
 		}
-		return $this->getRootElements( 'root', '', array(), $this->getJSON() );
+		$roots = $this->getRootElements( 'root', '', array(), $this->getJSON() );
+		if ( empty( $roots ) ) {
+			$this->_error = esc_html__( 'This does not appear to be a valid JSON feed. Please try again.', 'visualizer' );
+			return false;
+		}
+		return $roots;
 	}
 
 	/**

js/frame.js

@@ -390,7 +390,7 @@
                         $('#json-root-form').fadeIn('medium');
                         json_accordion_activate(1, true);
                     }else{
-                        alert(visualizer.l10n.json_error);
+                        alert(data.data.msg);
                     }
                 },
                 complete: function(){
@@ -435,7 +435,7 @@
                         json_accordion_activate(2, false);
                         $table.columns.adjust().draw();
                     }else{
-                        alert(visualizer.l10n.json_error);
+                        alert(data.data.msg);
                     }
                 },
                 complete: function(){