Merge branch 'master' into 'ttqureshi/enable-html'

Author: ttqureshi

Makefile

@@ -35,8 +35,6 @@ swagger: ## generate the swagger.yaml file
 extract_translations: ## extract localizable strings from sources
 	i18n_tool extract --no-segment -v
 	cd conf/locale/en/LC_MESSAGES && msgcat djangojs.po underscore.po -o djangojs.po
-	cd conf/locale/en/LC_MESSAGES && msgcat django.po wiki.po edx_proctoring_proctortrack.po mako.po -o django.po
-	cd conf/locale/en/LC_MESSAGES && rm wiki.po edx_proctoring_proctortrack.po mako.po underscore.po
 
 pull_plugin_translations:  ## Pull translations for edx_django_utils.plugins for both lms and cms
 	python manage.py lms pull_plugin_translations --verbose $(ATLAS_OPTIONS)

cms/djangoapps/contentstore/api/tests/test_validation.py

@@ -21,7 +21,12 @@
 
 
 @ddt.ddt
-@override_settings(PROCTORING_BACKENDS={'DEFAULT': 'proctortrack', 'proctortrack': {}})
+@override_settings(
+    PROCTORING_BACKENDS={
+        "DEFAULT": "test_proctoring_provider",
+        "test_proctoring_provider": {"requires_escalation_email": True},
+    }
+)
 class CourseValidationViewTest(SharedModuleStoreTestCase, APITestCase):
     """
     Test course validation view via a RESTful API
@@ -33,7 +38,7 @@ def setUpClass(cls):
         cls.course = CourseFactory.create(
             display_name='test course',
             run="Testing_course",
-            proctoring_provider='proctortrack',
+            proctoring_provider='test_proctoring_provider',
             proctoring_escalation_email='[email protected]',
         )
         cls.course_key = cls.course.id

cms/djangoapps/contentstore/api/views/course_validation.py

@@ -8,6 +8,7 @@
 
 from cms.djangoapps.contentstore.course_info_model import get_course_updates
 from cms.djangoapps.contentstore.views.certificates import CertificateManager
+from common.djangoapps.util.proctoring import requires_escalation_email
 from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, view_auth_classes
 from xmodule.course_metadata_utils import DEFAULT_GRADING_POLICY  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
@@ -340,8 +341,8 @@ def _has_grading_policy(self, course):  # lint-amnesty, pylint: disable=missing-
         return False
 
     def _proctoring_validation(self, course):
-        # A proctoring escalation email is currently only required for courses using Proctortrack
+        # A proctoring escalation email is required if 'required_escalation_email' is set on the proctoring backend
         return dict(
-            needs_proctoring_escalation_email=course.proctoring_provider == 'proctortrack',
+            needs_proctoring_escalation_email=requires_escalation_email(course.proctoring_provider),
             has_proctoring_escalation_email=bool(course.proctoring_escalation_email)
         )

cms/djangoapps/contentstore/config/waffle.py

@@ -22,10 +22,6 @@
     f'{WAFFLE_NAMESPACE}.enable_checklists_quality', __name__, LOG_PREFIX
 )
 
-SHOW_REVIEW_RULES_FLAG = CourseWaffleFlag(  # lint-amnesty, pylint: disable=toggle-missing-annotation
-    f'{WAFFLE_NAMESPACE}.show_review_rules', __name__, LOG_PREFIX
-)
-
 
 # .. toggle_name: studio.custom_relative_dates
 # .. toggle_implementation: CourseWaffleFlag

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

@@ -5,7 +5,7 @@
 from rest_framework import serializers
 
 from cms.djangoapps.contentstore.rest_api.serializers.common import ProctoringErrorListSerializer
-from xmodule.course_block import get_available_providers
+from xmodule.course_block import get_available_providers, get_requires_escalation_email_providers
 
 
 class ProctoredExamSettingsSerializer(serializers.Serializer):
@@ -29,6 +29,9 @@ class ProctoredExamConfigurationSerializer(serializers.Serializer):
     """ Serializer for various metadata associated with proctored exam settings. """
     proctored_exam_settings = ProctoredExamSettingsSerializer()
     available_proctoring_providers = serializers.ChoiceField(get_available_providers())
+    requires_escalation_email_providers = serializers.ChoiceField(
+        get_requires_escalation_email_providers()
+    )
     course_start_date = serializers.DateTimeField()
 
 

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

@@ -14,7 +14,10 @@
 from cms.djangoapps.contentstore.utils import get_proctored_exam_settings_url
 from cms.djangoapps.models.settings.course_metadata import CourseMetadata
 from common.djangoapps.student.auth import has_studio_advanced_settings_access
-from xmodule.course_block import get_available_providers  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.course_block import (
+    get_available_providers,
+    get_requires_escalation_email_providers,
+)  # lint-amnesty, pylint: disable=wrong-import-order
 from openedx.core.djangoapps.course_apps.toggles import exams_ida_enabled
 from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, verify_course_exists, view_auth_classes
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
@@ -49,7 +52,8 @@ class ProctoredExamSettingsView(APIView):
 
     **Response**
 
-        In the case of a 200 response code, the response will proctored exam settings data
+        In the case of a 200 response code, the response will proctored exam settings data,
+        list of proctoring backends that have 'requires_escalation_email' set to 'True'
         as well as other metadata about the course or the requesting user that are necessary
         for rendering the settings page.
 
@@ -65,7 +69,10 @@ class ProctoredExamSettingsView(APIView):
             },
             "available_proctoring_providers": [
                 "mockprock",
-                "proctortrack"
+                "software_secure",
+            ],
+            "requires_escalation_email_providers": [
+                "software_secure"
             ],
             "course_start_date": "2013-02-05T05:00:00Z",
         }
@@ -108,10 +115,15 @@ def get(self, request, course_id):
             data['course_start_date'] = course_metadata['start'].get('value')
 
             available_providers = get_available_providers()
+            requires_escalation_email_providers = (
+                get_requires_escalation_email_providers()
+            )
             if not exams_ida_enabled(CourseKey.from_string(course_id)):
                 available_providers.remove('lti_external')
+                requires_escalation_email_providers.remove('lti_external')
 
             data['available_proctoring_providers'] = available_providers
+            data['requires_escalation_email_providers'] = requires_escalation_email_providers
 
             serializer = ProctoredExamConfigurationSerializer(data)
 

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

@@ -62,6 +62,7 @@ def get_expected_response_data(
             },
             "course_start_date": "2030-01-01T00:00:00Z",
             "available_proctoring_providers": ["null"],
+            "requires_escalation_email_providers": [],
         }
 
     def make_request(self, course_id=None, data=None):
@@ -100,6 +101,7 @@ def test_providers_with_disabled_lti(self):
             },
             "course_start_date": "2030-01-01T00:00:00Z",
             "available_proctoring_providers": ["null"],
+            "requires_escalation_email_providers": [],
         }
         assert response.data == expected_data
 
@@ -122,6 +124,7 @@ def test_providers_with_enabled_lti(self):
             },
             "course_start_date": "2030-01-01T00:00:00Z",
             "available_proctoring_providers": ["lti_external", "null"],
+            "requires_escalation_email_providers": ["lti_external"],
         }
         assert response.data == expected_data
 
@@ -162,14 +165,17 @@ def test_course_instructor(self, expect_status=status.HTTP_403_FORBIDDEN):
         return super().test_course_instructor(expect_status=expect_status)
 
     @override_settings(
-        PROCTORING_BACKENDS={"DEFAULT": "proctortrack", "proctortrack": {}},
+        PROCTORING_BACKENDS={
+            "DEFAULT": "test_proctoring_provider",
+            "test_proctoring_provider": {"requires_escalation_email": True},
+        },
     )
     def test_update_exam_settings_200_escalation_email(self):
-        """update exam settings for provider that requires an escalation email (proctortrack)"""
+        """update exam settings for provider that requires an escalation email"""
         self.client.login(username=self.global_staff.username, password=self.password)
         data = self.get_request_data(
             enable_proctored_exams=True,
-            proctoring_provider="proctortrack",
+            proctoring_provider="test_proctoring_provider",
             proctoring_escalation_email="[email protected]",
         )
         response = self.make_request(data=data)
@@ -182,7 +188,7 @@ def test_update_exam_settings_200_escalation_email(self):
                 "proctored_exam_settings": {
                     "enable_proctored_exams": True,
                     "allow_proctoring_opt_out": True,
-                    "proctoring_provider": "proctortrack",
+                    "proctoring_provider": "test_proctoring_provider",
                     "proctoring_escalation_email": "[email protected]",
                     "create_zendesk_tickets": True,
                 }
@@ -192,7 +198,7 @@ def test_update_exam_settings_200_escalation_email(self):
         # course settings have been updated
         updated = modulestore().get_item(self.course.location)
         assert updated.enable_proctored_exams is True
-        assert updated.proctoring_provider == "proctortrack"
+        assert updated.proctoring_provider == "test_proctoring_provider"
         assert updated.proctoring_escalation_email == "[email protected]"
 
     @override_settings(
@@ -299,14 +305,17 @@ def test_403_if_instructor_request_includes_opting_out(self):
         assert response.status_code == status.HTTP_403_FORBIDDEN
 
     @override_settings(
-        PROCTORING_BACKENDS={"DEFAULT": "proctortrack", "proctortrack": {}},
+        PROCTORING_BACKENDS={
+            "DEFAULT": "test_proctoring_provider",
+            "test_proctoring_provider": {"requires_escalation_email": True},
+        },
     )
     def test_200_for_instructor_request_compatibility(self):
         self.client.login(username=self.course_instructor, password=self.password)
         data = {
             "proctored_exam_settings": {
                 "enable_proctored_exams": True,
-                "proctoring_provider": "proctortrack",
+                "proctoring_provider": "test_proctoring_provider",
                 "proctoring_escalation_email": "[email protected]",
             }
         }
@@ -315,16 +324,13 @@ def test_200_for_instructor_request_compatibility(self):
 
     @override_settings(
         PROCTORING_BACKENDS={
-            "DEFAULT": "proctortrack",
-            "proctortrack": {},
+            "DEFAULT": "software_secure",
             "software_secure": {},
         },
     )
     @patch("logging.Logger.info")
     @ddt.data(
-        ("proctortrack", False, False),
         ("software_secure", True, False),
-        ("proctortrack", True, True),
         ("software_secure", False, True),
     )
     @ddt.unpack