Merge branch 'master' into ttqureshi/enable-html

ttqureshi · web-flow · commit d3eb55091d42 · 2025-12-03T11:41:28.000+05:00
diff --git a/cms/envs/help_tokens.ini b/cms/envs/help_tokens.ini
@@ -2,39 +2,39 @@
 # NOTE: If any of these page settings change, their corresponding test must be updated
 #       in edx-platform/common/test/acceptance/tests/studio/test_studio.help.py
 [pages]
-default = course_author:index.html
-home = course_author:getting_started/CA_get_started_Studio.html
-develop_course = course_author:developing_course/index.html
-outline = course_author:developing_course/course_outline.html
-unit = course_author:developing_course/course_units.html
-visibility = course_author:developing_course/controlling_content_visibility.html
-updates = course_author:course_assets/handouts_updates.html
-pages = course_author:course_assets/pages.html
-files = course_author:course_assets/course_files.html
-textbooks = course_author:course_assets/textbooks.html
-schedule = course_author:set_up_course/studio_add_course_information/index.html
-grading = course_author:grading/index.html
-team_course = course_author:set_up_course/studio_add_course_information/studio_course_staffing.html
-team_library = course_author:course_components/libraries.html#give-other-users-access-to-your-library
-advanced = course_author:index.html
-checklist = course_author:set_up_course/index.html
-import_library = course_author:course_components/libraries.html#import-a-library
-import_course = course_author:releasing_course/export_import_course.html#import-a-course
-export_library = course_author:course_components/libraries.html#export-a-library
-export_course = course_author:releasing_course/export_import_course.html#export-a-course
-welcome = course_author:getting_started/index.html
-login = course_author:getting_started/index.html
-register = course_author:getting_started/index.html
-content_libraries = course_author:course_components/libraries.html
-content_groups = course_author:course_features/cohorts/cohorted_courseware.html
-enrollment_tracks = course_author:course_features/diff_content/enroll_track_courseware.html
-group_configurations = course_author:course_features/content_experiments/content_experiments_configure.html#set-up-group-configurations-in-edx-studio
-container = course_author:developing_course/course_components.html#components-that-contain-other-components
-video = course_author:video/index.html
-certificates = course_author:set_up_course/studio_add_course_information/studio_creating_certificates.html
-content_highlights = course_author:developing_course/course_sections.html#set-course-section-highlights
-image_accessibility = course_author:accessibility/best_practices_course_content_dev.html#use-best-practices-for-describing-images
-social_sharing = course_author:developing_course/social_sharing.html
+default = course_author:quickstarts/build_a_course.html
+home = course_author:concepts/open_edx_platform/what_is_studio.html
+develop_course = course_author:how-tos/set_up_course/create_new_course.html
+outline = course_author:concepts/open_edx_platform/about_course_outline.html
+unit = course_author:concepts/open_edx_platform/about_course_units.html
+visibility = course_author:references/controlling_content_visibility.html
+updates = course_author:concepts/communication/about_course_updates_handouts.html
+pages = course_author:how-tos/course_development/manage_custom_page.html
+files = course_author:references/course_development/files_page.html
+textbooks = course_author:how-tos/course_development/manage_textbooks.html
+schedule = course_author:how-tos/set_up_course/set_course_schedule.html
+grading = course_author:how-tos/grading/set_grade_range.html
+team_course = course_author:references/course_development/course_team_roles.html
+team_library = course_author:how-tos/course_development/add_users_to_libraries.html
+advanced = course_author:quickstarts/build_a_course.html
+checklist = course_author:concepts/releasing-course/course_launch_checklist.html
+import_library = course_author:how-tos/course_development/export_import_library.html#import-a-legacy-library
+import_course = course_author:how-tos/releasing-course/import_course.html
+export_library = course_author:how-tos/course_development/export_import_library.html#export-a-legacy-library
+export_course = course_author:how-tos/releasing-course/export_course.html
+welcome = course_author:index.html
+login = course_author:index.html
+register = course_author:index.html
+content_libraries = course_author:concepts/instructional_design/libraries.html
+content_groups = course_author:concepts/advanced_features/about_content_groups.html
+enrollment_tracks = course_author:how-tos/student_management/manage_course_enrollments.html
+group_configurations = course_author:concepts/advanced_features/about_content_groups.html
+container = course_author:references/course_development/parent_child_components.html
+video = course_author:references/course_development/guide_to_video.html
+certificates = course_author:concepts/open_edx_platform/about_certificates.html
+content_highlights = course_author:how-tos/course_development/manage_course_highlight_emails.html
+image_accessibility = course_author:references/accessibility/accessibility_best_practices_checklist.html#use-best-practices-for-describing-images
+social_sharing = course_author:how-tos/course_development/social_sharing.html
 
 # below are the language directory names for the different locales
 [locales]
