chore: Updated version of enterprise-integrated-channels

.github/workflows/js-tests.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - release-ulmo
 
 jobs:
   run_tests:

.github/workflows/lint-imports.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - release-ulmo
 
 jobs:
   lint-imports:

.github/workflows/lockfileversion-check.yml

@@ -5,7 +5,7 @@ name: Lockfile Version check
 on:
   push:
     branches:
-      - master
+      - release-ulmo
   pull_request:
 
 jobs:

.github/workflows/migrations-check.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - release-ulmo
 
 jobs:
   check_migrations:

.github/workflows/quality-checks.yml

@@ -4,8 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - open-release/lilac.master
+      - release-ulmo
 
 jobs:
   run_tests:

.github/workflows/semgrep.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - release-ulmo
 
 jobs:
   run_semgrep:

.github/workflows/shellcheck.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - release-ulmo
 
 permissions:
   contents: read

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

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - release-ulmo
 
 jobs:
   static_assets_check:

.github/workflows/unit-tests.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - release-ulmo
 
 concurrency:
   # We only need to be running tests for the latest commit on each PR
@@ -124,26 +124,26 @@ jobs:
         shell: bash
         run: |
           cd test_root/log
-          mv pytest_warnings.json pytest_warnings_${{ matrix.shard_name }}.json
+          mv pytest_warnings.json pytest_warnings_${{ matrix.shard_name }}_${{ matrix.python-version }}_${{ matrix.django-version }}_${{ matrix.mongo-version }}_${{ matrix.os-version }}.json
 
       - name: save pytest warnings json file
         if: success()
         uses: actions/upload-artifact@v4
         with:
-          name: pytest-warnings-json-${{ matrix.shard_name }}
+          name: pytest-warnings-json-${{ matrix.shard_name }}-${{ matrix.python-version }}-${{ matrix.django-version }}-${{ matrix.mongo-version }}-${{ matrix.os-version }}
           path: |
             test_root/log/pytest_warnings*.json
           overwrite: true
 
       - name: Renaming coverage data file
         run: |
-          mv reports/.coverage reports/${{ matrix.shard_name }}.coverage
+          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@v4
         with:
-          name: coverage-${{ matrix.shard_name }}
-          path: reports/${{ matrix.shard_name }}.coverage
+          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
           overwrite: true
 
   collect-and-verify:

.github/workflows/units-test-scripts-structures-pruning.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - release-ulmo
 
 jobs:
   test:

.github/workflows/units-test-scripts-user-retirement.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - release-ulmo
 
 jobs:
   test:

.github/workflows/update-geolite-database.yml

@@ -8,7 +8,7 @@ on:
       branch:
         description: "Target branch against which to create PR"
         required: false
-        default: "master"
+        default: "release-ulmo"
 
 env:
   MAXMIND_URL: "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=${{ secrets.MAXMIND_LICENSE_KEY }}&suffix=tar.gz"
@@ -69,7 +69,7 @@ jobs:
       - name: Create a branch, commit the code and make a PR
         id: create-pr
         run: |
-          BRANCH="${{ github.actor }}/geoip2-bot-update-country-database-$(echo "${{ github.sha }}" | cut -c 1-7)"
+          BRANCH="${{ github.actor }}/geoip2-bot-update-country-database-${{ github.run_id }}"
           git checkout -b $BRANCH
           git add .
           git status
@@ -79,13 +79,13 @@ jobs:
               --title "Update GeoLite Database" \
               --body "PR generated by workflow `${{ github.workflow }}` on behalf of @${{ github.actor }}." \
               --head $BRANCH \
-              --base 'master' \
-              --reviewer 'feanil' \
+              --base 'release-ulmo' \
+              --reviewer 'edx/orbi-bom' \
               | grep -o 'https://github.com/.*/pull/[0-9]*')
           echo "PR Created: ${PR_URL}"
           echo "pull-request-url=$PR_URL" >> $GITHUB_OUTPUT
         env:
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ secrets.GH_PAT_WITH_ORG }}
 
       - name: Job summary
         run: |

.github/workflows/upgrade-one-python-dependency.yml

@@ -6,7 +6,7 @@ on:
       branch:
         description: "Target branch to create requirements PR against"
         required: true
-        default: "master"
+        default: "release-ulmo"
         type: string
       package:
         description: "Name of package to upgrade"

.github/workflows/upgrade-python-requirements.yml

@@ -8,7 +8,7 @@ on:
       branch:
         description: "Target branch to create requirements PR against"
         required: true
-        default: "master"
+        default: "release-ulmo"
 jobs:
   call-upgrade-python-requirements-workflow:
     # Don't run the weekly upgrade job on forks -- it will send a weekly failure email.

.github/workflows/verify-dunder-init.yml

