Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,15 @@ def get_use_new_custom_pages(self, obj):

def get_use_new_schedule_details_page(self, obj):
"""
Method to get the use_new_schedule_details_page switch
Method to indicate whether we should use the new schedule details page.

This used to be based on a waffle flag but the flag is being removed so we
default it to true for now until we can remove the need for it from the consumers
of this serializer and the related APIs.

See https://github.com/openedx/edx-platform/issues/36275
"""
course_key = self.get_course_key()
return toggles.use_new_schedule_details_page(course_key)
return True

def get_use_new_advanced_settings_page(self, obj):
"""
Expand Down
5 changes: 3 additions & 2 deletions cms/djangoapps/contentstore/tests/test_contentstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -1493,8 +1493,9 @@ def test_get_json(handler):
test_get_html('export_handler')
with override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_TEAM, True):
test_get_html('course_team_handler')
with override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True):
test_get_html('settings_handler')
with override_settings(COURSE_AUTHORING_MICROFRONTEND_URL='https://mfe.example'):
resp = self.client.get_html(get_url('settings_handler', course_key, 'course_key_string'))
self.assertEqual(resp.status_code, 302) # noqa: PT009
with override_settings(COURSE_AUTHORING_MICROFRONTEND_URL='https://mfe.example'):
resp = self.client.get_html(get_url('grading_handler', course_key, 'course_key_string'))
self.assertEqual(resp.status_code, 302) # noqa: PT009
Expand Down
350 changes: 18 additions & 332 deletions cms/djangoapps/contentstore/tests/test_course_settings.py

Large diffs are not rendered by default.

19 changes: 0 additions & 19 deletions cms/djangoapps/contentstore/toggles.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,25 +159,6 @@ def use_react_markdown_editor(course_key):
return ENABLE_REACT_MARKDOWN_EDITOR.is_enabled(course_key)


# .. toggle_name: legacy_studio.schedule_details
# .. toggle_implementation: WaffleFlag
# .. toggle_default: False
# .. toggle_description: Temporarily fall back to the old Studio Schedule & Details page.
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2025-03-14
# .. toggle_target_removal_date: 2025-09-14
# .. toggle_tickets: https://github.com/openedx/edx-platform/issues/36275
# .. toggle_warning: In Ulmo, this toggle will be removed. Only the new (React-based) experience will be available.
LEGACY_STUDIO_SCHEDULE_DETAILS = CourseWaffleFlag('legacy_studio.schedule_details', __name__)


def use_new_schedule_details_page(course_key):
"""
Returns a boolean if new studio schedule and details mfe is enabled
"""
return not LEGACY_STUDIO_SCHEDULE_DETAILS.is_enabled(course_key)


# .. toggle_name: legacy_studio.advanced_settings
# .. toggle_implementation: WaffleFlag
# .. toggle_default: False
Expand Down
12 changes: 4 additions & 8 deletions cms/djangoapps/contentstore/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
use_new_export_page,
use_new_group_configurations_page,
use_new_import_page,
use_new_schedule_details_page,
use_new_unit_page,
)
from cms.djangoapps.models.settings.course_grading import CourseGradingModel
Expand Down Expand Up @@ -303,13 +302,10 @@ def get_schedule_details_url(course_locator) -> str:
"""
Gets course authoring microfrontend URL for schedule and details pages view.
"""
schedule_details_url = None
if use_new_schedule_details_page(course_locator):
mfe_base_url = get_course_authoring_url(course_locator)
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/settings/details'
if mfe_base_url:
schedule_details_url = course_mfe_url
return schedule_details_url
mfe_base_url = get_course_authoring_url(course_locator)
if mfe_base_url:
return f'{mfe_base_url}/course/{course_locator}/settings/details'
return None


def get_advanced_settings_url(course_locator) -> str:
Expand Down
7 changes: 1 addition & 6 deletions cms/djangoapps/contentstore/views/course.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,12 @@
default_enable_flexible_peer_openassessments,
use_new_advanced_settings_page,
use_new_group_configurations_page,
use_new_schedule_details_page,
)
from ..utils import (
add_instructor,
get_advanced_settings_url,
get_course_outline_url,
get_course_rerun_context,
get_course_settings,
get_grading_url,
get_group_configurations_context,
get_group_configurations_url,
Expand Down Expand Up @@ -1380,10 +1378,7 @@ def settings_handler(request, course_key_string): # pylint: disable=too-many-st
with modulestore().bulk_operations(course_key):
course_block = get_course_and_check_access(course_key, request.user)
if 'text/html' in request.META.get('HTTP_ACCEPT', '') and request.method == 'GET':
if use_new_schedule_details_page(course_key):
return redirect(get_schedule_details_url(course_key))
settings_context = get_course_settings(request, course_key, course_block)
return render_to_response('settings.html', settings_context)
return redirect(get_schedule_details_url(course_key))
elif 'application/json' in request.META.get('HTTP_ACCEPT', ''): # pylint: disable=too-many-nested-blocks
if request.method == 'GET':
course_details = CourseDetails.fetch(course_key)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,9 @@
"""