diff --git a/cms/envs/mock.yml b/cms/envs/mock.yml
@@ -481,8 +481,8 @@ GRADES_DOWNLOAD:
     querystring_expire: 300
   STORAGE_TYPE: ''
 HELP_TOKENS_BOOKS:
-  course_author: https://edx.readthedocs.io/projects/edx-partner-course-staff
-  learner: https://edx.readthedocs.io/projects/edx-guide-for-students
+  course_author: https://docs.openedx.org/en/latest/educators
+  learner: https://docs.openedx.org/en/latest/learners
 HOTJAR_ID: 7890
 ICP_LICENSE: icp_license
 ICP_LICENSE_INFO:
diff --git a/common/static/data/geoip/GeoLite2-Country.mmdb b/common/static/data/geoip/GeoLite2-Country.mmdb
diff --git a/lms/djangoapps/course_home_api/progress/serializers.py b/lms/djangoapps/course_home_api/progress/serializers.py
@@ -96,8 +96,27 @@ class GradingPolicySerializer(ReadOnlySerializer):
     """
     Serializer for grading policy
     """
+
+    # This implementation of the color coding feature is temporary and for testing purposes only.
+    # All CSS should be handled by design tokens, this is not implemented yet in Paragon.
+    # The backend should only work with labels, and the final design includes dynamic Label assignment per course
+    # (not CSS codes but color Labels), platform-level configuration, etc.
+    # See discussions in the associated PR for further details: https://github.com/openedx/edx-platform/pull/37438
+    ASSIGNMENT_COLORS = [
+        "#D24242",  # Crimson Red
+        "#7B9645",  # Olive Green
+        "#5A5AD8",  # Periwinkle Blue
+        "#B0842C",  # Amber Gold
+        "#2E90C2",  # Ocean Blue
+        "#D13F88",  # Magenta Pink
+        "#36A17D",  # Jade Green
+        "#AE5AD8",  # Lavender Purple
+        "#3BA03B",  # Forest Green
+    ]
+
     assignment_policies = serializers.SerializerMethodField()
     grade_range = serializers.DictField(source='GRADE_CUTOFFS')
+    assignment_colors = serializers.SerializerMethodField()
 
     def get_assignment_policies(self, grading_policy):
         return [{
@@ -108,6 +127,9 @@ def get_assignment_policies(self, grading_policy):
             'weight': assignment_policy['weight'],
         } for assignment_policy in grading_policy['GRADER']]
 