@@ -3,7 +3,7 @@ name: Verify Dunder __init__.py Files
 on:
   pull_request:
     branches:
-      - master
+      - release-ulmo
 
 jobs:
   verify_dunder_init:

cms/djangoapps/contentstore/exams.py

@@ -74,13 +74,13 @@ def register_exams(course_key):
         # Exams in courses not using an LTI based proctoring provider should use the original definition of due_date
         # from contentstore/proctoring.py. These exams are powered by the edx-proctoring plugin and not the edx-exams
         # microservice.
+        is_instructor_paced = not course.self_paced
         if course.proctoring_provider == 'lti_external':
-            due_date = (
-                timed_exam.due.isoformat() if timed_exam.due
-                else (course.end.isoformat() if course.end else None)
-            )
+            due_date_source = timed_exam.due if is_instructor_paced else course.end
         else:
-            due_date = timed_exam.due if not course.self_paced else None
+            due_date_source = timed_exam.due if is_instructor_paced else None
+
+        due_date = due_date_source.isoformat() if due_date_source else None
 
         exams_list.append({
             'course_id': str(course_key),

cms/djangoapps/contentstore/helpers.py

@@ -745,10 +745,10 @@ def _import_file_into_course(
         if thumbnail_content is not None:
             content.thumbnail_location = thumbnail_location
         contentstore().save(content)
-        return True, {clipboard_file_path: f"static/{import_path}"}
+        return True, {clipboard_file_path: filename if not import_path else f"static/{import_path}"}
     elif current_file.content_digest == file_data_obj.md5_hash:
-        # The file already exists and matches exactly, so no action is needed except substitutions
-        return None, {clipboard_file_path: f"static/{import_path}"}
+        # The file already exists and matches exactly, so no action is needed
+        return None, {}
     else:
         # There is a conflict with some other file that has the same name.
         return False, {}

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

@@ -11,6 +11,7 @@ class CourseWaffleFlagsSerializer(serializers.Serializer):
     """
     Serializer for course waffle flags
     """
+
     use_new_home_page = serializers.SerializerMethodField()
     use_new_custom_pages = serializers.SerializerMethodField()
     use_new_schedule_details_page = serializers.SerializerMethodField()
@@ -31,6 +32,7 @@ class CourseWaffleFlagsSerializer(serializers.Serializer):
     use_react_markdown_editor = serializers.SerializerMethodField()
     use_video_gallery_flow = serializers.SerializerMethodField()
     enable_course_optimizer_check_prev_run_links = serializers.SerializerMethodField()
+    enable_unit_expanded_view = serializers.SerializerMethodField()
 
     def get_course_key(self):
         """
@@ -175,3 +177,10 @@ def get_enable_course_optimizer_check_prev_run_links(self, obj):
         """
         course_key = self.get_course_key()
         return toggles.enable_course_optimizer_check_prev_run_links(course_key)
+
+    def get_enable_unit_expanded_view(self, obj):
+        """
+        Method to get the enable_unit_expanded_view waffle flag
+        """
+        course_key = self.get_course_key()
+        return toggles.enable_unit_expanded_view(course_key)

cms/djangoapps/contentstore/rest_api/v1/urls.py

@@ -25,6 +25,7 @@
     HomePageView,
     ProctoredExamSettingsView,
     ProctoringErrorsView,
+    UnitComponentsView,
     VideoDownloadView,
     VideoUsageView,
     vertical_container_children_redirect_view,
@@ -144,6 +145,11 @@
         CourseWaffleFlagsView.as_view(),
         name="course_waffle_flags"
     ),
+    re_path(
+        fr'^unit_handler/{settings.USAGE_KEY_PATTERN}$',
+        UnitComponentsView.as_view(),
+        name="unit_components"
+    ),
 
     # Authoring API
     # Do not use under v1 yet (Nov. 23). The Authoring API is still experimental and the v0 versions should be used

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

@@ -14,9 +14,6 @@
 from .proctoring import ProctoredExamSettingsView, ProctoringErrorsView
 from .settings import CourseSettingsView
 from .textbooks import CourseTextbooksView
+from .unit_handler import UnitComponentsView
 from .vertical_block import ContainerHandlerView, vertical_container_children_redirect_view
-from .videos import (
-    CourseVideosView,
-    VideoDownloadView,
-    VideoUsageView,
-)
+from .videos import CourseVideosView, VideoDownloadView, VideoUsageView

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

@@ -38,6 +38,7 @@ class CourseWaffleFlagsViewTest(CourseTestCase):
         "use_react_markdown_editor": False,
         "use_video_gallery_flow": False,
         "enable_course_optimizer_check_prev_run_links": False,
+        "enable_unit_expanded_view": False,
     }
 
     def setUp(self):