fixup! fix: adjust studio_grading_url to use the correct URL

Author: dwong2708

cms/envs/common.py

@@ -258,6 +258,7 @@
 
 ############################# MICROFRONTENDS ###################################
 COURSE_AUTHORING_MICROFRONTEND_URL = None
+ADMIN_CONSOLE_MICROFRONTEND_URL = None
 
 ############################# SET PATH INFORMATION #############################
 PROJECT_ROOT = path(__file__).abspath().dirname().dirname()  # /edx-platform/cms

cms/envs/devstack.py

@@ -181,6 +181,7 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 
 ################### FRONTEND APPLICATION COURSE AUTHORING ###################
 COURSE_AUTHORING_MICROFRONTEND_URL = 'http://localhost:2001'
+ADMIN_CONSOLE_MICROFRONTEND_URL = 'http://localhost:2025'
 
 ################### FRONTEND APPLICATION DISCUSSIONS ###################
 DISCUSSIONS_MICROFRONTEND_URL = 'http://localhost:2002'

cms/envs/mock.yml

@@ -230,6 +230,7 @@ CORS_ORIGIN_WHITELIST:
 - https://localhost
 - https://www.localhost
 COURSE_AUTHORING_MICROFRONTEND_URL: https://course-authoring.localhost
+ADMIN_CONSOLE_MICROFRONTEND_URL: http://admin-console.localhost
 COURSE_CATALOG_API_URL: https://discovery.localhost/api/v1
 COURSE_CATALOG_URL_ROOT: https://discovery.localhost
 COURSE_IMPORT_EXPORT_BUCKET: import-export

cms/envs/test.py

@@ -97,6 +97,7 @@
 CMS_ROOT_URL = f"http://{CMS_BASE}"
 
 COURSE_AUTHORING_MICROFRONTEND_URL = "http://course-authoring-mfe"
