diff --git a/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py b/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py index e61462fecb..78054edb3a 100644 --- a/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py +++ b/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py @@ -50,7 +50,7 @@ def send_ace_message(goal): site = Site.objects.get_current() message_context = get_base_template_context(site) - course_home_url = get_learning_mfe_home_url(course_key=goal.course_key, view_name='home') + course_home_url = get_learning_mfe_home_url(course_key=goal.course_key, url_fragment='home') goals_unsubscribe_url = f'{settings.LEARNING_MICROFRONTEND_URL}/goal-unsubscribe/{goal.unsubscribe_token}' diff --git a/lms/djangoapps/course_home_api/outline/views.py b/lms/djangoapps/course_home_api/outline/views.py index 79b569d20a..ca7c7ac86f 100644 --- a/lms/djangoapps/course_home_api/outline/views.py +++ b/lms/djangoapps/course_home_api/outline/views.py @@ -207,7 +207,7 @@ class OutlineTabView(RetrieveAPIView): if course_home_legacy_is_active(course.id): dates_tab_link = request.build_absolute_uri(reverse('dates', args=[course.id])) else: - dates_tab_link = get_learning_mfe_home_url(course_key=course.id, view_name='dates') + dates_tab_link = get_learning_mfe_home_url(course_key=course.id, url_fragment='dates') # Set all of the defaults access_expiration = None diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py index 5d2d6f6fc4..9c6a8f283e 100644 --- a/lms/djangoapps/courseware/tabs.py +++ b/lms/djangoapps/courseware/tabs.py @@ -47,7 +47,7 @@ class CoursewareTab(EnrolledTab): url_func = course_reverse_func_from_name_func(reverse_name_func) return url_func(course, reverse_func) else: - return get_learning_mfe_home_url(course_key=course.id, view_name='home') + return get_learning_mfe_home_url(course_key=course.id, url_fragment='home') tab_dict['link_func'] = link_func super().__init__(tab_dict) @@ -112,7 +112,7 @@ class ProgressTab(EnrolledTab): def __init__(self, tab_dict): def link_func(course, reverse_func): if course_home_mfe_progress_tab_is_active(course.id): - return get_learning_mfe_home_url(course_key=course.id, view_name=self.view_name) + return get_learning_mfe_home_url(course_key=course.id, url_fragment=self.view_name) else: return reverse_func(self.view_name, args=[str(course.id)]) @@ -337,7 +337,7 @@ class DatesTab(EnrolledTab): if course_home_legacy_is_active(course.id): return reverse_func(self.view_name, args=[str(course.id)]) else: - return get_learning_mfe_home_url(course_key=course.id, view_name=self.view_name) + return get_learning_mfe_home_url(course_key=course.id, url_fragment=self.view_name) tab_dict['link_func'] = link_func super().__init__(tab_dict) diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index 035950e44e..1a0c61984d 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -606,7 +606,7 @@ class ViewsTestCase(BaseViewsTestCase): 'course_id': str(course.id), } ) - mfe_url = get_learning_mfe_home_url(course_key=course.id, view_name='home') + mfe_url = get_learning_mfe_home_url(course_key=course.id, url_fragment='home') with _set_course_home_mfe_flag(activate_mfe): response = self.client.get(reverse('about_course', args=[str(course.id)])) diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py index 3313aac052..52b8760a83 100644 --- a/lms/djangoapps/courseware/views/views.py +++ b/lms/djangoapps/courseware/views/views.py @@ -936,7 +936,7 @@ def course_about(request, course_id): if course_home_legacy_is_active(course.id): course_target = reverse(course_home_url_name(course.id), args=[str(course.id)]) else: - course_target = get_learning_mfe_home_url(course_key=course.id, view_name='home') + course_target = get_learning_mfe_home_url(course_key=course.id, url_fragment='home') else: course_target = reverse('about_course', args=[str(course.id)]) @@ -1061,7 +1061,7 @@ def dates(request, course_id): course_key = CourseKey.from_string(course_id) if not (course_home_legacy_is_active(course_key) or request.user.is_staff): raise Redirect(get_learning_mfe_home_url( - course_key=course_key, view_name=COURSE_DATES_NAME, params=request.GET, + course_key=course_key, url_fragment=COURSE_DATES_NAME, params=request.GET, )) # Enable NR tracing for this view based on course @@ -1133,13 +1133,12 @@ def dates(request, course_id): @data_sharing_consent_required def progress(request, course_id, student_id=None): """ Display the progress page. """ - from lms.urls import COURSE_PROGRESS_NAME - course_key = CourseKey.from_string(course_id) if course_home_mfe_progress_tab_is_active(course_key) and not request.user.is_staff: + end_of_redirect_url = 'progress' if not student_id else f'progress/{student_id}' raise Redirect(get_learning_mfe_home_url( - course_key=course_key, view_name=COURSE_PROGRESS_NAME, params=request.GET, + course_key=course_key, url_fragment=end_of_redirect_url, params=request.GET, )) with modulestore().bulk_operations(course_key): diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py index d47638cda4..91a85312b3 100644 --- a/lms/djangoapps/instructor/views/api.py +++ b/lms/djangoapps/instructor/views/api.py @@ -1737,7 +1737,7 @@ def get_student_progress_url(request, course_id): user = get_student_from_identifier(request.POST.get('unique_student_identifier')) if course_home_mfe_progress_tab_is_active(course_id): - progress_url = get_learning_mfe_home_url(course_id, 'progress') + progress_url = get_learning_mfe_home_url(course_id, url_fragment='progress') if user is not None: progress_url += '/{}/'.format(user.id) else: diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html index c473897794..0ea955a0ae 100644 --- a/lms/templates/dashboard/_dashboard_course_listing.html +++ b/lms/templates/dashboard/_dashboard_course_listing.html @@ -75,7 +75,7 @@ from lms.djangoapps.experiments.utils import UPSELL_TRACKING_FLAG % endif >
- <% course_target = reverse(course_home_url_name(course_overview.id), args=[str(course_overview.id)]) if course_home_legacy_is_active(course_overview.id) else get_learning_mfe_home_url(course_key=course_overview.id, view_name="home") %> + <% course_target = reverse(course_home_url_name(course_overview.id), args=[str(course_overview.id)]) if course_home_legacy_is_active(course_overview.id) else get_learning_mfe_home_url(course_key=course_overview.id, url_fragment="home") %>

${_('Course details')}