chore: merge branch 'master' into braden/openedx-catalog

Author: bradenmacdonald

.github/workflows/js-tests.yml

@@ -73,7 +73,7 @@ jobs:
           npm run test
 
       - name: Save Job Artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: Build-Artifacts
           path: |

.github/workflows/quality-checks.yml

@@ -78,14 +78,14 @@ jobs:
           PIP_SRC: ${{ runner.temp }}
           TARGET_BRANCH: ${{ github.base_ref }}
         run: |
-            make pycodestyle
+            ruff check --output-format=github .
             make xsslint
             make pii_check
             make check_keywords
 
       - name: Save Job Artifacts
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: Build-Artifacts
           path: |

.github/workflows/static-assets-check.yml

@@ -98,7 +98,6 @@ jobs:
         env:
           LMS_CFG: lms/envs/minimal.yml
           CMS_CFG: lms/envs/minimal.yml
-          DJANGO_SETTINGS_MODULE: lms.envs.production
         run: |
-          ./manage.py lms collectstatic --noinput
-          ./manage.py cms collectstatic --noinput
+          DJANGO_SETTINGS_MODULE=lms.envs.production ./manage.py lms collectstatic --noinput
+          DJANGO_SETTINGS_MODULE=cms.envs.production ./manage.py cms collectstatic --noinput

.github/workflows/unit-tests.yml

@@ -131,7 +131,7 @@ jobs:
 
       - name: save pytest warnings json file
         if: success()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: pytest-warnings-json-${{ matrix.shard_name }}-${{ matrix.python-version }}-${{ matrix.django-version }}-${{ matrix.mongo-version }}-${{ matrix.os-version }}
           path: |
@@ -143,7 +143,7 @@ jobs:
           mv reports/.coverage reports/${{ matrix.shard_name }}_${{ matrix.python-version }}_${{ matrix.django-version }}_${{ matrix.mongo-version }}_${{ matrix.os-version }}.coverage
 
       - name: Upload coverage
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: coverage-${{ matrix.shard_name }}-${{ matrix.python-version }}-${{ matrix.django-version }}-${{ matrix.mongo-version }}-${{ matrix.os-version }}
           path: reports/${{ matrix.shard_name }}_${{ matrix.python-version }}_${{ matrix.django-version }}_${{ matrix.mongo-version }}_${{ matrix.os-version }}.coverage
@@ -230,7 +230,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: collect pytest warnings files
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           pattern: pytest-warnings-json-*
           merge-multiple: true
@@ -245,7 +245,7 @@ jobs:
 
       - name: save warning report
         if: success()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: pytest-warning-report-html
           path: |
@@ -257,14 +257,14 @@ jobs:
     needs: [compile-warnings-report]
     steps:
       - name: Merge Pytest Warnings JSON Artifacts
-        uses: actions/upload-artifact/merge@v6
+        uses: actions/upload-artifact/merge@v7
         with:
           name: pytest-warnings-json
           pattern: pytest-warnings-json-*
           delete-merged: true
 
       - name: Merge Coverage Artifacts
-        uses: actions/upload-artifact/merge@v6
+        uses: actions/upload-artifact/merge@v7
         with:
           name: coverage
           pattern: coverage-*
@@ -289,7 +289,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           pattern: coverage-*
           merge-multiple: true

.gitignore

@@ -13,6 +13,7 @@ lms/envs/private.py
 cms/envs/private.py
 .venv/
 CLAUDE.md
+.claude/
 AGENTS.md
 # end-noclean
 

Makefile

@@ -171,8 +171,8 @@ xsslint: ## check xss for quality issuest
 	--config=scripts.xsslint_config \
 	--thresholds=scripts/xsslint_thresholds.json
 
-pycodestyle: ## check python files for quality issues
-	pycodestyle .
+ruff: ## check python files with ruff
+	ruff check .
 
 ## Re-enable --lint flag when this issue https://github.com/openedx/edx-platform/issues/35775 is resolved
 pii_check: ## check django models for pii annotations

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

@@ -122,7 +122,12 @@ def get_use_new_files_uploads_page(self, obj):
 
     def get_use_new_video_uploads_page(self, obj):
         """
-        Method to get the use_new_video_uploads_page switch
+        Method to get the use_new_video_uploads_page switch.
+
+        This is off by default because the video uploads page requires the edX
+        video pipeline which is not available to the open source community.
+
+        See https://github.com/openedx/openedx-platform/issues/37972
         """
         course_key = self.get_course_key()
         return toggles.use_new_video_uploads_page(course_key)