+ADMIN_CONSOLE_MICROFRONTEND_URL = "http://admin-console-mfe"
 
 CACHES = {
     # This is the cache used for most things.

lms/djangoapps/instructor/tests/test_api_v2.py

@@ -119,6 +119,7 @@ def _get_url(self, course_id=None):
         return reverse('instructor_api_v2:course_metadata', kwargs={'course_id': course_id})
 
     @override_settings(COURSE_AUTHORING_MICROFRONTEND_URL='http://localhost:2001')
+    @override_settings(ADMIN_CONSOLE_MICROFRONTEND_URL='http://localhost:2025')
     def test_get_course_metadata_as_instructor(self):
         """
         Test that an instructor can retrieve comprehensive course metadata.
@@ -130,52 +131,54 @@ def test_get_course_metadata_as_instructor(self):
         data = response.data
 
         # Verify basic course information
-        self.assertEqual(data['course_id'], str(self.course_key))  # noqa: PT009
-        self.assertEqual(data['display_name'], 'Demonstration Course')  # noqa: PT009
-        self.assertEqual(data['org'], 'edX')  # noqa: PT009
-        self.assertEqual(data['course_number'], 'DemoX')  # noqa: PT009
-        self.assertEqual(data['course_run'], 'Demo_Course')  # noqa: PT009
-        self.assertEqual(data['pacing'], 'instructor')  # noqa: PT009
+        assert data['course_id'] == str(self.course_key)
+        assert data['display_name'] == 'Demonstration Course'
+        assert data['org'] == 'edX'
+        assert data['course_number'] == 'DemoX'
+        assert data['course_run'] == 'Demo_Course'
+        assert data['pacing'] == 'instructor'
 
         # Verify enrollment counts structure
-        self.assertIn('enrollment_counts', data)  # noqa: PT009
-        self.assertIn('total', data['enrollment_counts'])  # noqa: PT009
-        self.assertIn('total_enrollment', data)  # noqa: PT009
-        self.assertGreaterEqual(data['total_enrollment'], 3)  # noqa: PT009
+        assert 'enrollment_counts' in data
+        assert 'total' in data['enrollment_counts']
+        assert 'total_enrollment' in data
+        assert data['total_enrollment'] >= 3
 
         # Verify role-based enrollment counts are present
-        self.assertIn('learner_count', data)  # noqa: PT009
-        self.assertIn('staff_count', data)  # noqa: PT009
-        self.assertEqual(data['total_enrollment'], data['learner_count'] + data['staff_count'])  # noqa: PT009
+        assert 'learner_count' in data
+        assert 'staff_count' in data
+        assert data['total_enrollment'] == data['learner_count'] + data['staff_count']
 
         # Verify permissions structure
-        self.assertIn('permissions', data)  # noqa: PT009
+        assert 'permissions' in data
         permissions_data = data['permissions']
-        self.assertIn('admin', permissions_data)  # noqa: PT009
-        self.assertIn('instructor', permissions_data)  # noqa: PT009
-        self.assertIn('staff', permissions_data)  # noqa: PT009
-        self.assertIn('forum_admin', permissions_data)  # noqa: PT009
-        self.assertIn('finance_admin', permissions_data)  # noqa: PT009
-        self.assertIn('sales_admin', permissions_data)  # noqa: PT009
-        self.assertIn('data_researcher', permissions_data)  # noqa: PT009
+        assert 'admin' in permissions_data
+        assert 'instructor' in permissions_data
+        assert 'staff' in permissions_data
+        assert 'forum_admin' in permissions_data
+        assert 'finance_admin' in permissions_data
+        assert 'sales_admin' in permissions_data
+        assert 'data_researcher' in permissions_data
 
         # Verify sections structure
-        self.assertIn('tabs', data)  # noqa: PT009
-        self.assertIsInstance(data['tabs'], list)  # noqa: PT009
+        assert 'tabs' in data
+        assert isinstance(data['tabs'], list)
 
         # Verify other metadata fields
-        self.assertIn('num_sections', data)  # noqa: PT009
-        self.assertIn('tabs', data)  # noqa: PT009
-        self.assertIn('grade_cutoffs', data)  # noqa: PT009
-        self.assertIn('course_errors', data)  # noqa: PT009
-        self.assertIn('studio_url', data)  # noqa: PT009
-        self.assertIn('disable_buttons', data)  # noqa: PT009
-        self.assertIn('has_started', data)  # noqa: PT009
-        self.assertIn('has_ended', data)  # noqa: PT009
-        self.assertIn('analytics_dashboard_message', data)  # noqa: PT009
-
+        assert 'num_sections' in data
+        assert 'tabs' in data
+        assert 'grade_cutoffs' in data
+        assert 'course_errors' in data
+        assert 'studio_url' in data
+        assert 'disable_buttons' in data
+        assert 'has_started' in data
+        assert 'has_ended' in data
+        assert 'analytics_dashboard_message' in data
         assert 'studio_grading_url' in data
+        assert 'admin_console_url' in data
+
         assert data['studio_grading_url'] == f'http://localhost:2001/authoring/course/{self.course.id}/settings/grading'
+        assert data['admin_console_url'] == 'http://localhost:2025/admin-console/authz'
 
     def test_get_course_metadata_as_staff(self):
         """

lms/djangoapps/instructor/views/serializers_v2.py

@@ -75,6 +75,9 @@ class CourseInformationSerializerV2(serializers.Serializer):
     studio_grading_url = serializers.SerializerMethodField(
         help_text="URL to the Studio grading settings page for the course (null if not configured)"
     )
+    admin_console_url = serializers.SerializerMethodField(
+        help_text="URL to the admin console"
+    )
     permissions = serializers.SerializerMethodField(help_text="User permissions for instructor dashboard features")
     tabs = serializers.SerializerMethodField(help_text="List of course tabs with configuration and display information")
     disable_buttons = serializers.SerializerMethodField(
@@ -464,6 +467,18 @@ def get_studio_grading_url(self, data):
             return f'{mfe_base_url}/authoring/course/{course_key}/settings/grading'
         return None
 
+    def get_admin_console_url(self, data):
+        """Get admin console URL."""
+        course_key = data['course'].id
+        mfe_base_url = configuration_helpers.get_value_for_org(
+            course_key.org,
+            'ADMIN_CONSOLE_MICROFRONTEND_URL',
+            getattr(settings, 'ADMIN_CONSOLE_MICROFRONTEND_URL', None)
+        )
+        if mfe_base_url:
+            return f'{mfe_base_url}/admin-console/authz'
+        return mfe_base_url
+
     def get_disable_buttons(self, data):
         """Check if buttons should be disabled for large courses."""
         return not CourseEnrollment.objects.is_small_course(data['course'].id)