+    def get_assignment_colors(self, obj):
+        return self.ASSIGNMENT_COLORS
+
 
 class CertificateDataSerializer(ReadOnlySerializer):
     """
diff --git a/lms/djangoapps/discussion/rest_api/discussions_notifications.py b/lms/djangoapps/discussion/rest_api/discussions_notifications.py
@@ -122,6 +122,7 @@ def send_new_response_notification(self):
         if not self.parent_id and self.creator.id != int(self.thread.user_id):
             context = {
                 'email_content': clean_thread_html_body(self.comment.body),
+                'group_by_id': str(self.thread.id),
             }
             self._populate_context_with_ids_for_mobile(context, notification_type)
             self._send_notification([self.thread.user_id], notification_type, extra_context=context)
@@ -229,6 +230,7 @@ def send_response_on_followed_post_notification(self):
         if not self.parent_id:
             context = {
                 "email_content": clean_thread_html_body(self.comment.body),
+                "group_by_id": str(self.thread.id),
             }
             notification_type = "response_on_followed_post"
             self._populate_context_with_ids_for_mobile(context, notification_type)
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py b/lms/djangoapps/discussion/rest_api/tests/test_tasks_v2.py
@@ -148,6 +148,7 @@ def test_send_notification_to_thread_creator(self):
             'topic_id': None,
             'thread_id': 1,
             'comment_id': None,
+            'group_by_id': '1',
         }
         self.assertDictEqual(args.context, expected_context)
         self.assertEqual(
@@ -214,6 +215,8 @@ def test_send_notification_to_followers(self, parent_id, notification_type):
             'thread_id': 1,
             'comment_id': 4 if not notification_type == 'response_on_followed_post' else None,
         }
+        if notification_type == 'response_on_followed_post':
+            expected_context['group_by_id'] = '1'
         if parent_id:
             expected_context['author_name'] = 'dummy\'s'
             expected_context['author_pronoun'] = 'dummy\'s'
diff --git a/lms/envs/common.py b/lms/envs/common.py
@@ -2858,10 +2858,10 @@
         'url_stub': 'facebook.com/',
         'example': 'https://www.facebook.com/username'
     },
-    'twitter': {
-        'display_name': 'Twitter',
-        'url_stub': 'twitter.com/',
-        'example': 'https://www.twitter.com/username'
+    'x': {
+        'display_name': 'X',
+        'url_stub': 'x.com/',
+        'example': 'https://www.x.com/username'
     },
     'linkedin': {
         'display_name': 'LinkedIn',
diff --git a/lms/envs/help_tokens.ini b/lms/envs/help_tokens.ini
@@ -3,22 +3,22 @@
 #       in edx-platform/common/test/acceptance/tests/lms/test_lms_help.py
 [pages]
 default = learner:index.html
-instructor = course_author:CA_instructor_dash_help.html
+instructor = course_author:index.html
 course = learner:index.html
-profile = learner:SFD_dashboard_profile_SectionHead.html#adding-profile-information
-dashboard = learner:SFD_dashboard_profile_SectionHead.html
+profile = learner:concepts/open_edx_platform/what_is_profile_page.html
+dashboard = learner:concepts/open_edx_platform/what_is_course_dashboard.html
 courseinfo = learner:SFD_start_course.html
 progress = learner:SFD_check_progress.html
-learneraccountsettings = learner:SFD_update_acct_settings.html
-learnerdashboard = learner:SFD_dashboard_profile_SectionHead.html
-programs = learner:SFD_enrolling.html
+learneraccountsettings = learner:how-tos/update_course_specific_settings.html
+learnerdashboard = learner:concepts/open_edx_platform/what_is_course_dashboard.html
+programs = learner:OpenSFD_enrolling.html
 bookmarks = learner:SFD_bookmarks.html
 notes = learner:SFD_notes.html
 wiki = learner:SFD_wiki.html
 discussions = learner:sfd_discussions/index.html
 
-cohortmanual = course_author:course_features/cohorts/cohort_config.html#assign-learners-to-cohorts-manually
-cohortautomatic = course_author:course_features/cohorts/cohorts_overview.html#all-automated-assignment
+cohortmanual = course_author:references/advanced_features/managing_cohort_assignment.html#implementing-a-manual-assignment-strategy
+cohortautomatic = course_author:references/advanced_features/managing_cohort_assignment.html#implementing-an-automated-assignment-strategy
 
 # below are the language directory names for the different locales
 [locales]
diff --git a/lms/envs/mock.yml b/lms/envs/mock.yml
@@ -686,8 +686,8 @@ GRADES_DOWNLOAD:
     querystring_expire: 300
   STORAGE_TYPE: ''
 HELP_TOKENS_BOOKS:
-  course_author: http://edx.readthedocs.io/projects/open-edx-building-and-running-a-course
-  learner: http://edx.readthedocs.io/projects/open-edx-learner-guide
+  course_author: https://docs.openedx.org/en/latest/educators
+  learner: https://docs.openedx.org/en/latest/learners
 HIBP_LOGIN_BLOCK_PASSWORD_FREQUENCY_THRESHOLD: 5
 HOME_MICROFRONTEND_URL: hello
 HOTJAR_SITE_ID: 12345
diff --git a/openedx/core/djangoapps/notifications/base_notification.py b/openedx/core/djangoapps/notifications/base_notification.py
@@ -95,6 +95,8 @@ class NotificationType(TypedDict):
         'is_core': True,
         'content_template': _('<{p}><{strong}>{replier_name}</{strong}> responded to your '
                               'post <{strong}>{post_title}</{strong}></{p}>'),
+        'grouped_content_template': _('<{p}><{strong}>{replier_name}</{strong}> and others have responded to your post '
+                                      '<{strong}>{post_title}</{strong}></{p}>'),
         'content_context': {
             'post_title': 'Post title',
             'replier_name': 'replier name',
@@ -148,6 +150,8 @@ class NotificationType(TypedDict):
         'non_editable': [],
         'content_template': _('<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re following: '
                               '<{strong}>{post_title}</{strong}></{p}>'),
+        'grouped_content_template': _('<{p}><{strong}>{replier_name}</{strong}> and others responded to a post you’re '
+                                      'following: <{strong}>{post_title}</{strong}></{p}>'),
         'content_context': {
             'post_title': 'Post title',
             'replier_name': 'replier name',
diff --git a/openedx/core/djangoapps/notifications/grouping_notifications.py b/openedx/core/djangoapps/notifications/grouping_notifications.py
@@ -106,6 +106,38 @@ def group(self, new_notification, old_notification):
         return content_context
 
 
+@NotificationRegistry.register('new_response')
+class NewResponseGrouper(BaseNotificationGrouper):
+    """
+    Grouper for new response on post.
+    """
+
+    def group(self, new_notification, old_notification):
+        """
+        Groups new ora staff notifications based on the xblock ID.
+        """
+        content_context = old_notification.content_context
+        content_context.setdefault("grouped", True)
+        content_context["replier_name"] = new_notification.content_context["replier_name"]
+        return content_context
+
+
+@NotificationRegistry.register('response_on_followed_post')
+class NewResponseOnFollowedPostGrouper(BaseNotificationGrouper):
+    """
+    Grouper for new response on post.
+    """
+
+    def group(self, new_notification, old_notification):
+        """
+        Groups new ora staff notifications based on the xblock ID.
+        """
+        content_context = old_notification.content_context
+        content_context.setdefault("grouped", True)
+        content_context["replier_name"] = new_notification.content_context["replier_name"]
+        return content_context
+
+
 def group_user_notifications(new_notification: Notification, old_notification: Notification):
     """
     Groups user notification based on notification type and group_id
