From ff5b3d532d4df28b086bbc2f8cca79a3893d5103 Mon Sep 17 00:00:00 2001 From: AsadAzam Date: Wed, 16 Jun 2021 18:45:07 +0500 Subject: [PATCH] Move pages and resource mfe link to content menu (#27937) --- .../contentstore/views/certificates.py | 8 +++++++- cms/djangoapps/contentstore/views/checklists.py | 3 ++- cms/djangoapps/contentstore/views/course.py | 6 ++++++ cms/djangoapps/contentstore/views/tabs.py | 3 +-- .../contentstore/views/tests/test_tabs.py | 16 ---------------- cms/templates/edit-tabs.html | 5 ----- cms/templates/widgets/header.html | 5 +++++ 7 files changed, 21 insertions(+), 25 deletions(-) diff --git a/cms/djangoapps/contentstore/views/certificates.py b/cms/djangoapps/contentstore/views/certificates.py index 95aedb85e2..4e6a453bcd 100644 --- a/cms/djangoapps/contentstore/views/certificates.py +++ b/cms/djangoapps/contentstore/views/certificates.py @@ -47,7 +47,12 @@ from xmodule.modulestore import EdxJSONEncoder from xmodule.modulestore.django import modulestore from ..exceptions import AssetNotFoundException -from ..utils import get_lms_link_for_certificate_web_view, get_proctored_exam_settings_url, reverse_course_url +from ..utils import ( + get_lms_link_for_certificate_web_view, + get_pages_and_resources_url, + get_proctored_exam_settings_url, + reverse_course_url +) from .assets import delete_asset CERTIFICATE_SCHEMA_VERSION = 1 @@ -425,6 +430,7 @@ def certificates_list_handler(request, course_key_string): 'is_global_staff': GlobalStaff().has_user(request.user), 'certificate_activation_handler_url': activation_handler_url, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course.id), + 'pages_and_resources_mfe_link': get_pages_and_resources_url(course.id), }) elif "application/json" in request.META.get('HTTP_ACCEPT'): # Retrieve the list of certificates for the specified course diff --git a/cms/djangoapps/contentstore/views/checklists.py b/cms/djangoapps/contentstore/views/checklists.py index d9a440200a..7149d57797 100644 --- a/cms/djangoapps/contentstore/views/checklists.py +++ b/cms/djangoapps/contentstore/views/checklists.py @@ -6,7 +6,7 @@ from opaque_keys.edx.keys import CourseKey from common.djangoapps.edxmako.shortcuts import render_to_response from common.djangoapps.student.auth import has_course_author_access -from cms.djangoapps.contentstore.utils import get_proctored_exam_settings_url +from cms.djangoapps.contentstore.utils import get_pages_and_resources_url, get_proctored_exam_settings_url from xmodule.modulestore.django import modulestore __all__ = ['checklists_handler'] @@ -32,4 +32,5 @@ def checklists_handler(request, course_key_string=None): 'language_code': request.LANGUAGE_CODE, 'context_course': course_module, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), + 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), }) diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py index 44ea5c58bb..2c63c50c43 100644 --- a/cms/djangoapps/contentstore/views/course.py +++ b/cms/djangoapps/contentstore/views/course.py @@ -96,6 +96,7 @@ from ..toggles import split_library_view_on_dashboard from ..utils import ( add_instructor, get_lms_link_for_item, + get_pages_and_resources_url, get_proctored_exam_settings_url, initialize_permissions, remove_all_instructors, @@ -727,6 +728,7 @@ def course_index(request, course_key): 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), 'advance_settings_url': reverse_course_url('advanced_settings_handler', course_module.id), 'proctoring_errors': proctoring_errors, + 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), }) @@ -1163,6 +1165,7 @@ def settings_handler(request, course_key_string): # lint-amnesty, pylint: disab 'enable_extended_course_details': enable_extended_course_details, 'upgrade_deadline': upgrade_deadline, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), + 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), } if is_prerequisite_courses_enabled(): courses, in_process_course_actions = get_courses_accessible_to_user(request) @@ -1283,6 +1286,7 @@ def grading_handler(request, course_key_string, grader_index=None): 'grading_url': reverse_course_url('grading_handler', course_key), 'is_credit_course': is_credit_course(course_key), 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), + 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), }) elif 'application/json' in request.META.get('HTTP_ACCEPT', ''): if request.method == 'GET': @@ -1388,6 +1392,7 @@ def advanced_settings_handler(request, course_key_string): 'advanced_settings_url': reverse_course_url('advanced_settings_handler', course_key), 'publisher_enabled': publisher_enabled, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), + 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), 'proctoring_errors': proctoring_errors, }) elif 'application/json' in request.META.get('HTTP_ACCEPT', ''): @@ -1740,6 +1745,7 @@ def group_configurations_list_handler(request, course_key_string): 'all_group_configurations': displayable_partitions, 'should_show_enrollment_track': should_show_enrollment_track, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course.id), + 'pages_and_resources_mfe_link': get_pages_and_resources_url(course.id), }) elif "application/json" in request.META.get('HTTP_ACCEPT'): if request.method == 'POST': diff --git a/cms/djangoapps/contentstore/views/tabs.py b/cms/djangoapps/contentstore/views/tabs.py index 1e9df725c4..ade51e2cd3 100644 --- a/cms/djangoapps/contentstore/views/tabs.py +++ b/cms/djangoapps/contentstore/views/tabs.py @@ -15,7 +15,7 @@ from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.django import modulestore from xmodule.tabs import CourseTab, CourseTabList, InvalidTabsException, StaticTab -from ..utils import get_lms_link_for_item, get_pages_and_resources_url +from ..utils import get_lms_link_for_item __all__ = ['tabs_handler'] @@ -71,7 +71,6 @@ def tabs_handler(request, course_key_string): 'context_course': course_item, 'tabs_to_render': tabs_to_render, 'lms_link': get_lms_link_for_item(course_item.location), - 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_item.id), }) else: return HttpResponseNotFound() diff --git a/cms/djangoapps/contentstore/views/tests/test_tabs.py b/cms/djangoapps/contentstore/views/tests/test_tabs.py index caeb4cfa2c..96ae6a98cf 100644 --- a/cms/djangoapps/contentstore/views/tests/test_tabs.py +++ b/cms/djangoapps/contentstore/views/tests/test_tabs.py @@ -2,10 +2,7 @@ import json -import ddt -from edx_toggles.toggles.testutils import override_waffle_flag -from cms.djangoapps.contentstore.config.waffle import ENABLE_PAGES_AND_RESOURCES_MICROFRONTEND from cms.djangoapps.contentstore.tests.utils import CourseTestCase from cms.djangoapps.contentstore.utils import reverse_course_url from cms.djangoapps.contentstore.views import tabs @@ -16,7 +13,6 @@ from xmodule.tabs import CourseTabList from xmodule.x_module import STUDENT_VIEW -@ddt.ddt class TabsPageTests(CourseTestCase): """Test cases for Tabs (a.k.a Pages) page""" @@ -75,18 +71,6 @@ class TabsPageTests(CourseTestCase): resp = self.client.get_html(self.url) self.assertContains(resp, 'course-nav-list') - @ddt.data( - # toggle active, assert count - (True, 1), - (False, 0), - ) - @ddt.unpack - def test_pages_and_resources_toggle(self, toggle_active, assert_count): - """Basic check that the Pages page responds correctly""" - with override_waffle_flag(ENABLE_PAGES_AND_RESOURCES_MICROFRONTEND, active=toggle_active): - resp = self.client.get_html(self.url) - self.assertContains(resp, 'View new Pages and Resources Experience', count=assert_count) - def test_reorder_tabs(self): """Test re-ordering of tabs""" diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 34754f7e74..c9e30c3223 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -43,11 +43,6 @@
  • ${_("View Live")}
    • - % if pages_and_resources_mfe_link: -
  • - ${_("View new Pages and Resources Experience")} -
    • - % endif diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 137b33e261..5bb4e3313e 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -81,6 +81,11 @@ ${_("Video Uploads")} % endif + % if pages_and_resources_mfe_link: +
  • + ${_("Pages & Resources")} +
    • + % endif