from unittest import mock

from edx_toggles.toggles.testutils import override_waffle_flag

from cms.djangoapps.contentstore import toggles
from cms.djangoapps.contentstore.tests.utils import CourseTestCase
from cms.djangoapps.contentstore.utils import reverse_course_url
from openedx.core.djangoapps.credit.api import get_credit_requirements
from openedx.core.djangoapps.credit.models import CreditCourse
from openedx.core.djangoapps.credit.signals.handlers import on_course_publish
from xmodule.modulestore.tests.factories import CourseFactory # pylint: disable=wrong-import-order
from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order


class CreditEligibilityTest(CourseTestCase):
Expand All @@ -25,43 +17,3 @@ def setUp(self):
super().setUp()
self.course = CourseFactory.create(org='edX', number='dummy', display_name='Credit Course')
self.course_details_url = reverse_course_url('settings_handler', str(self.course.id))

@mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_CREDIT_ELIGIBILITY': False})
@override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True)
def test_course_details_with_disabled_setting(self):
"""
Test that user don't see credit eligibility requirements in response
if the feature flag 'ENABLE_CREDIT_ELIGIBILITY' is not enabled.
"""
response = self.client.get_html(self.course_details_url)
self.assertEqual(response.status_code, 200) # noqa: PT009
self.assertNotContains(response, "Course Credit Requirements")
self.assertNotContains(response, "Steps required to earn course credit")

@mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_CREDIT_ELIGIBILITY': True})
@override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True)
def test_course_details_with_enabled_setting(self):
"""
Test that credit eligibility requirements are present in
response if the feature flag 'ENABLE_CREDIT_ELIGIBILITY' is enabled.
"""
# verify that credit eligibility requirements block don't show if the
# course is not set as credit course
response = self.client.get_html(self.course_details_url)
self.assertEqual(response.status_code, 200) # noqa: PT009
self.assertNotContains(response, "Course Credit Requirements")
self.assertNotContains(response, "Steps required to earn course credit")

# verify that credit eligibility requirements block shows if the
# course is set as credit course and it has eligibility requirements
credit_course = CreditCourse(course_key=str(self.course.id), enabled=True)
credit_course.save()
self.assertEqual(len(get_credit_requirements(self.course.id)), 0) # noqa: PT009
# test that after publishing course, minimum grade requirement is added
on_course_publish(self.course.id)
self.assertEqual(len(get_credit_requirements(self.course.id)), 1) # noqa: PT009

response = self.client.get_html(self.course_details_url)
self.assertEqual(response.status_code, 200) # noqa: PT009
self.assertContains(response, "Course Credit Requirements")
self.assertContains(response, "Steps required to earn course credit")
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
},
)
@override_waffle_flag(toggles.LEGACY_STUDIO_CERTIFICATES, True)
@override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True)
@override_waffle_flag(toggles.LEGACY_STUDIO_CONFIGURATIONS, True)
@override_waffle_flag(toggles.LEGACY_STUDIO_ADVANCED_SETTINGS, True)
@override_settings(COURSE_AUTHORING_MICROFRONTEND_URL='https://mfe.example')
Expand All @@ -52,7 +51,6 @@ def _get_exam_settings_alert_text(raw_html_content):
@override_waffle_flag(toggles.LEGACY_STUDIO_EXAM_SETTINGS, True)
@ddt.data(
"certificates_list_handler",
"settings_handler",
"group_configurations_list_handler",
"advanced_settings_handler"
)
Expand All @@ -68,7 +66,6 @@ def test_view_without_exam_settings_enabled(self, handler):

@ddt.data(
"certificates_list_handler",
"settings_handler",
"group_configurations_list_handler",
"advanced_settings_handler"
)
Expand All @@ -88,6 +85,13 @@ def test_grading_handler_redirects_to_mfe(self):
resp = self.client.get(url, HTTP_ACCEPT='text/html')
self.assertEqual(resp.status_code, 302) # noqa: PT009

def test_settings_handler_redirects_to_mfe(self):
"""settings_handler (schedule & details) redirects to the authoring MFE."""
url = reverse_course_url('settings_handler', self.course.id)
resp = self.client.get(url, HTTP_ACCEPT='text/html')
self.assertEqual(resp.status_code, 302) # noqa: PT009


@override_settings(
PROCTORING_BACKENDS={
'DEFAULT': 'test_proctoring_provider',
Expand Down
1 change: 0 additions & 1 deletion cms/static/cms/js/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
'js/factories/index',
'js/factories/manage_users',
'js/factories/outline',
'js/factories/settings',
'js/factories/settings_advanced'
]),
/**
Expand Down
41 changes: 0 additions & 41 deletions cms/static/js/factories/settings.js

This file was deleted.

Loading
Loading