Merge branch 'master' into ktyagi/SSOPII

Author: ktyagiapphelix2u

cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py

@@ -81,8 +81,7 @@ def get_use_new_advanced_settings_page(self, obj):
         """
         Method to get the use_new_advanced_settings_page switch
         """
-        course_key = self.get_course_key()
-        return toggles.use_new_advanced_settings_page(course_key)
+        return True
 
     def get_use_new_grading_page(self, obj):
         """
@@ -112,15 +111,13 @@ def get_use_new_import_page(self, obj):
         """
         Method to get the use_new_import_page switch
         """
-        course_key = self.get_course_key()
-        return toggles.use_new_import_page(course_key)
+        return True
 
     def get_use_new_export_page(self, obj):
         """
         Method to get the use_new_export_page switch
         """
-        course_key = self.get_course_key()
-        return toggles.use_new_export_page(course_key)
+        return True
 
     def get_use_new_files_uploads_page(self, obj):
         """
@@ -194,8 +191,7 @@ def get_use_new_group_configurations_page(self, obj):
         """
         Method to get the use_new_group_configurations_page switch
         """
-        course_key = self.get_course_key()
-        return toggles.use_new_group_configurations_page(course_key)
+        return True
 
     def get_enable_course_optimizer(self, obj):
         """

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -1487,11 +1487,11 @@ def test_get_json(handler):
         self.assertContains(resp, 'Chapter 2')
 
         # go to various pages
-        with override_waffle_flag(toggles.LEGACY_STUDIO_IMPORT, True):
-            test_get_html('import_handler')
-        with override_waffle_flag(toggles.LEGACY_STUDIO_EXPORT, True):
-            test_get_html('export_handler')
         with override_settings(COURSE_AUTHORING_MICROFRONTEND_URL='https://mfe.example'):
+            resp = self.client.get_html(get_url('import_handler', course_key, 'course_key_string'))
+            self.assertEqual(resp.status_code, 302)  # noqa: PT009
+            resp = self.client.get_html(get_url('export_handler', course_key, 'course_key_string'))
+            self.assertEqual(resp.status_code, 302)  # noqa: PT009
             resp = self.client.get_html(get_url('course_team_handler', course_key, 'course_key_string'))
             self.assertEqual(resp.status_code, 302)  # noqa: PT009
         with override_settings(COURSE_AUTHORING_MICROFRONTEND_URL='https://mfe.example'):
@@ -1500,8 +1500,9 @@ def test_get_json(handler):
         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
-        with override_waffle_flag(toggles.LEGACY_STUDIO_ADVANCED_SETTINGS, True):
-            test_get_html('advanced_settings_handler')
+        with override_settings(COURSE_AUTHORING_MICROFRONTEND_URL='https://mfe.example'):
+            resp = self.client.get_html(get_url('advanced_settings_handler', course_key, 'course_key_string'))
+            self.assertEqual(resp.status_code, 302)  # noqa: PT009
         test_get_json('textbooks_list_handler')
 
         # Test that studio updates load

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -29,7 +29,6 @@
 from pytz import UTC
 from xblock.fields import Date
 
-from cms.djangoapps.contentstore import toggles
 from cms.djangoapps.contentstore.utils import reverse_course_url, reverse_usage_url
 from cms.djangoapps.models.settings.course_grading import (
     GRADING_POLICY_CHANGED_EVENT_TYPE,
@@ -123,18 +122,16 @@ def setUp(self):
         CourseStaffRole(self.course.id).add_users(self.nonstaff)
 
     @override_settings(FEATURES={'DISABLE_MOBILE_COURSE_AVAILABLE': True})
-    @override_waffle_flag(toggles.LEGACY_STUDIO_ADVANCED_SETTINGS, True)
     def test_mobile_field_available(self):
 
         """
         Test to check `Mobile Course Available` field is not viewable in Studio
         when DISABLE_MOBILE_COURSE_AVAILABLE is true.
         """
 
-        response = self.client.get_html(self.course_setting_url)
-        start = response.content.decode('utf-8').find("mobile_available")
-        end = response.content.decode('utf-8').find("}", start)
-        settings_fields = json.loads(response.content.decode('utf-8')[start + len("mobile_available: "):end + 1])
+        response = self.client.get(self.course_setting_url, HTTP_ACCEPT='application/json')
+        data = json.loads(response.content.decode('utf-8'))
+        settings_fields = data.get('mobile_available')
 
         self.assertEqual(settings_fields["display_name"], "Mobile Course Available")  # noqa: PT009
         self.assertEqual(settings_fields["deprecated"], True)  # noqa: PT009
@@ -146,7 +143,6 @@ def test_mobile_field_available(self):
         (False, True, True)
     )
     @ddt.unpack
-    @override_waffle_flag(toggles.LEGACY_STUDIO_ADVANCED_SETTINGS, True)
     def test_discussion_fields_available(self, is_pages_and_resources_enabled,
                                          is_legacy_discussion_setting_enabled, fields_visible):
         """
