From 73d7560e4ec3bf5267095938e387353c46f0e3dc Mon Sep 17 00:00:00 2001
From: Matjaz Gregoric <mtyaka@gmail.com>
Date: Tue, 11 Oct 2022 19:54:26 +0200
Subject: [PATCH 01/77] build: kickoff the Olive release

We follow the instructions from:
https://openedx.atlassian.net/wiki/spaces/COMM/pages/19662426/Process+to+Create+an+Open+edX+Release#Make-release-specific-changes-on-the-release-branch
---
 .github/pull_request_template.md | 17 -----------------
 .tx/config                       | 11 +++++++++++
 openedx/core/release.py          |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 0c61d1fb74fa..ed907c803152 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,20 +1,3 @@
-<!--
-
-🌰🌰
-🌰🌰🌰🌰         🌰 Note: the Nutmeg master branch has been created.  Please consider whether your change
-    🌰🌰🌰🌰     should also be applied to Nutmeg. If so, make another pull request against the
-🌰🌰🌰🌰         open-release/nutmeg.master branch, or ping @nedbat for help or questions.
-🌰🌰
-
-Please give your pull request a short but descriptive title.
-Use conventional commits to separate and summarize commits logically:
-https://open-edx-proposals.readthedocs.io/en/latest/oep-0051-bp-conventional-commits.html
-
-Use this template as a guide. Omit sections that don't apply. You may link to information rather than copy it.
-More details about the template are at https://github.com/openedx/open-edx-proposals/pull/180
-(link will be updated when that document merges)
--->
-
 ## Description
 
 Describe what this pull request changes, and why. Include implications for people using this change.
diff --git a/.tx/config b/.tx/config
index 5ab82585d37b..f9b8d235598e 100644
--- a/.tx/config
+++ b/.tx/config
@@ -67,3 +67,14 @@ source_file = conf/locale/en/LC_MESSAGES/wiki.po
 source_lang = en
 type        = PO
 
+[o:open-edx:p:open-edx-releases:r:release-olive]
+file_filter = conf/locale/<lang>/LC_MESSAGES/django.po
+source_file = conf/locale/en/LC_MESSAGES/django.po
+source_lang = en
+type = PO
+
+[o:open-edx:p:open-edx-releases:r:release-olive-js]
+file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs.po
+source_file = conf/locale/en/LC_MESSAGES/djangojs.po
+source_lang = en
+type = PO
diff --git a/openedx/core/release.py b/openedx/core/release.py
index ce30df8cc543..295b8b1f014a 100644
--- a/openedx/core/release.py
+++ b/openedx/core/release.py
@@ -8,7 +8,7 @@
 # The release line: an Open edX release name ("ficus"), or "master".
 # This should always be "master" on the master branch, and will be changed
 # manually when we start release-line branches, like open-release/ficus.master.
-RELEASE_LINE = "master"
+RELEASE_LINE = "olive"
 
 
 def doc_version():

From b2305b4ca3a2964c593a3af107b87180e6997333 Mon Sep 17 00:00:00 2001
From: Soban Javed <iamsobanjaved@gmail.com>
Date: Thu, 17 Nov 2022 01:04:38 +0500
Subject: [PATCH 02/77] build: run tests for open-release branches on GH hosted
 runners

---
 .github/workflows/unit-tests-gh-hosted.yml        | 4 ++--
 .github/workflows/unit-tests.yml                  | 2 +-
 .github/workflows/verify-gha-unit-tests-count.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml
index fd01feeccd99..94473111404d 100644
--- a/.github/workflows/unit-tests-gh-hosted.yml
+++ b/.github/workflows/unit-tests-gh-hosted.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   run-test:
-    if: github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private'
+    if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true))
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -75,7 +75,7 @@ jobs:
         uses: ./.github/actions/unit-tests
 
   collect-and-verify:
-    if: github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private'
+    if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true))
     runs-on: ubuntu-20.04
     strategy:
       matrix:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 51ae55569146..66cb5f7fd13f 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   run-tests:
     name: python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
-    if: github.repository == 'openedx/edx-platform' || github.repository == 'edx/edx-platform-private'
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     runs-on: [ edx-platform-runner ]
     strategy:
       matrix:
diff --git a/.github/workflows/verify-gha-unit-tests-count.yml b/.github/workflows/verify-gha-unit-tests-count.yml
index 039d45ad9548..c68092942d70 100644
--- a/.github/workflows/verify-gha-unit-tests-count.yml
+++ b/.github/workflows/verify-gha-unit-tests-count.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   collect-and-verify:
-    if: github.repository == 'openedx/edx-platform' || github.repository == 'edx/edx-platform-private'
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     runs-on: [ edx-platform-runner ]
     steps:
       - name: sync directory owner

From df4f843adaf7e67138334ebb31450f9ed2f8e651 Mon Sep 17 00:00:00 2001
From: Soban Javed <iamsobanjaved@gmail.com>
Date: Tue, 22 Nov 2022 02:14:00 +0500
Subject: [PATCH 03/77] build: update shard in unit test worflow for forks

This workflow wasn't updated when we updated shards for self-hosted runners, so updating in this commit
---
 .github/workflows/unit-tests-gh-hosted.yml | 2 +-
 .github/workflows/unit-tests.yml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml
index 94473111404d..5edfbff88f9d 100644
--- a/.github/workflows/unit-tests-gh-hosted.yml
+++ b/.github/workflows/unit-tests-gh-hosted.yml
@@ -31,7 +31,7 @@ jobs:
             "cms-2",
             "common-1",
             "common-2",
-            "common-3",
+            "xmodule-1"
         ]
     name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
     steps:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 66cb5f7fd13f..50b896977391 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -80,7 +80,7 @@ jobs:
   # https://github.com/orgs/community/discussions/33579
   success:
     name: Tests successful
-    if: always()
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     needs:
       - run-tests
     runs-on: ubuntu-latest

From 39b7b2b426c8b60318e1821b8c6e6d39f92c7410 Mon Sep 17 00:00:00 2001
From: Syed Sajjad Hussain Shah <syed.sajjad@arbisoft.com>
Date: Thu, 17 Nov 2022 08:43:40 +0500
Subject: [PATCH 04/77] fix: XSS and open redirect vulnerability

---
 openedx/core/djangoapps/user_authn/utils.py            | 10 ++++++++++
 .../djangoapps/user_authn/views/tests/test_logout.py   |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/openedx/core/djangoapps/user_authn/utils.py b/openedx/core/djangoapps/user_authn/utils.py
index 490223eaecda..5b70d2427859 100644
--- a/openedx/core/djangoapps/user_authn/utils.py
+++ b/openedx/core/djangoapps/user_authn/utils.py
@@ -19,6 +19,13 @@
 from openedx.core.djangoapps.user_api.accounts import USERNAME_MAX_LENGTH
 
 
+def _remove_unsafe_bytes_from_url(url):
+    _UNSAFE_URL_BYTES_TO_REMOVE = ["\t", "\r", "\n"]
+    for byte in _UNSAFE_URL_BYTES_TO_REMOVE:
+        url = url.replace(byte, "")
+    return url
+
+
 def is_safe_login_or_logout_redirect(redirect_to, request_host, dot_client_id, require_https):
     """
     Determine if the given redirect URL/path is safe for redirection.
@@ -41,6 +48,8 @@ def is_safe_login_or_logout_redirect(redirect_to, request_host, dot_client_id, r
     login_redirect_whitelist = set(getattr(settings, 'LOGIN_REDIRECT_WHITELIST', []))
     login_redirect_whitelist.add(request_host)
 
+    redirect_to = _remove_unsafe_bytes_from_url(redirect_to)
+
     # Allow OAuth2 clients to redirect back to their site after logout.
     if dot_client_id:
         application = Application.objects.get(client_id=dot_client_id)
@@ -50,6 +59,7 @@ def is_safe_login_or_logout_redirect(redirect_to, request_host, dot_client_id, r
     is_safe_url = http.is_safe_url(
         redirect_to, allowed_hosts=login_redirect_whitelist, require_https=require_https
     )
+
     return is_safe_url
 
 
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_logout.py b/openedx/core/djangoapps/user_authn/views/tests/test_logout.py
index 2a458cb4fcea..84fa3b8d7d1d 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_logout.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_logout.py
@@ -88,6 +88,8 @@ def test_no_redirect_supplied(self):
 
     @ddt.data(
         ('https://www.amazon.org', 'edx.org'),
+        ('/%09/google.com/', 'edx.org'),
+        ('java%0D%0Ascript%0D%0A%3aalert(document.domain)', 'edx.org'),
     )
     @ddt.unpack
     def test_logout_redirect_failure(self, redirect_url, host):

From 203bf9fc30df005a75c44e6e6335302b9ae80dfe Mon Sep 17 00:00:00 2001
From: connorhaugh <49422820+connorhaugh@users.noreply.github.com>
Date: Mon, 28 Nov 2022 04:21:44 -0500
Subject: [PATCH 05/77] fix: studio submit handler (olive backport) (#31219)

* fix: studio submit handler

* style: remove extra line

Co-authored-by: Matjaz Gregoric <mtyaka@gmail.com>
---
 cms/djangoapps/contentstore/views/component.py       |  5 +++++
 cms/djangoapps/contentstore/views/tests/test_item.py | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index da15dc5c84dc..d20cab68d74a 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -538,6 +538,11 @@ def component_handler(request, usage_key_string, handler, suffix=''):
     """
     usage_key = UsageKey.from_string(usage_key_string)
 
+    # Addendum:
+    # TNL 101-62 studio write permission is also checked for editing content.
+
+    if handler == 'submit_studio_edits' and not has_course_author_access(request.user, usage_key.course_key):
+        raise PermissionDenied("No studio write Permissions")
     # Let the module handle the AJAX
     req = django_to_webob_request(request)
 
diff --git a/cms/djangoapps/contentstore/views/tests/test_item.py b/cms/djangoapps/contentstore/views/tests/test_item.py
index 055cea6401c2..cf7ef1ecc3a8 100644
--- a/cms/djangoapps/contentstore/views/tests/test_item.py
+++ b/cms/djangoapps/contentstore/views/tests/test_item.py
@@ -8,6 +8,7 @@
 
 import ddt
 from django.conf import settings
+from django.core.exceptions import PermissionDenied
 from django.http import Http404
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -2197,6 +2198,15 @@ def create_response(handler, request, suffix):  # lint-amnesty, pylint: disable=
         self.assertEqual(component_handler(self.request, self.usage_key_string, 'dummy_handler').status_code,
                          status_code)
 
+    def test_submit_studio_edits_checks_author_permission(self):
+        with self.assertRaises(PermissionDenied):
+            with patch(
+                'common.djangoapps.student.auth.has_course_author_access',
+                return_value=False
+            ) as mocked_has_course_author_access:
+                component_handler(self.request, self.usage_key_string, 'submit_studio_edits')
+                assert mocked_has_course_author_access.called is True
+
     @ddt.data((True, True), (False, False),)
     @ddt.unpack
     def test_aside(self, is_xblock_aside, is_get_aside_called):

From 903ea00a124680100a96f91c9735a71f35cce065 Mon Sep 17 00:00:00 2001
From: Agrendalath <piotr@surowiec.it>
Date: Mon, 28 Nov 2022 16:14:31 +0100
Subject: [PATCH 06/77] feat!: update Drag and Drop v2 XBlock to prevent XSS
 vulnerabilities

BREAKING CHANGE: disallowed HTML tags (e.g. <script>) will no longer be
rendered in LMS and Studio.
---
 requirements/edx/base.in         | 1 +
 requirements/edx/base.txt        | 4 ++--
 requirements/edx/development.txt | 2 +-
 requirements/edx/github.in       | 1 -
 requirements/edx/testing.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 9b87a3c4e870..683b38659034 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -176,3 +176,4 @@ XBlock                              # Courseware component architecture
 xblock-utils                        # Provides utilities used by the Discussion XBlock
 xss-utils                           # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations
 enmerkar-underscore                 # Implements a underscore extractor for django-babel.
+xblock-drag-and-drop-v2             # Drag and Drop XBlock
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index cfed88745594..cd9d6c883435 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -1182,8 +1182,8 @@ xblock==1.6.1
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2 @ git+https://github.com/openedx/xblock-drag-and-drop-v2@v2.3.5
-    # via -r requirements/edx/github.in
+xblock-drag-and-drop-v2==3.0.0
+    # via -r requirements/edx/base.in
 xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0
     # via -r requirements/edx/github.in
 xblock-utils==3.0.0
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 8b077c498dfa..9c0e61c401ab 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1672,7 +1672,7 @@ xblock==1.6.1
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2 @ git+https://github.com/openedx/xblock-drag-and-drop-v2@v2.3.5
+xblock-drag-and-drop-v2==3.0.0
     # via -r requirements/edx/testing.txt
 xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0
     # via -r requirements/edx/testing.txt
diff --git a/requirements/edx/github.in b/requirements/edx/github.in
index a82ea209d861..4fb4a5b906bc 100644
--- a/requirements/edx/github.in
+++ b/requirements/edx/github.in
@@ -71,4 +71,3 @@ git+https://github.com/openedx/django-require.git@0c54adb167142383b26ea6b3edecc3
 # Third Party XBlocks
 
 git+https://github.com/open-craft/xblock-poll@v1.12.0#egg=xblock-poll==1.12.0
-git+https://github.com/openedx/xblock-drag-and-drop-v2@v2.3.5#egg=xblock-drag-and-drop-v2==2.3.5
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index b1eab969593a..154f9b04bde5 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1552,7 +1552,7 @@ xblock==1.6.1
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2 @ git+https://github.com/openedx/xblock-drag-and-drop-v2@v2.3.5
+xblock-drag-and-drop-v2==3.0.0
     # via -r requirements/edx/base.txt
 xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0
     # via -r requirements/edx/base.txt

From a0803678bbb6263f85a57603ade4815c11735d17 Mon Sep 17 00:00:00 2001
From: AliAkbar <aliakbarit019@gmail.com>
Date: Tue, 6 Dec 2022 14:39:53 +0500
Subject: [PATCH 07/77] fix: Fix retiring user auth models on disable event

---
 lms/djangoapps/support/tests/test_views.py  | 13 +++++++++++++
 lms/djangoapps/support/views/manage_user.py |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/support/tests/test_views.py b/lms/djangoapps/support/tests/test_views.py
index dcbfe3c82b62..bf31b23398e9 100644
--- a/lms/djangoapps/support/tests/test_views.py
+++ b/lms/djangoapps/support/tests/test_views.py
@@ -24,6 +24,7 @@
 from edx_proctoring.statuses import ProctoredExamStudentAttemptStatus
 from edx_proctoring.tests.test_services import MockLearningSequencesService, MockScheduleItemData
 from edx_proctoring.tests.utils import ProctoredExamTestCase
+from oauth2_provider.models import AccessToken, RefreshToken
 from opaque_keys.edx.locator import BlockUsageLocator
 from organizations.tests.factories import OrganizationFactory
 from pytz import UTC
@@ -58,6 +59,7 @@
 from lms.djangoapps.verify_student.services import IDVerificationService
 from lms.djangoapps.verify_student.tests.factories import SSOVerificationFactory
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from openedx.core.djangoapps.oauth_dispatch.tests import factories
 from openedx.features.content_type_gating.models import ContentTypeGatingConfig
 from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
 from openedx.features.enterprise_support.api import enterprise_is_enabled
@@ -155,6 +157,15 @@ def test_disable_user_account(self):
         test_user = UserFactory(
             username='foobar', email='foobar@foobar.com', password='foobar'
         )
