Merge branch 'master' into qasim/postgres

.github/workflows/pylint-checks.yml

@@ -22,7 +22,7 @@ jobs:
           - module-name: openedx-2
             path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/"
           - module-name: common
-            path: "common pavelib"
+            path: "common"
           - module-name: cms
             path: "cms"
           - module-name: xmodule

.github/workflows/unit-test-shards.json

@@ -255,15 +255,13 @@
   "common-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
-      "common/djangoapps/",
-      "pavelib/"
+      "common/djangoapps/"
     ]
   },
   "common-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
-      "common/djangoapps/",
-      "pavelib/"
+      "common/djangoapps/"
     ]
   },
   "xmodule-with-lms": {

.github/workflows/unit-tests.yml

@@ -71,29 +71,17 @@ jobs:
 
       - name: install system requirements
         run: |
-          sudo apt-get update && sudo apt-get install libmysqlclient-dev libxmlsec1-dev lynx openssl
-
-      # This is needed until the ENABLE_BLAKE2B_HASHING can be removed and we
-      # can stop using MD4 by default.
-      - name: enable md4 hashing in libssl
-        run: |
-          cat <<EOF | sudo tee /etc/ssl/openssl.cnf
-          # Use this in order to automatically load providers.
-          openssl_conf = openssl_init
-
-          [openssl_init]
-          providers = provider_sect
-
-          [provider_sect]
-          default = default_sect
-          legacy = legacy_sect
-
-          [default_sect]
-          activate = 1
-
-          [legacy_sect]
-          activate = 1
-          EOF
+          sudo apt-get update && sudo apt-get install libmysqlclient-dev libxmlsec1-dev lynx
+
+      # Try to log into DockerHub so that we're less likely to be rate-limited when pulling certain images.
+      # This will fail on any edx-platform fork which doesn't explicitly define its own DockerHub creds.
+      # That's OK--if we fail to log in, we'll proceed anonymously, and hope we don't get rate-limited.
+      - name: Try to log into Docker Hub
+        uses: docker/[email protected]
+        continue-on-error: true
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Start MongoDB
         uses: supercharge/[email protected]
@@ -180,7 +168,7 @@ jobs:
         shell: bash
         run: |
           echo "root_cms_unit_tests_count=$(pytest --disable-warnings --collect-only --ds=cms.envs.test cms/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
-          echo "root_lms_unit_tests_count=$(pytest --disable-warnings --collect-only --ds=lms.envs.test lms/ openedx/ common/djangoapps/ xmodule/ pavelib/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
+          echo "root_lms_unit_tests_count=$(pytest --disable-warnings --collect-only --ds=lms.envs.test lms/ openedx/ common/djangoapps/ xmodule/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
 
       - name: get GHA unit test paths
         shell: bash
@@ -219,7 +207,6 @@ jobs:
           to add any missing apps and match the count. for more details please take a look at scripts/gha-shards-readme.md"
           exit 1
 
-
   # This job aggregates test results. It's the required check for branch protection.
   # https://github.com/marketplace/actions/alls-green#why
   # https://github.com/orgs/community/discussions/33579

Makefile

@@ -93,7 +93,6 @@ requirements: dev-requirements ## install development environment requirements
 # Order is very important in this list: files must appear after everything they include!
 REQ_FILES = \
 	requirements/edx/coverage \
-	requirements/edx/paver \
 	requirements/edx-sandbox/base \
 	requirements/edx/base \
 	requirements/edx/doc \
@@ -179,7 +178,7 @@ xsslint: ## check xss for quality issuest
 	--config=scripts.xsslint_config \
 	--thresholds=scripts/xsslint_thresholds.json
 
-pycodestyle: ## check python files for quality issues 
+pycodestyle: ## check python files for quality issues
 	pycodestyle .
 
 ## Re-enable --lint flag when this issue https://github.com/openedx/edx-platform/issues/35775 is resolved
@@ -190,13 +189,13 @@ pii_check: ## check django models for pii annotations
 		--app_name cms \
 		--coverage \
 		--lint
-	
+
 	DJANGO_SETTINGS_MODULE=lms.envs.test \
 	code_annotations django_find_annotations \
 		--config_file .pii_annotations.yml \
 		--app_name lms \
 		--coverage \
-		--lint	
+		--lint
 
 check_keywords: ## check django models for reserve keywords
 	DJANGO_SETTINGS_MODULE=cms.envs.test \

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

@@ -62,7 +62,6 @@ class StudioHomeSerializer(serializers.Serializer):
     libraries_v2_enabled = serializers.BooleanField()
     taxonomies_enabled = serializers.BooleanField()
     taxonomy_list_mfe_url = serializers.CharField()
-    optimization_enabled = serializers.BooleanField()
     request_course_creator_url = serializers.CharField()
     rerun_creator_status = serializers.BooleanField()
     show_new_library_button = serializers.BooleanField()

cms/djangoapps/contentstore/rest_api/v1/views/home.py

@@ -62,7 +62,6 @@ def get(self, request: Request):
             "libraries_v1_enabled": true,
             "libraries_v2_enabled": true,
             "library_authoring_mfe_url": "//localhost:3001/course/course-v1:edX+P315+2T2023",
-            "optimization_enabled": true,
             "request_course_creator_url": "/request_course_creator",
             "rerun_creator_status": true,
             "show_new_library_button": true,

cms/djangoapps/contentstore/rest_api/v1/views/tests/test_home.py

@@ -8,16 +8,11 @@
 from django.conf import settings
 from django.test import override_settings
 from django.urls import reverse
-from edx_toggles.toggles.testutils import (
-    override_waffle_switch,
-)
 from rest_framework import status
 
 from cms.djangoapps.contentstore.tests.utils import CourseTestCase
 from cms.djangoapps.contentstore.tests.test_libraries import LibraryTestCase
-from cms.djangoapps.contentstore.views.course import ENABLE_GLOBAL_STAFF_OPTIMIZATION
 from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
-from xmodule.modulestore.tests.factories import CourseFactory
 
 
 FEATURES_WITH_HOME_PAGE_COURSE_V2_API = settings.FEATURES.copy()
@@ -52,7 +47,6 @@ def setUp(self):
             "libraries_v2_enabled": False,
             "taxonomies_enabled": True,
             "taxonomy_list_mfe_url": 'http://course-authoring-mfe/taxonomies',
-            "optimization_enabled": False,
             "request_course_creator_url": "/request_course_creator",
             "rerun_creator_status": True,
             "show_new_library_button": True,
@@ -242,27 +236,6 @@ def test_home_page_response_no_courses_non_staff(self, filter_key, filter_value)
         self.assertEqual(len(response.data["courses"]), 0)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-    @override_waffle_switch(ENABLE_GLOBAL_STAFF_OPTIMIZATION, True)
-    def test_org_query_if_passed(self):
-        """Test home page when org filter passed as a query param"""
-        foo_course = self.store.make_course_key('foo-org', 'bar-number', 'baz-run')
-        test_course = CourseFactory.create(
-            org=foo_course.org,
-            number=foo_course.course,
-            run=foo_course.run
-        )
-        CourseOverviewFactory.create(id=test_course.id, org='foo-org')
-        response = self.client.get(self.url, {"org": "foo-org"})
-        self.assertEqual(len(response.data['courses']), 1)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-    @override_waffle_switch(ENABLE_GLOBAL_STAFF_OPTIMIZATION, True)
-    def test_org_query_if_empty(self):
-        """Test home page with an empty org query param"""
-        response = self.client.get(self.url)
-        self.assertEqual(len(response.data['courses']), 0)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
 
 @ddt.ddt
 class HomePageLibrariesViewTest(LibraryTestCase):

cms/djangoapps/contentstore/rest_api/v2/views/tests/test_home.py

@@ -10,12 +10,10 @@
 from django.conf import settings
 from django.test import override_settings
 from django.urls import reverse
-from edx_toggles.toggles.testutils import override_waffle_switch
 from rest_framework import status
 
 from cms.djangoapps.contentstore.tests.utils import CourseTestCase
 from cms.djangoapps.contentstore.utils import reverse_course_url
-from cms.djangoapps.contentstore.views.course import ENABLE_GLOBAL_STAFF_OPTIMIZATION
 from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
 
 FEATURES_WITH_HOME_PAGE_COURSE_V2_API = settings.FEATURES.copy()
@@ -104,30 +102,6 @@ def test_home_page_response(self):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertDictEqual(expected_response, response.data)
 
-    @override_waffle_switch(ENABLE_GLOBAL_STAFF_OPTIMIZATION, True)
-    def test_org_query_if_passed(self):
-        """Get list of courses when org filter passed as a query param.
-
-        Expected result:
-        - A list of courses available to the logged in user for the specified org.
-        """
-        response = self.client.get(self.api_v2_url, {"org": "demo-org"})
-
-        self.assertEqual(len(response.data['results']['courses']), 1)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-    @override_waffle_switch(ENABLE_GLOBAL_STAFF_OPTIMIZATION, True)
-    def test_org_query_if_empty(self):
-        """Get home page with an empty org query param.
-
-        Expected result:
-        - An empty list of courses available to the logged in user.
-        """
-        response = self.client.get(self.api_v2_url)
-
-        self.assertEqual(len(response.data['results']['courses']), 0)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
     def test_active_only_query_if_passed(self):
         """Get list of active courses only.
 

cms/djangoapps/contentstore/utils.py

@@ -1595,7 +1595,6 @@ def get_course_context(request):
     from cms.djangoapps.contentstore.views.course import (
         get_courses_accessible_to_user,
         _process_courses_list,
-        ENABLE_GLOBAL_STAFF_OPTIMIZATION,
     )
 
     def format_in_process_course_view(uca):
@@ -1619,10 +1618,7 @@ def format_in_process_course_view(uca):
             ) if uca.state == CourseRerunUIStateManager.State.FAILED else ''
         }
 
-    optimization_enabled = GlobalStaff().has_user(request.user) and ENABLE_GLOBAL_STAFF_OPTIMIZATION.is_enabled()
-
-    org = request.GET.get('org', '') if optimization_enabled else None
-    courses_iter, in_process_course_actions = get_courses_accessible_to_user(request, org)
+    courses_iter, in_process_course_actions = get_courses_accessible_to_user(request)
     split_archived = settings.FEATURES.get('ENABLE_SEPARATE_ARCHIVED_COURSES', False)
     active_courses, archived_courses = _process_courses_list(courses_iter, in_process_course_actions, split_archived)
     in_process_course_actions = [format_in_process_course_view(uca) for uca in in_process_course_actions]
@@ -1637,7 +1633,6 @@ def get_course_context_v2(request):
     # 'cms.djangoapps.contentstore.utils' (most likely due to a circular import)
     from cms.djangoapps.contentstore.views.course import (
         get_courses_accessible_to_user,
-        ENABLE_GLOBAL_STAFF_OPTIMIZATION,
     )
 
     def format_in_process_course_view(uca):
@@ -1664,10 +1659,7 @@ def format_in_process_course_view(uca):
             ) if uca.state == CourseRerunUIStateManager.State.FAILED else ''
         }
 
-    optimization_enabled = GlobalStaff().has_user(request.user) and ENABLE_GLOBAL_STAFF_OPTIMIZATION.is_enabled()
-
-    org = request.GET.get('org', '') if optimization_enabled else None
-    courses_iter, in_process_course_actions = get_courses_accessible_to_user(request, org)
+    courses_iter, in_process_course_actions = get_courses_accessible_to_user(request)
     in_process_course_actions = [format_in_process_course_view(uca) for uca in in_process_course_actions]
     return courses_iter, in_process_course_actions
 
@@ -1685,7 +1677,6 @@ def get_home_context(request, no_course=False):
         _accessible_libraries_iter,
         _get_course_creator_status,
         _format_library_for_view,
-        ENABLE_GLOBAL_STAFF_OPTIMIZATION,
     )
     from cms.djangoapps.contentstore.views.library import (
         user_can_view_create_library_button,
@@ -1698,8 +1689,6 @@ def get_home_context(request, no_course=False):
     archived_courses = []
     in_process_course_actions = []
 
-    optimization_enabled = GlobalStaff().has_user(request.user) and ENABLE_GLOBAL_STAFF_OPTIMIZATION.is_enabled()
-
     user = request.user
     libraries = []
 
@@ -1728,7 +1717,6 @@ def get_home_context(request, no_course=False):
         'rerun_creator_status': GlobalStaff().has_user(user),
         'allow_unicode_course_id': settings.FEATURES.get('ALLOW_UNICODE_COURSE_ID', False),
         'allow_course_reruns': settings.FEATURES.get('ALLOW_COURSE_RERUNS', True),
-        'optimization_enabled': optimization_enabled,
         'active_tab': 'courses',
         'allowed_organizations': get_allowed_organizations(user),
         'allowed_organizations_for_libraries': get_allowed_organizations_for_libraries(user),

cms/djangoapps/contentstore/views/course.py

@@ -23,7 +23,6 @@
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_GET, require_http_methods
 from edx_django_utils.monitoring import function_trace
-from edx_toggles.toggles import WaffleSwitch
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import BlockUsageLocator
@@ -138,11 +137,6 @@
            'group_configurations_list_handler', 'group_configurations_detail_handler',
            'get_course_and_check_access']
 
-WAFFLE_NAMESPACE = 'studio_home'
-ENABLE_GLOBAL_STAFF_OPTIMIZATION = WaffleSwitch(  # lint-amnesty, pylint: disable=toggle-missing-annotation
-    f'{WAFFLE_NAMESPACE}.enable_global_staff_optimization', __name__
-)
-
 
 class AccessListFallback(Exception):
     """
@@ -394,15 +388,12 @@ def get_in_process_course_actions(request):
     ]
 
 