@@ -155,11 +151,27 @@ def test_discussion_fields_available(self, is_pages_and_resources_enabled,
 
         with override_waffle_flag(ENABLE_PAGES_AND_RESOURCES_MICROFRONTEND, is_pages_and_resources_enabled):
             with override_waffle_flag(OVERRIDE_DISCUSSION_LEGACY_SETTINGS_FLAG, is_legacy_discussion_setting_enabled):
-                response = self.client.get_html(self.course_setting_url).content.decode('utf-8')
-                self.assertEqual('allow_anonymous' in response, fields_visible)  # noqa: PT009
-                self.assertEqual('allow_anonymous_to_peers' in response, fields_visible)  # noqa: PT009
-                self.assertEqual('discussion_blackouts' in response, fields_visible)  # noqa: PT009
-                self.assertEqual('discussion_topics' in response, fields_visible)  # noqa: PT009
+                response = self.client.get(self.course_setting_url, HTTP_ACCEPT='application/json')
+                data = json.loads(response.content.decode('utf-8'))
+                self.assertEqual('allow_anonymous' in data, fields_visible)  # noqa: PT009
+                self.assertEqual('allow_anonymous_to_peers' in data, fields_visible)  # noqa: PT009
+                self.assertEqual('discussion_blackouts' in data, fields_visible)  # noqa: PT009
+                self.assertEqual('discussion_topics' in data, fields_visible)  # noqa: PT009
+
+    @ddt.data(False, True)
+    def test_disable_advanced_settings_feature(self, disable_advanced_settings):
+        """
+        When DISABLE_ADVANCED_SETTINGS is enabled, non-staff users should receive
+        a 403 on the advanced settings URL; staff users should always be redirected.
+        """
+        with override_settings(FEATURES={
+            'DISABLE_ADVANCED_SETTINGS': disable_advanced_settings,
+        }, COURSE_AUTHORING_MICROFRONTEND_URL='https://mfe.example'):
+            response = self.non_staff_client.get_html(self.course_setting_url)
+            self.assertEqual(response.status_code, 403 if disable_advanced_settings else 302)  # noqa: PT009
+
+            response = self.client.get_html(self.course_setting_url)
+            self.assertEqual(response.status_code, 302)  # noqa: PT009
 
     def test_grading_handler_redirects_to_mfe(self):
         """grading_handler redirects to the authoring MFE."""

cms/djangoapps/contentstore/tests/tests.py

@@ -2,9 +2,7 @@
 This test file will test registration, login, activation, and session activity timeouts
 
 TODO: Rewrite several of these assertions so that they check the output of the REST or Python
-APIs rather than parsing HTML from the deprecated legacy frontend pages. In particular, any
-test case using override_waffle_flag(toggles.LEGACY_STUDIO_*, True) will need to be fixed.
-Part of https://github.com/openedx/edx-platform/issues/36275.
+APIs rather than parsing HTML from the deprecated legacy frontend pages.
 """
 
 
@@ -17,10 +15,8 @@
 from django.core.cache import cache
 from django.test.utils import override_settings
 from django.urls import reverse
-from edx_toggles.toggles.testutils import override_waffle_flag
 from pytz import UTC
 
-from cms.djangoapps.contentstore import toggles
 from cms.djangoapps.contentstore.tests.test_course_settings import CourseTestCase
 from cms.djangoapps.contentstore.tests.utils import AjaxEnabledTestClient, parse_json, registration, user
 from cms.djangoapps.contentstore.utils import get_studio_home_url
@@ -237,20 +233,19 @@ def setUp(self):
         super().setUp()
         self.course = CourseFactory.create(org='edX', number='test_course_key', display_name='Test Course')
 
-    @data(('edX/test_course_key/Test_Course', 200), ('garbage:edX+test_course_key+Test_Course', 404))
+    @data(('edX/test_course_key/Test_Course', 302, 200), ('garbage:edX+test_course_key+Test_Course', 404, 404))
     @unpack
-    @override_waffle_flag(toggles.LEGACY_STUDIO_IMPORT, True)
-    def test_course_key_decorator(self, course_key, status_code):
+    def test_course_key_decorator(self, course_key, import_status_code, import_status_handler_code):
         """
         Tests for the ensure_valid_course_key decorator.
         """
         url = f'/import/{course_key}'
         resp = self.client.get_html(url)
-        self.assertEqual(resp.status_code, status_code)  # noqa: PT009
+        self.assertEqual(resp.status_code, import_status_code)  # noqa: PT009
 
         url = '/import_status/{course_key}/{filename}'.format(
             course_key=course_key,
             filename='xyz.tar.gz'
         )
         resp = self.client.get_html(url)
-        self.assertEqual(resp.status_code, status_code)  # noqa: PT009
+        self.assertEqual(resp.status_code, import_status_handler_code)  # noqa: PT009

cms/djangoapps/contentstore/toggles.py

@@ -159,64 +159,6 @@ def use_react_markdown_editor(course_key):
     return ENABLE_REACT_MARKDOWN_EDITOR.is_enabled(course_key)
 
 
-# .. toggle_name: legacy_studio.advanced_settings
-# .. toggle_implementation: WaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Temporarily fall back to the old Studio Advanced Settings 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_ADVANCED_SETTINGS = CourseWaffleFlag('legacy_studio.advanced_settings', __name__)
-
-
-def use_new_advanced_settings_page(course_key):
-    """
-    Returns a boolean if new studio advanced settings pafe mfe is enabled
-    """
-    return not LEGACY_STUDIO_ADVANCED_SETTINGS.is_enabled(course_key)
-
-
-
-# .. toggle_name: legacy_studio.import
-# .. toggle_implementation: WaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Temporarily fall back to the old Course Import 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_IMPORT = CourseWaffleFlag('legacy_studio.import', __name__)
-
-
-def use_new_import_page(course_key):
-    """
-    Returns a boolean if new studio import mfe is enabled
-    """
-    return not LEGACY_STUDIO_IMPORT.is_enabled(course_key)
-
-
-# .. toggle_name: legacy_studio.export
-# .. toggle_implementation: WaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Temporarily fall back to the old Course Export 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_EXPORT = CourseWaffleFlag('legacy_studio.export', __name__)
-
-
-def use_new_export_page(course_key):
-    """
-    Returns a boolean if new studio export mfe is enabled
-    """
-    return not LEGACY_STUDIO_EXPORT.is_enabled(course_key)
-
-
 # .. toggle_name: contentstore.new_studio_mfe.use_new_video_uploads_page
 # .. toggle_implementation: CourseWaffleFlag
 # .. toggle_default: False
@@ -271,27 +213,6 @@ def use_new_unit_page(course_key):
     return not LEGACY_STUDIO_UNIT_EDITOR.is_enabled(course_key)
 
 
-
-
-# .. toggle_name: legacy_studio.configurations
-# .. toggle_implementation: WaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Temporarily fall back to the old Studio Configurations 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_CONFIGURATIONS = CourseWaffleFlag('legacy_studio.configurations', __name__)
-
-
-def use_new_group_configurations_page(course_key):
-    """
-    Returns a boolean if new studio group configurations mfe is enabled
-    """
-    return not LEGACY_STUDIO_CONFIGURATIONS.is_enabled(course_key)
-
-
 # .. toggle_name: contentstore.mock_video_uploads
 # .. toggle_implementation: WaffleFlag
 # .. toggle_default: False