Merge pull request #7579 from Automattic/revert-7577-revert-7558-fix/…

…viewing-lesson-content Revert "Revert "Don't display "Complete Lesson" button if student doesn't have access""
Automattic · Apr 4, 2024 · 58d96dc · 58d96dc
2 parents fea167f + 29f1e96
commit 58d96dc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/changelog/fix-viewing-lesson-content b/changelog/fix-viewing-lesson-content
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Ensure student can view the lesson content when rendering the Complete Lesson button
diff --git a/includes/blocks/class-sensei-complete-lesson-block.php b/includes/blocks/class-sensei-complete-lesson-block.php
@@ -37,7 +37,11 @@ public function __construct() {
 	 *
 	 * @return string The block HTML.
 	 */
-	public function render( array $attributes, string $content ) : string {
+	public function render( array $attributes, string $content ): string {
+		if ( ! sensei_can_user_view_lesson() ) {
+			return '';
+		}
+
 		$lesson = get_post();
 
 		if ( empty( $lesson ) ) {
@@ -51,7 +55,6 @@ public function render( array $attributes, string $content ) : string {
 		}
 
 		if ( false === Sensei()->lesson->lesson_has_quiz_with_questions_and_pass_required( $lesson->ID ) ) {
-
 			return $this->render_with_form( $attributes, $content );
 		}
 
@@ -66,7 +69,7 @@ public function render( array $attributes, string $content ) : string {
 	 *
 	 * @return string The HTML to render.
 	 */
-	private function render_with_form( array $attributes, string $content ) : string {
+	private function render_with_form( array $attributes, string $content ): string {
 		wp_enqueue_script( 'sensei-stop-double-submission' );
 		$nonce     = wp_nonce_field( 'woothemes_sensei_complete_lesson_noonce', 'woothemes_sensei_complete_lesson_noonce', false, false );
 		$permalink = esc_url( get_permalink() );

diff --git a/includes/blocks/course-theme/class-lesson-actions.php b/includes/blocks/course-theme/class-lesson-actions.php
@@ -53,6 +53,10 @@ public function __construct() {
 	 * @return string The complete lesson button.
 	 */
 	private function render_complete_lesson( string $button_class, bool $is_outline_style, bool $is_disabled ): string {
+		if ( ! sensei_can_user_view_lesson() ) {
+			return '';
+		}
+
 		$button_style_class = $is_outline_style ? 'is-style-outline' : '';
 		$disabled_attribute = $is_disabled ? 'disabled' : '';
 

diff --git a/tests/unit-tests/blocks/course-theme/test-class-lesson-actions.php b/tests/unit-tests/blocks/course-theme/test-class-lesson-actions.php
@@ -191,9 +191,9 @@ public function testAlreadyCompletedNoNextLesson() {
 	}
 
 	/**
-	 * Test lesson actions block for a lesson with a pre-requisite lesson.
+	 * Test lesson actions block for a lesson with an unmet prerequisite.
 	 */
-	public function testHasPreRequisite() {
+	public function testHasPrerequisite() {
 		list( $lesson1, $course ) = $this->create_enrolled_lesson_with_quiz();
 		$lesson2                  = $this->factory->lesson->create_and_get(
 			[
@@ -212,9 +212,7 @@ public function testHasPreRequisite() {
 		$GLOBALS['post'] = $lesson2;
 		$block           = new Lesson_Actions();
 
-		// Check for disabled button.
-		$this->assertStringContainsString( ' disabled', $block->render(), 'Should render disabled button if lesson has a pre-requisite.' );
-		$this->assertStringContainsString( 'aria-disabled="true"', $block->render(), 'Should render disabled button if lesson has a pre-requisite.' );
+		$this->assertStringNotContainsString( 'Complete Lesson', $block->render(), 'Should not render button if lesson has an unmet prerequisite.' );
 	}
 
 	/**