cms/djangoapps/contentstore/toggles.py

@@ -259,19 +259,22 @@ def use_new_export_page(course_key):
 # .. toggle_name: contentstore.new_studio_mfe.use_new_video_uploads_page
 # .. toggle_implementation: CourseWaffleFlag
 # .. toggle_default: False
-# .. toggle_description: This flag enables the use of the new studio video uploads page mfe
-# .. toggle_use_cases: temporary
-# .. toggle_creation_date: 2023-5-15
-# .. toggle_target_removal_date: 2023-8-31
-# .. toggle_tickets: TNL-10619
-# .. toggle_warning:
+# .. toggle_description: This flag enables the use of the new studio video uploads page MFE.
+#      Note: This page only works on edx.org or other sites that have reverse-engineered
+#      the edX video pipeline. It is off by default for the community.
+# .. toggle_use_cases: opt_in
+# .. toggle_creation_date: 2023-05-15
+# .. toggle_tickets: https://github.com/openedx/openedx-platform/issues/37972
 ENABLE_NEW_STUDIO_VIDEO_UPLOADS_PAGE = CourseWaffleFlag(
     f'{CONTENTSTORE_NAMESPACE}.new_studio_mfe.use_new_video_uploads_page', __name__)
 
 
 def use_new_video_uploads_page(course_key):
     """
-    Returns a boolean if new studio video uploads mfe is enabled
+    Returns a boolean if new studio video uploads MFE is enabled.
+
+    This is off by default because the video uploads page requires the edX
+    video pipeline which is not available to the open source community.
     """
     return ENABLE_NEW_STUDIO_VIDEO_UPLOADS_PAGE.is_enabled(course_key)
 

cms/djangoapps/contentstore/utils.py

@@ -51,7 +51,6 @@
     use_new_import_page,
     use_new_schedule_details_page,
     use_new_unit_page,
-    use_new_video_uploads_page,
 )
 from cms.djangoapps.models.settings.course_grading import CourseGradingModel
 from cms.djangoapps.models.settings.course_metadata import CourseMetadata
@@ -425,11 +424,10 @@ def get_video_uploads_url(course_locator) -> str:
     Gets course authoring microfrontend URL for files and uploads page view.
     """
     video_uploads_url = None
-    if use_new_video_uploads_page(course_locator):
-        mfe_base_url = get_course_authoring_url(course_locator)
-        course_mfe_url = f'{mfe_base_url}/course/{course_locator}/videos/'
-        if mfe_base_url:
-            video_uploads_url = course_mfe_url
+    mfe_base_url = get_course_authoring_url(course_locator)
+    course_mfe_url = f'{mfe_base_url}/course/{course_locator}/videos/'
+    if mfe_base_url:
+        video_uploads_url = course_mfe_url
     return video_uploads_url
 
 

cms/djangoapps/contentstore/video_storage_handlers.py

@@ -50,7 +50,6 @@
 from tempfile import NamedTemporaryFile, mkdtemp
 from wsgiref.util import FileWrapper
 
-from common.djangoapps.edxmako.shortcuts import render_to_response
 from common.djangoapps.util.json_request import JsonResponse
 from openedx.core.djangoapps.video_config.models import VideoTranscriptEnabledFlag
 from openedx.core.djangoapps.video_config.toggles import PUBLIC_VIDEO_SHARE
@@ -62,8 +61,8 @@
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 
 from .models import VideoUploadConfig
-from .toggles import use_new_video_uploads_page, use_mock_video_uploads
-from .utils import get_video_uploads_url, get_course_videos_context
+from .toggles import use_mock_video_uploads
+from .utils import get_video_uploads_url
 from .video_utils import validate_video_image
 from .views.course import get_course_and_check_access
 
@@ -740,13 +739,7 @@ def videos_index_html(course, pagination_conf=None):
     """
     Returns an HTML page to display previous video uploads and allow new ones
     """
-    if use_new_video_uploads_page(course.id):
-        return redirect(get_video_uploads_url(course.id))
-    context = get_course_videos_context(
-        course,
-        pagination_conf,
-    )
-    return render_to_response('videos_index.html', context)
+    return redirect(get_video_uploads_url(course.id))
 
 
 def videos_index_json(course):