diff --git a/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py b/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py
@@ -13,7 +13,7 @@
     BaseNotificationGrouper,
     NotificationRegistry,
     group_user_notifications,
-    get_user_existing_notifications, NewPostGrouper
+    get_user_existing_notifications, NewPostGrouper, NewResponseGrouper, NewResponseOnFollowedPostGrouper
 )
 from openedx.core.djangoapps.notifications.models import Notification
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -98,12 +98,13 @@ class TestGroupUserNotifications(ModuleStoreTestCase):
     """
 
     @patch('openedx.core.djangoapps.notifications.grouping_notifications.NotificationRegistry.get_grouper')
-    def test_group_user_notifications(self, mock_get_grouper):
+    @ddt.data(NewPostGrouper, NewResponseGrouper, NewResponseOnFollowedPostGrouper)
+    def test_group_user_notifications(self, grouper_class, mock_get_grouper):
         """
-        Test that the function groups notifications using the appropriate grou
+        Test that the function groups notifications using the appropriate grouping class
         """
         # Mock the grouper
-        mock_grouper = MagicMock(spec=NewPostGrouper)
+        mock_grouper = MagicMock(spec=grouper_class)
         mock_get_grouper.return_value = mock_grouper
 
         new_notification = MagicMock(spec=Notification)
diff --git a/openedx/core/djangoapps/user_api/accounts/serializers.py b/openedx/core/djangoapps/user_api/accounts/serializers.py
@@ -99,12 +99,12 @@ class Meta:
 
     def validate_platform(self, platform):
         """