+
+        application = factories.ApplicationFactory(user=test_user)
+        access_token = factories.AccessTokenFactory(user=test_user, application=application)
+        factories.RefreshTokenFactory(
+            user=test_user, application=application, access_token=access_token
+        )
+        assert 0 != AccessToken.objects.filter(user=test_user).count()
+        assert 0 != RefreshToken.objects.filter(user=test_user).count()
+
         url = reverse('support:manage_user_detail') + test_user.username
         response = self.client.post(url, data={
             'username_or_email': test_user.username,
@@ -164,6 +175,8 @@ def test_disable_user_account(self):
         assert data['success_msg'] == 'User Disabled Successfully'
         test_user = User.objects.get(username=test_user.username, email=test_user.email)
         assert test_user.has_usable_password() is False
+        assert 0 == AccessToken.objects.filter(user=test_user).count()
+        assert 0 == RefreshToken.objects.filter(user=test_user).count()
 
 
 @ddt.ddt
diff --git a/lms/djangoapps/support/views/manage_user.py b/lms/djangoapps/support/views/manage_user.py
index 097202019d91..e29652a905c2 100644
--- a/lms/djangoapps/support/views/manage_user.py
+++ b/lms/djangoapps/support/views/manage_user.py
@@ -75,7 +75,7 @@ def post(self, request, username_or_email):
             UserPasswordToggleHistory.objects.create(
                 user=user, comment=comment, created_by=request.user, disabled=True
             )
-            retire_dot_oauth2_models(request.user)
+            retire_dot_oauth2_models(user)
         else:
             user.set_password(generate_password(length=25))
             UserPasswordToggleHistory.objects.create(

From 220bc72ad2a55756bd9c8448e6372ca095e97817 Mon Sep 17 00:00:00 2001
From: moeez96 <moeezzahid1996@gmail.com>
Date: Tue, 6 Sep 2022 20:54:12 +0500
Subject: [PATCH 08/77] fix: Fix retiring user auth models on disable event

---
 lms/djangoapps/support/tests/test_views.py  | 13 +++++++++++++
 lms/djangoapps/support/views/manage_user.py |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/support/tests/test_views.py b/lms/djangoapps/support/tests/test_views.py
index dcbfe3c82b62..bf31b23398e9 100644
--- a/lms/djangoapps/support/tests/test_views.py
+++ b/lms/djangoapps/support/tests/test_views.py
@@ -24,6 +24,7 @@
 from edx_proctoring.statuses import ProctoredExamStudentAttemptStatus
 from edx_proctoring.tests.test_services import MockLearningSequencesService, MockScheduleItemData
 from edx_proctoring.tests.utils import ProctoredExamTestCase
+from oauth2_provider.models import AccessToken, RefreshToken
 from opaque_keys.edx.locator import BlockUsageLocator
 from organizations.tests.factories import OrganizationFactory
 from pytz import UTC
@@ -58,6 +59,7 @@
 from lms.djangoapps.verify_student.services import IDVerificationService
 from lms.djangoapps.verify_student.tests.factories import SSOVerificationFactory
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from openedx.core.djangoapps.oauth_dispatch.tests import factories
 from openedx.features.content_type_gating.models import ContentTypeGatingConfig
 from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
 from openedx.features.enterprise_support.api import enterprise_is_enabled
@@ -155,6 +157,15 @@ def test_disable_user_account(self):
         test_user = UserFactory(
             username='foobar', email='foobar@foobar.com', password='foobar'
         )
+
+        application = factories.ApplicationFactory(user=test_user)
+        access_token = factories.AccessTokenFactory(user=test_user, application=application)
+        factories.RefreshTokenFactory(
+            user=test_user, application=application, access_token=access_token
+        )
+        assert 0 != AccessToken.objects.filter(user=test_user).count()
+        assert 0 != RefreshToken.objects.filter(user=test_user).count()
+
         url = reverse('support:manage_user_detail') + test_user.username
         response = self.client.post(url, data={
             'username_or_email': test_user.username,
@@ -164,6 +175,8 @@ def test_disable_user_account(self):
         assert data['success_msg'] == 'User Disabled Successfully'
         test_user = User.objects.get(username=test_user.username, email=test_user.email)
         assert test_user.has_usable_password() is False
+        assert 0 == AccessToken.objects.filter(user=test_user).count()
+        assert 0 == RefreshToken.objects.filter(user=test_user).count()
 
 
 @ddt.ddt
diff --git a/lms/djangoapps/support/views/manage_user.py b/lms/djangoapps/support/views/manage_user.py
index 097202019d91..e29652a905c2 100644
--- a/lms/djangoapps/support/views/manage_user.py
+++ b/lms/djangoapps/support/views/manage_user.py
@@ -75,7 +75,7 @@ def post(self, request, username_or_email):
             UserPasswordToggleHistory.objects.create(
                 user=user, comment=comment, created_by=request.user, disabled=True
             )
-            retire_dot_oauth2_models(request.user)
+            retire_dot_oauth2_models(user)
         else:
             user.set_password(generate_password(length=25))
             UserPasswordToggleHistory.objects.create(

From 7b4975c8434e3ad83b46970ff893d528de7cf7f9 Mon Sep 17 00:00:00 2001
From: Kshitij Sobti <kshitij@sobti.in>
Date: Wed, 19 Oct 2022 12:15:07 +0000
Subject: [PATCH 09/77] docs: Document the discussions app (#31045)

This change documents some of the workings of the discussions app for reference.
---
 .../core/djangoapps/discussions/README.rst    | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 openedx/core/djangoapps/discussions/README.rst

diff --git a/openedx/core/djangoapps/discussions/README.rst b/openedx/core/djangoapps/discussions/README.rst
new file mode 100644
index 000000000000..00bb8a2e78de
--- /dev/null
+++ b/openedx/core/djangoapps/discussions/README.rst
@@ -0,0 +1,66 @@
+Discussions
+===========
+
+This Discussions app is responsible for providing support for configuring
+discussion tools in the Open edX platform. This includes the in-built forum
+tool that uses the `cs_comments_service`, but also other LTI-based tools.
+
+
+Technical Overview
+------------------
+
+This app adds support for alternative Discussion providers, where a provider is
+initially an LTI app that can be embedded in the discussion tab.
+
+A list of supported providers is included configured in this app, with the
+features each app supports, its support level, and other details that are
+returned by the API and drive the UI for selecting and comparing providers in
+the course authoring MFE.
+
+Each context (course) has an associated `DiscussionConfiguration` object that
+specifies the provider to use for that course, and includes other configuration
+information for the course. For LTI-based providers, it's also linked to an
+`LtiConfiguration` entry.
+
+The `plugin_configuration` field on this model is to store
+provider/plugin-specific configuration that won't make sense for other plugins.
+
+Different parts of the course can be linked to different discussion topics. The
+standard use case here to have a topic for each Unit in the course. The
+`DiscussionTopicLink` model handles this association, and links a particular
+usage key in a particular course to a topic.
+
+The new Discussion API is driven entirely by these `DiscussionTopicLinks` in
+the database, so it's possible to have a third-party plugin that changes how
+and where these topic links are created.
+
+When a course is published, the `listen_for_course_publish` signal handler is
+called, and this signal in turn calls the
+update_discussions_settings_from_course_task` in the background.
+
+That task goes through the module store and builds a
+`CourseDiscussionConfigurationData` object that has all the relevant course
+discussion configuration information such as the course key, the provider type,
+whether in-context discussions are enabled, whether graded units are enabled,
+when unit level visibility is enabled. Other plugin configuration and a list
+of discussion contexts for which discussions are enabled. Each discussion
+context has a usage key, a title (the units name) an external id
+(the cs_comments_service id), it's ordering in the course, and additional
+context. It then sends its own signal that has the discussion configuration
+object attached.
+
+Finally, the handler for this discussion change signal, takes the information
+from the discussion change signal and compares it to the topics in the
+database, and does the following;
+
+- If it sees discussions contexts (units) without topics it creates new topics
+  link entries for the new units. This will happen if you create a new unit,
+  or enable discussions for a unit that previously had them disabled.
+
+- If it sees discussion topics without contexts it disables/archives them.
+  This could happen when a unit is deleted or if a unit that previously had
+  discussions enabled, now has discussions disabled.
+
+- If it sees any other change, i.e. unit name change etc. it applies that
+  change to the database as well.
+

From 3f8f0b2ceabc6fff54784fae1cae8ba41ddf4506 Mon Sep 17 00:00:00 2001
From: Kshitij Sobti <kshitij@sobti.in>
Date: Tue, 1 Nov 2022 09:31:27 +0000
Subject: [PATCH 10/77] fix: Change approach to processing course topics
 (#31200)

Course topics are now created by traversing the entire course structure from top to bottom instead of starting at the sequential level and then moving up or down as needed.

This also introduces a lot of debug logs to pontetially find the reason why under some circumstances new units don't get processed and end up without a discussions topic.
---
 .../core/djangoapps/discussions/README.rst    |  2 +-
 .../core/djangoapps/discussions/handlers.py   |  7 ++-
 openedx/core/djangoapps/discussions/tasks.py  | 63 +++++++++++--------
 3 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/openedx/core/djangoapps/discussions/README.rst b/openedx/core/djangoapps/discussions/README.rst
index 00bb8a2e78de..5c1127d324cc 100644
--- a/openedx/core/djangoapps/discussions/README.rst
+++ b/openedx/core/djangoapps/discussions/README.rst
@@ -51,7 +51,7 @@ object attached.
 
 Finally, the handler for this discussion change signal, takes the information
 from the discussion change signal and compares it to the topics in the
-database, and does the following;
+database, and does the following:
 
 - If it sees discussions contexts (units) without topics it creates new topics
   link entries for the new units. This will happen if you create a new unit,
diff --git a/openedx/core/djangoapps/discussions/handlers.py b/openedx/core/djangoapps/discussions/handlers.py
index 8787da82cee2..c894a6a53b8c 100644
--- a/openedx/core/djangoapps/discussions/handlers.py
+++ b/openedx/core/djangoapps/discussions/handlers.py
@@ -61,14 +61,16 @@ def update_course_discussion_config(configuration: CourseDiscussionConfiguration
             lookup_key = topic_link.usage_key or topic_link.external_id
             topic_context = new_topic_map.pop(lookup_key, None)
             if topic_context is None:
+                log.info(f"[DEBUG INF-291] Unit was deleted or discussion disabled: {lookup_key}")
                 topic_link.enabled_in_context = False
                 try:
                     # If the section/subsection/unit a topic is in is deleted, add that context to title.
                     topic_link.title = "{section}|{subsection}|{unit}".format(**topic_link.context)
                 except KeyError:
-                    # It's possible the context is if the topic link was created before the context field was added.
+                    # It's possible the context is empty if the link was created before the context field was added.
                     pass
             else:
+                log.info(f"[DEBUG INF-291] Unit topic already exists, will be updated: {lookup_key}")
                 topic_link.enabled_in_context = True
                 topic_link.ordering = topic_context.ordering
                 topic_link.title = topic_context.title
@@ -78,6 +80,9 @@ def update_course_discussion_config(configuration: CourseDiscussionConfiguration
             topic_link.save()
         log.info(f"Creating new discussion topic links for {course_key}")
 
+        log.info(f"[DEBUG INF-291] Discovered new units with keys: {[str(key) for key in new_topic_map.keys()]}")
+        log.info(f"[DEBUG INF-291] New unit names: {[topic.title for topic in new_topic_map.values()]}")
+
         DiscussionTopicLink.objects.bulk_create([
             DiscussionTopicLink(
                 context_key=course_key,
diff --git a/openedx/core/djangoapps/discussions/tasks.py b/openedx/core/djangoapps/discussions/tasks.py
index 9cbfac57d599..0113c63d831a 100644
--- a/openedx/core/djangoapps/discussions/tasks.py
+++ b/openedx/core/djangoapps/discussions/tasks.py
@@ -51,37 +51,48 @@ def update_discussions_settings_from_course(course_key: CourseKey) -> CourseDisc
     provider_type = discussions_config.provider_type
 
     def iter_discussable_units():
-        subsections = store.get_items(course_key, qualifiers={"category": "sequential"})
         # Start at 99 so that the initial increment starts it at 100.
         # This leaves the first 100 slots for the course wide topics, which is only a concern if there are more
         # than that many.
         idx = 99
-        for subsection in subsections:
-            section = store.get_item(subsection.parent)
-            for unit in subsection.get_children():
-                # Increment index even for skipped units so that the index is more stable and won't change
-                # if settings change, only if a unit is added or removed.
-                idx += 1
-                # If unit-level visibility is enabled and the unit doesn't have discussion enabled, skip it.
-                if unit_level_visibility and not getattr(unit, "discussion_enabled", False):
+        log.info(f"[DEBUG INF-291] Unit-level visibility enabled: {unit_level_visibility}")
+        for section in course.get_children():
+            if section.location.block_type != "chapter":
+                continue
+            for subsection in section.get_children():
+                if subsection.location.block_type != "sequential":
                     continue
-                # If the unit is in a graded section and graded sections aren't enabled skip it.
-                if subsection.graded and not enable_graded_units:
-                    continue
-                # If the unit is an exam, skip it.
-                if subsection.is_practice_exam or subsection.is_proctored_enabled or subsection.is_time_limited:
-                    continue
-                yield DiscussionTopicContext(
-                    usage_key=unit.location,
-                    title=unit.display_name,
-                    group_id=None,
-                    ordering=idx,
-                    context={
-                        "section": section.display_name,
-                        "subsection": subsection.display_name,
-                        "unit": unit.display_name,
-                    },
-                )
+                for unit in subsection.get_children():
+                    if unit.location.block_type != 'vertical':
+                        continue
+                    log.info(f"[DEBUG INF-291] Processing unit: {unit.location}")
+                    # Increment index even for skipped units so that the index is more stable and won't change
+                    # if settings change, only if a unit is added or removed.
+                    idx += 1
+                    # If unit-level visibility is enabled and the unit doesn't have discussion enabled, skip it.
+                    if unit_level_visibility and not getattr(unit, "discussion_enabled", False):
+                        log.info(f"[DEBUG INF-291] Skipping unit because discussion is disbled: {unit.location}")
+                        continue
+                    # If the unit is in a graded section and graded sections aren't enabled skip it.
+                    if subsection.graded and not enable_graded_units:
+                        log.info(f"[DEBUG INF-291] Skipping unit because it's in a graded subsection: {unit.location}")
+                        continue
+                    # If the unit is an exam, skip it.
+                    if subsection.is_practice_exam or subsection.is_proctored_enabled or subsection.is_time_limited:
+                        log.info(f"[DEBUG INF-291] Skipping unit because it's in an exam: {unit.location}")
+                        continue
+                    log.info(f"[DEBUG INF-291] Topic will be created for unit: {unit.location}")
+                    yield DiscussionTopicContext(
+                        usage_key=unit.location,
+                        title=unit.display_name,
+                        group_id=None,
+                        ordering=idx,
+                        context={
+                            "section": section.display_name,
+                            "subsection": subsection.display_name,
+                            "unit": unit.display_name,
+                        },
+                    )
 
     with store.branch_setting(ModuleStoreEnum.Branch.published_only, course_key):
         course = store.get_course(course_key)

From 023e07c29ef081dd4f5f444386a8290641abc6d9 Mon Sep 17 00:00:00 2001
From: Kshitij Sobti <kshitij@sobti.in>
Date: Fri, 18 Nov 2022 11:49:29 +0000
Subject: [PATCH 11/77] fix: delay creation of course topics after course
 publish (#31307)

When running in a sharded MongoDB setup it's possible that querying the
modulestore right after the course publish signal will not return the
latest data.

This commit adds a delay similar to the one used in other places in the
codebase for a similar reason.
---
 cms/djangoapps/contentstore/signals/handlers.py | 5 ++++-
 openedx/core/djangoapps/discussions/handlers.py | 5 -----
 openedx/core/djangoapps/discussions/tasks.py    | 6 ------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/cms/djangoapps/contentstore/signals/handlers.py b/cms/djangoapps/contentstore/signals/handlers.py
index 44bfdea32908..76711eaa4ddc 100644
--- a/cms/djangoapps/contentstore/signals/handlers.py
+++ b/cms/djangoapps/contentstore/signals/handlers.py
@@ -145,7 +145,10 @@ def listen_for_course_publish(sender, course_key, **kwargs):  # pylint: disable=
     if CoursewareSearchIndexer.indexing_is_enabled() and CourseAboutSearchIndexer.indexing_is_enabled():
         update_search_index.delay(course_key_str, datetime.now(UTC).isoformat())
 
-    update_discussions_settings_from_course_task.delay(course_key_str)
+    update_discussions_settings_from_course_task.apply_async(
+        args=[course_key_str],
+        countdown=settings.DISCUSSION_SETTINGS['COURSE_PUBLISH_TASK_DELAY'],
+    )
 
     # Send to a signal for catalog info changes as well, but only once we know the transaction is committed.
     transaction.on_commit(lambda: emit_catalog_info_changed_signal(course_key))
diff --git a/openedx/core/djangoapps/discussions/handlers.py b/openedx/core/djangoapps/discussions/handlers.py
index c894a6a53b8c..f43aaf4b09eb 100644
--- a/openedx/core/djangoapps/discussions/handlers.py
+++ b/openedx/core/djangoapps/discussions/handlers.py
@@ -61,7 +61,6 @@ def update_course_discussion_config(configuration: CourseDiscussionConfiguration
             lookup_key = topic_link.usage_key or topic_link.external_id
             topic_context = new_topic_map.pop(lookup_key, None)
             if topic_context is None:
-                log.info(f"[DEBUG INF-291] Unit was deleted or discussion disabled: {lookup_key}")
                 topic_link.enabled_in_context = False
                 try:
                     # If the section/subsection/unit a topic is in is deleted, add that context to title.
@@ -70,7 +69,6 @@ def update_course_discussion_config(configuration: CourseDiscussionConfiguration
                     # It's possible the context is empty if the link was created before the context field was added.
                     pass
             else:
-                log.info(f"[DEBUG INF-291] Unit topic already exists, will be updated: {lookup_key}")
                 topic_link.enabled_in_context = True
                 topic_link.ordering = topic_context.ordering
                 topic_link.title = topic_context.title
@@ -80,9 +78,6 @@ def update_course_discussion_config(configuration: CourseDiscussionConfiguration
             topic_link.save()
         log.info(f"Creating new discussion topic links for {course_key}")
 
-        log.info(f"[DEBUG INF-291] Discovered new units with keys: {[str(key) for key in new_topic_map.keys()]}")
-        log.info(f"[DEBUG INF-291] New unit names: {[topic.title for topic in new_topic_map.values()]}")
-
         DiscussionTopicLink.objects.bulk_create([
             DiscussionTopicLink(
                 context_key=course_key,
diff --git a/openedx/core/djangoapps/discussions/tasks.py b/openedx/core/djangoapps/discussions/tasks.py
index 0113c63d831a..1985da1c9aab 100644
--- a/openedx/core/djangoapps/discussions/tasks.py
+++ b/openedx/core/djangoapps/discussions/tasks.py
@@ -55,7 +55,6 @@ def iter_discussable_units():
         # This leaves the first 100 slots for the course wide topics, which is only a concern if there are more
         # than that many.
         idx = 99
-        log.info(f"[DEBUG INF-291] Unit-level visibility enabled: {unit_level_visibility}")
         for section in course.get_children():
             if section.location.block_type != "chapter":
                 continue
@@ -65,23 +64,18 @@ def iter_discussable_units():
                 for unit in subsection.get_children():
                     if unit.location.block_type != 'vertical':
                         continue
-                    log.info(f"[DEBUG INF-291] Processing unit: {unit.location}")
                     # Increment index even for skipped units so that the index is more stable and won't change
                     # if settings change, only if a unit is added or removed.
                     idx += 1
                     # If unit-level visibility is enabled and the unit doesn't have discussion enabled, skip it.
                     if unit_level_visibility and not getattr(unit, "discussion_enabled", False):
-                        log.info(f"[DEBUG INF-291] Skipping unit because discussion is disbled: {unit.location}")
                         continue
                     # If the unit is in a graded section and graded sections aren't enabled skip it.
                     if subsection.graded and not enable_graded_units:
-                        log.info(f"[DEBUG INF-291] Skipping unit because it's in a graded subsection: {unit.location}")
                         continue
                     # If the unit is an exam, skip it.
                     if subsection.is_practice_exam or subsection.is_proctored_enabled or subsection.is_time_limited:
-                        log.info(f"[DEBUG INF-291] Skipping unit because it's in an exam: {unit.location}")
                         continue
-                    log.info(f"[DEBUG INF-291] Topic will be created for unit: {unit.location}")
                     yield DiscussionTopicContext(
                         usage_key=unit.location,
                         title=unit.display_name,

From c459d6cfa1241101152fc231455e5ffe80ea73e9 Mon Sep 17 00:00:00 2001
From: Muhammad Adeel Tajamul
 <77053848+muhammadadeeltajamul@users.noreply.github.com>
Date: Wed, 12 Oct 2022 12:00:32 +0500
Subject: [PATCH 12/77] fix: removed switch experience bar from legacy (#31138)

Co-authored-by: adeel.tajamul <adeel.tajamul@arbisoft.com>
---
 .../discussion/discussion_board_fragment.html |  1 -
 .../_switch_experience_fragment.html          | 74 -------------------
 2 files changed, 75 deletions(-)
 delete mode 100644 lms/templates/discussion/_switch_experience_fragment.html

diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html b/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html
index a99739f07c48..be7bce1733e9 100644
--- a/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html
+++ b/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html
@@ -23,7 +23,6 @@
          data-sort-preference="${sort_preference}"
          data-flag-moderator="${json.dumps(flag_moderator)}"
          data-user-group-id="${user_group_id}">
-    <%include file="_switch_experience_fragment.html" />
     <header class="page-header has-secondary">
         ## Breadcrumb navigation
         <div class="page-header-main">
diff --git a/lms/templates/discussion/_switch_experience_fragment.html b/lms/templates/discussion/_switch_experience_fragment.html
deleted file mode 100644
index c718bed6dcad..000000000000
--- a/lms/templates/discussion/_switch_experience_fragment.html
+++ /dev/null
@@ -1,74 +0,0 @@
-## mako
-
-<%page expression_filter="h"/>
-
-<%!
-from django.utils.translation import ugettext as _
-%>
-
-% if show_banner:
-<div class="d-flex bg-primary text-white align-items-center px-4 py-1">
-    % if show_mfe:
-    <div class="d-flex w-100 small align-items-center">
-        ${_("Welcome to the new discussions experience. Please share your feedback.")}
-        <div class="legacy-button pl-2" role="button" tabindex="-1">
-            <svg  xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 20 20" fill="none" style="padding-top: 4px">
-                <path d="M9 5H11V7H9V5ZM9 9H11V15H9V9ZM10 0C4.48 0 0 4.48 0 10C0 15.52 4.48 20 10 20C15.52 20 20 15.52 20 10C20 4.48 15.52 0 10 0ZM10 18C5.59 18 2 14.41 2 10C2 5.59 5.59 2 10 2C14.41 2 18 5.59 18 10C18 14.41 14.41 18 10 18Z" fill="white"/>
-            </svg>
-
-            <span class="tooltiptext py-2">
-                <a href="${legacy_url}" class="px-2 tooltip-link">
-                        ${_('View legacy experience')}
-                </a>
-            </span>
-        </div>
-    </div>
-    % else:
-    <div class="d-flex w-100 small">
-        ${_("You are currently using the old discussions experience that will be deprecated soon. If you are facing any issues with the new experience, please share using the feedback button.")}
-    </div>
-    <a class="btn btn-inverse-primary ml-2" style="font-size: 12px;" href="${mfe_url}">
-        ${_("Switch to new experience")}
-    </a>
-    %endif
-
-    % if share_feedback_url:
-        <a class="btn btn-inverse-primary ml-2" style="font-size: 12px;" href="${share_feedback_url}" target="_blank" rel="noopener">
-            ${_("Share feedback")}
-        </a>
-    % endif
-</div>
-% endif
-
-
-<style>
-    /* This style is added as temporary fix to achieve design requirement as this feature will be deprecated soon */
-    /* The relevant scss files are not picking up design */
-
-    .legacy-button {
-        position: relative;
-        display: inline-block;
-    }
-    .legacy-button .tooltiptext {
-        visibility: hidden;
-        position: absolute;
-        background: #FFFFFF;
-        border-radius: 4px;
-        box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15), 0px 2px 8px rgba(0, 0, 0, 0.15);
-        width: max-content;
-        top: 100%;
-        left: 0%;
-    }
-    .legacy-button:hover .tooltiptext {
-        visibility: visible;
-        opacity: 1;
-    }
-    .tooltip-link{
-        color: #454545;
-    }
-    .tooltip-link:hover {
-        background-color:#e7e7e7;
-        color: #454545 !important;
-    }
-
-</style>

From 470b5d7572867a81c90376d07407a462ff778e75 Mon Sep 17 00:00:00 2001
From: Demid <demid@opencraft.com>
Date: Wed, 12 Oct 2022 14:41:06 +0300
Subject: [PATCH 13/77] feat: add "count_flagged" query param to the learner
 thread endpoint (#31048)

---
 lms/djangoapps/discussion/rest_api/api.py   | 2 +-
 lms/djangoapps/discussion/rest_api/views.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index e73278fb8818..570a47dacf10 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -892,7 +892,7 @@ def get_learner_active_thread_list(request, course_key, query_params):
     request: The django request objects used for build_absolute_uri
     course_key: The key of the course
     query_params: Parameters to fetch data from comments service. It must contain
-                        user_id, course_id, page, per_page, group_id
+                        user_id, course_id, page, per_page, group_id, count_flagged
 
     Returns:
 
diff --git a/lms/djangoapps/discussion/rest_api/views.py b/lms/djangoapps/discussion/rest_api/views.py
index 3c3e4c545dab..da55651463b2 100644
--- a/lms/djangoapps/discussion/rest_api/views.py
+++ b/lms/djangoapps/discussion/rest_api/views.py
@@ -571,6 +571,9 @@ class LearnerThreadView(APIView):
         * page: The (1-indexed) page to retrieve (default is 1)
 
         * page_size: The number of items per page (default is 10)
+
+        * count_flagged: If True, return the count of flagged comments for each thread.
+        (can only be used by moderators or above)
     """
 
     authentication_classes = (
@@ -590,6 +593,7 @@ def get(self, request, course_id=None):
         course_key = CourseKey.from_string(course_id)
         page_num = request.GET.get('page', 1)
         threads_per_page = request.GET.get('page_size', 10)
+        count_flagged = request.GET.get('count_flagged', False)
         discussion_id = None
         username = request.GET.get('username', None)
         user = get_object_or_404(User, username=username)
@@ -604,7 +608,8 @@ def get(self, request, course_id=None):
             "per_page": threads_per_page,
             "course_id": str(course_key),
             "user_id": user.id,
-            "group_id": group_id
+            "group_id": group_id,
+            "count_flagged": count_flagged,
         }
         return get_learner_active_thread_list(request, course_key, query_params)
 

From 10b5849ab11506630d3c058884b286f98227e425 Mon Sep 17 00:00:00 2001
From: Ahtisham Shahid <ahtisham300@gmail.com>
Date: Thu, 13 Oct 2022 15:09:19 +0500
Subject: [PATCH 14/77] fix: updated topic sorting for discussions MFE (#31124)

* fix: updated topic sorting for discussions MFE

* feat: updated topic sorting test case
---
 lms/djangoapps/discussion/rest_api/api.py     | 59 ++++++++++++-------
 .../discussion/rest_api/tests/test_api.py     | 24 ++++----
 2 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 570a47dacf10..4791b57034e3 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -4,8 +4,8 @@
 from __future__ import annotations
 
 import itertools
+import re
 from collections import defaultdict
-
 from enum import Enum
 from typing import Dict, Iterable, List, Literal, Optional, Set, Tuple
 from urllib.parse import urlencode, urlunparse
@@ -22,12 +22,8 @@
 from opaque_keys.edx.locator import CourseKey
 from rest_framework import status
 from rest_framework.exceptions import PermissionDenied
-from rest_framework.response import Response
 from rest_framework.request import Request
-
-from xmodule.course_module import CourseBlock
-from xmodule.modulestore.django import modulestore
-from xmodule.tabs import CourseTabList
+from rest_framework.response import Response
 
 from lms.djangoapps.course_blocks.api import get_course_blocks
 from lms.djangoapps.courseware.courses import get_course_with_access
@@ -41,48 +37,53 @@
 from openedx.core.djangoapps.django_comment_common.comment_client.comment import Comment
 from openedx.core.djangoapps.django_comment_common.comment_client.course import (
     get_course_commentable_counts,
-    get_course_user_stats,
+    get_course_user_stats
 )
 from openedx.core.djangoapps.django_comment_common.comment_client.thread import Thread
-from openedx.core.djangoapps.django_comment_common.comment_client.utils import CommentClientRequestError, \
-    CommentClient500Error
+from openedx.core.djangoapps.django_comment_common.comment_client.utils import (
+    CommentClient500Error,
+    CommentClientRequestError
+)
 from openedx.core.djangoapps.django_comment_common.models import (
     FORUM_ROLE_ADMINISTRATOR,
     FORUM_ROLE_COMMUNITY_TA,
     FORUM_ROLE_GROUP_MODERATOR,
     FORUM_ROLE_MODERATOR,
     CourseDiscussionSettings,
-    Role,
+    Role
 )
 from openedx.core.djangoapps.django_comment_common.signals import (
     comment_created,
     comment_deleted,
     comment_edited,
+    comment_flagged,
     comment_voted,
     thread_created,
     thread_deleted,
     thread_edited,
-    thread_voted,
     thread_flagged,
-    comment_flagged,
+    thread_voted
 )
 from openedx.core.djangoapps.user_api.accounts.api import get_account_settings
 from openedx.core.lib.exceptions import CourseNotFoundError, DiscussionNotFoundError, PageNotFoundError
-from ..config.waffle import ENABLE_LEARNERS_STATS
+from xmodule.course_module import CourseBlock
+from xmodule.modulestore.django import modulestore
+from xmodule.tabs import CourseTabList
 
+from ..config.waffle import ENABLE_LEARNERS_STATS
 from ..django_comment_client.base.views import (
     track_comment_created_event,
     track_comment_deleted_event,
     track_thread_created_event,
     track_thread_deleted_event,
     track_thread_viewed_event,
-    track_voted_event,
+    track_voted_event
 )
 from ..django_comment_client.utils import (
     get_group_id_for_user,
     get_user_role_names,
     has_discussion_privileges,
-    is_commentable_divided,
+    is_commentable_divided
 )
 from ..toggles import ENABLE_DISCUSSION_MODERATION_REASON_CODES
 from .exceptions import CommentNotFoundError, DiscussionBlackOutException, DiscussionDisabledError, ThreadNotFoundError
@@ -92,7 +93,7 @@
     can_delete,
     get_editable_fields,
     get_initializable_comment_fields,
-    get_initializable_thread_fields,
+    get_initializable_thread_fields
 )
 from .serializers import (
     CommentSerializer,
@@ -101,14 +102,14 @@
     ThreadSerializer,
     TopicOrdering,
     UserStatsSerializer,
-    get_context,
+    get_context
 )
-
 from .utils import (
+    add_stats_for_users_with_no_discussion_content,
     discussion_open_for_user,
+    get_usernames_for_course,
     get_usernames_from_search_string,
-    add_stats_for_users_with_no_discussion_content,
-    set_attribute, get_usernames_for_course,
+    set_attribute
 )
 
 User = get_user_model()
@@ -383,7 +384,23 @@ def get_courseware_topics(
     for xblock in discussion_xblocks:
         xblocks_by_category[xblock.discussion_category].append(xblock)
 
-    for category in xblocks_by_category.keys():
+    def sort_categories(category_list):
+        """
+        Sorts the given iterable containing alphanumeric correctly.
+        Required arguments:
+        category_list -- list of categories.
+        """
+        def convert(text):
+            if text.isdigit():
+                return int(text)
+            return text
+
+        def alphanum_key(key):
+            return [convert(c) for c in re.split('([0-9]+)', key)]
+
+        return sorted(category_list, key=alphanum_key)
+
+    for category in sort_categories(xblocks_by_category.keys()):
         children = []
         for xblock in xblocks_by_category[category]:
             if not topic_ids or xblock.discussion_id in topic_ids:
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_api.py b/lms/djangoapps/discussion/rest_api/tests/test_api.py
index a36ba5580ad9..83c8e9dda9ea 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_api.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_api.py
@@ -408,17 +408,17 @@ def test_many(self):
                 "B": {"id": "non-courseware-2"},
             }
             self.store.update_item(self.course, self.user.id)
-            self.make_discussion_xblock("courseware-1", "A", "1")
-            self.make_discussion_xblock("courseware-2", "A", "2")
-            self.make_discussion_xblock("courseware-3", "B", "1")
-            self.make_discussion_xblock("courseware-4", "B", "2")
-            self.make_discussion_xblock("courseware-5", "C", "1")
+            self.make_discussion_xblock("courseware-1", "Week 1", "1")
+            self.make_discussion_xblock("courseware-2", "Week 1", "2")
+            self.make_discussion_xblock("courseware-3", "Week 10", "1")
+            self.make_discussion_xblock("courseware-4", "Week 10", "2")
+            self.make_discussion_xblock("courseware-5", "Week 9", "1")
         actual = self.get_course_topics()
         expected = {
             "courseware_topics": [
                 self.make_expected_tree(
                     None,
-                    "A",
+                    "Week 1",
                     [
                         self.make_expected_tree("courseware-1", "1"),
                         self.make_expected_tree("courseware-2", "2"),
@@ -426,17 +426,17 @@ def test_many(self):
                 ),
                 self.make_expected_tree(
                     None,
-                    "B",
+                    "Week 9",
+                    [self.make_expected_tree("courseware-5", "1")]
+                ),
+                self.make_expected_tree(
+                    None,
+                    "Week 10",
                     [
                         self.make_expected_tree("courseware-3", "1"),
                         self.make_expected_tree("courseware-4", "2"),
                     ]
                 ),
-                self.make_expected_tree(
-                    None,
-                    "C",
-                    [self.make_expected_tree("courseware-5", "1")]
-                ),
             ],
             "non_courseware_topics": [
                 self.make_expected_tree("non-courseware-1", "A"),

From 00da61d38700582a4a71c64eb40cbe7a8d8ddd14 Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Fri, 30 Sep 2022 14:51:37 +0500
Subject: [PATCH 15/77] fix: filter out discussion topics that have not started
 yet for instructor paced courses

---
 lms/djangoapps/discussion/rest_api/api.py     |  9 +++-
 .../discussion/rest_api/tests/test_api.py     | 47 +++++++++++++++----
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 4791b57034e3..89b02eb66165 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -6,9 +6,13 @@
 import itertools
 import re
 from collections import defaultdict
+from datetime import datetime
+
 from enum import Enum
 from typing import Dict, Iterable, List, Literal, Optional, Set, Tuple
 from urllib.parse import urlencode, urlunparse
+from pytz import UTC
+
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -379,10 +383,13 @@ def get_courseware_topics(
     courseware_topics = []
     existing_topic_ids = set()
 
+    now = datetime.now(UTC)
+
     discussion_xblocks = get_accessible_discussion_xblocks(course, request.user)
     xblocks_by_category = defaultdict(list)
     for xblock in discussion_xblocks:
-        xblocks_by_category[xblock.discussion_category].append(xblock)
+        if course.self_paced or (xblock.start and xblock.start < now):
+            xblocks_by_category[xblock.discussion_category].append(xblock)
 
     def sort_categories(category_list):
         """
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_api.py b/lms/djangoapps/discussion/rest_api/tests/test_api.py
index 83c8e9dda9ea..b8c8a3d5086e 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_api.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_api.py
@@ -503,7 +503,6 @@ def test_access_control(self):
         ways in which a user may not have access are:
 
         * Module is visible to staff only
-        * Module has a start date in the future
         * Module is accessible only to a group the user is not in
 
         Also, there is a case that ensures that a category with no accessible
@@ -575,12 +574,7 @@ def test_access_control(self):
                         self.make_expected_tree("courseware-3", "Cohort B"),
                         self.make_expected_tree("courseware-1", "Everybody"),
                     ]
-                ),
-                self.make_expected_tree(
-                    None,
-                    "Second",
-                    [self.make_expected_tree("courseware-5", "Future Start Date")]
-                ),
+                )
             ],
             "non_courseware_topics": [
                 self.make_expected_tree("non-courseware-topic-id", "Test Topic"),
@@ -605,7 +599,6 @@ def test_access_control(self):
                     None,
                     "Second",
                     [
-                        self.make_expected_tree("courseware-5", "Future Start Date"),
                         self.make_expected_tree("courseware-4", "Staff Only"),
                     ]
                 ),
@@ -616,6 +609,44 @@ def test_access_control(self):
         }
         assert staff_actual == staff_expected
 
+    def test_un_released_discussion_topic(self):
+        """
+        Test discussion topics that have not yet started
+        """
+        staff = StaffFactory.create(course_key=self.course.id)
+        with self.store.bulk_operations(self.course.id, emit_signals=False):
+            self.store.update_item(self.course, self.user.id)
+            self.make_discussion_xblock(
+                "courseware-2",
+                "First",
+                "Released",
+                start=datetime.now(UTC) - timedelta(days=1)
+            )
+            self.make_discussion_xblock(
+                "courseware-3",
+                "First",
+                "Future release",
+                start=datetime.now(UTC) + timedelta(days=1)
+            )
+
+        self.request.user = staff
+        staff_actual = self.get_course_topics()
+        staff_expected = {
+            "courseware_topics": [
+                self.make_expected_tree(
+                    None,
+                    "First",
+                    [
+                        self.make_expected_tree("courseware-2", "Released"),
+                    ]
+                ),
+            ],
+            "non_courseware_topics": [
+                self.make_expected_tree("non-courseware-topic-id", "Test Topic"),
+            ],
+        }
+        assert staff_actual == staff_expected
+
     def test_discussion_topic(self):
         """
         Tests discussion topic details against a requested topic id

From fdedd9b57090fb76089d537c80bbe86126a6af76 Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Fri, 28 Oct 2022 18:44:56 +0500
Subject: [PATCH 16/77] refactor: remove todo to add tracking for reported
 content email notification

---
 lms/djangoapps/discussion/tasks.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lms/djangoapps/discussion/tasks.py b/lms/djangoapps/discussion/tasks.py
index 90ece99da47a..7c2e68f31dc7 100644
--- a/lms/djangoapps/discussion/tasks.py
+++ b/lms/djangoapps/discussion/tasks.py
@@ -115,7 +115,6 @@ def send_ace_message_for_reported_content(context):  # lint-amnesty, pylint: dis
             )
             log.info(f'Sending forum reported content email notification with context {message_context}')
             ace.send(message)
-            # TODO: add tracking for reported content email
 
 
 def _track_notification_sent(message, context):

From ef6bda13aad1addc9ab8dbd36d1fa1001b132d26 Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Thu, 27 Oct 2022 17:00:37 +0500
Subject: [PATCH 17/77] feat: add discussion reported and unreported events

---
 .../django_comment_client/base/views.py       | 86 ++++++++++++++++++
 lms/djangoapps/discussion/rest_api/api.py     | 15 ++--
 .../discussion/rest_api/tests/test_api.py     | 87 ++++++++++++++++++-
 lms/djangoapps/discussion/views.py            | 21 +----
 4 files changed, 182 insertions(+), 27 deletions(-)

diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index c842b2271446..6072ebd902a5 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/views.py
@@ -263,6 +263,92 @@ def track_comment_deleted_event(request, course, comment):
     track_forum_event(request, event_name, course, comment, event_data)
 
 
+def track_thread_reported_event(request, course, thread):
+    """
+    Send analytics event for a reported thread.
+    """
+    event_name = _EVENT_NAME_TEMPLATE.format(obj_type='thread', action_name='reported')
+    event_data = {
+        'body': thread.body[:TRACKING_MAX_FORUM_BODY],
+        'content_type': 'Post',
+        'commentable_id': thread.get('commentable_id', ''),
+    }
+    if hasattr(thread, 'username'):
+        event_data['target_username'] = thread.get('username', '')
+    add_truncated_title_to_event_data(event_data, thread.get('title', ''))
+    track_forum_event(request, event_name, course, thread, event_data)
+
+
+def track_comment_reported_event(request, course, comment):
+    """
+    Send analytics event for a reported response or comment.
+    """
+    obj_type = 'comment' if comment.get('parent_id') else 'response'
+    event_name = _EVENT_NAME_TEMPLATE.format(obj_type=obj_type, action_name='reported')
+    event_data = {
+        'body': comment.body[:TRACKING_MAX_FORUM_BODY],
+        'commentable_id': comment.get('commentable_id', ''),
+        'content_type': obj_type.capitalize(),
+    }
+    if hasattr(comment, 'username'):
+        event_data['target_username'] = comment.get('username', '')
+    track_forum_event(request, event_name, course, comment, event_data)
+
+
+def track_thread_unreported_event(request, course, thread):
+    """
+    Send analytics event for a unreported thread.
+    """
+    event_name = _EVENT_NAME_TEMPLATE.format(obj_type='thread', action_name='unreported')
+    event_data = {
+        'body': thread.body[:TRACKING_MAX_FORUM_BODY],
+        'content_type': 'Post',
+        'commentable_id': thread.get('commentable_id', ''),
+        'reported_status_cleared': not bool(thread.get('abuse_flaggers', [])),
+    }
+    if hasattr(thread, 'username'):
+        event_data['target_username'] = thread.get('username', '')
+    add_truncated_title_to_event_data(event_data, thread.get('title', ''))
+    track_forum_event(request, event_name, course, thread, event_data)
+
+
+def track_comment_unreported_event(request, course, comment):
+    """
+    Send analytics event for a unreported response or comment.
+    """
+    obj_type = 'comment' if comment.get('parent_id') else 'response'
+    event_name = _EVENT_NAME_TEMPLATE.format(obj_type=obj_type, action_name='unreported')
+    event_data = {
+        'body': comment.body[:TRACKING_MAX_FORUM_BODY],
+        'commentable_id': comment.get('commentable_id', ''),
+        'content_type': obj_type.capitalize(),
+        'reported_status_cleared': not bool(comment.get('abuse_flaggers', [])),
+    }
+    if hasattr(comment, 'username'):
+        event_data['target_username'] = comment.get('username', '')
+    track_forum_event(request, event_name, course, comment, event_data)
+
+
+def track_discussion_reported_event(request, course, cc_content):
+    """
+    Helper method for discussion reported events.
+    """
+    if cc_content.type == 'thread':
+        track_thread_reported_event(request, course, cc_content)
+    else:
+        track_comment_reported_event(request, course, cc_content)
+
+
+def track_discussion_unreported_event(request, course, cc_content):
+    """
+    Helper method for discussion unreported events.
+    """
+    if cc_content.type == 'thread':
+        track_thread_unreported_event(request, course, cc_content)
+    else:
+        track_comment_unreported_event(request, course, cc_content)
+
+
 def permitted(func):
     """
     View decorator to verify the user is authorized to access this endpoint.
diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 89b02eb66165..768a56340a0f 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -34,7 +34,7 @@
 from lms.djangoapps.courseware.exceptions import CourseAccessRedirect
 from lms.djangoapps.discussion.toggles import ENABLE_DISCUSSIONS_MFE, ENABLE_LEARNERS_TAB_IN_DISCUSSIONS_MFE
 from lms.djangoapps.discussion.toggles_utils import reported_content_email_notification_enabled
-from lms.djangoapps.discussion.views import is_user_moderator
+from lms.djangoapps.discussion.views import is_privileged_user
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, DiscussionTopicLink, Provider
 from openedx.core.djangoapps.discussions.utils import get_accessible_discussion_xblocks
 from openedx.core.djangoapps.django_comment_common import comment_client
@@ -81,7 +81,9 @@
     track_thread_created_event,
     track_thread_deleted_event,
     track_thread_viewed_event,
-    track_voted_event
+    track_voted_event,
+    track_discussion_reported_event,
+    track_discussion_unreported_event,
 )
 from ..django_comment_client.utils import (
     get_group_id_for_user,
@@ -1196,7 +1198,7 @@ def _do_extra_actions(api_content, cc_content, request_fields, actions_form, con
             if field == "following":
                 _handle_following_field(form_value, context["cc_requester"], cc_content)
             elif field == "abuse_flagged":
-                _handle_abuse_flagged_field(form_value, context["cc_requester"], cc_content)
+                _handle_abuse_flagged_field(form_value, context["cc_requester"], cc_content, request)
             elif field == "voted":
                 _handle_voted_field(form_value, cc_content, api_content, request, context)
             elif field == "read":
@@ -1215,11 +1217,13 @@ def _handle_following_field(form_value, user, cc_content):
         user.unfollow(cc_content)
 
 
-def _handle_abuse_flagged_field(form_value, user, cc_content):
+def _handle_abuse_flagged_field(form_value, user, cc_content, request):
     """mark or unmark thread/comment as abused"""
     course_key = CourseKey.from_string(cc_content.course_id)
+    course = get_course_with_access(request.user, 'load', course_key)
     if form_value:
         cc_content.flagAbuse(user, cc_content)
+        track_discussion_reported_event(request, course, cc_content)
         if ENABLE_DISCUSSIONS_MFE.is_enabled(course_key) and reported_content_email_notification_enabled(
                 course_key):
             if cc_content.type == 'thread':
@@ -1227,8 +1231,9 @@ def _handle_abuse_flagged_field(form_value, user, cc_content):
             else:
                 comment_flagged.send(sender='flag_abuse_for_comment', user=user, post=cc_content)
     else:
-        remove_all = bool(is_user_moderator(course_key, User.objects.get(id=user.id)))
+        remove_all = bool(is_privileged_user(course_key, User.objects.get(id=user.id)))
         cc_content.unFlagAbuse(user, cc_content, remove_all)
+        track_discussion_unreported_event(request, course, cc_content)
 
 
 def _handle_voted_field(form_value, cc_content, api_content, request, context):
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_api.py b/lms/djangoapps/discussion/rest_api/tests/test_api.py
index b8c8a3d5086e..15e6fb8cfb05 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_api.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_api.py
@@ -21,6 +21,7 @@
 from opaque_keys.edx.locator import CourseLocator
 from pytz import UTC
 from rest_framework.exceptions import PermissionDenied
+
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase
@@ -2830,7 +2831,8 @@ def test_vote_count_two_users(
 
     @ddt.data(*itertools.product([True, False], [True, False]))
     @ddt.unpack
-    def test_abuse_flagged(self, old_flagged, new_flagged):
+    @mock.patch("eventtracking.tracker.emit")
+    def test_abuse_flagged(self, old_flagged, new_flagged, mock_emit):
         """
         Test attempts to edit the "abuse_flagged" field.
 
@@ -2857,12 +2859,33 @@ def test_abuse_flagged(self, old_flagged, new_flagged):
             assert httpretty.last_request().method == 'PUT'
             assert parsed_body(httpretty.last_request()) == {'user_id': [str(self.user.id)]}
 
+            expected_event_name = 'edx.forum.thread.reported' if new_flagged else 'edx.forum.thread.unreported'
+            expected_event_data = {
+                'body': 'Original body',
+                'id': 'test_thread',
+                'content_type': 'Post',
+                'commentable_id': 'original_topic',
+                'url': '',
+                'user_course_roles': [],
+                'user_forums_roles': [FORUM_ROLE_STUDENT],
+                'target_username': self.user.username,
+                'title_truncated': False,
+                'title': 'Original Title',
+            }
+            if not new_flagged:
+                expected_event_data['reported_status_cleared'] = False
+
+            actual_event_name, actual_event_data = mock_emit.call_args[0]
+            self.assertEqual(actual_event_name, expected_event_name)
+            self.assertEqual(actual_event_data, expected_event_data)
+
     @ddt.data(
         (False, True),
         (True, True),
     )
     @ddt.unpack
-    def test_thread_un_abuse_flag_for_moderator_role(self, is_author, remove_all):
+    @mock.patch("eventtracking.tracker.emit")
+    def test_thread_un_abuse_flag_for_moderator_role(self, is_author, remove_all, mock_emit):
         """
         Test un-abuse flag for moderator role.
 
@@ -2883,6 +2906,25 @@ def test_thread_un_abuse_flag_for_moderator_role(self, is_author, remove_all):
             query_params.update({'all': ['True']})
         assert parsed_body(httpretty.last_request()) == query_params
 
+        expected_event_name = 'edx.forum.thread.unreported'
+        expected_event_data = {
+            'body': 'Original body',
+            'id': 'test_thread',
+            'content_type': 'Post',
+            'commentable_id': 'original_topic',
+            'url': '',
+            'user_course_roles': [],
+            'user_forums_roles': [FORUM_ROLE_STUDENT, FORUM_ROLE_ADMINISTRATOR],
+            'target_username': self.user.username,
+            'title_truncated': False,
+            'title': 'Original Title',
+            'reported_status_cleared': False,
+        }
+
+        actual_event_name, actual_event_data = mock_emit.call_args[0]
+        self.assertEqual(actual_event_name, expected_event_name)
+        self.assertEqual(actual_event_data, expected_event_data)
+
     def test_invalid_field(self):
         self.register_thread()
         with pytest.raises(ValidationError) as assertion:
@@ -3356,7 +3398,8 @@ def test_vote_count_two_users(
 
     @ddt.data(*itertools.product([True, False], [True, False]))
     @ddt.unpack
-    def test_abuse_flagged(self, old_flagged, new_flagged):
+    @mock.patch("eventtracking.tracker.emit")
+    def test_abuse_flagged(self, old_flagged, new_flagged, mock_emit):
         """
         Test attempts to edit the "abuse_flagged" field.
 
@@ -3383,12 +3426,31 @@ def test_abuse_flagged(self, old_flagged, new_flagged):
             assert httpretty.last_request().method == 'PUT'
             assert parsed_body(httpretty.last_request()) == {'user_id': [str(self.user.id)]}
 
+            expected_event_name = 'edx.forum.response.reported' if new_flagged else 'edx.forum.response.unreported'
+            expected_event_data = {
+                'body': 'Original body',
+                'id': 'test_comment',
+                'content_type': 'Response',
+                'commentable_id': 'dummy',
+                'url': '',
+                'user_course_roles': [],
+                'user_forums_roles': [FORUM_ROLE_STUDENT],
+                'target_username': self.user.username,
+            }
+            if not new_flagged:
+                expected_event_data['reported_status_cleared'] = False
+
+            actual_event_name, actual_event_data = mock_emit.call_args[0]
+            self.assertEqual(actual_event_name, expected_event_name)
+            self.assertEqual(actual_event_data, expected_event_data)
+
     @ddt.data(
         (False, True),
         (True, True),
     )
     @ddt.unpack
-    def test_comment_un_abuse_flag_for_moderator_role(self, is_author, remove_all):
+    @mock.patch("eventtracking.tracker.emit")
+    def test_comment_un_abuse_flag_for_moderator_role(self, is_author, remove_all, mock_emit):
         """
         Test un-abuse flag for moderator role.
 
@@ -3409,6 +3471,23 @@ def test_comment_un_abuse_flag_for_moderator_role(self, is_author, remove_all):
             query_params.update({'all': ['True']})
         assert parsed_body(httpretty.last_request()) == query_params
 
+        expected_event_name = 'edx.forum.response.unreported'
+        expected_event_data = {
+            'body': 'Original body',
+            'id': 'test_comment',
+            'content_type': 'Response',
+            'commentable_id': 'dummy',
+            'url': '',
+            'user_course_roles': [],
+            'user_forums_roles': [FORUM_ROLE_STUDENT, FORUM_ROLE_ADMINISTRATOR],
+            'target_username': self.user.username,
+            'reported_status_cleared': False,
+        }
+
+        actual_event_name, actual_event_data = mock_emit.call_args[0]
+        self.assertEqual(actual_event_name, expected_event_name)
+        self.assertEqual(actual_event_data, expected_event_data)
+
     @ddt.data(
         FORUM_ROLE_ADMINISTRATOR,
         FORUM_ROLE_MODERATOR,
diff --git a/lms/djangoapps/discussion/views.py b/lms/djangoapps/discussion/views.py
index 12212e337c9c..4d14ea50748e 100644
--- a/lms/djangoapps/discussion/views.py
+++ b/lms/djangoapps/discussion/views.py
@@ -761,31 +761,16 @@ def is_privileged_user(course_key: CourseKey, user: User):
     """
     Returns True if user has one of following course role
     Administrator, Moderator, Group Moderator, Community TA,
-    Global Staff, Course Instructor or Course Staff.
+    or Global Staff.
     """
     forum_roles = [
         FORUM_ROLE_COMMUNITY_TA,
         FORUM_ROLE_GROUP_MODERATOR,
         FORUM_ROLE_MODERATOR,
-        FORUM_ROLE_ADMINISTRATOR
+        FORUM_ROLE_ADMINISTRATOR,
     ]
     has_course_role = Role.user_has_role_for_course(user, course_key, forum_roles)
-    return GlobalStaff().has_user(user) or is_course_staff(course_key, user) or has_course_role
-
-
-def is_user_moderator(course_key: CourseKey, user: User):
-    """
-    Returns True if user has one of following course role
-    Administrator, Moderator, Group Moderator, Community TA.
-    """
-    forum_roles = [
-        FORUM_ROLE_COMMUNITY_TA,
-        FORUM_ROLE_GROUP_MODERATOR,
-        FORUM_ROLE_MODERATOR,
-        FORUM_ROLE_ADMINISTRATOR
-    ]
-    has_course_role = Role.user_has_role_for_course(user, course_key, forum_roles)
-    return has_course_role
+    return GlobalStaff().has_user(user) or has_course_role
 
 
 class DiscussionBoardFragmentView(EdxFragmentView):

From 259ff3217f861dc707341bca5e9e51e84acec765 Mon Sep 17 00:00:00 2001
From: Muhammad Adeel Tajamul
 <77053848+muhammadadeeltajamul@users.noreply.github.com>
Date: Thu, 3 Nov 2022 16:53:50 +0500
Subject: [PATCH 18/77] feat: added post filters in learners tab api (#31191)

Co-authored-by: adeel.tajamul <adeel.tajamul@arbisoft.com>
---
 lms/djangoapps/discussion/rest_api/api.py     |   6 +
 .../discussion/rest_api/tests/test_views.py   | 155 ++++++++++++++++++
 lms/djangoapps/discussion/rest_api/views.py   |  28 ++++
 3 files changed, 189 insertions(+)

diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 768a56340a0f..25183c65481b 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -1003,9 +1003,15 @@ def get_learner_active_thread_list(request, course_key, query_params):
 
     group_id = query_params.get('group_id', None)
     user_id = query_params.get('user_id', None)
+    count_flagged = query_params.get('count_flagged', None)
     if user_id is None:
         return Response({'detail': 'Invalid user id'}, status=status.HTTP_400_BAD_REQUEST)
 
+    if count_flagged and not context["has_moderation_privilege"]:
+        raise PermissionDenied("count_flagged can only be set by users with moderation roles.")
+    if "flagged" in query_params.keys() and not context["has_moderation_privilege"]:
+        raise PermissionDenied("Flagged filter is only available for moderators")
+
     if group_id is None:
         comment_client_user = comment_client.User(id=user_id, course_id=course_key)
     else:
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_views.py b/lms/djangoapps/discussion/rest_api/tests/test_views.py
index b856efeb836c..b69b60df9cd4 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_views.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_views.py
@@ -1452,6 +1452,7 @@ def test_delete_nonexistent_thread(self):
         assert response.status_code == 404
 
 
+@ddt.ddt
 @httpretty.activate
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 class LearnerThreadViewAPITest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
@@ -1601,6 +1602,160 @@ def test_not_authenticated(self):
         """
         assert True
 
+    @ddt.data("None", "discussion", "question")
+    def test_thread_type_by(self, thread_type):
+        """
+        Tests the thread_type parameter
+
+        Arguments:
+            thread_type (str): Value of thread_type can be 'None',
+                          'discussion' and 'question'
+        """
+        threads = [make_minimal_cs_thread({
+            "id": "test_thread",
+            "course_id": str(self.course.id),
+            "commentable_id": "test_topic",
+            "user_id": str(self.user.id),
+            "username": self.user.username,
+            "created_at": "2015-04-28T00:00:00Z",
+            "updated_at": "2015-04-28T11:11:11Z",
+            "title": "Test Title",
+            "body": "Test body",
+            "votes": {"up_count": 4},
+            "comments_count": 5,
+            "unread_comments_count": 3,
+        })]
+        expected_cs_comments_response = {
+            "collection": threads,
+            "page": 1,
+            "num_pages": 1,
+        }
+        self.register_get_user_response(self.user)
+        self.register_user_active_threads(self.user.id, expected_cs_comments_response)
+        response = self.client.get(
+            self.url,
+            {
+                "course_id": str(self.course.id),
+                "username": self.user.username,
+                "thread_type": thread_type,
+            }
+        )
+        assert response.status_code == 200
+        self.assert_last_query_params({
+            "user_id": [str(self.user.id)],
+            "course_id": [str(self.course.id)],
+            "page": ["1"],
+            "per_page": ["10"],
+            "thread_type": [thread_type],
+            "sort_key": ['activity'],
+            "count_flagged": ["False"]
+        })
+
+    @ddt.data(
+        ("last_activity_at", "activity"),
+        ("comment_count", "comments"),
+        ("vote_count", "votes")
+    )
+    @ddt.unpack
+    def test_order_by(self, http_query, cc_query):
+        """
+        Tests the order_by parameter for active threads
+
+        Arguments:
+            http_query (str): Query string sent in the http request
+            cc_query (str): Query string used for the comments client service
+        """
+        threads = [make_minimal_cs_thread({
+            "id": "test_thread",
+            "course_id": str(self.course.id),
+            "commentable_id": "test_topic",
+            "user_id": str(self.user.id),
+            "username": self.user.username,
+            "created_at": "2015-04-28T00:00:00Z",
+            "updated_at": "2015-04-28T11:11:11Z",
+            "title": "Test Title",
+            "body": "Test body",
+            "votes": {"up_count": 4},
+            "comments_count": 5,
+            "unread_comments_count": 3,
+        })]
+        expected_cs_comments_response = {
+            "collection": threads,
+            "page": 1,
+            "num_pages": 1,
+        }
+        self.register_get_user_response(self.user)
+        self.register_user_active_threads(self.user.id, expected_cs_comments_response)
+        response = self.client.get(
+            self.url,
+            {
+                "course_id": str(self.course.id),
+                "username": self.user.username,
+                "order_by": http_query,
+            }
+        )
+        assert response.status_code == 200
+        self.assert_last_query_params({
+            "user_id": [str(self.user.id)],
+            "course_id": [str(self.course.id)],
+            "page": ["1"],
+            "per_page": ["10"],
+            "sort_key": [cc_query],
+            "count_flagged": ["False"]
+        })
+
+    @ddt.data("flagged", "unanswered", "unread", "unresponded")
+    def test_status_by(self, post_status):
+        """
+        Tests the post_status parameter
+
+        Arguments:
+            post_status (str): Value of post_status can be 'flagged',
+                          'unanswered' and 'unread'
+        """
+        threads = [make_minimal_cs_thread({
+            "id": "test_thread",
+            "course_id": str(self.course.id),
+            "commentable_id": "test_topic",
+            "user_id": str(self.user.id),
+            "username": self.user.username,
+            "created_at": "2015-04-28T00:00:00Z",
+            "updated_at": "2015-04-28T11:11:11Z",
+            "title": "Test Title",
+            "body": "Test body",
+            "votes": {"up_count": 4},
+            "comments_count": 5,
+            "unread_comments_count": 3,
+        })]
+        expected_cs_comments_response = {
+            "collection": threads,
+            "page": 1,
+            "num_pages": 1,
+        }
+        self.register_get_user_response(self.user)
+        self.register_user_active_threads(self.user.id, expected_cs_comments_response)
+        response = self.client.get(
+            self.url,
+            {
+                "course_id": str(self.course.id),
+                "username": self.user.username,
+                "status": post_status,
+            }
+        )
+        if post_status == "flagged":
+            assert response.status_code == 403
+        else:
+            assert response.status_code == 200
+            self.assert_last_query_params({
+                "user_id": [str(self.user.id)],
+                "course_id": [str(self.course.id)],
+                "page": ["1"],
+                "per_page": ["10"],
+                post_status: ['True'],
+                "sort_key": ['activity'],
+                "count_flagged": ["False"]
+            })
+
 
 @ddt.ddt
 @httpretty.activate
diff --git a/lms/djangoapps/discussion/rest_api/views.py b/lms/djangoapps/discussion/rest_api/views.py
index da55651463b2..c04fc7e48471 100644
--- a/lms/djangoapps/discussion/rest_api/views.py
+++ b/lms/djangoapps/discussion/rest_api/views.py
@@ -574,6 +574,15 @@ class LearnerThreadView(APIView):
 
         * count_flagged: If True, return the count of flagged comments for each thread.
         (can only be used by moderators or above)
+
+        * thread_type: The type of thread to filter None, "discussion" or "question".
+
+        * order_by: Sort order for threads "last_activity_at", "comment_count" or
+        "vote_count".
+
+        * status: Filter for threads "flagged", "unanswered", "unread".
+
+        * group_id: Filter threads w.r.t cohorts (Cohort ID).
     """
 
     authentication_classes = (
@@ -594,6 +603,15 @@ def get(self, request, course_id=None):
         page_num = request.GET.get('page', 1)
         threads_per_page = request.GET.get('page_size', 10)
         count_flagged = request.GET.get('count_flagged', False)
+        thread_type = request.GET.get('thread_type')
+        order_by = request.GET.get('order_by')
+        order_by_mapping = {
+            "last_activity_at": "activity",
+            "comment_count": "comments",
+            "vote_count": "votes"
+        }
+        order_by = order_by_mapping.get(order_by, 'activity')
+        post_status = request.GET.get('status', None)
         discussion_id = None
         username = request.GET.get('username', None)
         user = get_object_or_404(User, username=username)
@@ -610,7 +628,17 @@ def get(self, request, course_id=None):
             "user_id": user.id,
             "group_id": group_id,
             "count_flagged": count_flagged,
+            "thread_type": thread_type,
+            "sort_key": order_by,
         }
+        if post_status:
+            if post_status not in ['flagged', 'unanswered', 'unread', 'unresponded']:
+                raise ValidationError({
+                    "status": [
+                        f"Invalid value. '{post_status}' must be 'flagged', 'unanswered', 'unread' or 'unresponded"
+                    ]
+                })
+            query_params[post_status] = True
         return get_learner_active_thread_list(request, course_key, query_params)
 
 

From af20df0caa9ca6b30aa675b2ccaef5c584ccea44 Mon Sep 17 00:00:00 2001
From: Muhammad Adeel Tajamul
 <77053848+muhammadadeeltajamul@users.noreply.github.com>
Date: Mon, 7 Nov 2022 11:15:01 +0500
Subject: [PATCH 19/77] feat: added sort by recent activity for activity stats
 api (#31252)

Co-authored-by: adeel.tajamul <adeel.tajamul@arbisoft.com>
---
 lms/djangoapps/discussion/rest_api/api.py              | 2 +-
 lms/djangoapps/discussion/rest_api/forms.py            | 1 +
 lms/djangoapps/discussion/rest_api/tests/test_views.py | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 25183c65481b..50461dd2b255 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -1700,7 +1700,7 @@ def get_course_discussion_user_stats(
         order_by = order_by or UserOrdering.BY_FLAGS
     else:
         order_by = order_by or UserOrdering.BY_ACTIVITY
-        if order_by != UserOrdering.BY_ACTIVITY:
+        if order_by == UserOrdering.BY_FLAGS:
             raise ValidationError({"order_by": "Invalid value"})
 
     if not ENABLE_LEARNERS_STATS.is_enabled(course_key):
diff --git a/lms/djangoapps/discussion/rest_api/forms.py b/lms/djangoapps/discussion/rest_api/forms.py
index b7a9286c2857..3663b41738bc 100644
--- a/lms/djangoapps/discussion/rest_api/forms.py
+++ b/lms/djangoapps/discussion/rest_api/forms.py
@@ -24,6 +24,7 @@
 class UserOrdering(TextChoices):
     BY_ACTIVITY = 'activity'
     BY_FLAGS = 'flagged'
+    BY_RECENT_ACTIVITY = 'recency'
 
 
 class _PaginationForm(Form):
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_views.py b/lms/djangoapps/discussion/rest_api/tests/test_views.py
index b69b60df9cd4..118b4fcc291f 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_views.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_views.py
@@ -3115,9 +3115,11 @@ def test_moderator_user(self):
     @ddt.data(
         ("moderator", "flagged", "flagged"),
         ("moderator", "activity", "activity"),
+        ("moderator", "recency", "recency"),
         ("moderator", None, "flagged"),
         ("user", None, "activity"),
         ("user", "activity", "activity"),
+        ("user", "recency", "recency"),
     )
     @ddt.unpack
     @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})

From 7ece651b5c51f3112ccc658e908022ada1d8d816 Mon Sep 17 00:00:00 2001
From: Mehak Nasir <67791278+mehaknasir@users.noreply.github.com>
Date: Fri, 11 Nov 2022 14:56:01 +0500
Subject: [PATCH 20/77] feat: added not responded filter for fetch thread list
 api (#31275)

---
 lms/djangoapps/discussion/rest_api/api.py              | 2 +-
 lms/djangoapps/discussion/rest_api/forms.py            | 2 +-
 lms/djangoapps/discussion/rest_api/tests/test_views.py | 2 +-
 lms/djangoapps/discussion/rest_api/views.py            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 50461dd2b255..5a104bba43b7 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -873,7 +873,7 @@ def get_thread_list(
     }
 
     if view:
-        if view in ["unread", "unanswered"]:
+        if view in ["unread", "unanswered", "unresponded"]:
             query_params[view] = "true"
         else:
             ValidationError({
diff --git a/lms/djangoapps/discussion/rest_api/forms.py b/lms/djangoapps/discussion/rest_api/forms.py
index 3663b41738bc..c7aa8c894b13 100644
--- a/lms/djangoapps/discussion/rest_api/forms.py
+++ b/lms/djangoapps/discussion/rest_api/forms.py
@@ -59,7 +59,7 @@ class ThreadListGetForm(_PaginationForm):
     count_flagged = ExtendedNullBooleanField(required=False)
     flagged = ExtendedNullBooleanField(required=False)
     view = ChoiceField(
-        choices=[(choice, choice) for choice in ["unread", "unanswered"]],
+        choices=[(choice, choice) for choice in ["unread", "unanswered", "unresponded"]],
         required=False,
     )
     order_by = ChoiceField(
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_views.py b/lms/djangoapps/discussion/rest_api/tests/test_views.py
index 118b4fcc291f..400c1be4aa11 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_views.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_views.py
@@ -955,7 +955,7 @@ def test_basic(self):
             "per_page": ["10"],
         })
 
-    @ddt.data("unread", "unanswered")
+    @ddt.data("unread", "unanswered", "unresponded")
     def test_view_query(self, query):
         threads = [make_minimal_cs_thread()]
         self.register_get_user_response(self.user)
diff --git a/lms/djangoapps/discussion/rest_api/views.py b/lms/djangoapps/discussion/rest_api/views.py
index c04fc7e48471..6831765fbf87 100644
--- a/lms/djangoapps/discussion/rest_api/views.py
+++ b/lms/djangoapps/discussion/rest_api/views.py
@@ -361,7 +361,7 @@ class ThreadViewSet(DeveloperErrorViewMixin, ViewSet):
 
         * view: "unread" for threads the requesting user has not read, or
             "unanswered" for question threads with no marked answer. Only one
-            can be selected.
+            can be selected, or unresponded for discussion type posts with no response
 
         * requested_fields: (list) Indicates which additional fields to return
           for each thread. (supports 'profile_image')

From 173ae15c8d6c8d45b0578de27882e214342210b1 Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Mon, 14 Nov 2022 13:49:16 +0500
Subject: [PATCH 21/77] fix: legacy coverage and add missing properties for
 reported events

---
 .../django_comment_client/base/tests.py         |  7 ++++---
 .../django_comment_client/base/views.py         | 17 +++++++++++++++--
 .../discussion/rest_api/tests/test_api.py       |  8 ++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/discussion/django_comment_client/base/tests.py b/lms/djangoapps/discussion/django_comment_client/base/tests.py
index 6254579d6835..717845fade17 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/tests.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/tests.py
@@ -138,7 +138,8 @@ def call_view(
                 "group_id": self.student_cohort.id,
                 "closed": False,
                 "type": "thread",
-                "commentable_id": "non_team_dummy_id"
+                "commentable_id": "non_team_dummy_id",
+                "body": "test body"
             }
         )
         request = RequestFactory().post("dummy_url", post_params or {})
@@ -1663,7 +1664,7 @@ def test_comment_actions(self, user, commentable_id, status_code, mock_request):
         commentable_id = getattr(self, commentable_id)
         self._setup_mock(
             user, mock_request,
-            {"closed": False, "commentable_id": commentable_id, "thread_id": "dummy_thread"},
+            {"closed": False, "commentable_id": commentable_id, "thread_id": "dummy_thread", "body": 'dummy body'},
         )
         for action in ["upvote_comment", "downvote_comment", "un_flag_abuse_for_comment", "flag_abuse_for_comment"]:
             response = self.client.post(
@@ -1684,7 +1685,7 @@ def test_threads_actions(self, user, commentable_id, status_code, mock_request):
         commentable_id = getattr(self, commentable_id)
         self._setup_mock(
             user, mock_request,
-            {"closed": False, "commentable_id": commentable_id},
+            {"closed": False, "commentable_id": commentable_id, "body": "dummy body"},
         )
         for action in ["upvote_thread", "downvote_thread", "un_flag_abuse_for_thread", "flag_abuse_for_thread",
                        "follow_thread", "unfollow_thread"]:
diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index 6072ebd902a5..29bf054cd539 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/views.py
@@ -270,8 +270,11 @@ def track_thread_reported_event(request, course, thread):
     event_name = _EVENT_NAME_TEMPLATE.format(obj_type='thread', action_name='reported')
     event_data = {
         'body': thread.body[:TRACKING_MAX_FORUM_BODY],
+        'truncated': len(thread.body) > TRACKING_MAX_FORUM_BODY,
         'content_type': 'Post',
         'commentable_id': thread.get('commentable_id', ''),
+        'thread_type': thread.get('thread_type', ''),
+        'group_id': thread.get('group_id', ''),
     }
     if hasattr(thread, 'username'):
         event_data['target_username'] = thread.get('username', '')
@@ -287,6 +290,7 @@ def track_comment_reported_event(request, course, comment):
     event_name = _EVENT_NAME_TEMPLATE.format(obj_type=obj_type, action_name='reported')
     event_data = {
         'body': comment.body[:TRACKING_MAX_FORUM_BODY],
+        'truncated': len(comment.body) > TRACKING_MAX_FORUM_BODY,
         'commentable_id': comment.get('commentable_id', ''),
         'content_type': obj_type.capitalize(),
     }
@@ -302,9 +306,13 @@ def track_thread_unreported_event(request, course, thread):
     event_name = _EVENT_NAME_TEMPLATE.format(obj_type='thread', action_name='unreported')
     event_data = {
         'body': thread.body[:TRACKING_MAX_FORUM_BODY],
+        'truncated': len(thread.body) > TRACKING_MAX_FORUM_BODY,
         'content_type': 'Post',
         'commentable_id': thread.get('commentable_id', ''),
         'reported_status_cleared': not bool(thread.get('abuse_flaggers', [])),
+        'thread_type': thread.get('thread_type', ''),
+        'group_id': thread.get('group_id', ''),
+
     }
     if hasattr(thread, 'username'):
         event_data['target_username'] = thread.get('username', '')
@@ -320,6 +328,7 @@ def track_comment_unreported_event(request, course, comment):
     event_name = _EVENT_NAME_TEMPLATE.format(obj_type=obj_type, action_name='unreported')
     event_data = {
         'body': comment.body[:TRACKING_MAX_FORUM_BODY],
+        'truncated': len(comment.body) > TRACKING_MAX_FORUM_BODY,
         'commentable_id': comment.get('commentable_id', ''),
         'content_type': obj_type.capitalize(),
         'reported_status_cleared': not bool(comment.get('abuse_flaggers', [])),
@@ -767,9 +776,10 @@ def flag_abuse_for_thread(request, course_id, thread_id):
     """
     course_key = CourseKey.from_string(course_id)
     user = cc.User.from_django_user(request.user)
+    course = get_course_by_id(course_key)
     thread = cc.Thread.find(thread_id)
     thread.flagAbuse(user, thread)
-
+    track_discussion_reported_event(request, course, thread)
     return JsonResponse(prepare_content(thread.to_dict(), course_key))
 
 
@@ -790,7 +800,7 @@ def un_flag_abuse_for_thread(request, course_id, thread_id):
         has_access(request.user, 'staff', course)
     )
     thread.unFlagAbuse(user, thread, remove_all)
-
+    track_discussion_unreported_event(request, course, thread)
     return JsonResponse(prepare_content(thread.to_dict(), course_key))
 
 
@@ -804,8 +814,10 @@ def flag_abuse_for_comment(request, course_id, comment_id):
     """
     course_key = CourseKey.from_string(course_id)
     user = cc.User.from_django_user(request.user)
+    course = get_course_by_id(course_key)
     comment = cc.Comment.find(comment_id)
     comment.flagAbuse(user, comment)
+    track_discussion_unreported_event(request, course, comment)
     return JsonResponse(prepare_content(comment.to_dict(), course_key))
 
 
@@ -826,6 +838,7 @@ def un_flag_abuse_for_comment(request, course_id, comment_id):
     )
     comment = cc.Comment.find(comment_id)
     comment.unFlagAbuse(user, comment, remove_all)
+    track_discussion_unreported_event(request, course, comment)
     return JsonResponse(prepare_content(comment.to_dict(), course_key))
 
 
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_api.py b/lms/djangoapps/discussion/rest_api/tests/test_api.py
index 15e6fb8cfb05..aab2be06c27a 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_api.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_api.py
@@ -2871,6 +2871,9 @@ def test_abuse_flagged(self, old_flagged, new_flagged, mock_emit):
                 'target_username': self.user.username,
                 'title_truncated': False,
                 'title': 'Original Title',
+                'thread_type': 'discussion',
+                'group_id': None,
+                'truncated': False,
             }
             if not new_flagged:
                 expected_event_data['reported_status_cleared'] = False
@@ -2919,6 +2922,9 @@ def test_thread_un_abuse_flag_for_moderator_role(self, is_author, remove_all, mo
             'title_truncated': False,
             'title': 'Original Title',
             'reported_status_cleared': False,
+            'thread_type': 'discussion',
+            'group_id': None,
+            'truncated': False,
         }
 
         actual_event_name, actual_event_data = mock_emit.call_args[0]
@@ -3433,6 +3439,7 @@ def test_abuse_flagged(self, old_flagged, new_flagged, mock_emit):
                 'content_type': 'Response',
                 'commentable_id': 'dummy',
                 'url': '',
+                'truncated': False,
                 'user_course_roles': [],
                 'user_forums_roles': [FORUM_ROLE_STUDENT],
                 'target_username': self.user.username,
@@ -3477,6 +3484,7 @@ def test_comment_un_abuse_flag_for_moderator_role(self, is_author, remove_all, m
             'id': 'test_comment',
             'content_type': 'Response',
             'commentable_id': 'dummy',
+            'truncated': False,
             'url': '',
             'user_course_roles': [],
             'user_forums_roles': [FORUM_ROLE_STUDENT, FORUM_ROLE_ADMINISTRATOR],

From dd68ade00d6a7c5b5a63a4d17544384dafc4080c Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Thu, 17 Nov 2022 15:33:32 +0500
Subject: [PATCH 22/77] fix: add fix for search event for learner search in
 discussions

---
 .../django_comment_client/base/views.py       | 11 +++++++++
 lms/djangoapps/discussion/rest_api/api.py     | 23 +++++++++----------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index 29bf054cd539..8e5f598270ee 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/views.py
@@ -167,6 +167,17 @@ def track_voted_event(request, course, obj, vote_value, undo_vote=False):
     track_forum_event(request, event_name, course, obj, event_data)
 
 
+def track_forum_search_event(request, course, search_event_data):
+    """
+    Send analytics event for discussions related search.
+    """
+    event_name = 'edx.forum.searched'
+
+    context = contexts.course_context_from_course_id(course.id)
+    with tracker.get_tracker().context(event_name, context):
+        tracker.emit(event_name, search_event_data)
+
+
 def track_thread_viewed_event(request, course, thread):
     """
     Send analytics event for a viewed thread.
diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 5a104bba43b7..552460dba6e3 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -21,7 +21,6 @@
 from django.http import Http404
 from django.urls import reverse
 from edx_django_utils.monitoring import function_trace
-from eventtracking import tracker
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.locator import CourseKey
 from rest_framework import status
@@ -84,6 +83,7 @@
     track_voted_event,
     track_discussion_reported_event,
     track_discussion_unreported_event,
+    track_forum_search_event
 )
 from ..django_comment_client.utils import (
     get_group_id_for_user,
@@ -1723,25 +1723,24 @@ def get_course_discussion_user_stats(
         comma_separated_usernames, matched_users_count, matched_users_pages = get_usernames_from_search_string(
             course_key, username_search_string, page, page_size
         )
+        search_event_data = {
+            'query': username_search_string,
+            'search_type': 'Learner',
+            'page': params.get('page'),
+            'sort_key': params.get('sort_key'),
+            'total_results': matched_users_count,
+        }
+        course = _get_course(course_key, request.user)
+        track_forum_search_event(request, course, search_event_data)
         if not comma_separated_usernames:
             return DiscussionAPIPagination(request, 0, 1).get_paginated_response({
                 "results": [],
             })
+
         params['usernames'] = comma_separated_usernames
 
     course_stats_response = get_course_user_stats(course_key, params)
 
-    tracker.emit(
-        'edx.forum.searched',
-        {
-            'query': username_search_string,
-            'search_type': 'Learner',
-            'page': params.get('page'),
-            'sort_key': params.get('sort_key'),
-            'total_results': course_stats_response.get('total_results'),
-        }
-    )
-
     if comma_separated_usernames:
         updated_course_stats = add_stats_for_users_with_no_discussion_content(
             course_stats_response["user_stats"],

From 1314cdbff097d11e653cac764e52f28b1a10e1e2 Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Tue, 15 Nov 2022 15:45:32 +0500
Subject: [PATCH 23/77] feat: add discussion event coverage for legacy
 experience.

---
 .../django_comment_client/base/tests.py         |  9 ++++++---
 .../django_comment_client/base/views.py         | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/lms/djangoapps/discussion/django_comment_client/base/tests.py b/lms/djangoapps/discussion/django_comment_client/base/tests.py
index 717845fade17..9a5f042b4952 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/tests.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/tests.py
@@ -139,7 +139,7 @@ def call_view(
                 "closed": False,
                 "type": "thread",
                 "commentable_id": "non_team_dummy_id",
-                "body": "test body"
+                "body": "test body",
             }
         )
         request = RequestFactory().post("dummy_url", post_params or {})
@@ -412,7 +412,7 @@ def test_create_thread(self, mock_request):
         self.create_thread_helper(mock_request)
 
     @ddt.data(
-        (ModuleStoreEnum.Type.split, 3, 6, 38),
+        (ModuleStoreEnum.Type.split, 3, 6, 42),
     )
     @ddt.unpack
     @count_queries
@@ -528,6 +528,7 @@ def test_delete_thread(self, mock_request):
         self._set_mock_request_data(mock_request, {
             "user_id": str(self.student.id),
             "closed": False,
+            "body": "test body",
         })
         test_thread_id = "test_thread_id"
         request = RequestFactory().post("dummy_url", {"id": test_thread_id})
@@ -546,6 +547,7 @@ def test_delete_comment(self, mock_request):
         self._set_mock_request_data(mock_request, {
             "user_id": str(self.student.id),
             "closed": False,
+            "body": "test body",
         })
         test_comment_id = "test_comment_id"
         request = RequestFactory().post("dummy_url", {"id": test_comment_id})
@@ -1595,7 +1597,8 @@ def test_delete_comment(self, user, comment_author, commentable_id, status_code,
             "commentable_id": commentable_id,
             "user_id": str(comment_author.id),
             "username": comment_author.username,
-            "course_id": str(self.course.id)
+            "course_id": str(self.course.id),
+            "body": "test body",
         })
 
         response = self.client.post(
diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index 8e5f598270ee..d88c6e063a4f 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/views.py
@@ -524,11 +524,11 @@ def update_thread(request, course_id, thread_id):
     user = request.user
     # The following checks should avoid issues we've seen during deploys, where end users are hitting an updated server
     # while their browser still has the old client code. This will avoid erasing present values in those cases.
+    course = get_course_with_access(user, 'load', course_key)
     if "thread_type" in request.POST:
         thread.thread_type = request.POST["thread_type"]
     if "commentable_id" in request.POST:
         commentable_id = request.POST["commentable_id"]
-        course = get_course_with_access(user, 'load', course_key)
         if thread_context == "course" and not discussion_category_id_access(course, user, commentable_id):
             return JsonError(_("Topic doesn't exist"))
         else:
@@ -538,6 +538,7 @@ def update_thread(request, course_id, thread_id):
 
     thread_edited.send(sender=None, user=user, post=thread)
 
+    track_thread_edited_event(request, course, thread, None)
     if request.is_ajax():
         return ajax_content_response(request, course_key, thread.to_dict())
     else:
@@ -616,9 +617,12 @@ def delete_thread(request, course_id, thread_id):
     this is ajax only
     """
     course_key = CourseKey.from_string(course_id)
+    course = get_course_with_access(request.user, 'load', course_key)
     thread = cc.Thread.find(thread_id)
     thread.delete()
     thread_deleted.send(sender=None, user=request.user, post=thread)
+
+    track_thread_deleted_event(request, course, thread)
     return JsonResponse(prepare_content(thread.to_dict(), course_key))
 
 
@@ -631,6 +635,7 @@ def update_comment(request, course_id, comment_id):
     handles static and ajax submissions
     """
     course_key = CourseKey.from_string(course_id)
+    course = get_course_with_access(request.user, 'load', course_key)
     comment = cc.Comment.find(comment_id)
     if 'body' not in request.POST or not request.POST['body'].strip():
         return JsonError(_("Body can't be empty"))
@@ -639,6 +644,7 @@ def update_comment(request, course_id, comment_id):
 
     comment_edited.send(sender=None, user=request.user, post=comment)
 
+    track_comment_edited_event(request, course, comment, None)
     if request.is_ajax():
         return ajax_content_response(request, course_key, comment.to_dict())
     else:
@@ -672,10 +678,13 @@ def openclose_thread(request, course_id, thread_id):
     ajax only
     """
     course_key = CourseKey.from_string(course_id)
+    course = get_course_with_access(request.user, 'load', course_key)
     thread = cc.Thread.find(thread_id)
-    thread.closed = request.POST.get('closed', 'false').lower() == 'true'
+    close_thread = request.POST.get('closed', 'false').lower() == 'true'
+    thread.closed = close_thread
     thread.save()
 
+    track_thread_lock_unlock_event(request, course, thread, None, close_thread)
     return JsonResponse({
         'content': prepare_content(thread.to_dict(), course_key),
         'ability': get_ability(course_key, thread.to_dict(), request.user),
@@ -704,9 +713,11 @@ def delete_comment(request, course_id, comment_id):
     ajax only
     """
     course_key = CourseKey.from_string(course_id)
+    course = get_course_with_access(request.user, 'load', course_key)
     comment = cc.Comment.find(comment_id)
     comment.delete()
     comment_deleted.send(sender=None, user=request.user, post=comment)
+    track_comment_deleted_event(request, course, comment)
     return JsonResponse(prepare_content(comment.to_dict(), course_key))
 
 
@@ -828,7 +839,7 @@ def flag_abuse_for_comment(request, course_id, comment_id):
     course = get_course_by_id(course_key)
     comment = cc.Comment.find(comment_id)
     comment.flagAbuse(user, comment)
-    track_discussion_unreported_event(request, course, comment)
+    track_discussion_reported_event(request, course, comment)
     return JsonResponse(prepare_content(comment.to_dict(), course_key))
 
 

From afe259a8758dbe1860f25a34d7e2d2782360a432 Mon Sep 17 00:00:00 2001
From: Mehak Nasir <67791278+mehaknasir@users.noreply.github.com>
Date: Thu, 1 Dec 2022 16:17:19 +0500
Subject: [PATCH 24/77] fix: thread will only be returned for matching course
 ID (#31340)

---
 lms/djangoapps/discussion/rest_api/api.py            | 6 +++++-
 lms/djangoapps/discussion/rest_api/tests/test_api.py | 8 ++++++++
 lms/djangoapps/discussion/rest_api/views.py          | 3 ++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 552460dba6e3..d9e53ceafb1e 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -1465,7 +1465,7 @@ def update_comment(request, comment_id, update_data):
     return api_comment
 
 
-def get_thread(request, thread_id, requested_fields=None):
+def get_thread(request, thread_id, requested_fields=None, course_id=None):
     """
     Retrieve a thread.
 
@@ -1476,6 +1476,8 @@ def get_thread(request, thread_id, requested_fields=None):
 
         thread_id: The id for the thread to retrieve
 
+        course_id: the id of the course the threads belongs to
+
         requested_fields: Indicates which additional fields to return for
         thread. (i.e. ['profile_image'])
     """
@@ -1489,6 +1491,8 @@ def get_thread(request, thread_id, requested_fields=None):
             "user_id": str(request.user.id),
         }
     )
+    if course_id and course_id != cc_thread.course_id:
+        raise ThreadNotFoundError("Thread not found.")
     return _serialize_discussion_entities(request, context, [cc_thread], requested_fields, DiscussionEntity.thread)[0]
 
 
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_api.py b/lms/djangoapps/discussion/rest_api/tests/test_api.py
index aab2be06c27a..8204ca0218f0 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_api.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_api.py
@@ -3993,6 +3993,14 @@ def test_group_access(self, role_name, course_is_cohorted, thread_group_state):
         except ThreadNotFoundError:
             assert expected_error
 
+    def test_course_id_mismatch(self):
+        """
+            Test if the api throws not found exception if course_id from params mismatches course_id in thread
+        """
+        self.register_thread()
+        get_thread(self.request, self.thread_id, 'different_course_id')
+        assert ThreadNotFoundError
+
 
 @mock.patch('lms.djangoapps.discussion.rest_api.api._get_course', mock.Mock())
 class CourseTopicsV2Test(ModuleStoreTestCase):
diff --git a/lms/djangoapps/discussion/rest_api/views.py b/lms/djangoapps/discussion/rest_api/views.py
index 6831765fbf87..daed977e2690 100644
--- a/lms/djangoapps/discussion/rest_api/views.py
+++ b/lms/djangoapps/discussion/rest_api/views.py
@@ -527,7 +527,8 @@ def retrieve(self, request, thread_id=None):
         Implements the GET method for thread ID
         """
         requested_fields = request.GET.get('requested_fields')
-        return Response(get_thread(request, thread_id, requested_fields))
+        course_id = request.GET.get('course_id')
+        return Response(get_thread(request, thread_id, requested_fields, course_id))
 
     def create(self, request):
         """

From 165142184f02c6c2f989724fa3890284fdc07b2e Mon Sep 17 00:00:00 2001
From: connorhaugh <49422820+connorhaugh@users.noreply.github.com>
Date: Thu, 8 Dec 2022 15:10:42 -0500
Subject: [PATCH 25/77] fix: hide library source xblock (#31424)

The library_sourced block is not production-ready and thus should
not be shown by-default in Studio.

https://github.com/openedx/build-test-release-wg/issues/231
---
 cms/envs/common.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 27e16e5c430c..986afff8528b 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1978,10 +1978,8 @@
 ]
 
 LIBRARY_BLOCK_TYPES = [
-    {
-        'component': 'library_sourced',
-        'boilerplate_name': None
-    },
+    # Per https://github.com/openedx/build-test-release-wg/issues/231
+    # we removed the library source content block from defaults until complete.
     {
         'component': 'library_content',
         'boilerplate_name': None

From 6ba2911fc8ef6e8b106b3fd3662774bce8d1643c Mon Sep 17 00:00:00 2001
From: Demid <demid@opencraft.com>
Date: Thu, 5 Jan 2023 14:40:36 +0200
Subject: [PATCH 26/77] test: fix hardcoded date of birth (2022) (#31488)
 (#31503)

(cherry picked from commit 21424bba2ff02f5b103e6bff3a6a61a5a3ec7906)
---
 common/djangoapps/student/tests/test_models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/djangoapps/student/tests/test_models.py b/common/djangoapps/student/tests/test_models.py
index fd90a2f37e4a..8a501f399cfd 100644
--- a/common/djangoapps/student/tests/test_models.py
+++ b/common/djangoapps/student/tests/test_models.py
@@ -794,7 +794,7 @@ def test_is_marketable_set_to_false_for_user_created_via_management_command(self
             'username': 'some_user',
             'name': 'Student Person',
             'age': -1,
-            'yearOfBirth': 2022,
+            'yearOfBirth': datetime.datetime.today().year,
             'education': None,
             'address': None,
             'gender': 'Male',

From 5af42f8ba32e5a58e07c404972faf1bdeae72d45 Mon Sep 17 00:00:00 2001
From: Asad Ali <asad.ali@arbisoft.com>
Date: Thu, 5 Jan 2023 18:54:49 +0500
Subject: [PATCH 27/77] fix: retrieve raw content from TinyMCE editor (#31212)
 (#31500)

During the upgrade to TinyMCE v5, we changed the content format to `text`.
However, it ignores changes in HTML tags. This reverts the format to `raw`.
---
 xmodule/js/spec/html/edit_spec.js | 2 +-
 xmodule/js/src/html/edit.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xmodule/js/spec/html/edit_spec.js b/xmodule/js/spec/html/edit_spec.js
index 6a78325da8ac..9ce8c06c4dbd 100644
--- a/xmodule/js/spec/html/edit_spec.js
+++ b/xmodule/js/spec/html/edit_spec.js
@@ -24,7 +24,7 @@ describe('HTMLEditingDescriptor', function() {
     });
     it('Returns data from Raw Editor if text has not changed', function(done) {
       const visualEditorStub =
-        {getContent() { return 'original visual text' }};
+        {getContent() { return '<p>original visual text</p>' }};
       spyOn(this.descriptor, 'getVisualEditor').and.callFake(() => visualEditorStub);
 
       var self = this;
diff --git a/xmodule/js/src/html/edit.js b/xmodule/js/src/html/edit.js
index 267297e21688..bb92d8c848d9 100644
--- a/xmodule/js/src/html/edit.js
+++ b/xmodule/js/src/html/edit.js
@@ -1390,7 +1390,7 @@
       haven't dirtied the Editor. Store the raw content so we can compare it later.
        */
       this.starting_content = visualEditor.getContent({
-        format: "text",
+        format: "raw",
         no_events: 1
       });
       return visualEditor.focus();
@@ -1410,7 +1410,7 @@
       if (this.editor_choice === 'visual') {
         visualEditor = this.getVisualEditor();
         raw_content = visualEditor.getContent({
-          format: "text",
+          format: "raw",
           no_events: 1
         });
         if (this.starting_content !== raw_content) {

From 11c9a62566e06cfe536fdc2b44346cd4ef8b9a5e Mon Sep 17 00:00:00 2001
From: teyotan <theo.tanadi122@gmail.com>
Date: Mon, 9 Jan 2023 14:08:03 +0700
Subject: [PATCH 28/77] fix: unresponsive modal in student dashboard view
 (#31433)

issue: https://github.com/openedx/build-test-release-wg/issues/228

Co-authored-by: Kyle McCormick <kdmc@pm.me>
---
 lms/static/sass/multicourse/_dashboard.scss | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index db099914f9d0..3ede8cb133a8 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -1643,6 +1643,12 @@ a.fade-cover {
 #unenroll-modal {
   margin-top: -60px;
 
+  @media (max-width: 640px) {
+    width: 82% !important;
+    margin-left: -41% !important;
+    box-sizing: border-box;
+  }
+
   .modal-form-error {
     background: tint($red, 95%);
     margin-left: $baseline;
@@ -1650,6 +1656,16 @@ a.fade-cover {
   }
 }
 
+#email-settings-modal {
+  margin-top: -60px;
+
+  @media (max-width: 640px) {
+    width: 82% !important;
+    margin-left: -41% !important;
+    box-sizing: border-box;
+  }
+}
+
 #activate-account-modal {
     display: block;
     position: fixed;

From 9133e01ed180bca7a98e4d80faa2ae852050f8c3 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@tcril.org>
Date: Mon, 30 Jan 2023 11:21:16 -0500
Subject: [PATCH 29/77] refactor: Pull in django-pyfs via XBlock extra
 requiremnts.

We don't depend on it directly we just get it as a side-effect of
XBlock so make that more clear while we're updating the package to the
new name on PyPI
---
 requirements/edx/base.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 683b38659034..06bd9cb3e7a1 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -56,7 +56,6 @@ django-mptt
 django-mysql
 django-oauth-toolkit                # Provides oAuth2 capabilities for Django
 django-pipeline
-django-pyfs
 django-ratelimit
 django-sekizai
 django-ses
@@ -172,7 +171,7 @@ unicodecsv                          # Easier support for CSV files with unicode
 user-util                           # Functionality for retiring users (GDPR compliance)
 webob
 web-fragments                       # Provides the ability to render fragments of web pages
-XBlock                              # Courseware component architecture
+XBlock[django]                      # Courseware component architecture
 xblock-utils                        # Provides utilities used by the Discussion XBlock
 xss-utils                           # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations
 enmerkar-underscore                 # Implements a underscore extractor for django-babel.

From e60ba2770a022d7482ce2fdfffbd47b0a65c2a08 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@tcril.org>
Date: Tue, 31 Jan 2023 10:11:32 -0500
Subject: [PATCH 30/77] chore: Just update the `xblock` package.

Run `make compile-requirements COMPILE_OPTS="-P 'xblock[django]'"` to
update only the xblock package to pull in the new dependency on
`openedx-django-pyfs`
---
 requirements/common_constraints.txt | 13 +++++++++----
 requirements/edx/base.txt           | 18 ++++++++----------
 requirements/edx/development.txt    | 19 +++++++++++--------
 requirements/edx/doc.txt            |  1 +
 requirements/edx/testing.txt        | 19 ++++++++++---------
 5 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
index 97e0e4e20388..a9878ac2ec81 100644
--- a/requirements/common_constraints.txt
+++ b/requirements/common_constraints.txt
@@ -24,9 +24,14 @@ Django<4.0
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
 elasticsearch<7.14.0
 
-# setuptools==60.0 had breaking changes and busted several service's pipeline.
-# Details can be found here: https://github.com/pypa/setuptools/issues/2940
-setuptools<60
-
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 django-simple-history==3.0.0
+
+# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
+# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
+tox<4.0.0
+
+# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version 
+# Pinning Sphinx version unless the compatibility issue gets resolved
+# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
+sphinx<6.0.0
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index cd9d6c883435..943961e586a1 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -164,9 +164,7 @@ cryptography==36.0.2
 cssutils==2.6.0
     # via pynliner
 ddt==1.6.0
-    # via
-    #   xblock-drag-and-drop-v2
-    #   xblock-poll
+    # via xblock-poll
 defusedxml==0.7.1
     # via
     #   -r requirements/edx/base.in
@@ -198,7 +196,6 @@ django==3.2.16
     #   django-multi-email-field
     #   django-mysql
     #   django-oauth-toolkit
-    #   django-pyfs
     #   django-sekizai
     #   django-ses
     #   django-splash
@@ -240,6 +237,7 @@ django==3.2.16
     #   jsonfield
     #   learner-pathway-progress
     #   lti-consumer-xblock
+    #   openedx-django-pyfs
     #   openedx-events
     #   openedx-filters
     #   ora2
@@ -336,8 +334,6 @@ django-object-actions==4.0.0
     # via edx-enterprise
 django-pipeline==2.0.8
     # via -r requirements/edx/base.in
-django-pyfs==3.2.0
-    # via -r requirements/edx/base.in
 django-ratelimit==3.0.1
     # via -r requirements/edx/base.in
 django-require @ git+https://github.com/openedx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776
@@ -580,13 +576,13 @@ frozenlist==1.3.1
 fs==2.0.27
     # via
     #   -r requirements/edx/base.in
-    #   django-pyfs
     #   fs-s3fs
+    #   openedx-django-pyfs
     #   xblock
 fs-s3fs==0.1.8
     # via
     #   -r requirements/edx/base.in
-    #   django-pyfs
+    #   openedx-django-pyfs
 future==0.18.2
     # via
     #   edx-celeryutils
@@ -663,6 +659,7 @@ lazy==1.5
     #   acid-xblock
     #   lti-consumer-xblock
     #   ora2
+    #   xblock
 learner-pathway-progress==1.3.3
     # via -r requirements/edx/base.in
 levenshtein==0.20.5
@@ -716,7 +713,6 @@ maxminddb==2.2.0
 mock==4.0.3
     # via
     #   -r requirements/edx/paver.txt
-    #   xblock-drag-and-drop-v2
     #   xblock-poll
 mongodbproxy @ git+https://github.com/openedx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a
     # via -r requirements/edx/github.in
@@ -761,6 +757,8 @@ oauthlib==3.0.1
     #   social-auth-core
 openedx-calc==3.0.1
     # via -r requirements/edx/base.in
+openedx-django-pyfs==3.2.1
+    # via xblock
 openedx-events==0.13.0
     # via
     #   -c requirements/edx/../constraints.txt
@@ -1164,7 +1162,7 @@ wrapt==1.14.1
     # via
     #   -r requirements/edx/paver.txt
     #   deprecated
-xblock==1.6.1
+xblock[django]==1.6.2
     # via
     #   -r requirements/edx/base.in
     #   acid-xblock
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 9c0e61c401ab..7bbcefe84f09 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -242,7 +242,6 @@ cssutils==2.6.0
 ddt==1.6.0
     # via
     #   -r requirements/edx/testing.txt
-    #   xblock-drag-and-drop-v2
     #   xblock-poll
 defusedxml==0.7.1
     # via
@@ -287,7 +286,6 @@ django==3.2.16
     #   django-multi-email-field
     #   django-mysql
     #   django-oauth-toolkit
-    #   django-pyfs
     #   django-sekizai
     #   django-ses
     #   django-splash
@@ -329,6 +327,7 @@ django==3.2.16
     #   jsonfield
     #   learner-pathway-progress
     #   lti-consumer-xblock
+    #   openedx-django-pyfs
     #   openedx-events
     #   openedx-filters
     #   ora2
@@ -439,8 +438,6 @@ django-object-actions==4.0.0
     #   edx-enterprise
 django-pipeline==2.0.8
     # via -r requirements/edx/testing.txt
-django-pyfs==3.2.0
-    # via -r requirements/edx/testing.txt
 django-ratelimit==3.0.1
     # via -r requirements/edx/testing.txt
 django-require @ git+https://github.com/openedx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776
@@ -729,13 +726,13 @@ frozenlist==1.3.1
 fs==2.0.27
     # via
     #   -r requirements/edx/testing.txt
-    #   django-pyfs
     #   fs-s3fs
+    #   openedx-django-pyfs
     #   xblock
 fs-s3fs==0.1.8
     # via
     #   -r requirements/edx/testing.txt
-    #   django-pyfs
+    #   openedx-django-pyfs
 future==0.18.2
     # via
     #   -r requirements/edx/testing.txt
@@ -860,6 +857,7 @@ lazy==1.5
     #   bok-choy
     #   lti-consumer-xblock
     #   ora2
+    #   xblock
 lazy-object-proxy==1.7.1
     # via
     #   -r requirements/edx/testing.txt
@@ -936,7 +934,6 @@ mistune==0.8.4
 mock==4.0.3
     # via
     #   -r requirements/edx/testing.txt
-    #   xblock-drag-and-drop-v2
     #   xblock-poll
 mongodbproxy @ git+https://github.com/openedx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a
     # via -r requirements/edx/testing.txt
@@ -990,6 +987,10 @@ oauthlib==3.0.1
     #   social-auth-core
 openedx-calc==3.0.1
     # via -r requirements/edx/testing.txt
+openedx-django-pyfs==3.2.1
+    # via
+    #   -r requirements/edx/testing.txt
+    #   xblock
 openedx-events==0.13.0
     # via
     #   -c requirements/edx/../constraints.txt
@@ -1477,6 +1478,7 @@ soupsieve==2.3.2.post1
     #   beautifulsoup4
 sphinx==5.0.2
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
     #   edx-sphinx-theme
     #   sphinxcontrib-httpdomain
@@ -1555,6 +1557,7 @@ tomli==2.0.1
     #   tox
 tox==3.26.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/testing.txt
     #   tox-battery
 tox-battery==0.6.1
@@ -1654,7 +1657,7 @@ wrapt==1.14.1
     #   -r requirements/edx/testing.txt
     #   astroid
     #   deprecated
-xblock==1.6.1
+xblock[django]==1.6.2
     # via
     #   -r requirements/edx/testing.txt
     #   acid-xblock
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 7c0880c80db0..15a78f5ce209 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -68,6 +68,7 @@ snowballstemmer==2.2.0
     # via sphinx
 sphinx==5.0.2
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.in
     #   edx-sphinx-theme
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 154f9b04bde5..d48a3179f4d7 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -68,7 +68,6 @@ attrs==22.1.0
     #   edx-ace
     #   jsonschema
     #   openedx-events
-    #   outcome
     #   pytest
 babel==2.10.3
     # via
@@ -232,7 +231,6 @@ ddt==1.6.0
     # via
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/testing.in
-    #   xblock-drag-and-drop-v2
     #   xblock-poll
 defusedxml==0.7.1
     # via
@@ -271,7 +269,6 @@ distlib==0.3.6
     #   django-multi-email-field
     #   django-mysql
     #   django-oauth-toolkit
-    #   django-pyfs
     #   django-sekizai
     #   django-ses
     #   django-splash
@@ -313,6 +310,7 @@ distlib==0.3.6
     #   jsonfield
     #   learner-pathway-progress
     #   lti-consumer-xblock
+    #   openedx-django-pyfs
     #   openedx-events
     #   openedx-filters
     #   ora2
@@ -421,8 +419,6 @@ django-object-actions==4.0.0
     #   edx-enterprise
 django-pipeline==2.0.8
     # via -r requirements/edx/base.txt
-django-pyfs==3.2.0
-    # via -r requirements/edx/base.txt
 django-ratelimit==3.0.1
     # via -r requirements/edx/base.txt
 django-require @ git+https://github.com/openedx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776
@@ -702,13 +698,13 @@ frozenlist==1.3.1
 fs==2.0.27
     # via
     #   -r requirements/edx/base.txt
-    #   django-pyfs
     #   fs-s3fs
+    #   openedx-django-pyfs
     #   xblock
 fs-s3fs==0.1.8
     # via
     #   -r requirements/edx/base.txt
-    #   django-pyfs
+    #   openedx-django-pyfs
 future==0.18.2
     # via
     #   -r requirements/edx/base.txt
@@ -825,6 +821,7 @@ lazy==1.5
     #   bok-choy
     #   lti-consumer-xblock
     #   ora2
+    #   xblock
 lazy-object-proxy==1.7.1
     # via astroid
 learner-pathway-progress==1.3.3
@@ -892,7 +889,6 @@ mccabe==0.7.0
 mock==4.0.3
     # via
     #   -r requirements/edx/base.txt
-    #   xblock-drag-and-drop-v2
     #   xblock-poll
 mongodbproxy @ git+https://github.com/openedx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a
     # via -r requirements/edx/base.txt
@@ -942,6 +938,10 @@ oauthlib==3.0.1
     #   social-auth-core
 openedx-calc==3.0.1
     # via -r requirements/edx/base.txt
+openedx-django-pyfs==3.2.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   xblock
 openedx-events==0.13.0
     # via
     #   -c requirements/edx/../constraints.txt
@@ -1446,6 +1446,7 @@ tomli==2.0.1
     #   tox
 tox==3.26.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/testing.in
     #   tox-battery
 tox-battery==0.6.1
@@ -1534,7 +1535,7 @@ wrapt==1.14.1
     #   -r requirements/edx/base.txt
     #   astroid
     #   deprecated
-xblock==1.6.1
+xblock[django]==1.6.2
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock

From 5ab6e0b7fc983e071c4e09315765ea91c0770979 Mon Sep 17 00:00:00 2001
From: Matjaz Gregoric <mtyaka@gmail.com>
Date: Tue, 7 Feb 2023 18:35:54 +0100
Subject: [PATCH 31/77] chore: upgrade Django to 3.2.17

---
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/django.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 943961e586a1..a97259fbac1a 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -178,7 +178,7 @@ deprecated==1.2.13
     # via
     #   jwcrypto
     #   redis
-django==3.2.16
+django==3.2.17
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 7bbcefe84f09..2c7f65db092a 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -267,7 +267,7 @@ distlib==0.3.6
     # via
     #   -r requirements/edx/testing.txt
     #   virtualenv
-django==3.2.16
+django==3.2.17
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt
index e92ee8ee6a63..332dcc3a0533 100644
--- a/requirements/edx/django.txt
+++ b/requirements/edx/django.txt
@@ -1 +1 @@
-django==3.2.16
+django==3.2.17

From 5f901a35d2550569ba034ad66354ed3b5f775835 Mon Sep 17 00:00:00 2001
From: Agrendalath <piotr@surowiec.it>
Date: Tue, 7 Feb 2023 18:41:21 +0100
Subject: [PATCH 32/77] chore: update LTI Consumer XBlock

---
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/testing.txt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 943961e586a1..28032b1f76d6 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -670,7 +670,7 @@ libsass==0.10.0
     #   ora2
 loremipsum==1.0.5
     # via ora2
-lti-consumer-xblock==4.5.0
+lti-consumer-xblock==4.5.1
     # via -r requirements/edx/base.in
 lxml==4.9.1
     # via
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 7bbcefe84f09..4b0dad6632c7 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -876,7 +876,7 @@ loremipsum==1.0.5
     # via
     #   -r requirements/edx/testing.txt
     #   ora2
-lti-consumer-xblock==4.5.0
+lti-consumer-xblock==4.5.1
     # via -r requirements/edx/testing.txt
 lxml==4.9.1
     # via
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index d48a3179f4d7..bc143be7730d 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -838,7 +838,7 @@ loremipsum==1.0.5
     # via
     #   -r requirements/edx/base.txt
     #   ora2
-lti-consumer-xblock==4.5.0
+lti-consumer-xblock==4.5.1
     # via -r requirements/edx/base.txt
 lxml==4.9.1
     # via

From 52472c08d164d9b18e3bf976d84148bd9be29dc3 Mon Sep 17 00:00:00 2001
From: Sergio Valero <sergio.valero@edunext.co>
Date: Sun, 12 Mar 2023 22:18:19 -0400
Subject: [PATCH 33/77] feat: add two new actions for each environment

---
 .../add-depr-ticket-to-depr-board.yml         | 19 ----------
 .github/workflows/build-push-image-main.yml   | 36 +++++++++++++++++++
 .github/workflows/build-push-image-stage.yml  | 36 +++++++++++++++++++
 .github/workflows/check-for-tutorial-prs.yml  | 35 ------------------
 .github/workflows/docker-publish.yml          | 22 ------------
 .github/workflows/lockfileversion-check.yml   | 13 -------
 .github/workflows/publish-ci-docker-image.yml | 35 ------------------
 .../workflows/upgrade-python-requirements.yml | 25 -------------
 8 files changed, 72 insertions(+), 149 deletions(-)
 delete mode 100644 .github/workflows/add-depr-ticket-to-depr-board.yml
 create mode 100644 .github/workflows/build-push-image-main.yml
 create mode 100644 .github/workflows/build-push-image-stage.yml
 delete mode 100644 .github/workflows/check-for-tutorial-prs.yml
 delete mode 100644 .github/workflows/docker-publish.yml
 delete mode 100644 .github/workflows/lockfileversion-check.yml
 delete mode 100644 .github/workflows/publish-ci-docker-image.yml
 delete mode 100644 .github/workflows/upgrade-python-requirements.yml

diff --git a/.github/workflows/add-depr-ticket-to-depr-board.yml b/.github/workflows/add-depr-ticket-to-depr-board.yml
deleted file mode 100644
index 73ca4c5c6e87..000000000000
--- a/.github/workflows/add-depr-ticket-to-depr-board.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Run the workflow that adds new tickets that are either:
-# - labelled "DEPR"
-# - title starts with "[DEPR]"
-# - body starts with "Proposal Date" (this is the first template field)
-# to the org-wide DEPR project board
-
-name: Add newly created DEPR issues to the DEPR project board
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  routeissue:
-    uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
-    secrets:
-      GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
-      GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/build-push-image-main.yml b/.github/workflows/build-push-image-main.yml
new file mode 100644
index 000000000000..76964c60631f
--- /dev/null
+++ b/.github/workflows/build-push-image-main.yml
@@ -0,0 +1,36 @@
+name: Tutor Build Action
+
+on:
+  push:
+    branches:
+      - 'pearson-release/olive.main'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Get current time
+        uses: josStorer/get-current-time@v2
+        id: current-time
+        with:
+          format: YYYY-MM-DD-HH-mm
+
+      - name: Build and push Image
+        uses: Pearson-Advance/tutor-build-image-action@0.2.0
+        with:
+          python-version: ${{ vars.BUILD_PYTHON_VERSION }}
+          tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}
+          path-image-to-be-built: '/env/build/openedx'
+          repository-name: ${{ vars.BUILD_MAIN_REPOSITORY_NAME }}
+          image-name: ${{ vars.BUILD_MAIN_IMAGE_NAME }}
+          image-tag: ${{ vars.BUILD_TUTOR_VERSION }}-${{ steps.current-time.outputs.formattedTime }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          use-docker-cache: ${{ vars.BUILD_USE_CACHE }}
+          gh-access-token: ${{ secrets.GH_PAT }}
+          theme-repository: ${{ vars.BUILD_THEME_REPOSITORY }}
+          theme-branch: ${{ vars.BUILD_THEME_BRANCH }}
+          extra-private-requirements: true
+          private-repositories: ${{ vars.BUILD_PRIVATE_REPOSITORIES }}
+          branches: ${{ vars.BUILD_BRANCHES }}
diff --git a/.github/workflows/build-push-image-stage.yml b/.github/workflows/build-push-image-stage.yml
new file mode 100644
index 000000000000..9a18920bf32e
--- /dev/null
+++ b/.github/workflows/build-push-image-stage.yml
@@ -0,0 +1,36 @@
+name: Tutor Build Action
+
+on:
+  push:
+    branches:
+      - 'pearson-release/olive.stage'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Get current time
+        uses: josStorer/get-current-time@v2
+        id: current-time
+        with:
+          format: YYYY-MM-DD-HH-mm
+
+      - name: Build and push Image
+        uses: Pearson-Advance/tutor-build-image-action@0.2.0
+        with:
+          python-version: ${{ vars.BUILD_PYTHON_VERSION }}
+          tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}
+          path-image-to-be-built: '/env/build/openedx'
+          repository-name: ${{ vars.BUILD_STAGE_REPOSITORY_NAME }}
+          image-name: ${{ vars.BUILD_STAGE_IMAGE_NAME }}
+          image-tag: ${{ vars.BUILD_TUTOR_VERSION }}-RC-${{ steps.current-time.outputs.formattedTime }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          use-docker-cache: ${{ vars.BUILD_USE_CACHE }}
+          gh-access-token: ${{ secrets.GH_PAT }}
+          theme-repository: ${{ vars.BUILD_THEME_REPOSITORY }}
+          theme-branch: ${{ vars.BUILD_THEME_BRANCH }}
+          extra-private-requirements: true
+          private-repositories: ${{ vars.BUILD_PRIVATE_REPOSITORIES }}
+          branches: ${{ vars.BUILD_BRANCHES }}
diff --git a/.github/workflows/check-for-tutorial-prs.yml b/.github/workflows/check-for-tutorial-prs.yml
deleted file mode 100644
index 6920542ac187..000000000000
--- a/.github/workflows/check-for-tutorial-prs.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# This workflow detects PRs that make changes to lms/templates/dashboard.html
-# and only lms/templates/dashboard.html. This is the file that users are
-# guided through changing in the Open edX tutorial:
-# https://docs.openedx.org/en/latest/developers/quickstarts/first_openedx_pr.html#exercise-update-the-learner-dashboard
-
-# If this is the only file changed in the PR, we comment on the PR congratulating
-# the user and letting others know that this is not a community PR in need of
-# review. CODEOWNERS will tag a triaging team to provide reviews & ultimately
-# close the PR.
-
-name: Check for Tutorial PR
-description: Welcome contributors making their first PR from the tutorial
-on:
-  pull_request:
-    types: [opened]
-    paths:
-      - 'lms/templates/dashboard.html'
-
-jobs:
-  # Provide helpful bot comment
-  comment:
-    runs-on: ubuntu-latest
-    name: provide helpful bot comment
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Comment PR
-        uses: thollander/actions-comment-pull-request@v1
-        with:
-          message: |
-            Thank you for your pull request! Congratulations on completing the Open edX tutorial! A team member will be by to take a look shortly.
-            To those watching community pull requests: No need to worry about this one, a tCRIL team member will be taking care of it.
-            For this PR's author: If this is a PR that is NOT coming from the Open edX tutorial, please comment and let us know to disregard this message.
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
deleted file mode 100644
index e7d9e0c1fa8e..000000000000
--- a/.github/workflows/docker-publish.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Push Docker Images
-
-on:
-  push:
-    branches:
-      - master
-jobs:
-  # Push image to GitHub Packages.
-  # See also https://docs.docker.com/docker-hub/builds/
-  push:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Build and Push docker image
-        env:
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        run : make docker_push
diff --git a/.github/workflows/lockfileversion-check.yml b/.github/workflows/lockfileversion-check.yml
deleted file mode 100644
index 42312e8cbf2d..000000000000
--- a/.github/workflows/lockfileversion-check.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-#check package-lock file version
-
-name: Lockfile Version check
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-jobs:
-  version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
diff --git a/.github/workflows/publish-ci-docker-image.yml b/.github/workflows/publish-ci-docker-image.yml
deleted file mode 100644
index e716c7d15340..000000000000
--- a/.github/workflows/publish-ci-docker-image.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Push CI Runner Docker Image
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 1 * * 3"
-
-jobs:
-  push:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.TOOLS_EDX_ECR_USER_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.TOOLS_EDX_ECR_USER_AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: Log in to ECR
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
-
-      - name: Build, tag, and push image to Amazon ECR
-        env:
-          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-          ECR_REPOSITORY: actions-runner
-          IMAGE_TAG: latest
-        run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f scripts/ci-runner.Dockerfile .
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-
diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml
deleted file mode 100644
index 911c6f0e51da..000000000000
--- a/.github/workflows/upgrade-python-requirements.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Upgrade Requirements
-
-on:
-  schedule:
-     - cron: "0 2 * * 2"
-  workflow_dispatch:
-     inputs:
-       branch:
-         description: 'Target branch to create requirements PR against'
-         required: true
-         default: 'master'
-jobs:
-   call-upgrade-python-requirements-workflow:
-    with:
-       branch: ${{ github.event.inputs.branch }}
-       team_reviewers: "arbi-bom"
-       email_address: arbi-bom@edx.org
-       send_success_notification: false
-    secrets:
-       requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}
-       requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }}
-       edx_smtp_username: ${{ secrets.EDX_SMTP_USERNAME }}
-       edx_smtp_password: ${{ secrets.EDX_SMTP_PASSWORD }}
-    uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master
-

From a7a034022e7cfaa74f7ed7cd94ad4ae6a9b92477 Mon Sep 17 00:00:00 2001
From: Sergio Valero <sergio.valero@edunext.co>
Date: Fri, 14 Apr 2023 16:19:59 -0400
Subject: [PATCH 34/77] refactor: change input names in build and push
 workflows

---
 .github/workflows/build-push-image-main.yml  | 10 ++++++----
 .github/workflows/build-push-image-stage.yml | 12 +++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-push-image-main.yml b/.github/workflows/build-push-image-main.yml
index 76964c60631f..6d2e494f8cc9 100644
--- a/.github/workflows/build-push-image-main.yml
+++ b/.github/workflows/build-push-image-main.yml
@@ -6,7 +6,7 @@ on:
       - 'pearson-release/olive.main'
 
 jobs:
-  docker:
+  Build:
     runs-on: ubuntu-latest
     steps:
 
@@ -21,9 +21,9 @@ jobs:
         with:
           python-version: ${{ vars.BUILD_PYTHON_VERSION }}
           tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}
-          path-image-to-be-built: '/env/build/openedx'
-          repository-name: ${{ vars.BUILD_MAIN_REPOSITORY_NAME }}
-          image-name: ${{ vars.BUILD_MAIN_IMAGE_NAME }}
+          path-image-to-be-built: 'env/build/openedx'
+          organization-name: ${{ vars.BUILD_ORGANIZATION_NAME }}
+          repository-name: ${{ vars.BUILD_REPOSITORY_NAME }}
           image-tag: ${{ vars.BUILD_TUTOR_VERSION }}-${{ steps.current-time.outputs.formattedTime }}
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -31,6 +31,8 @@ jobs:
           gh-access-token: ${{ secrets.GH_PAT }}
           theme-repository: ${{ vars.BUILD_THEME_REPOSITORY }}
           theme-branch: ${{ vars.BUILD_THEME_BRANCH }}
+          tutor-pearson-plugin-url: ${{ vars.TUTOR_PEARSON_PLUGIN_URL }}
+          tutor-pearson-plugin-name: 'pearson-plugin-edxapp-prod'
           extra-private-requirements: true
           private-repositories: ${{ vars.BUILD_PRIVATE_REPOSITORIES }}
           branches: ${{ vars.BUILD_BRANCHES }}
diff --git a/.github/workflows/build-push-image-stage.yml b/.github/workflows/build-push-image-stage.yml
index 9a18920bf32e..48f2d935ba72 100644
--- a/.github/workflows/build-push-image-stage.yml
+++ b/.github/workflows/build-push-image-stage.yml
@@ -1,4 +1,4 @@
-name: Tutor Build Action
+name: Tutor Build Action Test
 
 on:
   push:
@@ -6,7 +6,7 @@ on:
       - 'pearson-release/olive.stage'
 
 jobs:
-  docker:
+  Build:
     runs-on: ubuntu-latest
     steps:
 
@@ -21,9 +21,9 @@ jobs:
         with:
           python-version: ${{ vars.BUILD_PYTHON_VERSION }}
           tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}
-          path-image-to-be-built: '/env/build/openedx'
-          repository-name: ${{ vars.BUILD_STAGE_REPOSITORY_NAME }}
-          image-name: ${{ vars.BUILD_STAGE_IMAGE_NAME }}
+          path-image-to-be-built: 'env/build/openedx'
+          organization-name: ${{ vars.BUILD_ORGANIZATION_NAME }}
+          repository-name: ${{ vars.BUILD_REPOSITORY_NAME }}
           image-tag: ${{ vars.BUILD_TUTOR_VERSION }}-RC-${{ steps.current-time.outputs.formattedTime }}
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -31,6 +31,8 @@ jobs:
           gh-access-token: ${{ secrets.GH_PAT }}
           theme-repository: ${{ vars.BUILD_THEME_REPOSITORY }}
           theme-branch: ${{ vars.BUILD_THEME_BRANCH }}
+          tutor-pearson-plugin-url: ${{ vars.TUTOR_PEARSON_PLUGIN_URL }}
+          tutor-pearson-plugin-name: 'pearson-plugin-edxapp-stg'
           extra-private-requirements: true
           private-repositories: ${{ vars.BUILD_PRIVATE_REPOSITORIES }}
           branches: ${{ vars.BUILD_BRANCHES }}

From 351e5097683b6904f5f7794e1c2392f168ad5df0 Mon Sep 17 00:00:00 2001
From: anfbermudezme <andres.bermudez@edunext.co>
Date: Wed, 26 Apr 2023 19:14:58 +0200
Subject: [PATCH 35/77] feat: add run_extension_point wrapper function.

---
 .../core/djangoapps/plugins/plugins_hooks.py  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 openedx/core/djangoapps/plugins/plugins_hooks.py

diff --git a/openedx/core/djangoapps/plugins/plugins_hooks.py b/openedx/core/djangoapps/plugins/plugins_hooks.py
new file mode 100644
index 000000000000..a167827f99f3
--- /dev/null
+++ b/openedx/core/djangoapps/plugins/plugins_hooks.py
@@ -0,0 +1,40 @@
+"""
+Plugin extension points module
+"""
+import logging
+from importlib import import_module
+
+from django.conf import settings
+
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
+
+log = logging.getLogger(__name__)
+
+
+def run_extension_point(extension_point, *args, **kwargs):
+    """
+    Wrapper function to execute any extension point at platform level
+    if exceptions occurs returns None.
+    """
+    path = configuration_helpers.get_value(
+        extension_point,
+        getattr(settings, extension_point, None),
+    )
+
+    if not path:
+        return None
+
+    try:
+        module_name, func_name = path.rsplit('.', 1)
+        module = import_module(module_name)
+        extension_function = getattr(module, func_name)
+
+        return extension_function(*args, **kwargs)
+    except ImportError:
+        log.info('Could not import the %s : %s', extension_point, module)
+    except AttributeError:
+        log.info('Could not import the function %s in the module %s', func_name, module)
+    except ValueError:
+        log.info('Could not load the information from \"%s\"', path)
+
+    return None

From 0085d112cbbc955e255e449de27ac9b231ca89d4 Mon Sep 17 00:00:00 2001
From: Sergio Valero <sergio.valero@edunext.co>
Date: Mon, 17 Apr 2023 23:10:01 -0400
Subject: [PATCH 36/77] refactor: change composite version

---
 .github/workflows/build-push-image-main.yml  | 2 +-
 .github/workflows/build-push-image-stage.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-push-image-main.yml b/.github/workflows/build-push-image-main.yml
index 6d2e494f8cc9..35b57ba75506 100644
--- a/.github/workflows/build-push-image-main.yml
+++ b/.github/workflows/build-push-image-main.yml
@@ -17,7 +17,7 @@ jobs:
           format: YYYY-MM-DD-HH-mm
 
       - name: Build and push Image
-        uses: Pearson-Advance/tutor-build-image-action@0.2.0
+        uses: Pearson-Advance/tutor-build-image-action@v1.0.0
         with:
           python-version: ${{ vars.BUILD_PYTHON_VERSION }}
           tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}
diff --git a/.github/workflows/build-push-image-stage.yml b/.github/workflows/build-push-image-stage.yml
index 48f2d935ba72..f30e3e5cef0d 100644
--- a/.github/workflows/build-push-image-stage.yml
+++ b/.github/workflows/build-push-image-stage.yml
@@ -17,7 +17,7 @@ jobs:
           format: YYYY-MM-DD-HH-mm
 
       - name: Build and push Image
-        uses: Pearson-Advance/tutor-build-image-action@0.2.0
+        uses: Pearson-Advance/tutor-build-image-action@v1.0.0
         with:
           python-version: ${{ vars.BUILD_PYTHON_VERSION }}
           tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}

From adb88449c08bb29955a75c0cdc5b17d6c23fd7f6 Mon Sep 17 00:00:00 2001
From: anfbermudezme <andres.bermudez@edunext.co>
Date: Tue, 2 May 2023 20:40:22 +0200
Subject: [PATCH 37/77] feat: add extension_points related to
 course_operations.

---
 lms/djangoapps/ccx/plugins.py                 | 17 ++++
 lms/djangoapps/ccx/utils.py                   | 96 +++++++++++++++++++
 lms/djangoapps/ccx/views.py                   | 69 ++++++++++---
 .../instructor/views/instructor_dashboard.py  | 10 ++
 4 files changed, 181 insertions(+), 11 deletions(-)

diff --git a/lms/djangoapps/ccx/plugins.py b/lms/djangoapps/ccx/plugins.py
index 1852f5727a28..d155fdc9dcc3 100644
--- a/lms/djangoapps/ccx/plugins.py
+++ b/lms/djangoapps/ccx/plugins.py
@@ -5,6 +5,8 @@
 
 from django.conf import settings
 from django.utils.translation import gettext_noop
+from openedx.core.djangoapps.plugins.plugins_hooks import run_extension_point
+from common.djangoapps.student.auth import is_ccx_course
 
 from common.djangoapps.student.roles import CourseCcxCoachRole
 from xmodule.tabs import CourseTab  # lint-amnesty, pylint: disable=wrong-import-order
@@ -32,6 +34,21 @@ def is_enabled(cls, course, user=None):
             # If ccx is not enable do not show ccx coach tab.
             return False
 
+        # If Course Licensing is enable, disable CCXCoach tab for master courses if user is not allowed to create ccx.
+        is_course_licensing_enabled = run_extension_point('PCO_ENABLE_COURSE_LICENSING')
+
+        if (
+            not is_ccx_course(course.id) and
+            is_course_licensing_enabled and
+            not run_extension_point(
+                'PCO_IS_USER_ALLOWED_TO_CREATE_CCX',
+                user=user,
+                master_course=course.id,
+            )
+        ):
+            # If course licensing is enable, then regular ccxs are disabled.
+            return False
+
         if hasattr(course.id, 'ccx') and bool(user.has_perm(VIEW_CCX_COACH_DASHBOARD, course)):
             return True
 
diff --git a/lms/djangoapps/ccx/utils.py b/lms/djangoapps/ccx/utils.py
index 9f7c0eff3963..caf296c1d3cd 100644
--- a/lms/djangoapps/ccx/utils.py
+++ b/lms/djangoapps/ccx/utils.py
@@ -11,6 +11,8 @@
 from smtplib import SMTPException
 
 import pytz
+from ccx_keys.locator import CCXLocator
+from crum import get_current_request
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
@@ -28,6 +30,8 @@
 from lms.djangoapps.instructor.views.tools import get_student_from_identifier
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.lib.courses import get_course_by_id
+from openedx.core.djangoapps.plugins.plugins_hooks import run_extension_point
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 
 log = logging.getLogger("edx.ccx")
 
@@ -251,6 +255,11 @@ def ccx_students_enrolling_center(action, identifiers, email_students, course_ke
         course_locator = course_key.to_course_locator()
         staff = CourseStaffRole(course_locator).users_with_role()
         admins = CourseInstructorRole(course_locator).users_with_role()
+        is_course_licensing_enabled = run_extension_point('PCO_ENABLE_COURSE_LICENSING')
+
+        # If Course Licensing is enabled, current request is obtained.
+        if is_course_licensing_enabled:
+            current_request = get_current_request()
 
         for identifier in identifiers:
             must_enroll = False
@@ -263,6 +272,20 @@ def ccx_students_enrolling_center(action, identifiers, email_students, course_ke
                 errors.append(f"{exp}")
                 continue
 
+            if (
+                is_course_licensing_enabled and
+                not must_enroll and
+                not run_extension_point(
+                    'PCO_ENFORCE_LICENSE_LIMITS',
+                    course_key=course_key,
+                    email=email,
+                    student=student,
+                    request=current_request,
+                )
+            ):
+                # If License limit is reached, block enrollment.
+                break
+
             if CourseEnrollment.objects.is_course_full(ccx_course_overview) and not must_enroll:
                 error = _('The course is full: the limit is {max_student_enrollments_allowed}').format(
                     max_student_enrollments_allowed=ccx_course_overview.max_student_enrollments_allowed)
@@ -433,3 +456,76 @@ def remove_master_course_staff_from_ccx(master_course, ccx_key, display_name, se
                     email_students=send_email,
                     email_params=email_params,
                 )
+
+
+def get_master_course_by_ccx_id(ccx_id):
+    """
+    Return the master course id by the given CCX course id.
+    Args:
+        ccx_id: CCXLocator instance.
+    Returns:
+        None or a CourseLocator instance.
+    """
+    return ccx_id.to_course_locator() if ccx_id else None
+
+
+def exclude_master_course_staff_users(users, course_key, model='User'):
+    """
+    Return a new filtered queryset depending on weather the user is a staff member of the master course.
+
+    This is for CCX courses only, so if the course_key is not an instance of CCXLocator
+    will return the same users object.
+
+    Users will be interpreted as a staff members
+    if they have any entry in the Course Access Role model for the master course.
+
+    The model argument dictates how the lookup filter should be applied on the provided queryset.
+
+    Args:
+        users: django.db.models.query.QuerySet instance.
+        course_key: CCXLocator instance.
+        model: Dictates how to apply the lookup filter. Defaults to 'User'.
+            'User': Applies the lookup filter on the courseaccessrole model.
+            'CourseEnrollment': Applies the lookup filter on the user and then on
+                                the courseaccessrole model.
+
+    Returns:
+        Filtered django.db.models.query.QuerySet instance.
+        If course_key is not a CCXLocator instance it will return the users argument.
+        If model value is not recognized will it return the users argument.
+    """
+    if not isinstance(course_key, CCXLocator):
+        return users
+
+    if model == 'User':
+        return users.exclude(
+            courseaccessrole__course_id=get_master_course_by_ccx_id(course_key),
+        )
+
+    if model == 'CourseEnrollment':
+        return users.exclude(
+            user__courseaccessrole__course_id=get_master_course_by_ccx_id(course_key),
+        )
+
+    return users
+
+
+def multiple_ccx_per_coach(course):
+    """
+    Return if the feature to allows coaches to have multiple CCX
+    courses for the same main course is enabled for the site and the course.
+
+    This feature must be enabled at site-level and course-level.
+
+    Args:
+        Course: Course object.
+    Returns:
+        True or False.
+    """
+    return (
+        course.enable_ccx
+        and configuration_helpers.get_value(
+            'ALLOW_MULTIPLE_CCX_PER_COACH',
+            False,
+        )
+    )
diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index 66e18b2bd0cd..45b588d67e06 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -47,7 +47,8 @@
     get_ccx_for_coach,
     get_date,
     get_enrollment_action_and_identifiers,
-    parse_date
+    multiple_ccx_per_coach,
+    parse_date,
 )
 from lms.djangoapps.courseware.field_overrides import disable_overrides
 from lms.djangoapps.grades.api import CourseGradeFactory
@@ -56,6 +57,7 @@
 from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_ADMINISTRATOR, assign_role
 from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles
 from openedx.core.lib.courses import get_course_by_id
+from openedx.core.djangoapps.plugins.plugins_hooks import run_extension_point
 from xmodule.modulestore.django import SignalHandler  # lint-amnesty, pylint: disable=wrong-import-order
 
 log = logging.getLogger(__name__)
@@ -76,6 +78,8 @@ def wrapper(request, course_id):
         """
         course_key = CourseKey.from_string(course_id)
         ccx = None
+        is_course_licensing_enabled = run_extension_point('PCO_ENABLE_COURSE_LICENSING')
+
         if isinstance(course_key, CCXLocator):
             ccx_id = course_key.ccx
             try:
@@ -89,11 +93,33 @@ def wrapper(request, course_id):
 
         if not course.enable_ccx:  # lint-amnesty, pylint: disable=no-else-raise
             raise Http404
+        elif (
+            not ccx and
+            # If Course Licensing is enabled, Disable ccx view for master courses if user is not allowed to create ccx.
+            is_course_licensing_enabled and
+            not run_extension_point(
+                'PCO_IS_USER_ALLOWED_TO_CREATE_CCX',
+                user=request.user,
+                master_course=course.id,
+            )
+        ):
+            raise Http404
         else:
             if bool(request.user.has_perm(VIEW_CCX_COACH_DASHBOARD, course)):
                 # if user is staff or instructor then he can view ccx coach dashboard.
                 return view(request, course, ccx)
             else:
+                # If user has the staff role at CCX level, then he/she can view ccx coach dashboard for licensed ccxs.
+                if (
+                    ccx and
+                    is_course_licensing_enabled and
+                    run_extension_point(
+                        'PCO_IS_USER_ALLOWED_TO_ACCESS_CCX_COACH_TAB',
+                        ccx_id=CCXLocator.from_course_locator(course.id, six.text_type(ccx.id)),
+                        user=request.user,
+                    )
+                ):
+                    return view(request, course, ccx)
                 # if there is a ccx, we must validate that it is the ccx for this coach
                 role = CourseCcxCoachRole(course_key)
                 if not role.has_user(request.user):
@@ -118,7 +144,7 @@ def dashboard(request, course, ccx=None):
     """
     # right now, we can only have one ccx per user and course
     # so, if no ccx is passed in, we can sefely redirect to that
-    if ccx is None:
+    if ccx is None and not multiple_ccx_per_coach(course):
         ccx = get_ccx_for_coach(course, request.user)
         if ccx:
             url = reverse(
@@ -144,6 +170,12 @@ def dashboard(request, course, ccx=None):
         context['save_url'] = reverse(
             'save_ccx', kwargs={'course_id': ccx_locator})
         context['ccx_members'] = CourseEnrollment.objects.filter(course_id=ccx_locator, is_active=True)
+        # if course licensing is enabled, pending enrollments will be in the context.
+        is_course_licensing_enabled = run_extension_point('PCO_ENABLE_COURSE_LICENSING')
+        context['pending_ccx_members'] = run_extension_point(
+            'PCO_GET_PENDING_ENROLLMENTS_FOR_CCX',
+            ccx_id=ccx_locator,
+        ) if is_course_licensing_enabled else []
         context['gradebook_url'] = reverse(
             'ccx_gradebook', kwargs={'course_id': ccx_locator})
         context['grades_csv_url'] = reverse(
@@ -202,14 +234,18 @@ def create_ccx(request, course, ccx=None):
     # Save display name explicitly
     override_field_for_ccx(ccx, course, 'display_name', name)
 
-    # Hide anything that can show up in the schedule
-    hidden = 'visible_to_staff_only'
-    for chapter in course.get_children():
-        override_field_for_ccx(ccx, chapter, hidden, True)
-        for sequential in chapter.get_children():
-            override_field_for_ccx(ccx, sequential, hidden, True)
-            for vertical in sequential.get_children():
-                override_field_for_ccx(ccx, vertical, hidden, True)
+    is_course_licensing_enabled = run_extension_point('PCO_ENABLE_COURSE_LICENSING')
+
+    # if course licensing is enabled, then all units will be shown in schedule.
+    if not is_course_licensing_enabled:
+        # Hide anything that can show up in the schedule
+        hidden = 'visible_to_staff_only'
+        for chapter in course.get_children():
+            override_field_for_ccx(ccx, chapter, hidden, True)
+            for sequential in chapter.get_children():
+                override_field_for_ccx(ccx, sequential, hidden, True)
+                for vertical in sequential.get_children():
+                    override_field_for_ccx(ccx, vertical, hidden, True)
 
     ccx_id = CCXLocator.from_course_locator(course.id, str(ccx.id))
 
@@ -231,7 +267,9 @@ def create_ccx(request, course, ccx=None):
     )
 
     assign_staff_role_to_ccx(ccx_id, request.user, course.id)
-    add_master_course_staff_to_ccx(course, ccx_id, ccx.display_name)
+
+    if not is_course_licensing_enabled:
+        add_master_course_staff_to_ccx(course, ccx_id, ccx.display_name)
 
     # using CCX object as sender here.
     responses = SignalHandler.course_published.send(
@@ -241,6 +279,15 @@ def create_ccx(request, course, ccx=None):
     for rec, response in responses:
         log.info('Signal fired when course is published. Receiver: %s. Response: %s', rec, response)
 
+    # Adding an extension point to create the institution_ccx for PearsonVUE.
+    if is_course_licensing_enabled:
+        run_extension_point(
+            'PCO_CREATE_INSTITUTION_CCX_INSTANCE',
+            ccx_id=ccx_id,
+            custom_course=ccx,
+            user=request.user,
+        )
+
     return redirect(url)
 
 
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index 4625402f6efc..0005c28f6ef8 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -58,6 +58,7 @@
 from openedx.core.djangoapps.discussions.config.waffle_utils import legacy_discussion_experience_enabled
 from openedx.core.djangoapps.discussions.utils import available_division_schemes
 from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_ADMINISTRATOR, CourseDiscussionSettings
+from openedx.core.djangoapps.plugins.plugins_hooks import run_extension_point
 from openedx.core.djangoapps.plugins.constants import ProjectType
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangolib.markup import HTML, Text
@@ -462,7 +463,16 @@ def _section_membership(course, access):
     course_key = course.id
     ccx_enabled = settings.FEATURES.get('CUSTOM_COURSES_EDX', False) and course.enable_ccx
 
+    # if Course Licensing is enabled, hide the membership tab for licensed CCXs from their staff users.
+    is_course_licensing_enabled = run_extension_point('PCO_ENABLE_COURSE_LICENSING')
+
+    is_licensed_ccx = run_extension_point(
+        'PCO_IS_LICENSED_CCX',
+        course_id=course.id,
+    ) if is_course_licensing_enabled else False
+
     section_data = {
+        'is_hidden': is_licensed_ccx and not access.get('admin', False),
         'section_key': 'membership',
         'section_display_name': _('Membership'),
         'access': access,

From 8ac32ac93e46f919d889d66f169806d45856878d Mon Sep 17 00:00:00 2001
From: Squirrel18 <daniel.quiroga@edunext.co>
Date: Wed, 3 May 2023 23:31:20 -0500
Subject: [PATCH 38/77] chore: Change edx-sga for our custom version.

---
 requirements/edx/base.in         | 1 -
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/testing.txt     | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 06bd9cb3e7a1..3937329f793f 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -93,7 +93,6 @@ edx-proctoring>=2.0.1
 edx-proctoring-proctortrack==1.0.5  # Intentionally and permanently pinned to ensure code changes are reviewed
 edx-rest-api-client
 edx-search
-edx-sga
 edx-submissions
 edx-toggles                         # Feature toggles management
 edx-user-state-client
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 9efa268754c3..038129222d69 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -525,7 +525,7 @@ edx-rest-api-client==5.5.0
     #   edx-proctoring
 edx-search==3.4.0
     # via -r requirements/edx/base.in
-edx-sga==0.20.0
+git+https://github.com/Pearson-Advance/edx-sga.git@v0.20.0.post1#egg=edx-sga==0.20.0.post1
     # via -r requirements/edx/base.in
 edx-submissions==3.5.4
     # via
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index bd8f0494f7e3..3e5ba143d975 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -645,7 +645,7 @@ edx-rest-api-client==5.5.0
     #   edx-proctoring
 edx-search==3.4.0
     # via -r requirements/edx/testing.txt
-edx-sga==0.20.0
+git+https://github.com/Pearson-Advance/edx-sga.git@v0.20.0.post1#egg=edx-sga==0.20.0.post1
     # via -r requirements/edx/testing.txt
 edx-sphinx-theme==3.0.0
     # via -r requirements/edx/development.in
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index bc143be7730d..84935527d441 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -625,7 +625,7 @@ edx-rest-api-client==5.5.0
     #   edx-proctoring
 edx-search==3.4.0
     # via -r requirements/edx/base.txt
-edx-sga==0.20.0
+git+https://github.com/Pearson-Advance/edx-sga.git@v0.20.0.post1#egg=edx-sga==0.20.0.post1
     # via -r requirements/edx/base.txt
 edx-submissions==3.5.4
     # via

From 29e86b68cf9b5b93cdc6e9912c09c83e2f3e5379 Mon Sep 17 00:00:00 2001
From: Diego Millan <diego.millan@edunext.co>
Date: Thu, 8 Oct 2020 16:38:42 -0500
Subject: [PATCH 39/77] feat: migrate small features for olive.

---
 common/djangoapps/course_modes/models.py        |   5 ++++-
 .../images/ico-no-id-professional.png           | Bin 0 -> 35713 bytes
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 lms/static/certificates/images/ico-no-id-professional.png

diff --git a/common/djangoapps/course_modes/models.py b/common/djangoapps/course_modes/models.py
index 0b015a133c9e..77eb468c202f 100644
--- a/common/djangoapps/course_modes/models.py
+++ b/common/djangoapps/course_modes/models.py
@@ -774,7 +774,10 @@ def min_course_price_for_currency(cls, course_id, currency):
         If there is no mode found, will return the price of DEFAULT_MODE, which is 0
         """
         modes = cls.modes_for_course(course_id)
-        return min(mode.min_price for mode in modes if mode.currency.lower() == currency.lower())
+        try:
+            return min(mode.min_price for mode in modes if mode.currency.lower() == currency.lower())
+        except ValueError:
+            return 0
 
     @classmethod
     def is_eligible_for_certificate(cls, mode_slug, status=None):
diff --git a/lms/static/certificates/images/ico-no-id-professional.png b/lms/static/certificates/images/ico-no-id-professional.png
new file mode 100644
index 0000000000000000000000000000000000000000..d42623c15ed325d503b666e4d766e38512b90a56
GIT binary patch
literal 35713
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

literal 0
HcmV?d00001


From 09d1515354ba6f593bedd5a8198bbc316ad0cae8 Mon Sep 17 00:00:00 2001
From: Squirrel18 <daniel.quiroga@edunext.co>
Date: Mon, 12 Oct 2020 13:36:31 -0500
Subject: [PATCH 40/77] feat: add CCX related changes for olive.

---
 lms/djangoapps/ccx/views.py                  | 24 +++++++++++++++++++-
 lms/djangoapps/instructor_analytics/basic.py | 10 +++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index 45b588d67e06..08d6ec19824c 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -42,6 +42,7 @@
     assign_staff_role_to_ccx,
     ccx_course,
     ccx_students_enrolling_center,
+    exclude_master_course_staff_users,
     get_ccx_by_ccx_id,
     get_ccx_creation_dict,
     get_ccx_for_coach,
@@ -56,6 +57,7 @@
 from lms.djangoapps.instructor.views.gradebook_api import get_grade_book_page
 from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_ADMINISTRATOR, assign_role
 from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.lib.courses import get_course_by_id
 from openedx.core.djangoapps.plugins.plugins_hooks import run_extension_point
 from xmodule.modulestore.django import SignalHandler  # lint-amnesty, pylint: disable=wrong-import-order
@@ -166,10 +168,21 @@ def dashboard(request, course, ccx=None):
         schedule = get_ccx_schedule(course, ccx)
         grading_policy = get_override_for_ccx(
             ccx, course, 'grading_policy', course.grading_policy)
+        enrolled_students = CourseEnrollment.objects.filter(course_id=ccx_locator, is_active=True)
         context['schedule'] = json.dumps(schedule, indent=4)
         context['save_url'] = reverse(
             'save_ccx', kwargs={'course_id': ccx_locator})
-        context['ccx_members'] = CourseEnrollment.objects.filter(course_id=ccx_locator, is_active=True)
+        context['ccx_members'] = (
+            # TO DO: CCX feature is going to be used only for Licensing (Course Operations business logic)
+            # Additional information can be found at: https://github.com/Pearson-Advance/edx-platform/pull/96
+            enrolled_students
+            if not configuration_helpers.get_value('HIDE_MASTER_COURSE_STAFF_FROM_STUDENT_LIST', False)
+            else exclude_master_course_staff_users(
+                users=enrolled_students,
+                course_key=ccx_locator,
+                model='CourseEnrollment',
+            )
+        )
         # if course licensing is enabled, pending enrollments will be in the context.
         is_course_licensing_enabled = run_extension_point('PCO_ENABLE_COURSE_LICENSING')
         context['pending_ccx_members'] = run_extension_point(
@@ -574,6 +587,15 @@ def ccx_grades_csv(request, course, ccx=None):
             courseenrollment__course_id=ccx_key,
             courseenrollment__is_active=1
         ).order_by('username').select_related("profile")
+
+        # TO DO: CCX feature is going to be used only for Licensing (Course Operations business logic)
+        # Additional information can be found at: https://github.com/Pearson-Advance/edx-platform/pull/96
+        if configuration_helpers.get_value('HIDE_MASTER_COURSE_STAFF_FROM_GRADEBOOK', False):
+            enrolled_students = exclude_master_course_staff_users(
+                users=enrolled_students,
+                course_key=ccx_key,
+            )
+
         grades = CourseGradeFactory().iter(enrolled_students, course)
 
         header = None
diff --git a/lms/djangoapps/instructor_analytics/basic.py b/lms/djangoapps/instructor_analytics/basic.py
index afce0620aab0..69e7ba9b2fd9 100644
--- a/lms/djangoapps/instructor_analytics/basic.py
+++ b/lms/djangoapps/instructor_analytics/basic.py
@@ -84,7 +84,7 @@ def issued_certificates(course_key, features):
     return generated_certificates
 
 
-def enrolled_students_features(course_key, features):
+def enrolled_students_features(course_key, features):  # pylint: disable=too-many-statements
     """
     Return list of student features as dictionaries.
 
@@ -108,6 +108,14 @@ def enrolled_students_features(course_key, features):
         courseenrollment__is_active=1,
     ).order_by('username').select_related('profile')
 
+    if configuration_helpers.get_value('HIDE_MASTER_COURSE_STAFF_FROM_PROFILE_REPORT', False):
+        # Avoid circular import.
+        from lms.djangoapps.ccx.utils import exclude_master_course_staff_users
+        students = exclude_master_course_staff_users(
+            users=students,
+            course_key=course_key,
+        )
+
     if include_cohort_column:
         students = students.prefetch_related('course_groups')
 

From 51c17596e79101b248c4faf4b291f8bde7037dfb Mon Sep 17 00:00:00 2001
From: ivanvgh <ivanv.gonzales@gmail.com>
Date: Fri, 17 Sep 2021 17:24:03 -0500
Subject: [PATCH 41/77] User full name generation on IES authentication.

---
 common/djangoapps/third_party_auth/pipeline.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/common/djangoapps/third_party_auth/pipeline.py b/common/djangoapps/third_party_auth/pipeline.py
index 601b411b71d7..5a6f555e1d8c 100644
--- a/common/djangoapps/third_party_auth/pipeline.py
+++ b/common/djangoapps/third_party_auth/pipeline.py
@@ -889,6 +889,19 @@ def user_details_force_sync(auth_entry, strategy, details, user=None, *args, **k
                 changed[provider_field] = current_value
                 setattr(model, field, provider_value)
 
+        # Generate fullname only for IES IDP.
+        ies_entity_ids = [
+            'https://iam-stage.pearson.com:443/auth/saml-idp-uid',
+            'https://iam.pearson.com:443/auth/saml-idp-uid',
+        ]
+
+        if (details.get('first_name') and details.get('last_name') and
+            current_provider.entity_id in ies_entity_ids):
+            fullname_value = '{} {}'.format(details.get('first_name'), details.get('last_name'))
+            changed['fullname'] = fullname_value
+
+            setattr(user.profile, 'name', fullname_value)
+
         if changed:
             logger.info(
                 '[THIRD_PARTY_AUTH] User performed SSO and data was synchronized. '

From 572e0a3a7ad34e9470b59583a9eb0559f892dc52 Mon Sep 17 00:00:00 2001
From: Squirrel18 <daniel.quiroga@edunext.co>
Date: Thu, 5 Aug 2021 20:35:55 -0500
Subject: [PATCH 42/77] Add run_extension_point to the logout flow.

---
 openedx/core/djangoapps/user_authn/views/logout.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/openedx/core/djangoapps/user_authn/views/logout.py b/openedx/core/djangoapps/user_authn/views/logout.py
index c00fa2a5dada..31b648d1e48a 100644
--- a/openedx/core/djangoapps/user_authn/views/logout.py
+++ b/openedx/core/djangoapps/user_authn/views/logout.py
@@ -12,6 +12,7 @@
 from django.views.generic import TemplateView
 from oauth2_provider.models import Application
 
+from openedx.core.djangoapps.plugins.plugins_hooks import run_extension_point
 from openedx.core.djangoapps.safe_sessions.middleware import mark_user_change_as_expected
 from openedx.core.djangoapps.user_authn.cookies import delete_logged_in_cookies
 from openedx.core.djangoapps.user_authn.utils import is_safe_login_or_logout_redirect
@@ -82,6 +83,14 @@ def dispatch(self, request, *args, **kwargs):
         # Clear the cookie used by the edx.org marketing site
         delete_logged_in_cookies(response)
 
+        # This module makes a POST request to the IES logout endpoint
+        # to allow us to log out the user by clicking
+        # the "Sign Out" button on the platform.
+        run_extension_point(
+            'PEARSON_CORE_SSO_LOGOUT_MODULE',
+            request=request,
+        )
+
         mark_user_change_as_expected(None)
         return response
 

From 4ecdfde92a6fc9640a6b61b5c7394355a6ed3fe0 Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Wed, 24 May 2023 18:02:57 -0500
Subject: [PATCH 43/77] feat: improving SAML custom features code

---
 .../djangoapps/third_party_auth/pipeline.py   | 18 +++++--
 docs/custom_features_documentation.md         | 51 +++++++++++++++++++
 2 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 docs/custom_features_documentation.md

diff --git a/common/djangoapps/third_party_auth/pipeline.py b/common/djangoapps/third_party_auth/pipeline.py
index 5a6f555e1d8c..25c59f65ead9 100644
--- a/common/djangoapps/third_party_auth/pipeline.py
+++ b/common/djangoapps/third_party_auth/pipeline.py
@@ -890,17 +890,25 @@ def user_details_force_sync(auth_entry, strategy, details, user=None, *args, **k
                 setattr(model, field, provider_value)
 
         # Generate fullname only for IES IDP.
+        # We deliberately left these values hard-coded instead of using Django settings because
+        # it would force us to add custom settings to the edx platform code,
+        # which we try to avoid as we might lose track of that kind of setting.
         ies_entity_ids = [
             'https://iam-stage.pearson.com:443/auth/saml-idp-uid',
             'https://iam.pearson.com:443/auth/saml-idp-uid',
         ]
-
-        if (details.get('first_name') and details.get('last_name') and
-            current_provider.entity_id in ies_entity_ids):
-            fullname_value = '{} {}'.format(details.get('first_name'), details.get('last_name'))
+        first_name = details.get('first_name')
+        last_name = details.get('last_name')
+
+        if (
+            first_name and
+            last_name and
+            current_provider.entity_id in ies_entity_ids
+        ):
+            fullname_value = f'{first_name} {last_name}'
             changed['fullname'] = fullname_value
 
-            setattr(user.profile, 'name', fullname_value)
+            setattr(user.profile, 'name', fullname_value)  # pylint: disable=literal-used-as-attribute
 
         if changed:
             logger.info(
diff --git a/docs/custom_features_documentation.md b/docs/custom_features_documentation.md
new file mode 100644
index 000000000000..17ef8b12a7a9
--- /dev/null
+++ b/docs/custom_features_documentation.md
@@ -0,0 +1,51 @@
+# Custom Features Migration
+
+## SSO Logout Feature
+
+### Overview
+The SSO Logout feature adds an extension point to integrate the Pearson Core Single Sign-On (SSO) logout functionality into the system.
+
+### Test Cases
+
+To test the SSO Logout feature, follow these steps:
+
+1. Configure the site configurations:
+   - Set the value of `IES_SESSION_COOKIE_NAME` to the appropriate session cookie name.
+   - Set the value of `IES_LOGOUT_ENDPOINT_URL` to the URL of the logout endpoint.
+
+2. Perform a logout from the LMS:
+   - Ensure that the `ies_sso_logout` function from Pearson Core is being called during the logout process.
+
+3. Verify the expected behavior:
+   - Confirm that the Pearson Core SSO logout feature is triggered.
+
+## Full Name Construction
+
+The Full Name Construction feature enhances the user_details_force_sync pipeline to construct the full name attribute from the first name and last name attributes, compensating for the lack of a full name attribute sent by IES.
+
+### Test Cases
+
+Follow these steps to configure and test the Full Name Construction feature:
+
+1. Configure a SAML IdP and SP in the edx-platform:
+   - Refer to the [EDX documentation](https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/latest/configuration/tpa/tpa_integrate_open/tpa_SAML_IdP.html) for instructions on configuring a SAML IdP and SP.
+
+2. Configure the SAML IdP in the Django admin page:
+   - Leave the "Full Name Attribute" field blank.
+   - Set an arbitrary value for the "Full Name Default Value" attribute.
+   - Enable the Sync learner profile data field.
+
+3. Ensure the SAML IdP passes the first name and last name attributes:
+   - During the account creation process with SAML, make sure that the SAML IdP passes both the first name and last name attributes.
+
+4. Add the SAML IdP entity ID to the list in the code:
+   - Update the code to include the entity ID of your SAML IdP in the entity_id list.
+
+5. Create an account with SAML:
+   - When creating an account using SAML authentication, ensure that the first name and last name attributes are passed correctly.
+
+6. Verify the Full Name attribute:
+   - After the account is created, navigate to your profile page.
+   - Confirm that the Full Name attribute is constructed by combining the first name and last name values.
+
+If the first and last name attributes are not passed, the full name should contain the default value

From 25afe7d41afd5eb2a1e780d821cb11093e82f19b Mon Sep 17 00:00:00 2001
From: Elvin Quero <elvinempor@gmail.com>
Date: Mon, 20 Sep 2021 11:09:19 -0400
Subject: [PATCH 44/77] feat: When studio_home.enable_global_staff_optimization
 is activated, now it displays a dropdown.

The default behavior when no org is selected, is to bring all orgs' courses.

-----
fix: Addressing the PR's comments.
fix: Javier's comments were addressed. Deactivation of the ORGS app on the PR.
fix: the index.html will now be changed with theming.
fix: Daniel comments were addressed
refactor: some code refactoring addressing Daniel's comments.
fix: needed change to default behavior.
feat: no courses are fetch initially.
---
 cms/djangoapps/contentstore/views/course.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 2f6a6a0c6feb..28af0dd494ad 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -30,7 +30,7 @@
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import BlockUsageLocator
-from organizations.api import add_organization_course, ensure_organization
+from organizations.api import add_organization_course, ensure_organization, get_organizations
 from organizations.exceptions import InvalidOrganizationException
 from rest_framework.exceptions import ValidationError
 
@@ -537,7 +537,13 @@ def course_listing(request):
 
     optimization_enabled = GlobalStaff().has_user(request.user) and ENABLE_GLOBAL_STAFF_OPTIMIZATION.is_enabled()
 
-    org = request.GET.get('org', '') if optimization_enabled else None
+    org = None
+    org_names_list = []
+
+    if optimization_enabled:
+        org = request.GET.get('org') if request.GET.get('org') else None
+        org_names_list = [(org['short_name']) for org in get_organizations() if 'short_name' in org]
+
     courses_iter, in_process_course_actions = get_courses_accessible_to_user(request, org)
     user = request.user
     libraries = []
@@ -586,7 +592,8 @@ def format_in_process_course_view(uca):
         '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'
+        'active_tab': 'courses',
+        'org_names_list': org_names_list,
     })
 
 

From 5c82a6ab7b9f2dcd385715f8722f33094d4750b7 Mon Sep 17 00:00:00 2001
From: Felipe B <andres.bermudez@edunext.co>
Date: Thu, 19 May 2022 19:31:42 -0500
Subject: [PATCH 45/77] feat: adding custom registration extension point and
 custom email templates

---
 common/djangoapps/third_party_auth/views.py   |   4 +-
 .../edx_ace/accountactivation/email/body.html |  80 ++++----
 .../edx_ace/accountrecovery/email/body.html   |  66 +++---
 .../edx_ace/emailchange/email/body.html       |  65 ++++--
 .../email/body.html                           | 101 ++++-----
 .../edx_ace/addbetatester/email/body.html     |  91 ++++----
 .../edx_ace/allowedenroll/email/body.html     | 128 +++++++-----
 .../edx_ace/enrolledunenroll/email/body.html  |  65 +++---
 .../edx_ace/enrollenrolled/email/body.html    |  65 +++---
 .../edx_ace/removebetatester/email/body.html  |  65 +++---
 .../ace_common/edx_ace/common/base_body.html  | 194 +++++-------------
 .../edx_ace/common/return_to_course_cta.html  |  24 ++-
 openedx/core/djangoapps/user_authn/tasks.py   |  10 +-
 .../edx_ace/passwordreset/email/body.html     |  86 +++++---
 .../user_authn/views/registration_form.py     |   6 +
 15 files changed, 552 insertions(+), 498 deletions(-)

diff --git a/common/djangoapps/third_party_auth/views.py b/common/djangoapps/third_party_auth/views.py
index c6a406c5301c..1f18136b923c 100644
--- a/common/djangoapps/third_party_auth/views.py
+++ b/common/djangoapps/third_party_auth/views.py
@@ -51,8 +51,8 @@ def inactive_user_view(request):
             user.is_active = True
             user.save()
             activated = True
-    if not activated:
-        compose_and_send_activation_email(user, profile)
+    # if not activated:
+    compose_and_send_activation_email(user, profile)
 
     request_params = request.GET
     redirect_to = request_params.get('next')
diff --git a/common/templates/student/edx_ace/accountactivation/email/body.html b/common/templates/student/edx_ace/accountactivation/email/body.html
index 9709074cc3d4..79855e0d6eb8 100644
--- a/common/templates/student/edx_ace/accountactivation/email/body.html
+++ b/common/templates/student/edx_ace/accountactivation/email/body.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 {% load static %}
 {% block content %}
-<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
+<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="box-shadow: 0px 0px 10px 2px #c8c8c8;">
 {% if route_enabled %}
     <tr>
         <td>
@@ -18,51 +18,47 @@
     </tr>
 {% endif %}
     <tr>
-        <td>
-            <h1>
-                {% trans "Account activation" as header_msg %}{{ header_msg | force_escape }}
-            </h1>
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                    {% blocktrans %}You're almost there! Use the link below to activate your account to access engaging, high-quality {{ platform_name }} courses. Note that you will not be able to log back into your account until you have activated it.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
 
-            {% filter force_escape %}
-                {% blocktrans asvar course_cta_text %}Activate your account{% endblocktrans %}
-            {% endfilter %}
-            {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=confirm_activation_link %}
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                    {% blocktrans %}Enjoy learning with {{ platform_name }}.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
-        </td>
-    </tr>
-        <td>
-            <p style="color: rgba(0,0,0,.75);">
-                {% blocktrans trimmed asvar assist_msg %}
-                If you need help, please use our web form at {start_anchor_web}{{ support_url }}{end_anchor} or email {start_anchor_email}{{ support_email }}{end_anchor}.
-                {% endblocktrans %}
-                {% interpolate_html assist_msg start_anchor_web='<a href="'|add:support_url|add:'">'|safe start_anchor_email='<a href="mailto:'|add:support_email|add:'">'|safe end_anchor='</a>'|safe %}
-                <br />
-            </p>
-        </td>
-    <tr>
+            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
 
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;">
+
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700; font-size: 1.7em; margin-top: 30px; margin-bottom: 20px;">
+                    {% trans "You're Nearly Signed Up" %}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% blocktrans %}To validate your new account, please click on the Validate Account button below.{% endblocktrans %}
+                    <br />
+                </p>
+
+                {% trans "Validate Account" as course_cta_text %}
+                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=confirm_activation_link %}
+            </div>
+        </td>
     </tr>
-    <tr>
+    <tr style="background-color: #FFF;">
         <td>
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                    {% blocktrans %}This email message was automatically sent by {{ lms_url }} because someone attempted to create an account on {{ platform_name }} using this email address.{% endblocktrans %}
-                {% endfilter %}
+            <p style="margin: 0 40px 40px 40px; text-align: center; color: #444; font-size: 0.9em;">
+                {% blocktrans %}This email message was automatically sent because someone attempted to create an account on {{ site_name }} using this email address.{% endblocktrans %}
                 <br />
             </p>
         </td>
diff --git a/common/templates/student/edx_ace/accountrecovery/email/body.html b/common/templates/student/edx_ace/accountrecovery/email/body.html
index 448d84a4383e..54fbd33422ec 100644
--- a/common/templates/student/edx_ace/accountrecovery/email/body.html
+++ b/common/templates/student/edx_ace/accountrecovery/email/body.html
@@ -3,42 +3,46 @@
 {% load i18n %}
 {% load static %}
 {% block content %}
-<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
+<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="box-shadow: 0px 0px 10px 2px #c8c8c8;">
     <tr>
-        <td>
-            <h1>
-                {% trans "Create Password" as tmsg %}{{ tmsg | force_escape }}
-            </h1>
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}You're receiving this e-mail because you requested to create a password for your user account at {{ platform_name }}.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}We've restored access to your {{ platform_name }} account using the recovery email you provided at registration.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}Once you've created a password [below], you will be able to log in to {{ platform_name }} with this email ({{ email }}) and your new password.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% trans "If you didn't request this change, you can disregard this email - we have not yet reset your password." as tmsg %}{{ tmsg | force_escape }}
-                <br />
-            </p>
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700; font-size: 1.7em; margin-top: 30px; margin-bottom: 20px;">
+                    {% trans "Create Password" %}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% blocktrans %}You're receiving this e-mail because you requested to create a password for your user account at {{ site_name }}. If you didn't request this change, you can disregard this email - we have not yet created your password.{% endblocktrans %}
+                    <br />
+                </p>
 
-            {% filter force_escape %}
-                {% blocktrans asvar course_cta_text %}Create Password{% endblocktrans %}
-            {% endfilter %}
-            {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=reset_link %}
+                 {% trans "Create my Password" as course_cta_text %}
+                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=confirm_activation_link %}
+
+                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=reset_link %}
+
+            </div>
         </td>
     </tr>
 </table>
diff --git a/common/templates/student/edx_ace/emailchange/email/body.html b/common/templates/student/edx_ace/emailchange/email/body.html
index b5c2c5edf21e..8540686979a6 100644
--- a/common/templates/student/edx_ace/emailchange/email/body.html
+++ b/common/templates/student/edx_ace/emailchange/email/body.html
@@ -3,31 +3,56 @@
 {% load i18n %}
 {% load static %}
 {% block content %}
-<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
+<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="box-shadow: 0px 0px 10px 2px #c8c8c8;">
     <tr>
-        <td>
-            <h1>
-                {% trans "Email Change" as tmsg %}{{ tmsg | force_escape }}
-            </h1>
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}We received a request to change the e-mail associated with your {{ platform_name }} account from {{ old_email }} to {{ new_email }}. If this is correct, please confirm your new e-mail address by visiting:{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
+
+            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;">
 
-            {% filter force_escape %}
-                {% blocktrans asvar course_cta_text %}Confirm Email Change{% endblocktrans %}
-            {% endfilter %}
-            {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=confirm_link %}
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700;">
+                    {% trans "Email Change" %}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% if is_secondary_email_change_request %}
+                    {% blocktrans %}We received a request to change the secondary e-mail associated with your {{ site_name }} account to {{ new_email }}. If this is correct, please click below to confirm your new secondary e-mail address. {% endblocktrans %}
+                    {% else %}
+                    {% blocktrans %}We received a request to change the e-mail associated with your {{ site_name }} account from {{ old_email }} to {{ new_email }}. If this is correct, please click below to confirm your new e-mail address.{% endblocktrans %}
+                    {% endif %}
+                    <br />
+                </p>
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}If you didn't request this, you don't need to do anything; you won't receive any more email from us. Please do not reply to this e-mail; if you require assistance, check the help section of the {{ platform_name }} web site.{% endblocktrans %}
-                {% endfilter %}
+                {% trans "Confirm Email Change" as course_cta_text %}
+                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=confirm_link %}
+
+            </div>
+        </td>
+    </tr>
+    <tr style="background-color: #FFF;">
+        <td>
+            <p style="margin: 0 40px 40px 40px; text-align: center; color: #444; font-size: 0.9em;">
+                {% blocktrans %}If you didn't request this, you don't need to do anything; you won't receive any more email from us. Please do not reply to this e-mail; if you require assistance, check the help section of the {{ site_name }} web site.{% endblocktrans %}
                 <br />
             </p>
-
         </td>
     </tr>
 </table>
diff --git a/lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html b/lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html
index eaecefa345a3..8d7c2724d75e 100644
--- a/lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html
+++ b/lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html
@@ -3,59 +3,66 @@
 {% load i18n %}
 {% load static %}
 {% block content %}
-<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
+<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="box-shadow: 0px 0px 10px 2px #c8c8c8;">
     <tr>
-        <td>
-            <h1>
-                {% filter force_escape %}
-                {% blocktrans %}Welcome to {{ course_name }}{% endblocktrans %}
-                {% endfilter %}
-            </h1>
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}To get started, please visit https://{{ site_name }}.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}The login information for your account follows:{% endblocktrans %}
-                {% endfilter %}
-                <br />
-                {% filter force_escape %}
-                {% blocktrans %}email: {{ email_address }}{% endblocktrans %}
-                {% endfilter %}
-                <br />
-                {% filter force_escape %}
-                {% blocktrans %}password: {{ password }}{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;
+                        padding-bottom: 35%;
+                        ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}It is recommended that you change your password.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700; font-size: 1.7em; margin-top: 30px; margin-bottom: 20px;">
+                    {% blocktrans %}
+                    Welcome to {{ course_name }}
+                    {% endblocktrans %}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% blocktrans %}To get started, please visit https://{{ site_name }}.{% endblocktrans %}
+                    <br />
+                </p>
 
-            <p style="color: rgba(0,0,0,.75);">
-              <a href="{{ course_url }}">
-                {% filter force_escape %}
-                {% blocktrans %}You may access your course.{% endblocktrans %}
-                {% endfilter %}
-              </a>
-                <br />
-            </p>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% blocktrans %}The login information for your account follows:{% endblocktrans %}
+                    <br />
+                    {% blocktrans %}email: {{ email_address }}{% endblocktrans %}
+                    <br />
+                    {% blocktrans %}password: {{ password }}{% endblocktrans %}
+                    <br />
+                </p>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}Sincerely yours, The {{ course_name }} Team{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+                    {% blocktrans %}It is recommended that you change your password.{% endblocktrans %}
+                    <br />
+                </p>
+            </div>
         </td>
     </tr>
 </table>
diff --git a/lms/templates/instructor/edx_ace/addbetatester/email/body.html b/lms/templates/instructor/edx_ace/addbetatester/email/body.html
index fd834980cece..5c4ede3f5f03 100644
--- a/lms/templates/instructor/edx_ace/addbetatester/email/body.html
+++ b/lms/templates/instructor/edx_ace/addbetatester/email/body.html
@@ -3,64 +3,63 @@
 {% load i18n %}
 {% load static %}
 {% block content %}
-<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
+<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="box-shadow: 0px 0px 10px 2px #c8c8c8;">
     <tr>
-        <td>
-            <h1>
-                {% filter force_escape %}
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
+
+            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;
+                        padding-bottom: 35%;
+                        ">
+
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700;">
                 {% blocktrans %}
                     You have been invited to be a beta tester for {{ course_name }} at {{ site_name }}
                 {% endblocktrans %}
-                {% endfilter %}
-            </h1>
-
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}The invitation has been sent by a member of the course staff.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
-
-            {% if auto_enroll %}
-                <p style="color: rgba(0,0,0,.75);">
-                    {% filter force_escape %}
-                    {% blocktrans %}To start accessing course materials, please visit:{% endblocktrans %}
-                    {% endfilter %}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% blocktrans %}The invitation has been sent by a member of the course staff. To start accessing course materials, please click the button below.{% endblocktrans %}
                     <br />
                 </p>
 
+                {% trans "View Course" as course_cta_text %}
+
+                {% if auto_enroll %}
                 {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=display_name|default:course.display_name_with_default course_cta_url=course_url %}
-            {% elif course_about_url is not None %}
-                <p style="color: rgba(0,0,0,.75);">
-                    {% filter force_escape %}
-                    {% blocktrans %}To enroll in this course and begin the beta test:{% endblocktrans %}
-                    {% endfilter %}
-                    <br />
-                </p>
-                {% filter force_escape %}
+                {% elif course_about_url is not None %}
                 {% blocktrans asvar course_cta_text %}Visit {{ course_name }}{% endblocktrans %}
-                {% endfilter %}
-
                 {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=course_about_url %}
-            {% else %}
-                <p style="color: rgba(0,0,0,.75);">
-                    {% filter force_escape %}
-                    {% blocktrans %}To enroll in this course and begin the beta test:{% endblocktrans %}
-                    {% endfilter %}
-                    <br />
-                </p>
-                {% filter force_escape %}
-                {% blocktrans asvar course_cta_text %}Visit {{ site_name }}
-                {% endblocktrans %}
-                {%endfilter%}
-
+                {% else %}
+                {% blocktrans asvar course_cta_text %}Visit {{ site_name }}{% endblocktrans %}
                 {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=course_url %}
-            {% endif %}
+                {% endif %}
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}
-                {% endfilter %}
+            </div>
+        </td>
+    </tr>
+    <tr style="background-color: #FFF;">
+        <td>
+            <p style="margin: 0 40px 40px 40px; text-align: center; color: #444; font-size: 0.9em;">
+                {% blocktrans %}This email message was automatically sent because someone attempted to create an account on {{ site_name }} using this email address.{% endblocktrans %}
                 <br />
             </p>
         </td>
diff --git a/lms/templates/instructor/edx_ace/allowedenroll/email/body.html b/lms/templates/instructor/edx_ace/allowedenroll/email/body.html
index 6c97f57e4a3d..08f381b744d3 100644
--- a/lms/templates/instructor/edx_ace/allowedenroll/email/body.html
+++ b/lms/templates/instructor/edx_ace/allowedenroll/email/body.html
@@ -5,75 +5,111 @@
 {% block content %}
 <table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
     <tr>
-        <td>
-            <h1>
-                {% filter force_escape %}
-                {% blocktrans %}You have been invited to {{ course_name }}{% endblocktrans %}
-                {% endfilter %}
-            </h1>
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}You have been invited to join {{ course_name }} at {{ site_name }} by a member of the course staff.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
 
-        {% if is_shib_course %}
-            {% if auto_enroll %}
-                <p style="color: rgba(0,0,0,.75);">
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;
+                        padding-bottom: 35%;
+                        ">
+
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700;">
+                    {% filter force_escape %}
+                    {% blocktrans %}You have been invited to {{ course_name }}{% endblocktrans %}
+                    {% endfilter %}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
                     {% filter force_escape %}
-                    {% blocktrans %}To access this course click on the button below and login:{% endblocktrans %}
+                    {% blocktrans %}You have been invited to join {{ course_name }} at {{ site_name }} by a member of the course staff.{% endblocktrans %}
                     {% endfilter %}
                     <br />
                 </p>
 
-                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_name course_cta_url=course_url %}
-            {% elif course_about_url is not None %}
-                <p style="color: rgba(0,0,0,.75);">
+                {% if is_shib_course %}
+                {% if auto_enroll %}
+                    <p style="padding: 0px;
+                            width: 50%;
+                            min-width: 300px;
+                            margin-top: 20px;
+                            ">
+                        {% filter force_escape %}
+                        {% blocktrans %}To access this course click on the button below and log in.{% endblocktrans %}
+                        {% endfilter %}
+                        <br />
+                    </p>
+
+                    {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_name course_cta_url=course_url %}
+                {% elif course_about_url is not None %}
+                    <p style="padding: 0px;
+                            width: 50%;
+                            min-width: 300px;
+                            margin-top: 20px;
+                            ">
+                        {% filter force_escape %}
+                        {% blocktrans %}To access this course visit it and register:{% endblocktrans %}
+                        {% endfilter %}
+                        <br />
+                    </p>
+
+                    {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_name course_cta_url=course_about_url %}
+                {% endif %}
+                {% else %}
+                <p style="padding: 0px;
+                            width: 50%;
+                            min-width: 300px;
+                            margin-top: 20px;
+                            ">
                     {% filter force_escape %}
-                    {% blocktrans %}To access this course visit it and register:{% endblocktrans %}
+                    {% blocktrans %}Please finish your registration and fill out the registration form, making sure to use {{ email_address }} in the Email field:{% endblocktrans %}
                     {% endfilter %}
                     <br />
                 </p>
+                {# xss-lint: disable=django-trans-missing-escape #}
+                {% trans "Finish Your Registration" as button_cta_text %}
+                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=button_cta_text course_cta_url=registration_url %}
 
-                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_name course_cta_url=course_about_url %}
-            {% endif %}
-        {% else %}
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}Please finish your registration and fill out the registration form making sure to use {{ email_address }} in the Email field:{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
-            {# xss-lint: disable=django-trans-missing-escape #}
-            {% trans "Finish Your Registration" as button_cta_text %}
-            {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=button_cta_text course_cta_url=registration_url %}
-
-            <p style="color: rgba(0,0,0,.75);">
-                {% if auto_enroll %}
+                <p style="padding: 0px;
+                            width: 50%;
+                            min-width: 300px;
+                            margin-top: 20px;
+                            ">
+                    {% if auto_enroll %}
                     {% filter force_escape %}
                     {% blocktrans %}Once you have registered and activated your account, you will see {{ course_name }} listed on your dashboard.{% endblocktrans %}
                     {% endfilter %}
-                {% elif course_about_url is not None %}
+                    {% elif course_about_url is not None %}
                     {% filter force_escape %}
                     {% blocktrans %}Once you have registered and activated your account, you will be able to access this course:{% endblocktrans %}
                     {% endfilter %}
                     {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_name course_cta_url=course_about_url %}
-                {% else %}
+                    {% else %}
                     {% filter force_escape %}
                     {% blocktrans %}You can then enroll in {{ course_name }}.{% endblocktrans %}
                     {% endfilter %}
+                    {% endif %}
+                    <br />
+                </p>
                 {% endif %}
-                <br />
-            </p>
-        {% endif %}
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+
+            </div>
         </td>
     </tr>
 </table>
diff --git a/lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html b/lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html
index ca11b9463603..c8e78f9e2f7b 100644
--- a/lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html
+++ b/lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html
@@ -3,35 +3,48 @@
 {% load i18n %}
 {% load static %}
 {% block content %}
-<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
-    <tr>
-        <td>
-            <h1>
-                {% filter force_escape %}
-                {% blocktrans %}
-                    You have been unenrolled from {{ course_name }}
-                {% endblocktrans %}
-                {% endfilter %}
-            </h1>
+<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="box-shadow: 0px 0px 10px 2px #c8c8c8;">
+   <tr>
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}You have been unenrolled from {{ course_name }} at {{ site_name }} by a member of the course staff. This course will no longer appear on your {{ site_name }} dashboard.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}Your other courses have not been affected.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;
+                        padding-bottom: 35%;
+                        ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}This email was automatically sent from {{ site_name }} to {{ full_name }}{% endblocktrans %}
-                {% endfilter %}
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700;">
+                     {% blocktrans %}You have been unenrolled{% endblocktrans %}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% blocktrans %}You have been unenrolled from {{ course_name }} at {{ site_name }} by a member of the course staff. This course will no longer appear on your {{ site_name }} dashboard. Your other courses have not been affected. {% endblocktrans %}
+                    <br />
+                </p>
+            </div>
+        </td>
+    </tr>
+    <tr style="background-color: #FFF;">
+        <td>
+            <p style="margin: 0 40px 40px 40px; text-align: center; color: #444; font-size: 0.9em;">
+                 {% blocktrans %}This email was automatically sent from {{ site_name }} to {{ full_name }}{% endblocktrans %}
                 <br />
             </p>
         </td>
diff --git a/lms/templates/instructor/edx_ace/enrollenrolled/email/body.html b/lms/templates/instructor/edx_ace/enrollenrolled/email/body.html
index c8cfb00995d2..ec02f1a6e5f1 100644
--- a/lms/templates/instructor/edx_ace/enrollenrolled/email/body.html
+++ b/lms/templates/instructor/edx_ace/enrollenrolled/email/body.html
@@ -3,33 +3,52 @@
 {% load i18n %}
 {% load static %}
 {% block content %}
-<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
-    <tr>
-        <td>
-            <h1>
-                {% filter force_escape %}
-                {% blocktrans %}
-                    You have been enrolled in {{ course_name }}
-                {% endblocktrans %}
-                {% endfilter %}
-            </h1>
+<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="box-shadow: 0px 0px 10px 2px #c8c8c8;">
+   <tr>
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}You have been enrolled in {{ course_name }} at {{ site_name }} by a member of the course staff. This course will now appear on your {{ site_name }} dashboard.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;
+                        padding-bottom: 35%;
+                        ">
 
-            {% filter force_escape %}
-                {% blocktrans asvar course_cta_text %}Access the Course Materials Now{% endblocktrans %}
-            {% endfilter %}
-            {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=course_url %}
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700;">
+                    You have been enrolled in {{ course_name }}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% blocktrans %}You have been enrolled in {{ course_name }} at {{ site_name }} by a member of the course staff. This course will now appear on your {{ site_name }} dashboard.{% endblocktrans %}
+                    <br />
+                </p>
+
+                {% trans "Access the Course Materials Now" as course_cta_text %}
+                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=course_url %}
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
+            </div>
+        </td>
+    </tr>
+    <tr style="background-color: #FFF;">
+        <td>
+            <p style="margin: 0 40px 40px 40px; text-align: center; color: #444; font-size: 0.9em;">
                 {% blocktrans %}This email was automatically sent from {{ site_name }} to {{ full_name }}{% endblocktrans %}
-                {% endfilter %}
                 <br />
             </p>
         </td>
diff --git a/lms/templates/instructor/edx_ace/removebetatester/email/body.html b/lms/templates/instructor/edx_ace/removebetatester/email/body.html
index 60089458350d..bf119368bda1 100644
--- a/lms/templates/instructor/edx_ace/removebetatester/email/body.html
+++ b/lms/templates/instructor/edx_ace/removebetatester/email/body.html
@@ -3,40 +3,49 @@
 {% load i18n %}
 {% load static %}
 {% block content %}
-<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
+<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="box-shadow: 0px 0px 10px 2px #c8c8c8;">
     <tr>
-        <td>
-            <h1>
-                {% filter force_escape %}
-                {% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }}{% endblocktrans %}
-                {% endfilter %}
-            </h1>
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }} by a member of the course staff.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}This course will remain on your dashboard, but you will no longer be part of the beta testing group.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;
+                        padding-bottom: 35%;
+                        ">
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}Your other courses have not been affected.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700;">
+                     {% blocktrans %}You have been removed as a beta tester{% endblocktrans %}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }} by a member of the course staff. This course will remain on your dashboard, but you will no longer be part of the beta testing group. Your other courses have not been affected. {% endblocktrans %}
+                    <br />
+                </p>
 
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
+            </div>
+        </td>
+    </tr>
+    <tr style="background-color: #FFF;">
+        <td>
+            <p style="margin: 0 40px 40px 40px; text-align: center; color: #444; font-size: 0.9em;">
                 {% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}
-                {% endfilter %}
                 <br />
             </p>
         </td>
diff --git a/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html
index c04873ffdd44..66480a10ea82 100644
--- a/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html
+++ b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 <!-- These tags come from the ace_common djangoapp in edx ace -->
 {% load ace %}
+{% load static %}
 <!-- These tags come from the edx_ace app within the edx_ace repository -->
 {% load acetags %}
 
@@ -9,7 +10,18 @@
 
 {# This is preview text that is visible in the inbox view of many email clients but not visible in the actual #}
 {# email itself. #}
+<style>
+  body {
+    background-color: #f5f5f5 !important;
+  }
 
+  p, td {
+    font-family: 'Roboto', sans-serif;
+  }
+</style>
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;500;600;700;800;900&family=Roboto:wght@100;300;400;500;700;900&display=swap" rel="stylesheet">
 <div lang="{{ LANGUAGE_CODE|default:"en" }}" style="
   display:none;
   font-size:1px;
@@ -30,9 +42,7 @@
 {% google_analytics_tracking_pixel %}
 
 <div bgcolor="#f5f5f5" lang="{{ LANGUAGE_CODE|default:"en" }}" dir="{{ LANGUAGE_BIDI|yesno:"rtl,ltr" }}" style="
-  margin: 0;
-  padding: 0;
-  min-width: 100%;
+  padding: 0 20px;
   background-color: #f5f5f5;
   ">
   <!-- Hack for outlook 2010, which wants to render everything in Times New Roman -->
@@ -48,81 +58,39 @@
   <td>
   <![endif]-->
 
-  <!-- CONTENT -->
-  <table class="content" role="presentation" align="center" cellpadding="0" cellspacing="0" border="0" bgcolor="#fbfaf9" width="100%"
-    {% block table_style %}
-      style="
-      font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-      font-size: 1em;
-      line-height: 1.5;
-      max-width: 600px;
-      padding: 0 20px 0 20px;
-      "
-    {% endblock %}
-  >
-    {% block header %}
-      <td class="header" style="background-color: #f5f5f5;">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F5F5F5">
-          <tr>
-            <td valign="top" align="center">
-              <table width="600" cellpadding="0" cellspacing="0" align="center" class="width_100percent">
-                <tr>
-                  <td valign="top" align="center" style="min-width:600px;" class="min_width">
-                    <table width="100%" cellpadding="0" cellspacing="0" bgcolor="#F5F5F5">
-                      <tr><td height="10" style="line-height:1px;">&nbsp;</td></tr>
-                      <tr>
-                        <td align="left" valign="top" style="padding:0 60px;" class="padding_none">
-                          <table cellpadding="0" cellspacing="0" align="left" class="width_100percent">
-                            <tr>
-                              <td align="center" valign="top">
-                                <table cellpadding="0" cellspacing="0">
-                                  <tr>
-                                    <td align="left" valign="top">
-                                      <a href="{% with_link_tracking homepage_url %}">
-                                        <img src="{{ logo_url }}" style="max-height: 65px;" height="auto" alt="{% filter force_escape %}{% blocktrans %}Go to {{ platform_name }} Home Page{% endblocktrans %}{% endfilter %}"/></a>
-                                    </td>
-                                  </tr>
-                                </table>
-                              </td>
-                            </tr>
-                          </table>
-                          <table height="66" cellpadding="0" cellspacing="0" align="right" class="width_100percent height_0">
-                            <tr>
-                              <td align="center" valign="middle" class="paddingtop_10">
-                                <table cellpadding="0" cellspacing="0">
-                                  <tr>
-                                    <td align="left" valign="top" style="color: #d23228;">
-                                      {% if courses_url %}
-                                        <a href="{% with_link_tracking courses_url %}" target="_blank" style="font-family:'Inter',Helvetica,Arial,sans-serif;font-size:15px;line-height:20px;text-decoration:none;color:#000001;font-weight:bold;">
-                                          {% trans "Courses" as tmsg %}{{ tmsg | force_escape }}
-                                        </a>
-                                        &nbsp; / &nbsp;
-                                      {% endif %}
-                                      {% if programs_url %}
-                                        <a href="{% with_link_tracking programs_url %}" target="_blank" style="font-family:'Inter',Helvetica,Arial,sans-serif;font-size:15px;line-height:20px;text-decoration:none;color:#000001;font-weight:bold;">
-                                          {% trans "Programs" as tmsg %}{{ tmsg | force_escape }}
-                                        </a>
-                                        &nbsp; / &nbsp;
-                                      {% endif %}
-                                      <a href="{% with_link_tracking dashboard_url %}" target="_blank" style="font-family:'Inter',Helvetica,Arial,sans-serif;font-size:15px;line-height:20px;text-decoration:none;color:#000001;font-weight:bold;">
-                                        {% trans "My Account" as tmsg %}{{ tmsg | force_escape }}
-                                      </a>
-                                    </td>
-                                  </tr>
-                                </table>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr><td height="10" style="line-height:1px;font-size:1px;">&nbsp;</td></tr>
-                    </table>
-                  </td>
-                </tr>
-              </table>
+    <!-- CONTENT -->
+    <table class="content" role="presentation" align="center" cellpadding="0" cellspacing="0" border="0" bgcolor="#f5f5f5" width="100%" style="
+        font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        font-size: 1em;
+        line-height: 1.5;
+        max-width: 600px;
+        padding: 0 20px 0 20px;
+    ">
+        <tr>
+            <!-- HEADER -->
+            <td class="header" style="
+                padding: 20px;
+            ">
+                {% block header %}
+                <table role="presentation" width="100%" align="left" border="0" cellpadding="0" cellspacing="0">
+                  <tr>
+                    <td width="70">
+                      <a href="{% with_link_tracking homepage_url %}"><img
+                        src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/logo.png" width="40"
+                        height="40" alt="{% filter force_escape %}{% blocktrans %}Go to {{ platform_name }} Home Page{% endblocktrans %}{% endfilter %}"/></a>
+                    </td>
+                    <td align="right" style="text-align: {{ LANGUAGE_BIDI|yesno:"left,right" }};">
+                      <a class="login" href="{% with_link_tracking dashboard_url %}" style="color: #005686;">{%  trans "Sign In" %}</a>
+                    </td>
+                  </tr>
+                  <tr><td height="10" style="line-height:1px;font-size:1px;">&nbsp;</td></tr>
+                </table>
             </td>
-          </tr>
-        </table>
+        </tr>
+    </table>
+    </td>
+    </tr>
+    </table>
     {% endblock %}
   </td>
 </tr>
@@ -142,76 +110,8 @@
 
 <tr>
   <!-- FOOTER -->
-  <td class="footer" style="padding: 20px; background-color: #f5f5f5;">
-    <table role="presentation" width="100%" align="left" border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td style="padding-bottom: 20px;">
-          <!-- SOCIAL -->
-          <table role="presentation" align="{{ LANGUAGE_BIDI|yesno:"right,left" }}" border="0" border="0" cellpadding="0" cellspacing="0" width="210">
-            <tr>
-              {% if social_media_urls.linkedin %}
-                <td height="32" width="42">
-                  <a href="{{ social_media_urls.linkedin|safe }}">
-                    <img src="{{ social_media_logo_urls.linkedin }}"
-                      width="32" height="32" alt="{% filter force_escape %}{% blocktrans %}{{ platform_name }} on LinkedIn{% endblocktrans %}{% endfilter %}"/>
-                  </a>
-                </td>
-              {% endif %}
-              {% if social_media_urls.twitter %}
-                <td height="32" width="42">
-                  <a href="{{ social_media_urls.twitter|safe }}">
-                    <img src= "{{ social_media_logo_urls.twitter }}"
-                      width="32" height="32" alt="{% filter force_escape %}{% blocktrans %}{{ platform_name }} on Twitter{% endblocktrans %}{% endfilter %}"/>
-                  </a>
-                </td>
-              {% endif %}
-              {% if social_media_urls.facebook %}
-                <td height="32" width="42">
-                  <a href="{{ social_media_urls.facebook|safe }}">
-                    <img src="{{ social_media_logo_urls.facebook }}"
-                      width="32" height="32" alt="{% filter force_escape %}{% blocktrans %}{{ platform_name }} on Facebook{% endblocktrans %}{% endfilter %}"/>
-                  </a>
-                </td>
-              {% endif %}
-              {% if social_media_urls.google_plus %}
-                <td height="32" width="42">
-                  <a href="{{ social_media_urls.google_plus|safe }}">
-                    <img src="{{ social_media_logo_urls.google_plus}}"
-                      width="32" height="32" alt="{% filter force_escape %}{% blocktrans %}{{ platform_name }} on Google Plus{% endblocktrans %}{% endfilter %}"/>
-                  </a>
-                </td>
-              {% endif %}
-              {% if social_media_urls.reddit %}
-                <td height="32" width="42">
-                  <a href="{{ social_media_urls.reddit|safe }}">
-                    <img src="{{ social_media_logo_urls.reddit}}"
-                      width="32" height="32" alt="{% filter force_escape %}{% blocktrans %}{{ platform_name }} on Reddit{% endblocktrans %}{% endfilter %}"/>
-                  </a>
-                </td>
-              {% endif %}
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <!-- APP BUTTONS -->
-        <td style="padding-bottom: 20px;">
-          {% if mobile_store_urls.apple %}
-            <a href="{{ mobile_store_urls.apple|safe }}" style="text-decoration: none">
-              <img src="{{ mobile_store_logo_urls.apple}}"
-                alt="{% trans "Download the iOS app on the Apple Store" as tmsg %}{{ tmsg | force_escape }}"
-                width="136" height="50" style="margin-{{ LANGUAGE_BIDI|yesno:"left,right" }}: 10px"/>
-            </a>
-          {% endif %}
-          {% if mobile_store_urls.google %}
-            <a href="{{ mobile_store_urls.google|safe }}" style="text-decoration: none">
-              <img src="{{ mobile_store_logo_urls.google}}"
-                alt="{% trans "Download the Android app on the Google Play Store" as tmsg %}{{ tmsg | force_escape }}"
-                width="136" height="50"/>
-            </a>
-          {% endif %}
-        </td>
-      </tr>
+  <td class="footer" style="padding: 20px; background-color: #f5f5f5; margin-top: 60px;">
+    <table role="presentation" width="100%" align="left" border="0" cellpadding="0" cellspacing="0" style="margin-top: 60px;">
       <tr>
         <!-- Actions -->
         <td style="padding-bottom: 20px; background-color: #f5f5f5;">
diff --git a/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html
index 72806a7c5c60..9a1ed36b3fa3 100644
--- a/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html
+++ b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html
@@ -16,19 +16,21 @@
         {% endif %}
     {% endif %}
     style="
-        color: #ffffff;
+        padding: 15px 20px;
+        margin: 50px 0px;
+        font-family: 'Open Sans', sans-serif;
+        background-color: #FFB81C;
+        font-size: 18px;
+        border: 2px solid #505759;
+        border-radius: 5px;
+        -webkit-border-radius: 5px;
+        -moz-border-radius: 5px;
         text-decoration: none;
-        border-radius: 4px;
-        -webkit-border-radius: 4px;
-        -moz-border-radius: 4px;
-        background-color: #005686;
-        border-top: 12px solid #005686;
-        border-bottom: 12px solid #005686;
-        border-right: 50px solid #005686;
-        border-left: 50px solid #005686;
         display: inline-block;
+        color: #000000;
+
     ">
-        {# old email clients require the use of the font tag :( #}
-        <font color="#ffffff"><b>{{ course_cta_text }}</b></font>
+    {# old email clients require the use of the font tag :( #}
+        <font color="#000000;"><b>{{ course_cta_text }}</b></font>
     </a>
 </p>
diff --git a/openedx/core/djangoapps/user_authn/tasks.py b/openedx/core/djangoapps/user_authn/tasks.py
index 27ddfe466e3b..429106d742c7 100644
--- a/openedx/core/djangoapps/user_authn/tasks.py
+++ b/openedx/core/djangoapps/user_authn/tasks.py
@@ -6,6 +6,7 @@
 
 from celery import shared_task
 from celery.exceptions import MaxRetriesExceededError
+from crum import get_current_request
 from django.conf import settings
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.contrib.sites.models import Site
@@ -62,8 +63,13 @@ def send_activation_email(self, msg_string, from_address=None):
 
     dest_addr = msg.recipient.email_address
 
-    site = Site.objects.get_current()
-    user = User.objects.get(id=msg.recipient.lms_user_id)
+    # This approach only works with the Pearson-Core's asynchronous site context feature.
+    try:
+        site = get_current_request().site or Site.objects.get_current()
+    except AttributeError:
+        site = Site.objects.get_current()
+
+    user = User.objects.get(username=msg.recipient.username)
 
     try:
         with emulate_http_request(site=site, user=user):
diff --git a/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html b/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html
index 4f6e07433983..f31f58f19501 100644
--- a/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html
+++ b/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html
@@ -1,44 +1,76 @@
 {% extends 'ace_common/edx_ace/common/base_body.html' %}
-
 {% load i18n %}
 {% load static %}
 {% block content %}
-<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
+<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="box-shadow: 0px 0px 10px 2px #c8c8c8;">
     <tr>
-        <td>
-            <h1>
-                {% trans "Password reset" as tmsg %}{{ tmsg | force_escape }}
-            </h1>
-            <p style="color: rgba(0,0,0,.75);">
-                {% filter force_escape %}
-                {% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ platform_name }}.{% endblocktrans %}
-                {% endfilter %}
-                <br />
-            </p>
-
-            {% if failed %}
-                <p style="color: rgba(0,0,0,.75);">
-                    {% filter force_escape %}
+        <td style="width: 100%;
+            max-width: 800px;
+            background-color: #FFF;
+            color: #000000;
+            margin: auto;
+            text-align: center;
+            padding: 20px;
+            ">
+
+        <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+
+            <div style="width: 90%;
+                        background-color: #D4EAE4;
+                        text-align: left;
+                        padding: 2% 5%;
+                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-size: 50%;
+                        background-position: right bottom;
+                        background-repeat: no-repeat;
+                        padding-bottom: 35%;
+                        ">
+
+                <h1 style="font-family:'Playfair Display', serif; font-weight: 700; font-size: 1.7em; margin-top: 30px; margin-bottom: 20px;">
+                    {% trans "Password Reset" %}
+                </h1>
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
+                </p>
+
+
+                {% if failed %}
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
                     {% blocktrans %}However, there is currently no user account associated with your email address: {{ email_address }}.{% endblocktrans %}
-                    {% endfilter %}
                     <br />
                 </p>
 
-                <p style="color: rgba(0,0,0,.75);">
-                    {% trans "If you did not request this change, you can ignore this email." as tmsg %}{{ tmsg | force_escape }}
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% trans "If you did not request this change, you can ignore this email." %}
                     <br />
                 </p>
-            {% else %}
-                <p style="color: rgba(0,0,0,.75);">
-                    {% trans "If you didn't request this change, you can disregard this email - we have not yet reset your password." as tmsg %}{{ tmsg | force_escape }}
+                {% else %}
+                <p style="padding: 0px;
+                          width: 50%;
+                          min-width: 300px;
+                          margin-top: 20px;
+                          ">
+                    {% trans "If you didn't request this change, you can disregard this email - we have not yet reset your password." %}
                     <br />
                 </p>
-                {# xss-lint: disable=django-trans-missing-escape #}
-                {% trans "Reset my password" as course_cta_text %}
 
-                {# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
-                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text reset_url=reset_link %}
-            {% endif %}
+                {% trans "Change my Password" as course_cta_text %}
+                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=reset_link %}
+                {% endif %}
+
+            </div>
         </td>
     </tr>
 </table>
diff --git a/openedx/core/djangoapps/user_authn/views/registration_form.py b/openedx/core/djangoapps/user_authn/views/registration_form.py
index 0321250a3458..8eb005cbc04b 100644
--- a/openedx/core/djangoapps/user_authn/views/registration_form.py
+++ b/openedx/core/djangoapps/user_authn/views/registration_form.py
@@ -19,6 +19,7 @@
 from common.djangoapps import third_party_auth
 from common.djangoapps.edxmako.shortcuts import marketing_link
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
+from openedx.core.djangoapps.plugins.plugins_hooks import run_extension_point
 from openedx.core.djangoapps.user_api import accounts
 from openedx.core.djangoapps.user_api.helpers import FormDescription
 from openedx.core.djangoapps.user_authn.utils import check_pwned_password, is_registration_api_v1 as is_api_v1
@@ -1076,6 +1077,11 @@ def _add_terms_of_service_field(self, form_desc, required=True):
             ),
             tos_link_end=HTML("</a>"),
         )
+        label_with_terms_of_service_and_privacy_policy = run_extension_point(
+            'PEARSON_CORE_REGISTRATION_FORM_MODULE',
+            platform_name=configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME),
+        )
+        label = label_with_terms_of_service_and_privacy_policy or label
 
         # Translators: "Terms of service" is a legal document users must agree to
         # in order to register a new account.

From ebec74cd5b570bae970d482b398b57e9d62b5a34 Mon Sep 17 00:00:00 2001
From: Sergio Valero <sergio.valero@edunext.co>
Date: Wed, 14 Jun 2023 22:20:26 -0400
Subject: [PATCH 46/77] fix: change recipient attribute and fix commented line

---
 common/djangoapps/third_party_auth/views.py | 4 ++--
 openedx/core/djangoapps/user_authn/tasks.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/djangoapps/third_party_auth/views.py b/common/djangoapps/third_party_auth/views.py
index 1f18136b923c..c6a406c5301c 100644
--- a/common/djangoapps/third_party_auth/views.py
+++ b/common/djangoapps/third_party_auth/views.py
@@ -51,8 +51,8 @@ def inactive_user_view(request):
             user.is_active = True
             user.save()
             activated = True
-    # if not activated:
-    compose_and_send_activation_email(user, profile)
+    if not activated:
+        compose_and_send_activation_email(user, profile)
 
     request_params = request.GET
     redirect_to = request_params.get('next')
diff --git a/openedx/core/djangoapps/user_authn/tasks.py b/openedx/core/djangoapps/user_authn/tasks.py
index 429106d742c7..c2078ddfb898 100644
--- a/openedx/core/djangoapps/user_authn/tasks.py
+++ b/openedx/core/djangoapps/user_authn/tasks.py
@@ -69,7 +69,7 @@ def send_activation_email(self, msg_string, from_address=None):
     except AttributeError:
         site = Site.objects.get_current()
 
-    user = User.objects.get(username=msg.recipient.username)
+    user = User.objects.get(id=msg.recipient.lms_user_id)
 
     try:
         with emulate_http_request(site=site, user=user):

From 5e9bf0e19b8824ea9186e4b61a8df7738bd7108b Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Fri, 16 Jun 2023 13:19:19 -0500
Subject: [PATCH 47/77] feat: changing MFEs URLs to site aware

---
 .../management/commands/goal_reminder_email.py   |  6 ++++--
 lms/djangoapps/discussion/views.py               | 16 +++++++++++++---
 .../instructor/views/instructor_dashboard.py     |  9 +++++++--
 .../commands/send_verification_expiry_email.py   |  6 +++++-
 lms/djangoapps/verify_student/services.py        |  5 ++++-
 lms/djangoapps/verify_student/views.py           |  5 ++++-
 .../core/djangoapps/discussions/url_helpers.py   |  9 +++++++--
 .../user_api/accounts/settings_views.py          |  5 ++++-
 .../features/course_experience/url_helpers.py    | 16 +++++++++++++---
 .../learner_profile/views/learner_profile.py     |  5 ++++-
 10 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py b/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py
index 9ba82b76024c..83e23205632c 100644
--- a/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py
+++ b/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py
@@ -52,8 +52,10 @@ def send_ace_message(goal):
 
     course_home_url = get_learning_mfe_home_url(course_key=goal.course_key, url_fragment='home')
 
-    goals_unsubscribe_url = f'{settings.LEARNING_MICROFRONTEND_URL}/goal-unsubscribe/{goal.unsubscribe_token}'
-
+    goals_unsubscribe_url = (
+        f'{configuration_helpers.get_value("LEARNING_MICROFRONTEND_URL", settings.LEARNING_MICROFRONTEND_URL)}'
+        f'/goal-unsubscribe/{goal.unsubscribe_token}'
+    )
     language = get_user_preference(user, LANGUAGE_KEY)
 
     # Code to allow displaying different banner images for different languages
diff --git a/lms/djangoapps/discussion/views.py b/lms/djangoapps/discussion/views.py
index 4d14ea50748e..55589e108889 100644
--- a/lms/djangoapps/discussion/views.py
+++ b/lms/djangoapps/discussion/views.py
@@ -66,6 +66,7 @@
 )
 from openedx.core.djangoapps.django_comment_common.utils import ThreadContext
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.features.course_duration_limits.access import generate_course_expired_fragment
 
 User = get_user_model()
@@ -272,7 +273,10 @@ def redirect_forum_url_to_new_mfe(request, course_id):
 
     redirect_url = None
     if discussions_mfe_enabled:
-        mfe_base_url = settings.DISCUSSIONS_MICROFRONTEND_URL
+        mfe_base_url = configuration_helpers.get_value(
+            'DISCUSSIONS_MICROFRONTEND_URL',
+            settings.DISCUSSIONS_MICROFRONTEND_URL,
+        )
         redirect_url = f"{mfe_base_url}/{str(course_key)}"
     return redirect_url
 
@@ -332,7 +336,10 @@ def redirect_thread_url_to_new_mfe(request, course_id, thread_id):
     discussions_mfe_enabled = ENABLE_DISCUSSIONS_MFE.is_enabled(course_key)
     redirect_url = None
     if discussions_mfe_enabled:
-        mfe_base_url = settings.DISCUSSIONS_MICROFRONTEND_URL
+        mfe_base_url = configuration_helpers.get_value(
+            'DISCUSSIONS_MICROFRONTEND_URL',
+            settings.DISCUSSIONS_MICROFRONTEND_URL,
+        )
         if thread_id:
             redirect_url = f"{mfe_base_url}/{str(course_key)}/posts/{thread_id}"
     return redirect_url
@@ -652,7 +659,10 @@ def user_profile(request, course_key, user_id):
         else:
             discussions_mfe_enabled = ENABLE_DISCUSSIONS_MFE.is_enabled(course_key)
             if discussions_mfe_enabled:
-                mfe_base_url = settings.DISCUSSIONS_MICROFRONTEND_URL
+                mfe_base_url = configuration_helpers.get_value(
+                    'DISCUSSIONS_MICROFRONTEND_URL',
+                    settings.DISCUSSIONS_MICROFRONTEND_URL,
+                )
                 return redirect(f"{mfe_base_url}/{str(course_key)}/learners")
 
             tab_view = CourseTabView()
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index 0005c28f6ef8..46516d7a50f2 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -583,8 +583,13 @@ def _section_student_admin(course, access):
         ),
         'spoc_gradebook_url': reverse('spoc_gradebook', kwargs={'course_id': str(course_key)}),
     }
-    if is_writable_gradebook_enabled(course_key) and settings.WRITABLE_GRADEBOOK_URL:
-        section_data['writable_gradebook_url'] = f'{settings.WRITABLE_GRADEBOOK_URL}/{str(course_key)}'
+    writable_gradebook_url = configuration_helpers.get_value(
+        'WRITABLE_GRADEBOOK_URL',
+        settings.WRITABLE_GRADEBOOK_URL,
+    )
+
+    if is_writable_gradebook_enabled(course_key) and writable_gradebook_url:
+        section_data['writable_gradebook_url'] = f'{writable_gradebook_url}/{str(course_key)}'
     return section_data
 
 
diff --git a/lms/djangoapps/verify_student/management/commands/send_verification_expiry_email.py b/lms/djangoapps/verify_student/management/commands/send_verification_expiry_email.py
index 04f75ef42439..ccd58a50aeaa 100644
--- a/lms/djangoapps/verify_student/management/commands/send_verification_expiry_email.py
+++ b/lms/djangoapps/verify_student/management/commands/send_verification_expiry_email.py
@@ -21,6 +21,7 @@
 from lms.djangoapps.verify_student.message_types import VerificationExpiry
 from lms.djangoapps.verify_student.models import ManualVerification, SoftwareSecurePhotoVerification, SSOVerification
 from openedx.core.djangoapps.ace_common.template_context import get_base_template_context
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY
 from openedx.core.djangoapps.user_api.preferences.api import get_user_preference
 from openedx.core.lib.celery.task_utils import emulate_http_request
@@ -191,7 +192,10 @@ def send_verification_expiry_email(self, batch_verifications, email_config):
         message_context = get_base_template_context(site)
         message_context.update({
             'platform_name': settings.PLATFORM_NAME,
-            'lms_verification_link': f'{settings.ACCOUNT_MICROFRONTEND_URL}/id-verification',
+            'lms_verification_link': (
+                f'{configuration_helpers.get_value("ACCOUNT_MICROFRONTEND_URL", settings.ACCOUNT_MICROFRONTEND_URL)}'
+                f'/id-verification'
+            ),
             'help_center_link': settings.ID_VERIFICATION_SUPPORT_LINK
         })
 
diff --git a/lms/djangoapps/verify_student/services.py b/lms/djangoapps/verify_student/services.py
index bdfa31fee6d6..aa1c286ba691 100644
--- a/lms/djangoapps/verify_student/services.py
+++ b/lms/djangoapps/verify_student/services.py
@@ -232,7 +232,10 @@ def get_verify_location(cls, course_id=None):
         Returns a string:
             Returns URL for IDV on Account Microfrontend
         """
-        location = f'{settings.ACCOUNT_MICROFRONTEND_URL}/id-verification'
+        location = (
+            f'{configuration_helpers.get_value("ACCOUNT_MICROFRONTEND_URL", settings.ACCOUNT_MICROFRONTEND_URL)}'
+            f'/id-verification'
+        )
         if course_id:
             location += f'?course_id={quote(str(course_id))}'
         return location
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index 99cf7004992d..8f918fc9f03d 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -1122,7 +1122,10 @@ def results_callback(request):  # lint-amnesty, pylint: disable=too-many-stateme
     elif result == "FAIL":
         log.debug("Denying verification for %s", receipt_id)
         attempt.deny(json.dumps(reason), error_code=error_code)
-        reverify_url = f'{settings.ACCOUNT_MICROFRONTEND_URL}/id-verification'
+        reverify_url = (
+            f'{configuration_helpers.get_value("ACCOUNT_MICROFRONTEND_URL", settings.ACCOUNT_MICROFRONTEND_URL)}'
+            f'/id-verification'
+        )
         verification_status_email_vars['reasons'] = reason
         verification_status_email_vars['reverify_url'] = reverify_url
         verification_status_email_vars['faq_url'] = settings.ID_VERIFICATION_SUPPORT_LINK
diff --git a/openedx/core/djangoapps/discussions/url_helpers.py b/openedx/core/djangoapps/discussions/url_helpers.py
index 60b29d919762..5691e984dbbb 100644
--- a/openedx/core/djangoapps/discussions/url_helpers.py
+++ b/openedx/core/djangoapps/discussions/url_helpers.py
@@ -6,6 +6,7 @@
 
 from django.conf import settings
 from opaque_keys.edx.keys import CourseKey
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 
 
 def _get_url_with_view_query_params(path: str, view: Optional[str] = None) -> str:
@@ -20,9 +21,13 @@ def _get_url_with_view_query_params(path: str, view: Optional[str] = None) -> st
         (str) URL link for MFE
 
     """
-    if settings.DISCUSSIONS_MICROFRONTEND_URL is None:
+    discussion_microfontend_url = configuration_helpers.get_value(
+        'DISCUSSIONS_MICROFRONTEND_URL',
+        settings.DISCUSSIONS_MICROFRONTEND_URL,
+    )
+    if not discussion_microfontend_url:
         return ''
-    url = f"{settings.DISCUSSIONS_MICROFRONTEND_URL}/{path}"
+    url = f"{discussion_microfontend_url}/{path}"
 
     query_params = {}
     if view == "in_context":
diff --git a/openedx/core/djangoapps/user_api/accounts/settings_views.py b/openedx/core/djangoapps/user_api/accounts/settings_views.py
index ae7bca301444..be70e2b16a9a 100644
--- a/openedx/core/djangoapps/user_api/accounts/settings_views.py
+++ b/openedx/core/djangoapps/user_api/accounts/settings_views.py
@@ -58,7 +58,10 @@ def account_settings(request):
 
     """
     if should_redirect_to_account_microfrontend():
-        url = settings.ACCOUNT_MICROFRONTEND_URL
+        url = configuration_helpers.get_value(
+            'ACCOUNT_MICROFRONTEND_URL',
+            settings.ACCOUNT_MICROFRONTEND_URL,
+        )
 
         duplicate_provider = pipeline.get_duplicate_provider(messages.get_messages(request))
         if duplicate_provider:
diff --git a/openedx/features/course_experience/url_helpers.py b/openedx/features/course_experience/url_helpers.py
index 0e52cee57982..182761b13092 100644
--- a/openedx/features/course_experience/url_helpers.py
+++ b/openedx/features/course_experience/url_helpers.py
@@ -15,6 +15,7 @@
 from six.moves.urllib.parse import urlencode, urlparse
 
 from lms.djangoapps.courseware.toggles import courseware_mfe_is_active
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.search import navigation_index, path_to_location  # lint-amnesty, pylint: disable=wrong-import-order
 
@@ -158,7 +159,10 @@ def make_learning_mfe_courseware_url(
     strings. They're only ever used to concatenate a URL string.
     `params` is an optional QueryDict object (e.g. request.GET)
     """
-    mfe_link = f'{settings.LEARNING_MICROFRONTEND_URL}/course/{course_key}'
+    mfe_link = (
+        f'{configuration_helpers.get_value("LEARNING_MICROFRONTEND_URL", settings.LEARNING_MICROFRONTEND_URL)}'
+        f'/course/{course_key}'
+    )
 
     if sequence_key:
         mfe_link += f'/{sequence_key}'
@@ -188,7 +192,10 @@ def get_learning_mfe_home_url(
     `url_fragment` is an optional string.
     `params` is an optional QueryDict object (e.g. request.GET)
     """
-    mfe_link = f'{settings.LEARNING_MICROFRONTEND_URL}/course/{course_key}'
+    mfe_link = (
+        f'{configuration_helpers.get_value("LEARNING_MICROFRONTEND_URL", settings.LEARNING_MICROFRONTEND_URL)}'
+        f'/course/{course_key}'
+    )
 
     if url_fragment:
         mfe_link += f'/{url_fragment}'
@@ -206,6 +213,9 @@ def is_request_from_learning_mfe(request: HttpRequest):
     if not settings.LEARNING_MICROFRONTEND_URL:
         return False
 
-    url = urlparse(settings.LEARNING_MICROFRONTEND_URL)
+    url = urlparse(configuration_helpers.get_value(
+        "LEARNING_MICROFRONTEND_URL",
+        settings.LEARNING_MICROFRONTEND_URL,
+    ))
     mfe_url_base = f'{url.scheme}://{url.netloc}'
     return request.META.get('HTTP_REFERER', '').startswith(mfe_url_base)
diff --git a/openedx/features/learner_profile/views/learner_profile.py b/openedx/features/learner_profile/views/learner_profile.py
index e19e6853e8eb..4f23b31c8fff 100644
--- a/openedx/features/learner_profile/views/learner_profile.py
+++ b/openedx/features/learner_profile/views/learner_profile.py
@@ -44,7 +44,10 @@ def learner_profile(request, username):
         GET /account/profile
     """
     if should_redirect_to_profile_microfrontend():
-        profile_microfrontend_url = f"{settings.PROFILE_MICROFRONTEND_URL}{username}"
+        profile_microfrontend_url = (
+            f"{configuration_helpers.get_value('PROFILE_MICROFRONTEND_URL', settings.PROFILE_MICROFRONTEND_URL)}"
+            f"{username}"
+        )
         if request.GET:
             profile_microfrontend_url += f'?{request.GET.urlencode()}'
         return redirect(profile_microfrontend_url)

From 601814640a40fa9cb5aac2d971f491bb426e4bae Mon Sep 17 00:00:00 2001
From: anfbermudezme <andres.bermudez@edunext.co>
Date: Tue, 27 Jun 2023 03:44:52 +0200
Subject: [PATCH 48/77] feat: disable data sharing consent.

---
 openedx/features/enterprise_support/api.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py
index f06df135a3ce..7ed1a06cbf68 100644
--- a/openedx/features/enterprise_support/api.py
+++ b/openedx/features/enterprise_support/api.py
@@ -108,6 +108,11 @@ def consent_required(self, enrollment_exists=False, **kwargs):
         conceptual scope of the consent involved in the request.
         """
 
+        # If enterprise-catalog is not enabled it is necessary disable data sharing consent
+        # for enterprise customers.
+        if configuration_helpers.get_value('DISABLE_DATA_SHARING_CONSENT', False):
+            return False
+
         # Call the endpoint with the given kwargs, and check the value that it provides.
         response = self.client.get(self.consent_endpoint, params=kwargs)
         response.raise_for_status()

From cd2050d12ac76363e7870005c4c7d3da88bbff21 Mon Sep 17 00:00:00 2001
From: Squirrel18 <daniel.quiroga@edunext.co>
Date: Tue, 25 Jul 2023 10:05:18 -0500
Subject: [PATCH 49/77] feat: allow association by email under certain
 conditions.

---
 .../djangoapps/third_party_auth/pipeline.py   | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/common/djangoapps/third_party_auth/pipeline.py b/common/djangoapps/third_party_auth/pipeline.py
index 25c59f65ead9..828959c428f7 100644
--- a/common/djangoapps/third_party_auth/pipeline.py
+++ b/common/djangoapps/third_party_auth/pipeline.py
@@ -826,6 +826,69 @@ def associate_by_email_if_enterprise_user():
                              'Provider ID: %s, Exception: %s', current_user.id, current_user.email,
                              current_provider.provider_id, ex)
 
+    def associate_by_email(backend, details, user):
+        """
+        We need to associate the SAML IDP account with an existing platform account
+        to prevent existing users from having to log into the platform to link their accounts.
+
+        We only link the SAML account to the platform account if:
+        - The platform user's email matches the SAML account email.
+        - There are not multiple platform accounts with the same email.
+        - The platform user is not staff or superuser.
+        - The platform user is active.
+
+        Part of this implementation is taken from:
+        https://github.com/python-social-auth/social-core/blob/4.3.0/social_core/pipeline/social_auth.py#L56
+
+        Args:
+            backend: Backend associated with the TPA auth request.
+            details: TPA pipeline details.
+            user: edX platform user.
+        Returns:
+            Dictionary containing the matched edX platform user.
+        Raises:
+            AuthException: If the SAML account cannot be associated with the platform account.
+        """
+        email = details.get('email')
+
+        if user or not email:
+            return None
+
+        users = list(backend.strategy.storage.user.get_users_by_email(email))
+
+        if not users:
+            return None
+
+        # Try to associate accounts registered with the same email address,
+        # only if it's a single object. AuthException is raised if multiple
+        # objects are returned.
+        if len(users) > 1:
+            raise AuthException(
+                backend,
+                f'The given email address {email} is associated with another account.',
+            )
+
+        matched_user = users[0]
+
+        # It is not allowed to be associated to a staff or superuser to prevent impersonation.
+        if matched_user.is_staff or matched_user.is_superuser:
+            raise AuthException(
+                backend,
+                f'It is not allowed to auto associate staff or superuser users {email}',
+            )
+
+        # It is not allowed to be associated to an inactive account to prevent impersonation.
+        if not matched_user.is_active:
+            raise AuthException(
+                backend,
+                f'Platform user account is not active: {email} {backend.name}',
+            )
+
+        return {
+            'user': matched_user,
+            'is_new': False,
+        }
+
     saml_provider, current_provider = is_saml_provider(strategy.request.backend.name, kwargs)
 
     if saml_provider:
@@ -837,6 +900,17 @@ def associate_by_email_if_enterprise_user():
         if associate_response:
             return associate_response
 
+        if not configuration_helpers.get_value('ASSOCIATE_ACCOUNT_WITH_SAML_IDP_USER', False):
+            return None
+
+        try:
+            associate_by_email_response = associate_by_email(backend, details, user)
+        except AuthException as auth_exc:
+            logger.error(auth_exc)
+            return None
+
+        return associate_by_email_response
+
 
 def user_details_force_sync(auth_entry, strategy, details, user=None, *args, **kwargs):  # lint-amnesty, pylint: disable=keyword-arg-before-vararg
     """

From d911c674a23f74c41daad2f0f2536290d27aef9e Mon Sep 17 00:00:00 2001
From: nicolas-mateoli <nicolas.mateoli@edunext.co>
Date: Thu, 2 Nov 2023 10:48:47 -0300
Subject: [PATCH 50/77] fix: Overwrote all the places where urls were pointing
 to
 'https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png'
 to 'partner-courses.pearson.com/static/pearson-theme/images/logo.png', and
 removed the decorative background images.

---
 .../student/edx_ace/accountactivation/email/body.html       | 5 ++---
 .../student/edx_ace/accountrecovery/email/body.html         | 5 ++---
 .../templates/student/edx_ace/emailchange/email/body.html   | 5 ++---
 .../edx_ace/accountcreationandenrollment/email/body.html    | 5 ++---
 .../instructor/edx_ace/addbetatester/email/body.html        | 5 ++---
 .../instructor/edx_ace/allowedenroll/email/body.html        | 5 ++---
 .../instructor/edx_ace/enrolledunenroll/email/body.html     | 5 ++---
 .../instructor/edx_ace/enrollenrolled/email/body.html       | 6 ++----
 .../instructor/edx_ace/removebetatester/email/body.html     | 5 ++---
 .../templates/ace_common/edx_ace/common/base_body.html      | 2 +-
 .../user_authn/edx_ace/passwordreset/email/body.html        | 5 ++---
 11 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/common/templates/student/edx_ace/accountactivation/email/body.html b/common/templates/student/edx_ace/accountactivation/email/body.html
index 79855e0d6eb8..ee6b3dcd149f 100644
--- a/common/templates/student/edx_ace/accountactivation/email/body.html
+++ b/common/templates/student/edx_ace/accountactivation/email/body.html
@@ -27,13 +27,12 @@
             padding: 20px;
             ">
 
-            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;">
diff --git a/common/templates/student/edx_ace/accountrecovery/email/body.html b/common/templates/student/edx_ace/accountrecovery/email/body.html
index 54fbd33422ec..2e5f36a8af01 100644
--- a/common/templates/student/edx_ace/accountrecovery/email/body.html
+++ b/common/templates/student/edx_ace/accountrecovery/email/body.html
@@ -14,13 +14,12 @@
             padding: 20px;
             ">
 
-            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;">
diff --git a/common/templates/student/edx_ace/emailchange/email/body.html b/common/templates/student/edx_ace/emailchange/email/body.html
index 8540686979a6..7ea5e0ea138b 100644
--- a/common/templates/student/edx_ace/emailchange/email/body.html
+++ b/common/templates/student/edx_ace/emailchange/email/body.html
@@ -14,13 +14,12 @@
             padding: 20px;
             ">
 
-            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;">
diff --git a/lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html b/lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html
index 8d7c2724d75e..2861e9bf90c8 100644
--- a/lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html
+++ b/lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html
@@ -14,13 +14,12 @@
             padding: 20px;
             ">
 
-            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;
diff --git a/lms/templates/instructor/edx_ace/addbetatester/email/body.html b/lms/templates/instructor/edx_ace/addbetatester/email/body.html
index 5c4ede3f5f03..f1523585ce71 100644
--- a/lms/templates/instructor/edx_ace/addbetatester/email/body.html
+++ b/lms/templates/instructor/edx_ace/addbetatester/email/body.html
@@ -14,13 +14,12 @@
             padding: 20px;
             ">
 
-            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;
diff --git a/lms/templates/instructor/edx_ace/allowedenroll/email/body.html b/lms/templates/instructor/edx_ace/allowedenroll/email/body.html
index 08f381b744d3..640740df0d3f 100644
--- a/lms/templates/instructor/edx_ace/allowedenroll/email/body.html
+++ b/lms/templates/instructor/edx_ace/allowedenroll/email/body.html
@@ -14,13 +14,12 @@
             padding: 20px;
             ">
 
-            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;
diff --git a/lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html b/lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html
index c8e78f9e2f7b..9af4c27c6187 100644
--- a/lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html
+++ b/lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html
@@ -14,13 +14,12 @@
             padding: 20px;
             ">
 
-            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;
diff --git a/lms/templates/instructor/edx_ace/enrollenrolled/email/body.html b/lms/templates/instructor/edx_ace/enrollenrolled/email/body.html
index ec02f1a6e5f1..9e860d0fbe88 100644
--- a/lms/templates/instructor/edx_ace/enrollenrolled/email/body.html
+++ b/lms/templates/instructor/edx_ace/enrollenrolled/email/body.html
@@ -13,14 +13,12 @@
             text-align: center;
             padding: 20px;
             ">
-
-            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;
diff --git a/lms/templates/instructor/edx_ace/removebetatester/email/body.html b/lms/templates/instructor/edx_ace/removebetatester/email/body.html
index bf119368bda1..ea83d27aea93 100644
--- a/lms/templates/instructor/edx_ace/removebetatester/email/body.html
+++ b/lms/templates/instructor/edx_ace/removebetatester/email/body.html
@@ -14,13 +14,12 @@
             padding: 20px;
             ">
 
-            <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;
diff --git a/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html
index 66480a10ea82..315b847f6c80 100644
--- a/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html
+++ b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html
@@ -76,7 +76,7 @@
                   <tr>
                     <td width="70">
                       <a href="{% with_link_tracking homepage_url %}"><img
-                        src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/logo.png" width="40"
+                        src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" width="40"
                         height="40" alt="{% filter force_escape %}{% blocktrans %}Go to {{ platform_name }} Home Page{% endblocktrans %}{% endfilter %}"/></a>
                     </td>
                     <td align="right" style="text-align: {{ LANGUAGE_BIDI|yesno:"left,right" }};">
diff --git a/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html b/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html
index f31f58f19501..f5e815c21448 100644
--- a/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html
+++ b/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html
@@ -13,13 +13,12 @@
             padding: 20px;
             ">
 
-        <img src="https://mylearningx.pearson.com/static/pearson-pols-theme/images/PearsonLogo_Primary_Blk_RGB.png" style="width: 150px; padding: 5px; margin: auto;" />
+            <img src="https://partner-courses.pearson.com/static/pearson-theme/images/logo.png" style="width: 150px; padding: 5px; margin: auto;" />
 
             <div style="width: 90%;
-                        background-color: #D4EAE4;
                         text-align: left;
                         padding: 2% 5%;
-                        background-image: url('https://mylearningx.pearson.com/static/pearson-pols-theme/images/laptop_transparent-bg.png');
+                        background-color: #D4EAE4;
                         background-size: 50%;
                         background-position: right bottom;
                         background-repeat: no-repeat;

From 9bb85f68321549caa659c89515d5037ad0753a24 Mon Sep 17 00:00:00 2001
From: juan <juan.buitrago@edunext.co>
Date: Mon, 27 Nov 2023 14:02:37 -0500
Subject: [PATCH 51/77] feat: add course created event signals

---
 lms/djangoapps/ccx/views.py                   | 11 ++++++++
 requirements/constraints.txt                  |  2 +-
 requirements/edx/base.txt                     |  2 +-
 requirements/edx/development.txt              |  2 +-
 requirements/edx/testing.txt                  |  2 +-
 xmodule/modulestore/mixed.py                  | 12 +++++++++
 .../tests/test_mixed_modulestore.py           | 27 +++++++++++++++++++
 7 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index 08d6ec19824c..fcbc70ec58ce 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -21,11 +21,14 @@
 from django.shortcuts import redirect
 from django.urls import reverse
 from django.utils.translation import gettext as _
+from django.utils.timezone import timezone
 from django.views.decorators.cache import cache_control
 from django.views.decorators.csrf import ensure_csrf_cookie
 from opaque_keys.edx.keys import CourseKey
 from six import StringIO
 
+from openedx_events.content_authoring.data import CourseData
+from openedx_events.content_authoring.signals import COURSE_CREATED
 from common.djangoapps.edxmako.shortcuts import render_to_response
 from common.djangoapps.student.models import CourseEnrollment
 from common.djangoapps.student.roles import CourseCcxCoachRole
@@ -301,6 +304,14 @@ def create_ccx(request, course, ccx=None):
             user=request.user,
         )
 
+    # .. event_implemented_name: COURSE_CREATED
+    COURSE_CREATED.send_event(
+        time=datetime.datetime.now(tz=timezone.utc),
+        course=CourseData(
+            course_key=ccx_id,
+        )
+    )
+
     return redirect(url)
 
 
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 3017d343ad31..38872ccdfe56 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -100,4 +100,4 @@ pytz==2022.2.1
 
 # openedx-events>0.13.0 causes test failures due to breaking changes
 # These broken tests will be fixed in a separate PR
-openedx-events==0.13.0
+openedx-events==8.3.0
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 038129222d69..2c7e75896ccc 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -759,7 +759,7 @@ openedx-calc==3.0.1
     # via -r requirements/edx/base.in
 openedx-django-pyfs==3.2.1
     # via xblock
-openedx-events==0.13.0
+openedx-events==8.3.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 3e5ba143d975..406ff19b1614 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -991,7 +991,7 @@ openedx-django-pyfs==3.2.1
     # via
     #   -r requirements/edx/testing.txt
     #   xblock
-openedx-events==0.13.0
+openedx-events==8.3.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 84935527d441..e1ea3eb1187f 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -942,7 +942,7 @@ openedx-django-pyfs==3.2.1
     # via
     #   -r requirements/edx/base.txt
     #   xblock
-openedx-events==0.13.0
+openedx-events==8.3.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
diff --git a/xmodule/modulestore/mixed.py b/xmodule/modulestore/mixed.py
index 17b5e8a0869d..639a624ce1a9 100644
--- a/xmodule/modulestore/mixed.py
+++ b/xmodule/modulestore/mixed.py
@@ -13,6 +13,10 @@
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import LibraryLocator
 
+from openedx_events.content_authoring.data import CourseData
+from openedx_events.content_authoring.signals import COURSE_CREATED
+
+from django.utils.timezone import datetime, timezone
 from xmodule.assetstore import AssetMetadata
 
 from . import XMODULE_FIELDS_WITH_USAGE_KEYS, ModuleStoreWriteBase
@@ -667,6 +671,14 @@ def create_course(self, org, course, run, user_id, **kwargs):  # lint-amnesty, p
         # add new course to the mapping
         self.mappings[course_key] = store
 
+        # .. event_implemented_name: COURSE_CREATED
+        COURSE_CREATED.send_event(
+            time=datetime.now(timezone.utc),
+            course=CourseData(
+                course_key=course_key,
+            )
+        )
+
         return course
 
     @strip_key
diff --git a/xmodule/modulestore/tests/test_mixed_modulestore.py b/xmodule/modulestore/tests/test_mixed_modulestore.py
index 318f6dc57d9b..e4bbdf6ebcb7 100644
--- a/xmodule/modulestore/tests/test_mixed_modulestore.py
+++ b/xmodule/modulestore/tests/test_mixed_modulestore.py
@@ -15,6 +15,7 @@
 from unittest.mock import Mock, call, patch
 
 import ddt
+from openedx_events.content_authoring.signals import COURSE_CREATED
 import pymongo
 import pytest
 # Mixed modulestore depends on django, so we'll manually configure some django settings
@@ -109,6 +110,9 @@ class CommonMixedModuleStoreSetup(CourseComparisonTest):
         ],
         'xblock_mixins': modulestore_options['xblock_mixins'],
     }
+    ENABLED_OPENEDX_EVENTS = [
+        "org.openedx.content_authoring.course.created.v1",
+    ]
 
     def setUp(self):
         """
@@ -724,6 +728,29 @@ def test_publish_automatically_after_delete_unit(self, default_ms):
         self.store.delete_item(vertical.location, self.user_id)
         assert not self._has_changes(sequential.location)
 
+    @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split)
+    def test_course_create_event(self, default_ms):
+        """
+        Check that COURSE_CREATED event is sent when a course is created.
+        """
+        self.initdb(default_ms)
+        event_receiver = Mock()
+        COURSE_CREATED.connect(event_receiver)
+
+        test_course = self.store.create_course('test_org', 'test_course', 'test_run', self.user_id)
+
+        event_receiver.assert_called_once()
+        self.assertDictContainsSubset(
+            {
+                "signal": COURSE_CREATED,
+                "sender": None,
+                "course": CourseData(
+                    course_key=test_course.id,
+                ),
+            },
+            event_receiver.call_args.kwargs,
+        )
+
     def setup_has_changes(self, default_ms):
         """
         Common set up for has_changes tests below.

From f6c041935716c20a72baca8cdbae0816a8c86541 Mon Sep 17 00:00:00 2001
From: Javier Torres <javier.torres@edunext.co>
Date: Fri, 1 Dec 2023 15:08:49 -0500
Subject: [PATCH 52/77] fix: delay update_outline_from_modulestore_task after
 course publish.

---
 cms/djangoapps/contentstore/signals/handlers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cms/djangoapps/contentstore/signals/handlers.py b/cms/djangoapps/contentstore/signals/handlers.py
index 76711eaa4ddc..c36d72aab163 100644
--- a/cms/djangoapps/contentstore/signals/handlers.py
+++ b/cms/djangoapps/contentstore/signals/handlers.py
@@ -134,7 +134,10 @@ def listen_for_course_publish(sender, course_key, **kwargs):  # pylint: disable=
 
     if key_supports_outlines(course_key):
         # Push the course outline to learning_sequences asynchronously.
-        update_outline_from_modulestore_task.delay(course_key_str)
+        update_outline_from_modulestore_task.apply_async(
+            args=[course_key_str],
+            countdown=settings.BLOCK_STRUCTURES_SETTINGS.get('COURSE_PUBLISH_TASK_DELAY', 30),
+        )
 
     if settings.COURSEGRAPH_DUMP_COURSE_ON_PUBLISH:
         # Push the course out to CourseGraph asynchronously.

From 5cb4d090699a907e63fc63c4eb020b38b22003d1 Mon Sep 17 00:00:00 2001
From: juan <juan.buitrago@edunext.co>
Date: Wed, 27 Dec 2023 00:09:45 -0500
Subject: [PATCH 53/77] chore: use the ccx data complete for course created
 openedx event

---
 lms/djangoapps/ccx/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index fcbc70ec58ce..83d05765704d 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -308,7 +308,7 @@ def create_ccx(request, course, ccx=None):
     COURSE_CREATED.send_event(
         time=datetime.datetime.now(tz=timezone.utc),
         course=CourseData(
-            course_key=ccx_id,
+            course_key=ccx,
         )
     )
 

From 9e21c29af6765efd680e7166ca7b7cad22c75e56 Mon Sep 17 00:00:00 2001
From: juan <juan.buitrago@edunext.co>
Date: Thu, 4 Jan 2024 06:58:27 -0500
Subject: [PATCH 54/77] Revert "Merge pull request #112 from
 Pearson-Advance/vue/PADV-815"

This reverts commit 59b367a86b689d85b807a5c28b500f042a68d5d0, reversing
changes made to 95541f5e1cec191ae06fa2ade29a3ce4798cd856.
---
 lms/djangoapps/ccx/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index 83d05765704d..fcbc70ec58ce 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -308,7 +308,7 @@ def create_ccx(request, course, ccx=None):
     COURSE_CREATED.send_event(
         time=datetime.datetime.now(tz=timezone.utc),
         course=CourseData(
-            course_key=ccx,
+            course_key=ccx_id,
         )
     )
 

From 0117d5d1ab0cb6160d5e9c4d4f7c011e3d1f74b8 Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Tue, 26 Dec 2023 17:37:11 -0500
Subject: [PATCH 55/77] feat: adding CCX support to gradebook API

---
 lms/djangoapps/grades/rest_api/v1/gradebook_views.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
index 6f2b45feae6e..7e2cfe4c4698 100644
--- a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
+++ b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
@@ -20,9 +20,9 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from common.djangoapps.student.auth import has_course_author_access
+from common.djangoapps.student.auth import has_course_author_access, is_ccx_course
 from common.djangoapps.student.models import CourseAccessRole, CourseEnrollment, CourseMode
-from common.djangoapps.student.roles import BulkRoleCache
+from common.djangoapps.student.roles import BulkRoleCache, CourseInstructorRole, CourseStaffRole
 from common.djangoapps.track.event_transaction_utils import (
     create_new_event_transaction_id,
     get_event_transaction_id,
@@ -227,6 +227,13 @@ def _wrapper_view(self, request, course_id, *args, **kwargs):
         """
         course_key = CourseKey.from_string(course_id)
         if not has_course_author_access(request.user, course_key):
+            user_has_gradebook_access = any([
+                CourseStaffRole(course_key).has_user(request.user),
+                CourseInstructorRole(course_key).has_user(request.user),
+            ])
+            if is_ccx_course(course_key) and user_has_gradebook_access:
+                return view(self, request, course_key, *args, **kwargs)
+
             raise DeveloperErrorViewMixin.api_error(
                 status_code=status.HTTP_403_FORBIDDEN,
                 developer_message='The requesting user does not have course author permissions.',

From 452fb93fd2e15e940463f8420a414659c47c907c Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Mon, 15 Jan 2024 13:16:03 -0500
Subject: [PATCH 56/77] feat: updating CCX coach tab gradebook link

---
 lms/djangoapps/ccx/views.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index fcbc70ec58ce..71248b88b058 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -55,7 +55,7 @@
     parse_date,
 )
 from lms.djangoapps.courseware.field_overrides import disable_overrides
-from lms.djangoapps.grades.api import CourseGradeFactory
+from lms.djangoapps.grades.api import CourseGradeFactory, is_writable_gradebook_enabled
 from lms.djangoapps.instructor.enrollment import enroll_email, get_email_params
 from lms.djangoapps.instructor.views.gradebook_api import get_grade_book_page
 from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_ADMINISTRATOR, assign_role
@@ -194,6 +194,12 @@ def dashboard(request, course, ccx=None):
         ) if is_course_licensing_enabled else []
         context['gradebook_url'] = reverse(
             'ccx_gradebook', kwargs={'course_id': ccx_locator})
+        writable_gradebook_url = configuration_helpers.get_value(
+            'WRITABLE_GRADEBOOK_URL',
+            getattr(settings, 'WRITABLE_GRADEBOOK_URL', None),
+        )
+        if is_writable_gradebook_enabled(ccx_locator) and writable_gradebook_url:
+            context['gradebook_url'] = f'{writable_gradebook_url}/{str(ccx_locator)}'
         context['grades_csv_url'] = reverse(
             'ccx_grades_csv', kwargs={'course_id': ccx_locator})
         context['grading_policy'] = json.dumps(grading_policy, indent=4)

From 08cbcdfb3f254c08805beba5287a43f98bf1081e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mois=C3=A9s=20Ar=C3=A9valo?= <moises.arevalo@edunext.co>
Date: Mon, 22 Jan 2024 18:45:54 -0500
Subject: [PATCH 57/77] fix: add JwtRestrictedApplication check to XBlock
 callback

---
 lms/djangoapps/courseware/module_render.py    | 12 ++++++++--
 .../courseware/tests/test_module_render.py    | 22 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 04015787c6f1..07d22c465230 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -29,6 +29,7 @@
 from edx_proctoring.api import get_attempt_status_summary
 from edx_proctoring.services import ProctoringService
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
+from edx_rest_framework_extensions.permissions import JwtRestrictedApplication
 from edx_when.field_data import DateLookupFieldData
 from eventtracking import tracker
 from opaque_keys import InvalidKeyError
@@ -944,12 +945,19 @@ def handle_xblock_callback(request, course_id, usage_id, handler, suffix=None):
                 )
             else:
                 if user_auth_tuple is not None:
-                    request.user, _ = user_auth_tuple
+                    # When using JWT authentication, the second element contains the JWT token. We need it to determine
+                    # whether the application that issued the token is restricted.
+                    request.user, request.auth = user_auth_tuple
+                    # This is verified by the `JwtRestrictedApplication` before it decodes the token.
+                    request.successful_authenticator = authenticator
                     break
 
     # NOTE (CCB): Allow anonymous GET calls (e.g. for transcripts). Modifying this view is simpler than updating
     # the XBlocks to use `handle_xblock_callback_noauth`, which is practically identical to this view.
-    if request.method != 'GET' and not (request.user and request.user.is_authenticated):
+    # Block all request types coming from restricted applications.
+    if (
+        request.method != 'GET' and not (request.user and request.user.is_authenticated)
+    ) or JwtRestrictedApplication().has_permission(request, None):  # type: ignore
         return HttpResponseForbidden('Unauthenticated')
 
     request.user.known = request.user.is_authenticated
diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py
index 9e187fd1ebe2..ea22027c8c04 100644
--- a/lms/djangoapps/courseware/tests/test_module_render.py
+++ b/lms/djangoapps/courseware/tests/test_module_render.py
@@ -81,7 +81,7 @@
 from lms.djangoapps.lms_xblock.field_data import LmsFieldData
 from openedx.core.djangoapps.credit.api import set_credit_requirement_status, set_credit_requirements
 from openedx.core.djangoapps.credit.models import CreditCourse
-from openedx.core.djangoapps.oauth_dispatch.jwt import create_jwt_for_user
+from openedx.core.djangoapps.oauth_dispatch.jwt import _create_jwt, create_jwt_for_user
 from openedx.core.djangoapps.oauth_dispatch.tests.factories import AccessTokenFactory, ApplicationFactory
 from openedx.core.lib.courses import course_image_url
 from openedx.core.lib.gating import api as gating_api
@@ -375,6 +375,26 @@ def test_jwt_authentication(self):
         response = self.client.post(dispatch_url, {}, **headers)
         assert 200 == response.status_code
 
+    def test_jwt_authentication_with_restricted_application(self):
+        """Test that the XBlock endpoint disallows JWT authentication with restricted applications."""
+
+        def _mock_create_restricted_jwt(*args, **kwargs):
+            """Pass an additional argument to `_create_jwt` without modifying the signature of `create_jwt_for_user`."""
+            kwargs['is_restricted'] = True
+            return _create_jwt(*args, **kwargs)
+
+        with patch('openedx.core.djangoapps.oauth_dispatch.jwt._create_jwt', _mock_create_restricted_jwt):
+            token = create_jwt_for_user(self.mock_user)
+
+        dispatch_url = self._get_dispatch_url()
+        headers = {'HTTP_AUTHORIZATION': 'JWT ' + token}
+
+        response = self.client.get(dispatch_url, {}, **headers)
+        assert 403 == response.status_code
+
+        response = self.client.post(dispatch_url, {}, **headers)
+        assert 403 == response.status_code
+
     def test_missing_position_handler(self):
         """
         Test that sending POST request without or invalid position argument don't raise server error

From a22d68bc691f522ed817645a7b9eb6ef3ebbf4e1 Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Tue, 6 Feb 2024 09:20:32 -0500
Subject: [PATCH 58/77] feat: adding apps.py to ccx app

---
 lms/djangoapps/ccx/apps.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 lms/djangoapps/ccx/apps.py

diff --git a/lms/djangoapps/ccx/apps.py b/lms/djangoapps/ccx/apps.py
new file mode 100644
index 000000000000..5dcb1a615aab
--- /dev/null
+++ b/lms/djangoapps/ccx/apps.py
@@ -0,0 +1,18 @@
+"""
+LMS CCX application configuration
+Signal handlers are connected here.
+"""
+from django.apps import AppConfig
+
+
+class CCXConfig(AppConfig):
+    """
+    Application Configuration for CCX.
+    """
+    name = 'lms.djangoapps.ccx'
+
+    def ready(self):
+        """
+        Connect signal handlers.
+        """
+        from . import tasks # pylint: disable=unused-import

From ffd3b4a9f2f9a91e8114828c261f82262405b2ea Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Wed, 28 Feb 2024 12:33:34 -0500
Subject: [PATCH 59/77] feat: adding CCX support to edx notes

---
 lms/djangoapps/edxnotes/decorators.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/edxnotes/decorators.py b/lms/djangoapps/edxnotes/decorators.py
index 247bb6b913f4..c522ba36bed4 100644
--- a/lms/djangoapps/edxnotes/decorators.py
+++ b/lms/djangoapps/edxnotes/decorators.py
@@ -9,6 +9,7 @@
 from xblock.exceptions import NoSuchServiceError
 
 from common.djangoapps.edxmako.shortcuts import render_to_string
+from common.djangoapps.student.auth import is_ccx_course
 
 
 def edxnotes(cls):
@@ -34,6 +35,9 @@ def get_html(self, *args, **kwargs):
             return original_get_html(self, *args, **kwargs)
 
         is_studio = getattr(self.runtime, "is_author_mode", False)
+        # Right now, if the course is a CCX, the course.id value contains a course id with branches.
+        # This causes discrepancy in the notes data, since the course_id for the note is being saved using
+        # branches and meanwhile the notes tab searches for the course without branches.
         course = getattr(self, 'descriptor', self).runtime.modulestore.get_course(self.scope_ids.usage_id.context_key)
 
         # Must be disabled when:
@@ -58,7 +62,8 @@ def get_html(self, *args, **kwargs):
                 "params": {
                     # Use camelCase to name keys.
                     "usageId": self.scope_ids.usage_id,
-                    "courseId": course.id,
+                    # We need to change the value when the course is a CCX because of the issue commented above.
+                    "courseId": course.id if not is_ccx_course(course.id) else course.id.for_branch(branch=None),
                     "token": get_edxnotes_id_token(user),
                     "tokenUrl": get_token_url(course.id),
                     "endpoint": get_public_endpoint(),

From 2a9cecaea71c42ee4b662df82e278eeb3c8976d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Silva?= <cesar.silva@edunext.co>
Date: Fri, 15 Mar 2024 08:43:26 -0400
Subject: [PATCH 60/77] feat: delete run_extension_point.

---
 lms/djangoapps/ccx/views.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index 71248b88b058..f8c784ca98a3 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -301,15 +301,6 @@ def create_ccx(request, course, ccx=None):
     for rec, response in responses:
         log.info('Signal fired when course is published. Receiver: %s. Response: %s', rec, response)
 
-    # Adding an extension point to create the institution_ccx for PearsonVUE.
-    if is_course_licensing_enabled:
-        run_extension_point(
-            'PCO_CREATE_INSTITUTION_CCX_INSTANCE',
-            ccx_id=ccx_id,
-            custom_course=ccx,
-            user=request.user,
-        )
-
     # .. event_implemented_name: COURSE_CREATED
     COURSE_CREATED.send_event(
         time=datetime.datetime.now(tz=timezone.utc),

From 282a7fbfe397489dba80196e35b581425016d34c Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Tue, 19 Mar 2024 14:23:08 -0500
Subject: [PATCH 61/77] feat: adding global staff to allowed users in ccx
 gradebook

---
 lms/djangoapps/grades/rest_api/v1/gradebook_views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
index 7e2cfe4c4698..804d665a347b 100644
--- a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
+++ b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
@@ -230,6 +230,7 @@ def _wrapper_view(self, request, course_id, *args, **kwargs):
             user_has_gradebook_access = any([
                 CourseStaffRole(course_key).has_user(request.user),
                 CourseInstructorRole(course_key).has_user(request.user),
+                request.user.is_staff,
             ])
             if is_ccx_course(course_key) and user_has_gradebook_access:
                 return view(self, request, course_key, *args, **kwargs)

From 211affcb12733c49d1fd1b45ec38fbf422d0b6d9 Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Fri, 17 May 2024 16:21:29 -0500
Subject: [PATCH 62/77] feat: updating openedx-events version to 9.10.0

---
 requirements/constraints.txt     | 2 +-
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 38872ccdfe56..675f58090f71 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -100,4 +100,4 @@ pytz==2022.2.1
 
 # openedx-events>0.13.0 causes test failures due to breaking changes
 # These broken tests will be fixed in a separate PR
-openedx-events==8.3.0
+openedx-events==9.10.0
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 2c7e75896ccc..7ed33a46f421 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -759,7 +759,7 @@ openedx-calc==3.0.1
     # via -r requirements/edx/base.in
 openedx-django-pyfs==3.2.1
     # via xblock
-openedx-events==8.3.0
+openedx-events==9.10.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 406ff19b1614..6732a0cbe650 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -991,7 +991,7 @@ openedx-django-pyfs==3.2.1
     # via
     #   -r requirements/edx/testing.txt
     #   xblock
-openedx-events==8.3.0
+openedx-events==9.10.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/testing.txt

From e73db48967f4af4c33f6802e44421b0b2be8a8d3 Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Tue, 21 May 2024 10:22:33 -0500
Subject: [PATCH 63/77] feat: adding new course passing events

---
 lms/djangoapps/grades/event_utils.py | 49 ++++++++++++++++++++++++++++
 lms/djangoapps/grades/events.py      |  5 +++
 2 files changed, 54 insertions(+)
 create mode 100644 lms/djangoapps/grades/event_utils.py

diff --git a/lms/djangoapps/grades/event_utils.py b/lms/djangoapps/grades/event_utils.py
new file mode 100644
index 000000000000..8e4df28c846b
--- /dev/null
+++ b/lms/djangoapps/grades/event_utils.py
@@ -0,0 +1,49 @@
+from openedx_events.learning.data import (
+    CcxCourseData,
+    CcxCoursePassingStatusData,
+    CourseData,
+    CoursePassingStatusData,
+    UserData,
+    UserPersonalData
+)
+from openedx_events.learning.signals import CCX_COURSE_PASSING_STATUS_UPDATED, COURSE_PASSING_STATUS_UPDATED
+
+
+def emit_course_passing_status_update(user, course_id, is_passing):
+    if hasattr(course_id, 'ccx'):
+        CCX_COURSE_PASSING_STATUS_UPDATED.send_event(
+            course_passing_status=CcxCoursePassingStatusData(
+                is_passing=is_passing,
+                user=UserData(
+                    pii=UserPersonalData(
+                        username=user.username,
+                        email=user.email,
+                        name=user.get_full_name(),
+                    ),
+                    id=user.id,
+                    is_active=user.is_active,
+                ),
+                course=CcxCourseData(
+                    ccx_course_key=course_id,
+                    master_course_key=course_id.to_course_locator(),
+                ),
+            )
+        )
+    else:
+        COURSE_PASSING_STATUS_UPDATED.send_event(
+            course_passing_status=CoursePassingStatusData(
+                is_passing=is_passing,
+                user=UserData(
+                    pii=UserPersonalData(
+                        username=user.username,
+                        email=user.email,
+                        name=user.get_full_name(),
+                    ),
+                    id=user.id,
+                    is_active=user.is_active,
+                ),
+                course=CourseData(
+                    course_key=course_id,
+                ),
+            )
+        )
diff --git a/lms/djangoapps/grades/events.py b/lms/djangoapps/grades/events.py
index 90279a3e69fe..aada530cb7d6 100644
--- a/lms/djangoapps/grades/events.py
+++ b/lms/djangoapps/grades/events.py
@@ -16,6 +16,7 @@
     get_event_transaction_type,
     set_event_transaction_type
 )
+from lms.djangoapps.grades.event_utils import emit_course_passing_status_update
 from lms.djangoapps.grades.signals.signals import SCHEDULE_FOLLOW_UP_SEGMENT_EVENT_FOR_COURSE_PASSED_FIRST_TIME
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.features.enterprise_support.context import get_enterprise_event_context
@@ -190,6 +191,8 @@ def course_grade_now_passed(user, course_id):
             }
         )
 
+    emit_course_passing_status_update(user, course_id, is_passing=True)
+
 
 def course_grade_now_failed(user, course_id):
     """
@@ -209,6 +212,8 @@ def course_grade_now_failed(user, course_id):
             }
         )
 
+    emit_course_passing_status_update(user, course_id, is_passing=False)
+
 
 def fire_segment_event_on_course_grade_passed_first_time(user_id, course_locator):
     """

From 6a15a3542665b6b420a53fca9c94d3d6734b281b Mon Sep 17 00:00:00 2001
From: Serafin-dev <nicolas.mateoli@edunext.co>
Date: Wed, 29 May 2024 11:55:52 -0300
Subject: [PATCH 64/77] feat: backport Event Bus configuration.

---
 cms/envs/common.py     | 54 ++++++++++++++++++++++++++++++++++++++++++
 cms/envs/production.py |  2 +-
 lms/envs/common.py     | 53 +++++++++++++++++++++++++++++++++++++++++
 lms/envs/production.py |  6 +++++
 4 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 986afff8528b..782e6c40ae36 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -516,6 +516,14 @@
     #   in the LMS and CMS.
     # .. toggle_tickets: 'https://github.com/open-craft/edx-platform/pull/429'
     'DISABLE_UNENROLLMENT': False,
+
+    # .. toggle_name: FEATURES['BADGES_ENABLED']
+    # .. toggle_implementation: DjangoSetting
+    # .. toggle_default: False
+    # .. toggle_description: Set to True to enable the Badges feature.
+    # .. toggle_use_cases: open_edx
+    # .. toggle_creation_date: 2024-04-10
+    'BADGES_ENABLED': False,
 }
 
 # .. toggle_name: ENABLE_COPPA_COMPLIANCE
@@ -2696,3 +2704,49 @@
 
 # Redirect URL for inactive user. If not set, user will be redirected to /login after the login itself (loop)
 INACTIVE_USER_URL = f'http://{CMS_BASE}'
+
+#### Event bus producing ####
+
+
+def _should_send_learning_badge_events(settings):
+    return settings.FEATURES['BADGES_ENABLED']
+
+
+# .. setting_name: EVENT_BUS_PRODUCER_CONFIG
+# .. setting_default: all events disabled
+# .. setting_description: Dictionary of event_types mapped to dictionaries of topic to topic-related configuration.
+#    Each topic configuration dictionary contains
+#    * `enabled`: a toggle denoting whether the event will be published to the topic. These should be annotated
+#       according to
+#       https://edx.readthedocs.io/projects/edx-toggles/en/latest/how_to/documenting_new_feature_toggles.html
+#    * `event_key_field` which is a period-delimited string path to event data field to use as event key.
+#    Note: The topic names should not include environment prefix as it will be dynamically added based on
+#    EVENT_BUS_TOPIC_PREFIX setting.
+
+EVENT_BUS_PRODUCER_CONFIG = {
+    "org.openedx.learning.course.passing.status.updated.v1": {
+        "learning-badges-lifecycle": {
+            "event_key_field": "course_passing_status.course.course_key",
+            "enabled": _should_send_learning_badge_events,
+        },
+    },
+    "org.openedx.learning.ccx.course.passing.status.updated.v1": {
+        "learning-badges-lifecycle": {
+            "event_key_field": "course_passing_status.course.ccx_course_key",
+            "enabled": _should_send_learning_badge_events,
+        },
+    },
+}
+
+derived_collection_entry(
+    "EVENT_BUS_PRODUCER_CONFIG",
+    "org.openedx.learning.course.passing.status.updated.v1",
+    "learning-badges-lifecycle",
+    "enabled",
+)
+derived_collection_entry(
+    "EVENT_BUS_PRODUCER_CONFIG",
+    "org.openedx.learning.ccx.course.passing.status.updated.v1",
+    "learning-badges-lifecycle",
+    "enabled",
+)
diff --git a/cms/envs/production.py b/cms/envs/production.py
index 6431ad95c15d..f5cb1f818c55 100644
--- a/cms/envs/production.py
+++ b/cms/envs/production.py
@@ -19,7 +19,6 @@
 from edx_django_utils.plugins import add_plugins
 from path import Path as path
 
-
 from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType
 
 from .common import *
@@ -84,6 +83,7 @@ def get_env_setting(setting):
         'MKTG_URL_LINK_MAP',
         'MKTG_URL_OVERRIDES',
         'REST_FRAMEWORK',
+        'EVENT_BUS_PRODUCER_CONFIG',
     ]
     for key in KEYS_WITH_MERGED_VALUES:
         if key in __config_copy__:
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 407fea2b1e2b..2ba82866b64e 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1018,6 +1018,15 @@
     # .. toggle_target_removal_date: None
     # .. toggle_tickets: 'https://openedx.atlassian.net/browse/MST-1458'
     'ENABLE_CERTIFICATES_IDV_REQUIREMENT': False,
+
+    # .. toggle_name: FEATURES['BADGES_ENABLED']
+    # .. toggle_implementation: DjangoSetting
+    # .. toggle_default: False
+    # .. toggle_description: Set to True to enable badges functionality.
+    # .. toggle_use_cases: open_edx
+    # .. toggle_creation_date: 2024-04-02
+    # .. toggle_target_removal_date: None
+    'BADGES_ENABLED': False,
 }
 
 # Specifies extra XBlock fields that should available when requested via the Course Blocks API
@@ -3256,6 +3265,8 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 
     # MFE API
     'lms.djangoapps.mfe_config_api',
+
+    'openedx_events',
 ]
 
 ######################### CSRF #########################################
@@ -5259,3 +5270,45 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
     'bachelors_degree': 'https://www.edx.org/bachelors',
     'boot_camps': 'https://www.edx.org/boot-camps',
 }
+
+#### Event bus producing ####
+
+def _should_send_learning_badge_events(settings):
+    return settings.FEATURES['BADGES_ENABLED']
+
+# .. setting_name: EVENT_BUS_PRODUCER_CONFIG
+# .. setting_default: all events disabled
+# .. setting_description: Dictionary of event_types mapped to dictionaries of topic to topic-related configuration.
+#    Each topic configuration dictionary contains
+#    * `enabled`: a toggle denoting whether the event will be published to the topic. These should be annotated
+#       according to
+#       https://edx.readthedocs.io/projects/edx-toggles/en/latest/how_to/documenting_new_feature_toggles.html
+#    * `event_key_field` which is a period-delimited string path to event data field to use as event key.
+#    Note: The topic names should not include environment prefix as it will be dynamically added based on
+#    EVENT_BUS_TOPIC_PREFIX setting.
+EVENT_BUS_PRODUCER_CONFIG = {
+    "org.openedx.learning.course.passing.status.updated.v1": {
+        "learning-badges-lifecycle": {
+            "event_key_field": "course_passing_status.course.course_key",
+            "enabled": _should_send_learning_badge_events,
+        },
+    },
+    "org.openedx.learning.ccx.course.passing.status.updated.v1": {
+        "learning-badges-lifecycle": {
+            "event_key_field": "course_passing_status.course.ccx_course_key",
+            "enabled": _should_send_learning_badge_events,
+        },
+    },
+}
+derived_collection_entry(
+    "EVENT_BUS_PRODUCER_CONFIG",
+    "org.openedx.learning.course.passing.status.updated.v1",
+    "learning-badges-lifecycle",
+    "enabled",
+)
+derived_collection_entry(
+    "EVENT_BUS_PRODUCER_CONFIG",
+    "org.openedx.learning.ccx.course.passing.status.updated.v1",
+    "learning-badges-lifecycle",
+    "enabled",
+)
diff --git a/lms/envs/production.py b/lms/envs/production.py
index d1c5a08aa2b0..2668ff38c06a 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -25,6 +25,7 @@
 from corsheaders.defaults import default_headers as corsheaders_default_headers
 from django.core.exceptions import ImproperlyConfigured
 from edx_django_utils.plugins import add_plugins
+from openedx_events.event_bus import merge_producer_configs
 from path import Path as path
 
 from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType
@@ -83,6 +84,7 @@ def get_env_setting(setting):
         'MKTG_URL_LINK_MAP',
         'MKTG_URL_OVERRIDES',
         'REST_FRAMEWORK',
+        'EVENT_BUS_PRODUCER_CONFIG',
     ]
     for key in KEYS_WITH_MERGED_VALUES:
         if key in __config_copy__:
@@ -1080,3 +1082,7 @@ def get_env_setting(setting):
     "SECRET": ENV_TOKENS.get('BIG_BLUE_BUTTON_GLOBAL_SECRET', None),
     "URL": ENV_TOKENS.get('BIG_BLUE_BUTTON_GLOBAL_URL', None),
 }
+
+############## Event bus producer ##############
+EVENT_BUS_PRODUCER_CONFIG = merge_producer_configs(EVENT_BUS_PRODUCER_CONFIG,
+                                                   ENV_TOKENS.get('EVENT_BUS_PRODUCER_CONFIG', {}))

From 02fcb57f1174503bc024d0251e0f51fb127c2ebf Mon Sep 17 00:00:00 2001
From: anfbermudezme <andres.bermudez@edunext.co>
Date: Fri, 31 May 2024 21:11:37 +0200
Subject: [PATCH 65/77] feat: add filter in CourseEnrollmentAllowed.

---
 lms/djangoapps/instructor/enrollment.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lms/djangoapps/instructor/enrollment.py b/lms/djangoapps/instructor/enrollment.py
index 866820c5139f..3b5d4f17e3e6 100644
--- a/lms/djangoapps/instructor/enrollment.py
+++ b/lms/djangoapps/instructor/enrollment.py
@@ -33,6 +33,7 @@
     get_event_transaction_id,
     set_event_transaction_type
 )
+from common.djangoapps.student.models import EnrollmentNotAllowed
 from lms.djangoapps.courseware.models import StudentModule
 from lms.djangoapps.grades.api import constants as grades_constants
 from lms.djangoapps.grades.api import disconnect_submissions_signal_receiver
@@ -51,6 +52,7 @@
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.user_api.models import UserPreference
 from openedx.core.djangolib.markup import Text
+from openedx_filters.learning.filters import CourseEnrollmentStarted
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.exceptions import ItemNotFoundError  # lint-amnesty, pylint: disable=wrong-import-order
 
@@ -166,6 +168,13 @@ def enroll_email(course_id, student_email, auto_enroll=False, email_students=Fal
             send_mail_to_student(student_email, email_params, language=language)
 
     elif not is_email_retired(student_email):
+        try:
+            CourseEnrollmentStarted.run_filter(
+                user=None, course_key=course_id, mode=None,
+            )
+        except CourseEnrollmentStarted.PreventEnrollment as exc:
+            raise EnrollmentNotAllowed(str(exc)) from exc
+
         cea, _ = CourseEnrollmentAllowed.objects.get_or_create(course_id=course_id, email=student_email)
         cea.auto_enroll = auto_enroll
         cea.save()

From 1710fc15a19fac335fd03906e24c3372454ad784 Mon Sep 17 00:00:00 2001
From: anfbermudezme <andres.bermudez@edunext.co>
Date: Tue, 16 Jul 2024 00:28:25 +0200
Subject: [PATCH 66/77] chore: update py2neo version.

---
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/testing.txt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 7ed33a46f421..6e9fc5c4d3fc 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -818,7 +818,7 @@ psutil==5.9.2
     # via
     #   -r requirements/edx/paver.txt
     #   edx-django-utils
-py2neo==2021.2.3
+py2neo==2021.2.4
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 6732a0cbe650..074e49e6dcd0 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1093,7 +1093,7 @@ py==1.11.0
     #   pytest
     #   pytest-forked
     #   tox
-py2neo==2021.2.3
+py2neo==2021.2.4
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index e1ea3eb1187f..0ae4d3ea97f4 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1034,7 +1034,7 @@ py==1.11.0
     #   pytest
     #   pytest-forked
     #   tox
-py2neo==2021.2.3
+py2neo==2021.2.4
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt

From 975f8f90eb3e92d243d0c32cf02d117e9bd93e21 Mon Sep 17 00:00:00 2001
From: Squirrel18 <daniel.quiroga@edunext.co>
Date: Mon, 29 Jul 2024 12:38:48 -0500
Subject: [PATCH 67/77] feat: improve the way we handle the IES IDP id values.

---
 common/djangoapps/third_party_auth/pipeline.py |  8 +-------
 lms/envs/common.py                             | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/common/djangoapps/third_party_auth/pipeline.py b/common/djangoapps/third_party_auth/pipeline.py
index 828959c428f7..1e7075a106a6 100644
--- a/common/djangoapps/third_party_auth/pipeline.py
+++ b/common/djangoapps/third_party_auth/pipeline.py
@@ -964,13 +964,7 @@ def user_details_force_sync(auth_entry, strategy, details, user=None, *args, **k
                 setattr(model, field, provider_value)
 
         # Generate fullname only for IES IDP.
-        # We deliberately left these values hard-coded instead of using Django settings because
-        # it would force us to add custom settings to the edx platform code,
-        # which we try to avoid as we might lose track of that kind of setting.
-        ies_entity_ids = [
-            'https://iam-stage.pearson.com:443/auth/saml-idp-uid',
-            'https://iam.pearson.com:443/auth/saml-idp-uid',
-        ]
+        ies_entity_ids = getattr(settings, 'SAML_IES_ENTITIES_IDS', [])
         first_name = details.get('first_name')
         last_name = details.get('last_name')
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 2ba82866b64e..d961c05b6f1b 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -5312,3 +5312,17 @@ def _should_send_learning_badge_events(settings):
     "learning-badges-lifecycle",
     "enabled",
 )
+
+# IES SAML integration.
+# .. setting_name: SAML_IES_ENTITIES_IDS
+# .. setting_default: []
+# .. setting_example_value: ['https://my-idp-integration-uri-id']
+# .. setting_description: This configuration allows us to define the IDs of the IES entities, to perform certain actions to the SAML IES request only.
+#    adding a new step to SOCIAL_AUTH_PIPELINE (edx-platform/common/djangoapps/third_party_auth/settings.py)
+#    is not a feasible option, since we can't override the SOCIAL_AUTH_PIPELINE from the Django or other plugin configuration,
+#    so we decided to handle it this way and add the necessary logic, directly in the edx-platform code
+#    edx-platform/common/djangoapps/third_party_auth/pipeline.py
+#    We will define the requried values using our Tutor plugin.
+#    Entity ID docs:
+#    https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/latest/configuration/tpa/tpa_integrate_open/tpa_SAML_IdP.html#add-and-enable-a-saml-identity-provider
+SAML_IES_ENTITIES_IDS = []

From 66471bbdd2fce8f35e845d6f0ef7a5be624d3e7f Mon Sep 17 00:00:00 2001
From: Esteban Giraldo <bryan.9511@hotmail.com>
Date: Tue, 10 Sep 2024 12:32:37 -0500
Subject: [PATCH 68/77] feat: registration extension form site awareness

---
 .../user_authn/views/registration_form.py           | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/openedx/core/djangoapps/user_authn/views/registration_form.py b/openedx/core/djangoapps/user_authn/views/registration_form.py
index 8eb005cbc04b..bec90a5f3392 100644
--- a/openedx/core/djangoapps/user_authn/views/registration_form.py
+++ b/openedx/core/djangoapps/user_authn/views/registration_form.py
@@ -298,13 +298,18 @@ def cleaned_extended_profile(self):
 
 def get_registration_extension_form(*args, **kwargs):
     """
-    Convenience function for getting the custom form set in settings.REGISTRATION_EXTENSION_FORM.
+    Convenience function for getting the custom form set in site configurations or plataform settings
+    REGISTRATION_EXTENSION_FORM.
 
-    An example form app for this can be found at http://github.com/open-craft/custom-form-app
+    Documentation on how to enable this feature can be found on
+    https://github.com/Pearson-Advance/pearson-core/blob/master/docs/pearson_core_features.md#amazon-custom-registration-form
     """
-    if not getattr(settings, 'REGISTRATION_EXTENSION_FORM', None):
+    # No Default valued is passed since we prioritize site configurations over site settings.
+    registration_extra_form = configuration_helpers.get_value('REGISTRATION_EXTENSION_FORM',
+                                                              settings.REGISTRATION_EXTENSION_FORM)
+    if not registration_extra_form:
         return None
-    module, klass = settings.REGISTRATION_EXTENSION_FORM.rsplit('.', 1)
+    module, klass = registration_extra_form.rsplit('.', 1)
     module = import_module(module)
     return getattr(module, klass)(*args, **kwargs)
 

From 44d1c5282d97e92b15bd204eea6cb3bac754a020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Montilla?= <cesar.montilla@edunext.co>
Date: Tue, 1 Oct 2024 08:36:50 +0000
Subject: [PATCH 69/77] fix: courseware-chromeless.html iframe height

---
 lms/templates/courseware/courseware-chromeless.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
index 071295d6e32d..6b4c43c8cb6d 100644
--- a/lms/templates/courseware/courseware-chromeless.html
+++ b/lms/templates/courseware/courseware-chromeless.html
@@ -121,14 +121,15 @@
     // document loads, window resizes, or DOM mutates.
     if (window !== window.parent) {
       document.body.className += ' view-in-mfe';
-      var lastHeight = window.offsetHeight;
+      const extraHeight = 250;  // Set extra height value.
+      var lastHeight = window.offsetHeight + extraHeight; // Add extra height to avoid clipping.
       var lastWidth = window.offsetWidth;
       var contentElement = document.getElementById('content');
 
       function dispatchResizeMessage(event) {
         // Note: event is actually an Array of MutationRecord objects when fired from the MutationObserver
         var isLoadEvent = event.type === 'load';
-        var newHeight = contentElement.offsetHeight;
+        var newHeight = contentElement.offsetHeight + extraHeight;  // Add extra height to avoid clipping.
         var newWidth = contentElement.offsetWidth;
         if (!isLoadEvent && newWidth === lastWidth && newHeight === lastHeight) {
             // Monitor when any anchor tag is clicked, it is checked to make sure

From ba49378184f8e43927db08bbb9b9e54e86f5b892 Mon Sep 17 00:00:00 2001
From: juan <juan.buitrago@edunext.co>
Date: Fri, 4 Oct 2024 15:16:04 +0200
Subject: [PATCH 70/77] feat: adds a new custom content jsonfield to ccx model

---
 lms/djangoapps/ccx/api/v0/serializers.py      |  2 ++
 lms/djangoapps/ccx/api/v0/views.py            | 26 ++++++++++++++++++-
 ...ustomcourseforedx_other_course_settings.py | 18 +++++++++++++
 lms/djangoapps/ccx/models.py                  |  2 ++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 lms/djangoapps/ccx/migrations/0007_customcourseforedx_other_course_settings.py

diff --git a/lms/djangoapps/ccx/api/v0/serializers.py b/lms/djangoapps/ccx/api/v0/serializers.py
index c94a458f49a1..8d631772d759 100644
--- a/lms/djangoapps/ccx/api/v0/serializers.py
+++ b/lms/djangoapps/ccx/api/v0/serializers.py
@@ -19,6 +19,7 @@ class CCXCourseSerializer(serializers.ModelSerializer):
     due = serializers.CharField(allow_blank=True)
     max_students_allowed = serializers.IntegerField(source='max_student_enrollments_allowed')
     course_modules = serializers.SerializerMethodField()
+    other_course_settings = serializers.JSONField(required=False, allow_null=True)
 
     class Meta:
         model = CustomCourseForEdX
@@ -31,6 +32,7 @@ class Meta:
             "due",
             "max_students_allowed",
             "course_modules",
+            "other_course_settings",
         )
         read_only_fields = (
             "ccx_course_id",
diff --git a/lms/djangoapps/ccx/api/v0/views.py b/lms/djangoapps/ccx/api/v0/views.py
index b3e345a77022..4ee0b1d34c44 100644
--- a/lms/djangoapps/ccx/api/v0/views.py
+++ b/lms/djangoapps/ccx/api/v0/views.py
@@ -152,6 +152,10 @@ def get_valid_input(request_data, ignore_missing=False):
     elif 'max_students_allowed' in request_data:
         field_errors['max_students_allowed'] = {'error_code': 'null_field_max_students_allowed'}
 
+    other_course_settings = request_data.get('other_course_settings')
+    if other_course_settings and isinstance(other_course_settings, dict):
+        valid_input['other_course_settings'] = other_course_settings
+
     course_modules = request_data.get('course_modules')
     if course_modules is not None:
         if isinstance(course_modules, list):
@@ -221,6 +225,7 @@ class CCXListView(GenericAPIView):
                 "display_name": "CCX example title",
                 "coach_email": "john@example.com",
                 "max_students_allowed": 123,
+                "other_course_settings": {"custom_field": "CCX custom content example"},
                 "course_modules" : [
                     "block-v1:Organization+EX101+RUN-FALL2099+type@chapter+block@week1",
                     "block-v1:Organization+EX101+RUN-FALL2099+type@chapter+block@week4",
@@ -255,6 +260,8 @@ class CCXListView(GenericAPIView):
             * max_students_allowed: An integer representing he maximum number of students that
               can be enrolled in the CCX Course.
 
+            * other_course_settings: Optional. A dictionary representation of the custom content.
+
             * course_modules: Optional. A list of course modules id keys.
 
         **GET Response Values**
@@ -279,6 +286,8 @@ class CCXListView(GenericAPIView):
                 * max_students_allowed: An integer representing he maximum number of students that
                   can be enrolled in the CCX Course.
 
+                * other_course_settings: A dictionary with the custom content for the CCX Course.
+
                 * course_modules: A list of course modules id keys.
 
             * count: An integer representing the total number of records that matched the request parameters.
@@ -303,6 +312,7 @@ class CCXListView(GenericAPIView):
                         "start": "2019-01-01",
                         "due": "2019-06-01",
                         "max_students_allowed": 123,
+                        "other_course_settings": {"custom_field": "CCX custom content example"},
                         "course_modules" : [
                             "block-v1:Organization+EX101+RUN-FALL2099+type@chapter+block@week1",
                             "block-v1:Organization+EX101+RUN-FALL2099+type@chapter+block@week4",
@@ -333,6 +343,8 @@ class CCXListView(GenericAPIView):
             * max_students_allowed: An integer representing he maximum number of students that
               can be enrolled in the CCX Course.
 
+            * other_course_settings: A dictionary with the custom content for the CCX Course.
+
             * course_modules: A list of course modules id keys.
 
         **Example POST Response**
@@ -344,6 +356,7 @@ class CCXListView(GenericAPIView):
                 "start": "2019-01-01",
                 "due": "2019-06-01",
                 "max_students_allowed": 123,
+                "other_course_settings": {"custom_field": "CCX custom content example"},
                 "course_modules" : [
                     "block-v1:Organization+EX101+RUN-FALL2099+type@chapter+block@week1",
                     "block-v1:Organization+EX101+RUN-FALL2099+type@chapter+block@week4",
@@ -455,12 +468,16 @@ def post(self, request):
         # prepare the course_modules to be stored in a json stringified field
         course_modules_json = json.dumps(valid_input.get('course_modules'))
 
+        # Include the json array to add/storage custom content, if it exist.
+        custom_content_json = valid_input.get('other_course_settings')
+
         with transaction.atomic():
             ccx_course_object = CustomCourseForEdX(
                 course_id=master_course_object.id,
                 coach=coach,
                 display_name=valid_input['display_name'],
-                structure_json=course_modules_json
+                structure_json=course_modules_json,
+                other_course_settings=custom_content_json,
             )
             ccx_course_object.save()
 
@@ -552,6 +569,7 @@ class CCXDetailView(GenericAPIView):
                 "display_name": "CCX example title modified",
                 "coach_email": "joe@example.com",
                 "max_students_allowed": 111,
+                "other_course_settings": {"custom_field": "CCX custom content example"},
                 "course_modules" : [
                     "block-v1:Organization+EX101+RUN-FALL2099+type@chapter+block@week1",
                     "block-v1:Organization+EX101+RUN-FALL2099+type@chapter+block@week4",
@@ -580,6 +598,8 @@ class CCXDetailView(GenericAPIView):
             * max_students_allowed: Optional. An integer representing he maximum number of students that
               can be enrolled in the CCX Course.
 
+            * other_course_settings: Optional. A dictionary representation of the custom content.
+
             * course_modules: Optional. A list of course modules id keys.
 
         **GET Response Values**
@@ -602,6 +622,8 @@ class CCXDetailView(GenericAPIView):
             * max_students_allowed: An integer representing he maximum number of students that
               can be enrolled in the CCX Course.
 
+            * other_course_settings: A dictionary with the custom content for the CCX Course.
+
             * course_modules: A list of course modules id keys.
 
         **PATCH and DELETE Response Values**
@@ -733,6 +755,8 @@ def patch(self, request, ccx_course_id=None):
                 if ccx_course_object.coach.id != coach.id:
                     old_coach = ccx_course_object.coach
                     ccx_course_object.coach = coach
+            if 'other_course_settings' in valid_input:
+                ccx_course_object.other_course_settings = valid_input.get('other_course_settings')
             if 'course_modules' in valid_input:
                 if valid_input.get('course_modules'):
                     if not valid_course_modules(valid_input['course_modules'], master_course_key):
diff --git a/lms/djangoapps/ccx/migrations/0007_customcourseforedx_other_course_settings.py b/lms/djangoapps/ccx/migrations/0007_customcourseforedx_other_course_settings.py
new file mode 100644
index 000000000000..d10368b45b21
--- /dev/null
+++ b/lms/djangoapps/ccx/migrations/0007_customcourseforedx_other_course_settings.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.17 on 2024-10-08 11:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ccx', '0006_set_display_name_as_override'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customcourseforedx',
+            name='other_course_settings',
+            field=models.JSONField(blank=True, default={}, null=True, verbose_name='Custom Json Content'),
+        ),
+    ]
diff --git a/lms/djangoapps/ccx/models.py b/lms/djangoapps/ccx/models.py
index 46400b53579e..907019a8c721 100644
--- a/lms/djangoapps/ccx/models.py
+++ b/lms/djangoapps/ccx/models.py
@@ -32,6 +32,8 @@ class CustomCourseForEdX(models.Model):
     # if not empty, this field contains a json serialized list of
     # the master course modules
     structure_json = models.TextField(verbose_name='Structure JSON', blank=True, null=True)
+    # Custom Json field to add any additional information to the CCX model.
+    other_course_settings = models.JSONField(default=dict(), blank=True, null=True, verbose_name='Custom Json Content')
 
     class Meta:
         app_label = 'ccx'

From 2d350f5c0151e8a357fb9b605342e5ceff6ab0ff Mon Sep 17 00:00:00 2001
From: Serafin-dev <nicolas.mateoli@edunext.co>
Date: Wed, 9 Oct 2024 15:30:39 -0300
Subject: [PATCH 71/77] feat: adding summarize plugin for annotatorjs

---
 .../js/edxnotes/plugins/llm_summarize.js      | 84 +++++++++++++++++++
 lms/static/js/edxnotes/views/notes_factory.js |  5 +-
 2 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 lms/static/js/edxnotes/plugins/llm_summarize.js

diff --git a/lms/static/js/edxnotes/plugins/llm_summarize.js b/lms/static/js/edxnotes/plugins/llm_summarize.js
new file mode 100644
index 000000000000..6f812511118b
--- /dev/null
+++ b/lms/static/js/edxnotes/plugins/llm_summarize.js
@@ -0,0 +1,84 @@
+(function(define, undefined) {
+    'use strict';
+    define(['jquery', 'annotator_1.2.9'], function($, Annotator) {
+    /**
+     * LlmSummarize plugin adds a button to the annotatorjs adder in order to
+     * summarize the text selected and save as annotation.
+     **/
+        Annotator.Plugin.LlmSummarize = function() {
+            Annotator.Plugin.apply(this, arguments);
+        };
+
+        $.extend(Annotator.Plugin.LlmSummarize.prototype, new Annotator.Plugin(), {
+            pluginInit: function() {
+                // Overrides of annotatorjs HTML/CSS to add summarize button.
+                var style = document.createElement('style');
+                style.innerHTML = `
+                    .annotator-adder::before {
+                        content: '';
+                        width: 10px;
+                        height: 10px;
+                        background-color: white;
+                        display: block;
+                        position: absolute;
+                        top: 100%;
+                        left: 5px;
+                        border-bottom: 1px solid gray;
+                        border-right: 1px solid gray;
+                        z-index: 0;
+                        transform: translateY(-50%) rotate(45deg);
+                    }
+
+                    .annotator-adder button::before,
+                    .annotator-adder button::after {
+                        display: none !important;
+                    }
+
+                    .annotator-adder #annotateButton,
+                    .annotator-adder #summarizeButton {
+                        border: none !important;
+                        background: rgb(0, 48, 87) !important;
+                        box-shadow: none !important;
+                        width: initial;
+                        transition: color .1s;
+                        text-indent: initial;
+                        font-size: 20px;
+                        padding: 0;
+                        height: fit-content;
+                        color: white;
+                        border-radius: 5px;
+                        padding-left: 5px;
+                        padding-right: 5px;
+                        font-weight: normal;
+                        display: inline-block;
+                    }
+
+                    .annotator-adder #summarizeButton {
+                        margin-left: 3px;
+                    }
+
+                    .annotator-adder button i.fa {
+                        font-style: normal;
+                    }
+
+                    .annotator-adder {
+                        width: fit-content;
+                        height: fit-content;
+                        padding: 5px;
+                        background-color: white;
+                        border: 1px solid gray;
+                    }
+                `;
+                document.head.appendChild(style);
+                var annotator = this.annotator;
+                annotator.adder[0].children[0].id = 'annotateButton';
+                annotator.adder[0].children[0].innerHTML = '<i class="fa fa-pencil" aria-hidden="true"></i>';
+                annotator.adder[0].innerHTML += `
+                <button class="summarize-button" id="summarizeButton" title="${gettext('Summarize text using AI.')}">
+                    <i class="fa fa-star" aria-hidden="true"></i>
+                </button>
+                `;
+            },
+        });
+    });
+}).call(this, define || RequireJS.define);
diff --git a/lms/static/js/edxnotes/views/notes_factory.js b/lms/static/js/edxnotes/views/notes_factory.js
index 5c98bc7683b7..8d8b5b1dcfec 100644
--- a/lms/static/js/edxnotes/views/notes_factory.js
+++ b/lms/static/js/edxnotes/views/notes_factory.js
@@ -7,9 +7,10 @@
         'js/edxnotes/plugins/events', 'js/edxnotes/plugins/accessibility',
         'js/edxnotes/plugins/caret_navigation',
         'js/edxnotes/plugins/store_error_handler',
-        'js/edxnotes/plugins/search_override'
+        'js/edxnotes/plugins/search_override',
+        'js/edxnotes/plugins/llm_summarize',
     ], function($, _, Annotator, NotesLogger, NotesCollector) {
-        var plugins = ['Auth', 'Store', 'Scroller', 'Events', 'Accessibility', 'CaretNavigation', 'Tags'],
+        var plugins = ['Auth', 'Store', 'Scroller', 'Events', 'Accessibility', 'CaretNavigation', 'Tags', 'LlmSummarize'],
             getOptions, setupPlugins, getAnnotator;
 
     /**

From c5443942f55f7a49d2dba45f6108c6a5dd045ba9 Mon Sep 17 00:00:00 2001
From: Serafin-dev <nicolas.mateoli@edunext.co>
Date: Thu, 10 Oct 2024 08:50:52 -0300
Subject: [PATCH 72/77] feat: adding backend connection to summarize
 annotatorjs plugin

---
 .../js/edxnotes/plugins/llm_summarize.js      | 99 ++++++++++++++++++-
 1 file changed, 97 insertions(+), 2 deletions(-)

diff --git a/lms/static/js/edxnotes/plugins/llm_summarize.js b/lms/static/js/edxnotes/plugins/llm_summarize.js
index 6f812511118b..fff196fa4840 100644
--- a/lms/static/js/edxnotes/plugins/llm_summarize.js
+++ b/lms/static/js/edxnotes/plugins/llm_summarize.js
@@ -12,7 +12,7 @@
         $.extend(Annotator.Plugin.LlmSummarize.prototype, new Annotator.Plugin(), {
             pluginInit: function() {
                 // Overrides of annotatorjs HTML/CSS to add summarize button.
-                var style = document.createElement('style');
+                const style = document.createElement('style');
                 style.innerHTML = `
                     .annotator-adder::before {
                         content: '';
@@ -68,9 +68,84 @@
                         background-color: white;
                         border: 1px solid gray;
                     }
+
+                    // Defining content loader since fontawesome icons don't work
+                    // inside the annotatorjs modal.
+                    .loader {
+                        width: 5em !important;
+                        border-color: red !important;
+                    }
+
+                    @keyframes rotation {
+                    0% {
+                        transform: rotate(0deg);
+                    }
+                    100% {
+                        transform: rotate(360deg);
+                    }
                 `;
+                let annotator = this.annotator;
                 document.head.appendChild(style);
-                var annotator = this.annotator;
+                this.modifyDom(this.annotator);
+
+                const summarizeButton = document.getElementById('summarizeButton');
+
+                summarizeButton.addEventListener('click', function(ev) {
+                    annotator.editor.element[0].setAttribute('is_summarizing', true);
+                });
+                annotator.subscribe('annotationEditorShown', this.handleSummarize);
+                annotator.subscribe('annotationEditorHidden', this.cleanupSummarize);
+            },
+            handleSummarize: function (editor, annotation) {
+                if (editor.element[0].getAttribute('is_summarizing') !== 'true') return;
+
+                function toggleLoader() {
+                    const saveButton = document.querySelector('.annotator-controls .annotator-save');
+                    const loaderWrapper = document.querySelector('.summarize-loader-wrapper');
+                    editor.fields[0].element.children[0].classList.toggle('d-none');
+                    loaderWrapper.classList.toggle('d-none');
+                    saveButton.disabled = !saveButton.disabled;
+                }
+                const textAreaWrapper = editor.fields[0].element;
+                const request = new Request('/pearson-core/llm-assistance/api/v0/summarize-text', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'X-CSRFToken': $.cookie('csrftoken'),
+                    },
+                    body: JSON.stringify({
+                        text_to_summarize: annotation.quote,
+                    }),
+                });
+
+                editor.fields[1].element.children[0].value = 'ai_summary';
+                toggleLoader(editor);
+                fetch(request)
+                    .then((response) => {
+                        toggleLoader();
+                        if (response.ok) return response.json();
+                        throw new Error(gettext('There was an error while summarizing the content.'));
+                    })
+                    .then((data) => {
+                        textAreaWrapper.children[0].value = data.summary;
+                    })
+                    .catch((error) => {
+                        alert(error.message);
+                        editor.hide();
+                    });
+            },
+            cleanupSummarize: function(editor) {
+                const textAreaWrapper = editor.fields[0].element;
+                const loaderWrapper = document.querySelector('.summarize-loader-wrapper');
+
+                textAreaWrapper.children[0].value = '';
+                textAreaWrapper.children[1].value = '';
+                editor.element[0].setAttribute('is_summarizing', 'false');
+                loaderWrapper.classList.add('d-none');
+            },
+            modifyDom: function(annotator) {
+                const textAreaWrapper = annotator.editor.fields[0].element;
+
                 annotator.adder[0].children[0].id = 'annotateButton';
                 annotator.adder[0].children[0].innerHTML = '<i class="fa fa-pencil" aria-hidden="true"></i>';
                 annotator.adder[0].innerHTML += `
@@ -78,6 +153,26 @@
                     <i class="fa fa-star" aria-hidden="true"></i>
                 </button>
                 `;
+                // Style is being defined here since classes styling not working
+                // for this element.
+                textAreaWrapper.innerHTML += `
+                <div class="summarize-loader-wrapper d-none">
+                    <span class="loader" style="
+                        width: 1.2em;
+                        height: 1.2em;
+                        border: 3px solid rgb(0, 48, 87);
+                        border-bottom-color: white;
+                        border-radius: 50%;
+                        display: inline-block;
+                        box-sizing: border-box;
+                        animation: rotation 3s linear infinite;
+                        margin-right: 5px;
+                        transform-origin: center;">
+                    </span>
+                    <span style="font-size: 1.2em; color: rgb(0, 48, 87);">
+                        ${gettext('Summarizing...')}
+                    </span>
+                </div>`;
             },
         });
     });

From ba1191fb06a439340a52d9d71b909b3435cc531e Mon Sep 17 00:00:00 2001
From: Serafin-dev <nicolas.mateoli@edunext.co>
Date: Wed, 9 Oct 2024 15:48:02 -0300
Subject: [PATCH 73/77] feat: add feature flag for LLM summarize

---
 lms/djangoapps/edxnotes/decorators.py           | 7 +++++++
 lms/static/js/edxnotes/plugins/llm_summarize.js | 9 +++++----
 lms/static/js/edxnotes/views/notes_factory.js   | 9 ++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/edxnotes/decorators.py b/lms/djangoapps/edxnotes/decorators.py
index c522ba36bed4..7e058c3a2368 100644
--- a/lms/djangoapps/edxnotes/decorators.py
+++ b/lms/djangoapps/edxnotes/decorators.py
@@ -7,6 +7,7 @@
 
 from django.conf import settings
 from xblock.exceptions import NoSuchServiceError
+from openedx.core.djangoapps.plugins.plugins_hooks import run_extension_point
 
 from common.djangoapps.edxmako.shortcuts import render_to_string
 from common.djangoapps.student.auth import is_ccx_course
@@ -50,6 +51,8 @@ def get_html(self, *args, **kwargs):
         except NoSuchServiceError:
             user = None
 
+        is_llm_summarize_enabled = run_extension_point('PEARSON_CORE_ENABLE_LLM_SUMMARIZE', course_id=str(course.id))
+
         if is_studio or not is_feature_enabled(course, user):
             return original_get_html(self, *args, **kwargs)
         else:
@@ -69,6 +72,10 @@ def get_html(self, *args, **kwargs):
                     "endpoint": get_public_endpoint(),
                     "debug": settings.DEBUG,
                     "eventStringLimit": settings.TRACK_MAX_EVENT / 6,
+                    "llmSummarize": {
+                        "isEnabled": is_llm_summarize_enabled,
+                        "courseId": str(course.id),
+                    },
                 },
             })
 
diff --git a/lms/static/js/edxnotes/plugins/llm_summarize.js b/lms/static/js/edxnotes/plugins/llm_summarize.js
index fff196fa4840..2ee1e636746c 100644
--- a/lms/static/js/edxnotes/plugins/llm_summarize.js
+++ b/lms/static/js/edxnotes/plugins/llm_summarize.js
@@ -87,17 +87,17 @@
                 let annotator = this.annotator;
                 document.head.appendChild(style);
                 this.modifyDom(this.annotator);
-
+                annotator.editor.options.llmSummarize = annotator.options.llmSummarize
                 const summarizeButton = document.getElementById('summarizeButton');
 
                 summarizeButton.addEventListener('click', function(ev) {
-                    annotator.editor.element[0].setAttribute('is_summarizing', true);
+                    annotator.editor.options.isSummarizing = true;
                 });
                 annotator.subscribe('annotationEditorShown', this.handleSummarize);
                 annotator.subscribe('annotationEditorHidden', this.cleanupSummarize);
             },
             handleSummarize: function (editor, annotation) {
-                if (editor.element[0].getAttribute('is_summarizing') !== 'true') return;
+                if (!editor.options || !editor.options.isSummarizing) return;
 
                 function toggleLoader() {
                     const saveButton = document.querySelector('.annotator-controls .annotator-save');
@@ -115,6 +115,7 @@
                     },
                     body: JSON.stringify({
                         text_to_summarize: annotation.quote,
+                        course_id: editor.options && editor.options.llmSummarize && editor.options.llmSummarize.courseId,
                     }),
                 });
 
@@ -140,7 +141,7 @@
 
                 textAreaWrapper.children[0].value = '';
                 textAreaWrapper.children[1].value = '';
-                editor.element[0].setAttribute('is_summarizing', 'false');
+                editor.options.isSummarizing = false;
                 loaderWrapper.classList.add('d-none');
             },
             modifyDom: function(annotator) {
diff --git a/lms/static/js/edxnotes/views/notes_factory.js b/lms/static/js/edxnotes/views/notes_factory.js
index 8d8b5b1dcfec..d3d70bfd1a1b 100644
--- a/lms/static/js/edxnotes/views/notes_factory.js
+++ b/lms/static/js/edxnotes/views/notes_factory.js
@@ -51,7 +51,11 @@
                         destroy: '/annotations/:id/',
                         search: '/search/'
                     }
-                }
+                },
+                llmSummarize: {
+                    isEnabled: params && params.llmSummarize && params.llmSummarize.isEnabled,
+                    courseId: params && params.llmSummarize && params.llmSummarize.courseId,
+                },
             };
         };
 
@@ -85,6 +89,9 @@
                 logger = NotesLogger.getLogger(element.id, params.debug),
                 annotator;
 
+            if (options && options.llmSummarize && options.llmSummarize.isEnabled) {
+                plugins.push('LlmSummarize');
+            }
             annotator = $el.annotator(options).data('annotator');
             setupPlugins(annotator, plugins, options);
             NotesCollector.storeNotesRequestData(

From 31f648df35c7b9e212aaed6622c9f0f71e025b26 Mon Sep 17 00:00:00 2001
From: Serafin-dev <nicolas.mateoli@edunext.co>
Date: Fri, 25 Oct 2024 10:48:35 -0300
Subject: [PATCH 74/77] style: expand annotation textarea and apply
 responsiveness for different devices.

---
 .../js/edxnotes/plugins/llm_summarize.js      | 69 +++++++++++++++----
 1 file changed, 56 insertions(+), 13 deletions(-)

diff --git a/lms/static/js/edxnotes/plugins/llm_summarize.js b/lms/static/js/edxnotes/plugins/llm_summarize.js
index 2ee1e636746c..cac7ca13d5e2 100644
--- a/lms/static/js/edxnotes/plugins/llm_summarize.js
+++ b/lms/static/js/edxnotes/plugins/llm_summarize.js
@@ -14,6 +14,20 @@
                 // Overrides of annotatorjs HTML/CSS to add summarize button.
                 const style = document.createElement('style');
                 style.innerHTML = `
+                    form.annotator-widget {
+                        width: fit-content;
+                    }
+
+                    .annotator-invert-x .annotator-widget {
+                        left: -18px;
+                    }
+
+                    @media (max-width: 768px) {
+                        .annotator-widget textarea{
+                            max-height: 380px;
+                        }
+                    }
+
                     .annotator-adder::before {
                         content: '';
                         width: 10px;
@@ -106,6 +120,8 @@
                     loaderWrapper.classList.toggle('d-none');
                     saveButton.disabled = !saveButton.disabled;
                 }
+
+                const container = document.querySelector('.edx-notes-wrapper-content')
                 const textAreaWrapper = editor.fields[0].element;
                 const request = new Request('/pearson-core/llm-assistance/api/v0/summarize-text', {
                     method: 'POST',
@@ -122,27 +138,54 @@
                 editor.fields[1].element.children[0].value = 'ai_summary';
                 toggleLoader(editor);
                 fetch(request)
-                    .then((response) => {
-                        toggleLoader();
-                        if (response.ok) return response.json();
-                        throw new Error(gettext('There was an error while summarizing the content.'));
-                    })
-                    .then((data) => {
-                        textAreaWrapper.children[0].value = data.summary;
-                    })
-                    .catch((error) => {
-                        alert(error.message);
-                        editor.hide();
-                    });
+                .then((response) => {
+                    toggleLoader();
+                    if (response.ok) return response.json();
+                    throw new Error(gettext('There was an error while summarizing the content.'));
+                })
+                .then((data) => {
+                    const annotatorEditor = editor.element[0];
+                    const annotatorForm = annotatorEditor.children[0];
+                    const controlsHeight = annotatorForm.children[1].offsetHeight;
+                    const editorTop = parseInt(annotatorEditor.style.getPropertyValue('top'));
+                    const tagFieldHeight = editor.fields[1].element.offsetHeight;
+                    const textArea = textAreaWrapper.children[0];
+
+                    annotatorEditor.style.left = '0px'
+                    textArea.setAttribute('style', `
+                        background-color: #f7f7f7 !important;
+                        border-radius: 5px;
+                        font-size: 12px !important;
+                        width: ${container.offsetWidth}px !important;
+                        height: auto;
+                        overflow-y: auto;
+                    `);
+                    textArea.value = data.summary;
+                    textArea.style.height = `${textArea.scrollHeight}px`;
+                    textAreaWrapper.querySelector(".annotator-resize").remove();
+
+                    if (annotatorForm.offsetHeight > editorTop){
+                        textArea.style.maxHeight = `${editorTop - controlsHeight - tagFieldHeight}px`;
+                    }
+
+                    annotatorForm.setAttribute('tabindex', '-1');
+                    annotatorForm.scrollIntoView({behavior: 'smooth', block: 'start'});
+                })
+                .catch((error) => {
+                    alert(error.message);
+                    editor.hide();
+                });
             },
             cleanupSummarize: function(editor) {
                 const textAreaWrapper = editor.fields[0].element;
+                const textArea = textAreaWrapper.children[0]
                 const loaderWrapper = document.querySelector('.summarize-loader-wrapper');
 
-                textAreaWrapper.children[0].value = '';
+                textArea.value = '';
                 textAreaWrapper.children[1].value = '';
                 editor.options.isSummarizing = false;
                 loaderWrapper.classList.add('d-none');
+                textArea.removeAttribute('style');
             },
             modifyDom: function(annotator) {
                 const textAreaWrapper = annotator.editor.fields[0].element;

From 4be01489068a255cf3df6c29bd5945ab29238579 Mon Sep 17 00:00:00 2001
From: Serafin-dev <nicolas.mateoli@edunext.co>
Date: Tue, 5 Nov 2024 12:32:15 -0300
Subject: [PATCH 75/77] fix: revert modal resize removal

---
 lms/static/js/edxnotes/plugins/llm_summarize.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lms/static/js/edxnotes/plugins/llm_summarize.js b/lms/static/js/edxnotes/plugins/llm_summarize.js
index cac7ca13d5e2..162833b4a063 100644
--- a/lms/static/js/edxnotes/plugins/llm_summarize.js
+++ b/lms/static/js/edxnotes/plugins/llm_summarize.js
@@ -162,7 +162,6 @@
                     `);
                     textArea.value = data.summary;
                     textArea.style.height = `${textArea.scrollHeight}px`;
-                    textAreaWrapper.querySelector(".annotator-resize").remove();
 
                     if (annotatorForm.offsetHeight > editorTop){
                         textArea.style.maxHeight = `${editorTop - controlsHeight - tagFieldHeight}px`;

From 83489281679d1c4dbbeef87e9ab355aea8f2db14 Mon Sep 17 00:00:00 2001
From: alexjmpb <alexander.mendoza@edunext.co>
Date: Thu, 14 Nov 2024 13:11:53 -0500
Subject: [PATCH 76/77] fix: removing llm_summarize from default annotatorjs
 plugins

---
 lms/static/js/edxnotes/views/notes_factory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/static/js/edxnotes/views/notes_factory.js b/lms/static/js/edxnotes/views/notes_factory.js
index d3d70bfd1a1b..b3d159fdd348 100644
--- a/lms/static/js/edxnotes/views/notes_factory.js
+++ b/lms/static/js/edxnotes/views/notes_factory.js
@@ -10,7 +10,7 @@
         'js/edxnotes/plugins/search_override',
         'js/edxnotes/plugins/llm_summarize',
     ], function($, _, Annotator, NotesLogger, NotesCollector) {
-        var plugins = ['Auth', 'Store', 'Scroller', 'Events', 'Accessibility', 'CaretNavigation', 'Tags', 'LlmSummarize'],
+        var plugins = ['Auth', 'Store', 'Scroller', 'Events', 'Accessibility', 'CaretNavigation', 'Tags'],
             getOptions, setupPlugins, getAnnotator;
 
     /**

From 5697c6c3b40b47d4790debe8050326d679bb9025 Mon Sep 17 00:00:00 2001
From: Esteban Giraldo <bryan.9511@hotmail.com>
Date: Mon, 9 Dec 2024 15:53:22 -0500
Subject: [PATCH 77/77] chore: update edx-sga version

---
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 6e9fc5c4d3fc..b12cb9647967 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -525,7 +525,7 @@ edx-rest-api-client==5.5.0
     #   edx-proctoring
 edx-search==3.4.0
     # via -r requirements/edx/base.in
-git+https://github.com/Pearson-Advance/edx-sga.git@v0.20.0.post1#egg=edx-sga==0.20.0.post1
+git+https://github.com/Pearson-Advance/edx-sga.git@v0.20.0.post2#egg=edx-sga==0.20.0.post2
     # via -r requirements/edx/base.in
 edx-submissions==3.5.4
     # via
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 074e49e6dcd0..668d2174198a 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -645,7 +645,7 @@ edx-rest-api-client==5.5.0
     #   edx-proctoring
 edx-search==3.4.0
     # via -r requirements/edx/testing.txt
-git+https://github.com/Pearson-Advance/edx-sga.git@v0.20.0.post1#egg=edx-sga==0.20.0.post1
+git+https://github.com/Pearson-Advance/edx-sga.git@v0.20.0.post2#egg=edx-sga==0.20.0.post2
     # via -r requirements/edx/testing.txt
 edx-sphinx-theme==3.0.0
     # via -r requirements/edx/development.in