diff --git a/common/djangoapps/student/views/dashboard.py b/common/djangoapps/student/views/dashboard.py index a349c5643eed..d38a3c3c3407 100644 --- a/common/djangoapps/student/views/dashboard.py +++ b/common/djangoapps/student/views/dashboard.py @@ -58,11 +58,6 @@ from openedx.core.djangolib.markup import HTML, Text from openedx.features.content_type_gating.models import ContentTypeGatingConfig from openedx.features.course_duration_limits.access import get_user_course_duration, get_user_course_expiration_date -from openedx.features.enterprise_support.api import ( - get_dashboard_consent_notification, - get_enterprise_learner_portal_context, -) -from openedx.features.enterprise_support.utils import is_enterprise_learner from xmodule.modulestore.django import modulestore # pylint: disable=wrong-import-order log = logging.getLogger("edx.student") @@ -619,8 +614,6 @@ def student_dashboard(request): # pylint: disable=too-many-statements link_end=HTML(""), ) - enterprise_message = get_dashboard_consent_notification(request, user, course_enrollments) - recovery_email_message = recovery_email_activation_message = None if is_secondary_email_feature_enabled(): try: @@ -647,10 +640,6 @@ def student_dashboard(request): # pylint: disable=too-many-statements ) ) - # Disable lookup of Enterprise consent_required_course due to ENT-727 - # Will re-enable after fixing WL-1315 - consent_required_courses = set() - # Account activation message account_activation_messages = [ message for message in messages.get_messages(request) if 'account-activation' in message.tags @@ -801,8 +790,6 @@ def student_dashboard(request): # pylint: disable=too-many-statements context = { 'urls': urls, 'programs_data': programs_data, - 'enterprise_message': enterprise_message, - 'consent_required_courses': consent_required_courses, 'enrollment_message': enrollment_message, 'redirect_message': Text(redirect_message), 'account_activation_messages': account_activation_messages, @@ -852,14 +839,8 @@ def student_dashboard(request): # pylint: disable=too-many-statements 'course_info': get_dashboard_course_info(user, course_enrollments), # TODO START: clean up as part of REVEM-199 (END) 'disable_unenrollment': disable_unenrollment, - # TODO: clean when experiment(Merchandise 2U LOBs - Dashboard) would be stop. [VAN-1097] - 'is_enterprise_user': is_enterprise_learner(user), } - # Include enterprise learner portal metadata and messaging - enterprise_learner_portal_context = get_enterprise_learner_portal_context(request) - context.update(enterprise_learner_portal_context) - context_from_plugins = get_plugins_view_context( ProjectType.LMS, COURSE_DASHBOARD_PLUGIN_VIEW_NAME, diff --git a/lms/envs/common.py b/lms/envs/common.py index 55d432d155ca..3b7133836d9c 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3291,6 +3291,10 @@ def _should_send_certificate_events(settings): "fail_silently": True, "pipeline": ["enterprise.filters.accounts.AccountSettingsReadOnlyFieldsStep"], }, + "org.openedx.learning.dashboard.render.started.v1": { + "fail_silently": False, + "pipeline": ["enterprise.filters.dashboard.DashboardContextEnricher"], + }, } ############################## Miscellaneous ############################### diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 6149418035ca..34270eea53d5 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -220,10 +220,9 @@ is_course_voucher_refundable = (session_id in enrolled_courses_voucher_refundable) course_requirements = courses_requirements_not_met.get(session_id) related_programs = inverted_programs.get(str(entitlement.course_uuid if is_unfulfilled_entitlement else session_id)) - show_consent_link = (session_id in consent_required_courses) resume_button_url = resume_button_urls[dashboard_index] %> - <%include file='dashboard/_dashboard_course_listing.html' args='course_overview=course_overview, course_card_index=dashboard_index, enrollment=enrollment, enrollments_fbe_is_on=enrollments_fbe_is_on, is_unfulfilled_entitlement=is_unfulfilled_entitlement, is_fulfilled_entitlement=is_fulfilled_entitlement, entitlement=entitlement, entitlement_session=entitlement_session, entitlement_available_sessions=entitlement_available_sessions, entitlement_expiration_date=entitlement_expiration_date, entitlement_expired_at=entitlement_expired_at, show_courseware_link=show_courseware_link, cert_status=cert_status, can_refund_entitlement=can_refund_entitlement, can_unenroll=can_unenroll, credit_status=credit_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, is_paid_course=is_paid_course, is_course_voucher_refundable=is_course_voucher_refundable, course_requirements=course_requirements, dashboard_index=dashboard_index, share_settings=share_settings, user=user, related_programs=related_programs, display_course_modes_on_dashboard=display_course_modes_on_dashboard, show_consent_link=show_consent_link, enterprise_customer_name=enterprise_customer_name, resume_button_url=resume_button_url, partner_managed_enrollment=partner_managed_enrollment' /> + <%include file='dashboard/_dashboard_course_listing.html' args='course_overview=course_overview, course_card_index=dashboard_index, enrollment=enrollment, enrollments_fbe_is_on=enrollments_fbe_is_on, is_unfulfilled_entitlement=is_unfulfilled_entitlement, is_fulfilled_entitlement=is_fulfilled_entitlement, entitlement=entitlement, entitlement_session=entitlement_session, entitlement_available_sessions=entitlement_available_sessions, entitlement_expiration_date=entitlement_expiration_date, entitlement_expired_at=entitlement_expired_at, show_courseware_link=show_courseware_link, cert_status=cert_status, can_refund_entitlement=can_refund_entitlement, can_unenroll=can_unenroll, credit_status=credit_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, is_paid_course=is_paid_course, is_course_voucher_refundable=is_course_voucher_refundable, course_requirements=course_requirements, dashboard_index=dashboard_index, share_settings=share_settings, user=user, related_programs=related_programs, display_course_modes_on_dashboard=display_course_modes_on_dashboard, resume_button_url=resume_button_url, partner_managed_enrollment=partner_managed_enrollment' /> % endfor % if show_load_all_courses_link:
diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html index 39c66f0e81fa..ff27485a87b4 100644 --- a/lms/templates/dashboard/_dashboard_course_listing.html +++ b/lms/templates/dashboard/_dashboard_course_listing.html @@ -1,4 +1,4 @@ -<%page args="course_overview, enrollment, entitlement, entitlement_session, course_card_index, enrollments_fbe_is_on, is_unfulfilled_entitlement, is_fulfilled_entitlement, entitlement_available_sessions, entitlement_expiration_date, entitlement_expired_at, show_courseware_link, cert_status, can_refund_entitlement, can_unenroll, credit_status, show_email_settings, course_mode_info, is_paid_course, is_course_voucher_refundable, course_requirements, dashboard_index, share_settings, related_programs, display_course_modes_on_dashboard, show_consent_link, enterprise_customer_name, resume_button_url, partner_managed_enrollment" expression_filter="h"/> +<%page args="course_overview, enrollment, entitlement, entitlement_session, course_card_index, enrollments_fbe_is_on, is_unfulfilled_entitlement, is_fulfilled_entitlement, entitlement_available_sessions, entitlement_expiration_date, entitlement_expired_at, show_courseware_link, cert_status, can_refund_entitlement, can_unenroll, credit_status, show_email_settings, course_mode_info, is_paid_course, is_course_voucher_refundable, course_requirements, dashboard_index, share_settings, related_programs, display_course_modes_on_dashboard, resume_button_url, partner_managed_enrollment" expression_filter="h"/> <%! import datetime @@ -370,10 +370,6 @@

