Skip to content

Commit

Permalink
feat: [AXIMST-783] change disscussion feature flag name
Browse files Browse the repository at this point in the history
  • Loading branch information
NiedielnitsevIvan committed Apr 11, 2024
1 parent 74db0c7 commit 3bd818b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 16 deletions.
21 changes: 12 additions & 9 deletions lms/djangoapps/courseware/toggles.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,20 @@
f'{WAFFLE_FLAG_NAMESPACE}.disable_navigation_sidebar', __name__
)

# .. toggle_name: courseware.disable_default_opening_discussion_sidebar
# .. toggle_name: courseware.show_default_right_sidebar
# .. toggle_implementation: WaffleFlag
# .. toggle_default: False
# .. toggle_description: Disable opening the discussion sidebar by default on Learning MFE.
# .. toggle_description: If waffle flag disabled
# Discussions or Notifications sidebar shouldn't be displayed at all on Learning MFE.
# If waffle flag enabled - Discussions opens always on the pages with discussions,
# if user is in Audit and course has verified mode - show Notifications.
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2024-03-13
# .. toggle_creation_date: 2024-04-11
# .. toggle_target_removal_date: None
# .. toggle_tickets: AXIMST-629
# .. toggle_tickets: FC-0056
# .. toggle_warning: None.
COURSEWARE_MICROFRONTEND_DISCUSSION_SIDEBAR_OPEN_DISABLED = CourseWaffleFlag(
f'{WAFFLE_FLAG_NAMESPACE}.disable_default_opening_discussion_sidebar', __name__
COURSEWARE_SHOW_DEFAULT_RIGHT_SIDEBAR = CourseWaffleFlag(
f'{WAFFLE_FLAG_NAMESPACE}.show_default_right_sidebar', __name__
)

# .. toggle_name: courseware.mfe_progress_milestones_streak_discount_enabled
Expand Down Expand Up @@ -218,11 +221,11 @@ def courseware_mfe_sidebar_is_disabled(course_key=None):
return COURSEWARE_MICROFRONTEND_SIDEBAR_DISABLED.is_enabled(course_key)


def courseware_mfe_discussion_sidebar_opening_is_disabled(course_key=None):
def courseware_show_default_right_sidebar_is_enabled(course_key=None):
"""
Return whether the courseware.disable_default_opening_discussion_sidebar flag is on.
Return whether the courseware.show_default_right_sidebar flag is on.
"""
return COURSEWARE_MICROFRONTEND_DISCUSSION_SIDEBAR_OPEN_DISABLED.is_enabled(course_key)
return COURSEWARE_SHOW_DEFAULT_RIGHT_SIDEBAR.is_enabled(course_key)


def courseware_mfe_navigation_sidebar_blocks_caching_is_enabled(course_key=None):
Expand Down
11 changes: 7 additions & 4 deletions lms/djangoapps/courseware/views/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@
from lms.djangoapps.courseware.permissions import MASQUERADE_AS_STUDENT, VIEW_COURSE_HOME, VIEW_COURSEWARE
from lms.djangoapps.courseware.toggles import (
course_is_invitation_only,
courseware_mfe_discussion_sidebar_opening_is_disabled,
courseware_mfe_search_is_enabled,
courseware_mfe_sidebar_is_disabled,
courseware_show_default_right_sidebar_is_enabled,
)
from lms.djangoapps.courseware.user_state_client import DjangoXBlockUserStateClient
from lms.djangoapps.courseware.utils import (
Expand Down Expand Up @@ -2288,12 +2288,15 @@ def courseware_mfe_sidebar_enabled(request, course_id=None):


@api_view(['GET'])
def courseware_mfe_discussion_sidebar_opening_is_enabled(request, course_id=None):
def courseware_mfe_show_default_right_sidebar_is_enabled(request, course_id=None):
"""
Simple GET endpoint to expose whether the course may open discussion sidebar by default.
"""
course_key = CourseKey.from_string(course_id) if course_id else None
try:
course_key = CourseKey.from_string(course_id) if course_id else None
except InvalidKeyError:
return JsonResponse({"error": "Invalid course_id"})

return JsonResponse({
"enabled": not courseware_mfe_discussion_sidebar_opening_is_disabled(course_key)
"enabled": courseware_show_default_right_sidebar_is_enabled(course_key)
})
6 changes: 3 additions & 3 deletions lms/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -755,9 +755,9 @@
name='courseware_sidebar_enabled_view',
),
re_path(
fr'^courses/{settings.COURSE_ID_PATTERN}/discussion-sidebar/enabled/$',
courseware_views.courseware_mfe_discussion_sidebar_opening_is_enabled,
name='discussion_sidebar_enabled_view',
fr'^courses/{settings.COURSE_ID_PATTERN}/show-default-right-sidebar/enabled/$',
courseware_views.courseware_mfe_show_default_right_sidebar_is_enabled,
name='show_default_right_sidebar_enabled_view',
),
]

Expand Down

0 comments on commit 3bd818b

Please sign in to comment.