-def _accessible_courses_summary_iter(request, org=None):
+def _accessible_courses_summary_iter(request):
     """
     List all courses available to the logged in user by iterating through all the courses
 
     Arguments:
         request: the request object
-        org (string): if not None, this value will limit the courses returned. An empty
-            string will result in no courses, and otherwise only courses with the
-            specified org will be returned. The default value is None.
     """
     def course_filter(course_summary):
         """
@@ -416,9 +407,7 @@ def course_filter(course_summary):
 
     enable_home_page_api_v2 = settings.FEATURES["ENABLE_HOME_PAGE_COURSE_API_V2"]
 
-    if org is not None:
-        courses_summary = [] if org == '' else CourseOverview.get_all_courses(orgs=[org])
-    elif enable_home_page_api_v2:
+    if enable_home_page_api_v2:
         # If the new home page API is enabled, we should use the Django ORM to filter and order the courses
         courses_summary = CourseOverview.get_all_courses()
     else:
@@ -765,21 +754,17 @@ def course_index(request, course_key):
 
 
 @function_trace('get_courses_accessible_to_user')
-def get_courses_accessible_to_user(request, org=None):
+def get_courses_accessible_to_user(request):
     """
     Try to get all courses by first reversing django groups and fallback to old method if it fails
     Note: overhead of pymongo reads will increase if getting courses from django groups fails
 
     Arguments:
         request: the request object
