Merge pull request #710 from Codeinwp/fixes/revison-wipe

fixes for revison wipe

Author: rodica-andronache

classes/Visualizer/Gutenberg/Block.php

@@ -520,7 +520,9 @@ public function update_chart_data( $data ) {
 		}
 
 		if ( $data['id'] && ! is_wp_error( $data['id'] ) ) {
-
+			if ( get_post_type( $data['id'] ) !== Visualizer_Plugin::CPT_VISUALIZER ) {
+				return new WP_Error( 'invalid_post_type', 'Invalid post type.' );
+			}
 			$chart_type = sanitize_text_field( $data['visualizer-chart-type'] );
 			$source_type = sanitize_text_field( $data['visualizer-source'] );
 

classes/Visualizer/Module.php

@@ -395,22 +395,38 @@ private function _getHTML( $rows ) {
 		);
 	}
 
+	/**
+	 * Disable revisions temporarily for visualizer post type.
+	 */
+	protected final function disableRevisionsTemporarily() {
+		add_filter(
+			'wp_revisions_to_keep', function( $num, $post ) {
+				if ( $post->post_type === Visualizer_Plugin::CPT_VISUALIZER ) {
+					return 0;
+				}
+				return $num;
+			}, 10, 2
+		);
+	}
+
 	/**
 	 * Undo revisions for the chart, and if necessary, restore the earliest version.
 	 *
 	 * @return bool If any revisions were found.
 	 */
 	public final function undoRevisions( $chart_id, $restore = false ) {
 		do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'undoRevisions for %d with%s restore', $chart_id, ( $restore ? '' : 'out' ) ), 'debug', __FILE__, __LINE__ );
-
+		if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) {
+			return false;
+		}
 		$revisions = wp_get_post_revisions( $chart_id, array( 'order' => 'ASC' ) );
 		if ( count( $revisions ) > 1 ) {
 			$revision_ids = array_keys( $revisions );
 
 			do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'found %d revisions = %s', count( $revisions ), print_r( $revision_ids, true ) ), 'debug', __FILE__, __LINE__ );
 
 			// when we restore, a new revision is likely to be created. so, let's disable revisions for the time being.
-			add_filter( 'wp_revisions_to_keep', '__return_false' );
+			$this->disableRevisionsTemporarily();
 
 			if ( $restore ) {
 				// restore to the oldest one i.e. the first one.
@@ -431,8 +447,11 @@ public final function undoRevisions( $chart_id, $restore = false ) {
 	 * If existing revisions exist for the chart, restore the earliest version and then create a new revision to initiate editing.
 	 */
 	public final function handleExistingRevisions( $chart_id, $chart ) {
-		do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ );
 
+		do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ );
+		if ( get_post_type( $chart_id ) !== Visualizer_Plugin::CPT_VISUALIZER ) {
+			return $chart_id;
+		}
 		// undo revisions.
 		$revisions_found    = $this->undoRevisions( $chart_id, true );
 

classes/Visualizer/Module/Chart.php

@@ -684,7 +684,8 @@ private function _handleDataAndSettingsPage() {
 
 				// ensure that a revision is not created. If a revision is created it will have the proper data and the parent of the revision will have default data.
 				// we do not want any difference in data so disable revisions temporarily.
-				add_filter( 'wp_revisions_to_keep', '__return_false' );
+				$this->disableRevisionsTemporarily();
+
 				wp_update_post( $this->_chart->to_array() );
 			}
 			// save meta data only when it is NOT being canceled.

classes/Visualizer/Module/Setup.php

@@ -298,7 +298,7 @@ public function refresh_db_for_chart( $chart, $chart_id, $force = false ) {
 
 		$error      = $source->get_error();
 		if ( empty( $error ) ) {
-			add_filter( 'wp_revisions_to_keep', '__return_false' );
+			$this->disableRevisionsTemporarily();
 			if ( $load_series ) {
 				update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
 			}

tests/test-import.php

@@ -232,6 +232,8 @@ public function test_db_import() {
 	 * @access public
 	 */
 	public function fileProvider() {
+		$this->assertFileExists( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples', 'Folder "samples" does not exist' );
+
 		$file = VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'bar.csv';
 		list( $content, $series ) = $this->parseFile( $file );
 
@@ -305,6 +307,8 @@ private function parseFile( $file, $multiplyValuesBy = 1 ) {
 	 * @access public
 	 */
 	public function urlProvider() {
+		$this->assertFileExists( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples', 'Folder "samples" does not exist' );
+
 		$url  = 'https://demo.themeisle.com/wp-content/plugins/visualizer/samples/bar.csv';
 		$file = download_url( $url );
 		list( $content, $series ) = $this->parseFile( $file );

tests/test-revisions.php

@@ -272,6 +272,8 @@ public function test_chart_edit_save( $file_orig, $file_new ) {
 	 * @access public
 	 */
 	public function fileProvider() {
+		$this->assertFileExists( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples', 'Folder "samples" does not exist' );
+
 		return array(
 			array( VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'line.csv', VISUALIZER_ABSPATH . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'bar.csv' ),
 		);