MDL-87930 core: fix hidden restricted subsections in navigation

Author: muhammadarnaldo

public/lib/classes/navigation/global_navigation.php

@@ -1228,6 +1228,10 @@ protected function load_section_activities_navigation(
 
             // If activity is a delegated section, load a section node instead of the activity one.
             if ($activitydata->delegatedsection) {
+                $format = course_get_format($activitydata->delegatedsection->course);
+                if (!$format->is_section_visible($activitydata->delegatedsection)) {
+                    continue;
+                }
                 $activitynodes[$activitydata->id] = $this->load_section_navigation(
                     parentnode: $sectionnode,
                     section: $activitydata->delegatedsection,

public/lib/tests/navigation/global_navigation_test.php

@@ -54,4 +54,65 @@ public function test_module_extends_navigation(): void {
         $this->assertTrue($node->exposed_module_extends_navigation('data'));
         $this->assertFalse($node->exposed_module_extends_navigation('test1'));
     }
+
+    /**
+     * Test that subsections with hidden restrictions are not shown in the navigation block.
+     */
+    public function test_load_section_activities_navigation_hidden_subsection_visibility(): void {
+        global $PAGE, $CFG;
+        require_once($CFG->dirroot . '/course/lib.php');
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+        set_config('enableavailability', 1);
+
+        $generator = $this->getDataGenerator();
+        $course = $generator->create_course(['numsections' => 1]);
+
+        $student = $generator->create_user();
+        $generator->enrol_user($student->id, $course->id, 'student');
+
+        // Date condition far in the future: restriction can never be met.
+        // showc:[false] = eye closed (restriction hidden from students).
+        $eyeclosed = '{"op":"&","c":[{"type":"date","d":">=","t":9999999999}],"showc":[false]}';
+        // showc:[true] = eye open (restriction visible to students, MDL-87671 scenario).
+        $eyeopen = '{"op":"&","c":[{"type":"date","d":">=","t":9999999999}],"showc":[true]}';
+
+        $hiddensubsection = $generator->create_module('subsection', [
+            'course' => $course->id,
+            'section' => 1,
+            'availability' => $eyeclosed,
+        ]);
+        $visiblesubsection = $generator->create_module('subsection', [
+            'course' => $course->id,
+            'section' => 1,
+            'availability' => $eyeopen,
+        ]);
+
+        rebuild_course_cache($course->id, true);
+        $course = get_course($course->id);
+
+        $this->setUser($student);
+        $PAGE->set_url('/course/view.php', ['id' => $course->id]);
+        $PAGE->set_course($course);
+        $PAGE->set_context(\core\context\course::instance($course->id));
+
+        $modinfo = get_fast_modinfo($course);
+        $section1 = $modinfo->get_section_info(1);
+        $hiddeninfo = $modinfo->get_section_info_by_component('mod_subsection', $hiddensubsection->id);
+        $visibleinfo = $modinfo->get_section_info_by_component('mod_subsection', $visiblesubsection->id);
+
+        $nav = new exposed_global_navigation($PAGE);
+        $nav->set_initialised();
+
+        [, $activities] = $nav->exposed_generate_sections_and_activities($course);
+
+        $sectionnode = $nav->add('Section 1', null, navigation_node::TYPE_SECTION, null, $section1->id);
+        $nav->exposed_load_section_activities_navigation($sectionnode, $section1, $activities);
+
+        // Eye-closed restricted subsection must NOT appear in the navigation block.
+        $this->assertFalse($sectionnode->find($hiddeninfo->id, navigation_node::TYPE_SECTION));
+        // Eye-open restricted subsection MUST appear in navigation (MDL-87671 behaviour).
+        $this->assertNotFalse($sectionnode->find($visibleinfo->id, navigation_node::TYPE_SECTION));
+    }
 }