-        org (string): for global staff users ONLY, this value will be used to limit
-            the courses returned. A value of None will have no effect (all courses
-            returned), an empty string will result in no courses, and otherwise only courses with the
-            specified org will be returned. The default value is None.
     """
     if GlobalStaff().has_user(request.user):
         # user has global access so no need to get courses from django groups
-        courses, in_process_course_actions = _accessible_courses_summary_iter(request, org)
+        courses, in_process_course_actions = _accessible_courses_summary_iter(request)
     else:
         try:
             courses, in_process_course_actions = _accessible_courses_list_from_groups(request)

cms/envs/common.py

@@ -566,9 +566,6 @@
     # .. toggle_tickets: https://github.com/openedx/edx-platform/pull/33911
     'ENABLE_GRADING_METHOD_IN_PROBLEMS': False,
 
-    # See annotations in lms/envs/common.py for details.
-    'ENABLE_BLAKE2B_HASHING': False,
-
     # .. toggle_name: FEATURES['BADGES_ENABLED']
     # .. toggle_implementation: DjangoSetting
     # .. toggle_default: False

cms/static/js/views/components/add_library_content.js

@@ -22,6 +22,7 @@ function($, _, gettext, BaseModal) {
             // Translators: "title" is the name of the current component being edited.
             titleFormat: gettext('Add library content'),
             addPrimaryActionButton: false,
+            showEditorModeButtons: false,
         }),
 
         initialize: function() {