Merge branch 'master' into pwnage101/ENT-11569

Author: kiram15

.github/renovate.json5

@@ -1,45 +1,50 @@
 {
   extends: [
-    'config:recommended',
-    'schedule:weekly',
-    ':automergeLinters',
-    ':automergeMinor',
-    ':automergeTesters',
-    ':enableVulnerabilityAlerts',
-    ':semanticCommits',
-    ':updateNotScheduled',
+    'config:recommended',  // Renovate base defaults: dependency dashboard, monorepo grouping, sane PR limits
+    'schedule:weekly',     // Only open new PRs once a week
+    ':automergeLinters',   // Automerge linter updates (eslint, prettier, etc.)
+    ':automergeTesters',   // Automerge test runner updates (jest, mocha, etc.)
+    ':enableVulnerabilityAlerts',  // Open security PRs immediately, ignoring the weekly schedule
+    ':semanticCommits',    // Use conventional commit format (fix(deps):, chore(deps):)
+    ':updateNotScheduled', // Allow vulnerability fixes to bypass the weekly schedule
   ],
+
+  // Never auto-rebase PRs; let humans decide when to rebase
+  rebaseWhen: 'never',
+
+  // Wait 3 days after a release before opening a PR, giving time for early bugs and
+  // potentially malicious releases (e.g. supply chain attacks) to be detected
+  minimumReleaseAge: '3 days',
+
+  // Only manage npm dependencies
+  enabledManagers: [
+    'npm',
+  ],
+
+  // Only create PRs during Eastern time (aligns with the weekly schedule)
+  timezone: 'America/New_York',
+
+  // Cap the number of open Renovate PRs at any one time
+  prConcurrentLimit: 3,
+
+  // Packages with known breaking changes or no active maintainer
+  ignoreDeps: [
+    'karma-spec-reporter',
+  ],
+
   packageRules: [
     {
-      matchDepTypes: [
-        'devDependencies',
-      ],
-      matchUpdateTypes: [
-        'lockFileMaintenance',
-        'minor',
-        'patch',
-        'pin',
+      // Automerge minor and patch updates for @edx and @openedx scoped packages;
+      // these are maintained by the same org so breakage is caught upstream
+      matchPackageNames: [
+        '/@edx/',
+        '/@openedx/',
       ],
-      automerge: true,
-    },
-    {
       matchUpdateTypes: [
         'minor',
         'patch',
       ],
       automerge: true,
-      matchPackageNames: [
-        '/@edx/',
-        '/@openedx/',
-      ],
     },
   ],
-  ignoreDeps: [
-    'karma-spec-reporter',
-  ],
-  timezone: 'America/New_York',
-  prConcurrentLimit: 3,
-  enabledManagers: [
-    'npm',
-  ],
 }

cms/djangoapps/contentstore/models.py

@@ -17,7 +17,12 @@
 from opaque_keys.edx.locator import LibraryContainerLocator
 from openedx_content.api import get_published_version
 from openedx_content.models_api import Component, Container
-from openedx_django_lib.fields import immutable_uuid_field, manual_date_time_field, ref_field
+
+try:
+    from openedx_django_lib.fields import immutable_uuid_field, manual_date_time_field, ref_field
+except ImportError:  # pragma: no cover - runtime compatibility shim for different openedx_django_lib versions
+    from openedx_django_lib.fields import immutable_uuid_field, manual_date_time_field
+    from openedx_django_lib.fields import key_field as ref_field
 
 logger = logging.getLogger(__name__)
 

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

@@ -67,24 +67,33 @@ 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):
         """
         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):
         """
-        Method to get the use_new_grading_page switch
+        Method to indicate whether we should use the new grading 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_grading_page(course_key)
+        return True
 
     def get_use_new_updates_page(self, obj):
         """
@@ -102,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):
         """
@@ -160,15 +167,13 @@ def get_use_new_course_team_page(self, obj):
         """
         Method to get the use_new_course_team_page switch
         """
-        course_key = self.get_course_key()
-        return toggles.use_new_course_team_page(course_key)
+        return True
 
     def get_use_new_certificates_page(self, obj):
         """
         Method to get the use_new_certificates_page switch
         """
-        course_key = self.get_course_key()
-        return toggles.use_new_certificates_page(course_key)
+        return True
 
     def get_use_new_textbooks_page(self, obj):
         """
@@ -186,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,18 +1487,22 @@ 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_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_waffle_flag(toggles.LEGACY_STUDIO_GRADING, True):
-            test_get_html('grading_handler')
-        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('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'):
+            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
+        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