-        Validate that the platform value is one of (facebook, twitter or linkedin)
+        Validate that the platform value is one of (facebook, x or linkedin)
         """
-        valid_platforms = ["facebook", "twitter", "linkedin"]
+        valid_platforms = ["facebook", "x", "linkedin"]
         if platform not in valid_platforms:
             raise serializers.ValidationError(
-                "The social platform must be facebook, twitter or linkedin"
+                "The social platform must be facebook, x or linkedin"
             )
         return platform
 
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
@@ -187,7 +187,7 @@ def test_set_single_social_link(self):
     def test_set_multiple_social_links(self):
         social_links = [
             dict(platform="facebook", social_link=f"https://www.facebook.com/{self.user.username}"),
-            dict(platform="twitter", social_link=f"https://www.twitter.com/{self.user.username}"),
+            dict(platform="x", social_link=f"https://www.x.com/{self.user.username}"),
         ]
         update_account_settings(self.user, {"social_links": social_links})
         account_settings = get_account_settings(self.default_request)[0]
@@ -200,7 +200,7 @@ def test_add_social_links(self):
         update_account_settings(self.user, {"social_links": original_social_links})
 
         extra_social_links = [
-            dict(platform="twitter", social_link=f"https://www.twitter.com/{self.user.username}"),
+            dict(platform="x", social_link=f"https://www.x.com/{self.user.username}"),
             dict(platform="linkedin", social_link=f"https://www.linkedin.com/in/{self.user.username}"),
         ]
         update_account_settings(self.user, {"social_links": extra_social_links})
@@ -211,25 +211,25 @@ def test_add_social_links(self):
 
     def test_replace_social_links(self):
         original_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/myself")
-        original_twitter_link = dict(platform="twitter", social_link="https://www.twitter.com/myself")
-        update_account_settings(self.user, {"social_links": [original_facebook_link, original_twitter_link]})
+        original_x_link = dict(platform="x", social_link="https://www.x.com/myself")
+        update_account_settings(self.user, {"social_links": [original_facebook_link, original_x_link]})
 
         modified_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/new_me")
         update_account_settings(self.user, {"social_links": [modified_facebook_link]})
 
         account_settings = get_account_settings(self.default_request)[0]
-        assert account_settings['social_links'] == [modified_facebook_link, original_twitter_link]
+        assert account_settings['social_links'] == [modified_facebook_link, original_x_link]
 
     def test_remove_social_link(self):
         original_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/myself")
-        original_twitter_link = dict(platform="twitter", social_link="https://www.twitter.com/myself")
-        update_account_settings(self.user, {"social_links": [original_facebook_link, original_twitter_link]})
+        original_x_link = dict(platform="x", social_link="https://www.x.com/myself")
+        update_account_settings(self.user, {"social_links": [original_facebook_link, original_x_link]})
 
         removed_facebook_link = dict(platform="facebook", social_link="")
         update_account_settings(self.user, {"social_links": [removed_facebook_link]})
 
         account_settings = get_account_settings(self.default_request)[0]
-        assert account_settings['social_links'] == [original_twitter_link]
+        assert account_settings['social_links'] == [original_x_link]
 
     def test_unsupported_social_link_platform(self):
         social_links = [
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_utils.py b/openedx/core/djangoapps/user_api/accounts/tests/test_utils.py
diff --git a/openedx/envs/common.py b/openedx/envs/common.py
