Merge pull request #258 from gocodebox/dev

Release 2.6.1

Author: brianhogg

CHANGELOG.md

@@ -1,6 +1,14 @@
 LifterLMS Blocks Changelog
 ==========================
 
+v2.6.1 - 2025-08-18
+-------------------
+
+##### Bug Fixes
+
++ Avoid unsaved changes warning with the course instructors block.
+
+
 v2.6.0 - 2025-07-17
 -------------------
 

includes/blocks/class-llms-blocks-instructors-block.php

@@ -75,11 +75,7 @@ public function get_attributes() {
 		return array_merge(
 			parent::get_attributes(),
 			array(
-				'post_id'  => array(
-					'type'    => 'integer',
-					'default' => 0,
-				),
-				'_refresh' => array(
+				'post_id' => array(
 					'type'    => 'integer',
 					'default' => 0,
 				),

lifterlms-blocks.php

@@ -11,7 +11,7 @@
  * Plugin Name: LifterLMS Blocks
  * Plugin URI: https://github.com/gocodebox/lifterlms-blocks
  * Description: WordPress Editor (Gutenberg) blocks for LifterLMS.
- * Version: 2.6.0
+ * Version: 2.6.1
  * Author: LifterLMS
  * Author URI: https://lifterlms.com/
  * Text Domain: lifterlms
@@ -27,7 +27,7 @@
 
 // Define Constants.
 if ( ! defined( 'LLMS_BLOCKS_VERSION' ) ) {
-	define( 'LLMS_BLOCKS_VERSION', '2.6.0' );
+	define( 'LLMS_BLOCKS_VERSION', '2.6.1' );
 }
 
 /**

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lifterlms-blocks",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "blocks",
   "author": "LifterLMS",
   "homepage": "https://lifterlms.com/",

package.json

@@ -30,9 +30,23 @@ class InstructorsEdit extends Component {
 
 		this.state = {
 			instructors: this.props.instructors,
+			// Used to force a remount of <ServerSideRender /> after a save finishes.
+			ssrNonce: 0,
 		};
 	}
 
+	/**
+	 * When a save transitions from "saving" -> "not saving", bump the nonce
+	 * so the SSR component remounts and refetches fresh HTML.
+	 *
+	 * @param {Object} prevProps
+	 */
+	componentDidUpdate( prevProps ) {
+		if ( prevProps.isSavingPost && ! this.props.isSavingPost ) {
+			this.setState( { ssrNonce: Date.now() } );
+		}
+	}
+
 	/**
 	 * Render component
 	 *
@@ -42,15 +56,15 @@ class InstructorsEdit extends Component {
 	 */
 	render = () => {
 		const { name, attributes, post_id } = this.props; // eslint-disable-line camelcase
+		const { ssrNonce } = this.state;
 
 		return (
 			<Fragment>
 				<ServerSideRender
+					key={ ssrNonce } // remount -> refetch on save complete
 					block={ name }
 					attributes={ attributes }
-					urlQueryArgs={ {
-						post_id,
-					} }
+					urlQueryArgs={ { post_id } }
 				/>
 			</Fragment>
 		);
@@ -66,12 +80,13 @@ class InstructorsEdit extends Component {
  */
 export default compose( [
 	withSelect( ( select ) => {
-		const { getEditedPostAttribute, getCurrentPostId } = select(
-			'core/editor'
-		);
+		const { getEditedPostAttribute, getCurrentPostId, isSavingPost } =
+			select( 'core/editor' );
+
 		return {
 			post_id: getCurrentPostId(),
 			instructors: getEditedPostAttribute( 'instructors' ),
+			isSavingPost: isSavingPost(),
 		};
 	} ),
 ] )( InstructorsEdit );

src/js/blocks/instructors/edit.js

@@ -33,27 +33,6 @@ export const name = 'llms/instructors';
  */
 export const postTypes = [ 'course', 'llms_membership' ];
 
-let wasSaving = false;
-
-subscribe( () => {
-	const isSaving = select( 'core/edit-post' ).isSavingMetaBoxes();
-
-	if ( wasSaving && ! isSaving ) {
-		wasSaving = isSaving;
-
-		select( 'core/block-editor' )
-			.getBlocks()
-			.filter( ( b ) => b.name === name )
-			.forEach( ( b ) =>
-				dispatch( 'core/block-editor' ).updateBlockAttributes(
-					b.clientId,
-					{ _refresh: Date.now() }
-				)
-			);
-	} else {
-		wasSaving = isSaving;
-	}
-} );
 /**
  * Register Block.
  *
@@ -75,10 +54,6 @@ export const settings = {
 		post_id: {
 			type: 'integer',
 			default: 0,
-		},
-		_refresh: {
-			type: 'integer',
-			default: 0,
 		}
 	},