<%include file="_dashboard_credit_info.html" args="credit_status=credit_status"/> % endif - % if show_consent_link: - <%include file="_dashboard_show_consent.html" args="course_overview=course_overview, course_target=course_target, enrollment=enrollment, enterprise_customer_name=enterprise_customer_name"/> - %endif - % if display_course_upgrade:
diff --git a/lms/templates/dashboard/_dashboard_show_consent.html b/lms/templates/dashboard/_dashboard_show_consent.html deleted file mode 100644 index 98f8ffd3c473..000000000000 --- a/lms/templates/dashboard/_dashboard_show_consent.html +++ /dev/null @@ -1,25 +0,0 @@ -<%page expression_filter="h" args="course_overview, course_target, enrollment, enterprise_customer_name" /> -<%! -from django.utils.translation import gettext as _ -%> -<%namespace name='static' file='../static_content.html'/> - -
-
-

- - ${_("Consent to share your data")} - -
- ${_("To access this course, you must first consent to share your learning achievements with {enterprise_customer_name}.").format(enterprise_customer_name=enterprise_customer_name)} -

-
- - - ${_("View Consent")} -  ${_(course_overview.display_name_with_default)} - - -
-
-
diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py index ea497164b103..fe9519acf026 100644 --- a/openedx/features/enterprise_support/api.py +++ b/openedx/features/enterprise_support/api.py @@ -711,29 +711,6 @@ def consent_needed_for_course(request, user, course_id, enrollment_exists=False) return True -@enterprise_is_enabled(otherwise=set()) -def get_consent_required_courses(user, course_ids): - """ - Returns a set of course_ids that require consent - Note that this function makes use of the Enterprise models directly instead of using the API calls - """ - result = set() - enterprise_learner = EnterpriseCustomerUser.objects.filter(user_id=user.id).first() - if not enterprise_learner or not enterprise_learner.enterprise_customer: - return result - - enterprise_uuid = enterprise_learner.enterprise_customer.uuid - data_sharing_consent = DataSharingConsent.objects.filter(username=user.username, - course_id__in=course_ids, - enterprise_customer__uuid=enterprise_uuid) - - for consent in data_sharing_consent: - if consent.consent_required(): - result.add(consent.course_id) - - return result - - @enterprise_is_enabled(otherwise='') def get_enterprise_consent_url(request, course_id, user=None, return_to=None, enrollment_exists=False, source='lms'): """ diff --git a/openedx/features/enterprise_support/tests/test_api.py b/openedx/features/enterprise_support/tests/test_api.py index 444782eddd01..d93a77ed9ae8 100644 --- a/openedx/features/enterprise_support/tests/test_api.py +++ b/openedx/features/enterprise_support/tests/test_api.py @@ -41,7 +41,6 @@ enterprise_enabled, get_active_enterprise_customer_user, get_consent_notification_data, - get_consent_required_courses, get_dashboard_consent_notification, get_data_sharing_consents, get_enterprise_consent_url, @@ -530,38 +529,6 @@ def test_consent_needed_for_course_when_consent_is_required( ) ) - @httpretty.activate - @mock.patch('enterprise.models.EnterpriseCustomer.catalog_contains_course') - def test_get_consent_required_courses(self, mock_catalog_contains_course): - mock_catalog_contains_course.return_value = True - user = UserFactory() - enterprise_customer_user = EnterpriseCustomerUserFactory(user_id=user.id) - - course_id = 'fake-course' - data_sharing_consent = DataSharingConsent( - course_id=course_id, - enterprise_customer=enterprise_customer_user.enterprise_customer, - username=user.username, - granted=False - ) - data_sharing_consent.save() - consent_required = get_consent_required_courses(user, [course_id]) - assert course_id in consent_required - - # now grant consent and call our method again - data_sharing_consent.granted = True - data_sharing_consent.save() - consent_required = get_consent_required_courses(user, [course_id]) - assert course_id not in consent_required - - def test_consent_not_required_for_non_enterprise_user(self): - user = UserFactory() - course_id = 'fake-course' - - consent_required_courses = get_consent_required_courses(user, [course_id]) - - assert set() == consent_required_courses - @mock.patch('openedx.features.enterprise_support.api.create_jwt_for_user') def test_fetch_enterprise_learner_data_unauthenticated(self, mock_jwt_builder): api_client = self._assert_api_client_with_user(EnterpriseApiClient, mock_jwt_builder)