undo revisions in the library and on clicking edit button

Author: contactashish13

classes/Visualizer/Module.php

@@ -323,4 +323,48 @@ private function _getHTML( $rows ) {
 		);
 	}
 
+	/**
+	 * Undo revisions for the chart, and if necessary, restore the earliest version.
+	 *
+	 * @return bool If any revisions were found.
+	 */
+	protected function undoRevisions( $chart_id, $restore = false ) {
+		$revisions = wp_get_post_revisions( $chart_id, array( 'order' => 'ASC' ) );
+		if ( $revisions ) {
+			$revision_ids = array_keys( $revisions );
+
+			// 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' );
+
+			if ( $restore ) {
+				// restore to the oldest one i.e. the first one.
+				wp_restore_post_revision( $revision_ids[0] );
+			}
+
+			// delete all revisions.
+			foreach ( $revision_ids as $id ) {
+				wp_delete_post_revision( $id );
+			}
+
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * If existing revisions exist for the chart, restore the earliest version and then create a new revision to initiate editing.
+	 */
+	protected function handleExistingRevisions( $chart_id, $chart ) {
+		// undo revisions.
+		$revisions_found	= $this->undoRevisions( $chart_id, true );
+		// create revision for the edit action.
+		wp_save_post_revision( $chart_id );
+
+		if ( $revisions_found ) {
+			// fetch chart data again in case it was updated by an earlier revision.
+			$chart = get_post( $chart_id );
+		}
+		return $chart;
+	}
+
 }

classes/Visualizer/Module/Admin.php

@@ -496,6 +496,10 @@ public function renderLibraryPage() {
 		$query  = new WP_Query( $query_args );
 		while ( $query->have_posts() ) {
 			$chart = $query->next_post();
+
+			// if the user has updated a chart and instead of saving it, has closed the modal. If the user refreshes, they should get the original chart.
+			$chart = $this->handleExistingRevisions( $chart->ID, $chart );
+
 			// fetch and update settings
 			$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
 			unset( $settings['height'], $settings['width'] );

classes/Visualizer/Module/Chart.php

@@ -57,9 +57,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		$this->_addAjaxAction( Visualizer_Plugin::ACTION_EDIT_CHART, 'renderChartPages' );
 		$this->_addAjaxAction( Visualizer_Plugin::ACTION_UPLOAD_DATA, 'uploadData' );
 		$this->_addAjaxAction( Visualizer_Plugin::ACTION_CLONE_CHART, 'cloneChart' );
-		// Added by Ash/Upwork
 		$this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
-		// Added by Ash/Upwork
 	}
 
 	/**
@@ -281,7 +279,7 @@ public function renderChartPages() {
 			$this->undoRevisions( $chart_id, false );
 		} else {
 			// if the edit button is clicked.
-			$rev = wp_save_post_revision( $chart_id );
+			$this->_chart = $this->handleExistingRevisions( $chart_id, $this->_chart );
 		}
 
 		switch ( $tab ) {
@@ -613,26 +611,4 @@ private function _handleDataPage() {
 		wp_iframe( array( $render, 'render' ) );
 	}
 
-	/**
-	 * Undo revisions for the chart, and if necessary, restore the earliest version.
-	 */
-	private function undoRevisions( $chart_id, $restore = false ) {
-		$revisions = wp_get_post_revisions( $chart_id, array( 'order' => 'ASC' ) );
-		if ( $revisions ) {
-			$revision_ids = array_keys( $revisions );
-
-			// 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' );
-
-			if ( $restore ) {
-				// restore to the oldest one i.e. the first one.
-				wp_restore_post_revision( $revision_ids[0] );
-			}
-
-			// delete all revisions.
-			foreach ( $revision_ids as $id ) {
-				wp_delete_post_revision( $id );
-			}
-		}
-	}
 }