Skip to content

feat!: Remove the course sock and related APIs. #36436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feanil merged 1 commit into from
Apr 9, 2025
Merged

feat!: Remove the course sock and related APIs. #36436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions lms/djangoapps/course_home_api/outline/tests/test_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
from openedx.features.course_experience import (
COURSE_ENABLE_UNENROLLED_ACCESS_FLAG,
DISPLAY_COURSE_SOCK_FLAG,
ENABLE_COURSE_GOALS
)
from openedx.features.discounts.applicability import (
Expand Down Expand Up @@ -362,12 +361,6 @@ def test_visibility(self, is_enrolled, is_staff, course_visibility):
assert (data['access_expiration'] is not None) == show_enrolled
assert (data['resume_course']['url'] is not None) == show_enrolled

@ddt.data(True, False)
def test_can_show_upgrade_sock(self, sock_enabled):
with override_waffle_flag(DISPLAY_COURSE_SOCK_FLAG, active=sock_enabled):
response = self.client.get(self.url)
assert response.data['can_show_upgrade_sock'] == sock_enabled

def test_verified_mode(self):
enrollment = CourseEnrollment.enroll(self.user, self.course.id)
CourseDurationLimitConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1))
Expand Down
6 changes: 0 additions & 6 deletions lms/djangoapps/course_home_api/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from lms.djangoapps.courseware.utils import verified_upgrade_deadline_link
from openedx.core.djangoapps.courseware_api.utils import serialize_upgrade_info
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG
from openedx.features.course_experience.utils import dates_banner_should_display


Expand Down Expand Up @@ -59,13 +58,8 @@ class VerifiedModeSerializer(ReadOnlySerializer):

Requires 'course_overview', 'enrollment', and 'request' from self.context.
"""
can_show_upgrade_sock = serializers.SerializerMethodField()
verified_mode = serializers.SerializerMethodField()

def get_can_show_upgrade_sock(self, _):
course_overview = self.context['course_overview']
return DISPLAY_COURSE_SOCK_FLAG.is_enabled(course_overview.id)

def get_verified_mode(self, _):
"""Return verified mode information, or None."""
course_overview = self.context['course_overview']
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def test_index_query_counts(self):
self.client.login(username=self.user.username, password=self.user_password)
CourseEnrollment.enroll(self.user, course.id)

with self.assertNumQueries(154, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with self.assertNumQueries(152, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with check_mongo_calls(3):
url = reverse(
'courseware_section',
Expand Down
4 changes: 0 additions & 4 deletions lms/djangoapps/courseware/views/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
default_course_url
)
from openedx.features.course_experience.url_helpers import make_learning_mfe_courseware_url
from openedx.features.course_experience.views.course_sock import CourseSockFragmentView
from openedx.features.enterprise_support.api import data_sharing_consent_required

from ..access import has_access
Expand Down Expand Up @@ -454,9 +453,6 @@ def _create_courseware_context(self, request):
table_of_contents['chapters'],
)

courseware_context['course_sock_fragment'] = CourseSockFragmentView().render_to_fragment(
request, course=self.course)

# entrance exam data
self._add_entrance_exam_to_context(courseware_context)

Expand Down
3 changes: 0 additions & 3 deletions lms/static/sass/_build-course.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,3 @@
// responsive
@import 'base/layouts'; // temporary spot for responsive course
@import 'header';

// features
@import 'features/course-sock';
1 change: 0 additions & 1 deletion lms/static/sass/bootstrap/lms-main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ $static-path: '../..';
@import 'features/bookmarks';
@import 'features/course-experience';
@import 'features/course-search';
@import 'features/course-sock';
@import 'features/course-upgrade-message';
@import 'features/course-duration-limits';

Expand Down
170 changes: 0 additions & 170 deletions lms/static/sass/features/_course-sock.scss
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions lms/templates/courseware/courseware.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@
</section>

</div>
${HTML(course_sock_fragment.body_html())}
</div>
<div class="container-footer">
% if settings.FEATURES.get("LICENSING", False):
Expand All @@ -317,36 +316,3 @@
% endif
</nav>
% endif

<%static:require_module_async module_name="js/commerce/track_ecommerce_events" class_name="TrackECommerceEvents">

var fbeLink = $("#FBE_banner");
var welcomeLink = $("#welcome");
var accessDeniedUpsellLink = $("#accessDeniedUpsell");
var sockLink = $("#sock");

TrackECommerceEvents.trackUpsellClick(fbeLink, 'in_course_audit_access_expires', {
pageName: "in_course",
linkType: "link",
linkCategory: "FBE_banner"
});

TrackECommerceEvents.trackUpsellClick(welcomeLink, 'in_course_welcome', {
pageName: "in_course",
linkType: "link",
linkCategory: "welcome"
});

TrackECommerceEvents.trackUpsellClick(accessDeniedUpsellLink, 'in_course_upgrade', {
pageName: "in_course",
linkType: "link",
linkCategory: "(none)"
});

TrackECommerceEvents.trackUpsellClick(sockLink, 'in_course_sock', {
pageName: "in_course",
linkType: "button",
linkCategory: "green_upgrade"
});

</%static:require_module_async>
1 change: 0 additions & 1 deletion openedx/core/djangoapps/courseware_api/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ class CourseInfoSerializer(serializers.Serializer): # pylint: disable=abstract-
"""

access_expiration = serializers.DictField()
can_show_upgrade_sock = serializers.BooleanField()
content_type_gating_enabled = serializers.BooleanField()
course_goals = CourseGoalsSerializer()
effort = serializers.CharField()
Expand Down
5 changes: 0 additions & 5 deletions openedx/core/djangoapps/courseware_api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin
from openedx.core.lib.courses import get_course_by_id
from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG
from openedx.features.course_experience import ENABLE_COURSE_GOALS
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
from openedx.features.course_duration_limits.access import get_access_expiration_data
Expand Down Expand Up @@ -127,10 +126,6 @@ def content_type_gating_enabled(self):
course_key=self.course_key,
)

@property
def can_show_upgrade_sock(self):
return DISPLAY_COURSE_SOCK_FLAG.is_enabled(self.course_key)

@property
def license(self):
return self.course.license
Expand Down
3 changes: 0 additions & 3 deletions openedx/features/course_experience/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
f'{WAFFLE_FLAG_NAMESPACE}.disable_course_outline_page', __name__
)

# Waffle flag to enable the sock on the footer of the home and courseware pages.
DISPLAY_COURSE_SOCK_FLAG = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.display_course_sock', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation

# Waffle flag to let learners access a course before its start date.
COURSE_PRE_START_ACCESS_FLAG = WaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.pre_start_access', __name__) # lint-amnesty, pylint: disable=toggle-missing-annotation

Expand Down
Loading
Loading