Merge pull request #657 from contactashish13/issue-655

UX Changes to chart settings

Author: rodica-andronache

classes/Visualizer/Module.php

@@ -706,7 +706,7 @@ public static function get_chart_data( $chart, $type, $run_filter = true ) {
 		$data = unserialize( html_entity_decode( $chart->post_content ) );
 		$altered = array();
 		foreach ( $data as $index => $array ) {
-			if ( ! is_array( $index ) ) {
+			if ( ! is_array( $index ) && is_array( $array ) ) {
 				foreach ( $array as &$datum ) {
 					if ( is_string( $datum ) ) {
 						$datum = stripslashes( $datum );

classes/Visualizer/Module/Chart.php

@@ -534,7 +534,7 @@ public function renderChartPages() {
 		wp_register_style( 'visualizer-chosen', VISUALIZER_ABSURL . 'css/lib/chosen.min.css', array(), Visualizer_Plugin::VERSION );
 
 		wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array( 'visualizer-chosen' ), Visualizer_Plugin::VERSION );
-		wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion' ), Visualizer_Plugin::VERSION, true );
+		wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'visualizer-chosen', 'jquery-ui-accordion', 'jquery-ui-tabs' ), Visualizer_Plugin::VERSION, true );
 		wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
 		wp_register_script(
 			'visualizer-render',
@@ -575,6 +575,7 @@ public function renderChartPages() {
 			// if the cancel button is clicked.
 			$this->undoRevisions( $chart_id, true );
 		} elseif ( isset( $_POST['save'] ) && 1 === intval( $_POST['save'] ) ) {
+			$this->handlePermissions();
 			// if the save button is clicked.
 			$this->undoRevisions( $chart_id, false );
 		} else {
@@ -591,7 +592,7 @@ public function renderChartPages() {
 				$this->_handleTypesPage();
 				break;
 			default:
-				do_action( 'visualizer_pro_handle_tab', $tab, $this->_chart );
+				// this should never happen.
 				break;
 		}
 		defined( 'WP_TESTS_DOMAIN' ) ? wp_die() : exit();
@@ -652,13 +653,31 @@ private function loadCodeEditorAssets( $chart_id ) {
 		return $table_col_mapping;
 	}
 
+	/**
+	 * Handle permissions from the new conslidated settings sidebar.
+	 */
+	private function handlePermissions() {
+		if ( ! Visualizer_Module::is_pro() ) {
+			return;
+		}
+
+		// we will not support old free and new pro.
+		// handling new free and old pro.
+		if ( has_action( 'visualizer_pro_handle_tab' ) ) {
+			do_action( 'visualizer_pro_handle_tab', 'permissions', $this->_chart );
+		} else {
+			do_action( 'visualizer_handle_permissions', $this->_chart );
+		}
+	}
+
 	/**
 	 * Handle data and settings page
 	 */
 	private function _handleDataAndSettingsPage() {
 		if ( isset( $_POST['map_api_key'] ) ) {
 			update_option( 'visualizer-map-api-key', $_POST['map_api_key'] );
 		}
+
 		if ( $_SERVER['REQUEST_METHOD'] === 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
 			if ( $this->_chart->post_status === 'auto-draft' ) {
 				$this->_chart->post_status = 'publish';
@@ -691,7 +710,6 @@ private function _handleDataAndSettingsPage() {
 			$render       = new Visualizer_Render_Page_Send();
 			$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
 			wp_iframe( array( $render, 'render' ) );
-
 			return;
 		}
 		$data          = $this->_getChartArray();
@@ -743,6 +761,7 @@ private function _handleDataAndSettingsPage() {
 					'loading'       => esc_html__( 'Loading...', 'visualizer' ),
 					'json_error'    => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
 					'select_columns'    => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ),
+					'save_settings'    => esc_html__( 'The settings seem to have changed. If you want to update your data, please save the chart first to save your settings. If you continue, you may lose your changes.', 'visualizer' ),
 				),
 				'charts' => array(
 					'canvas' => $data,