Skip to content

Commit d5111c7

Browse files
Merge pull request #38424 from openedx/iahmad/DEPR-36108-general-cleanup
feat: General cleanup of legacy Studio page waffle flags and related code
2 parents 7bd6e04 + bc589aa commit d5111c7

2 files changed

Lines changed: 16 additions & 28 deletions

File tree

cms/djangoapps/contentstore/toggles.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,6 @@ def use_react_markdown_editor(course_key):
159159
return ENABLE_REACT_MARKDOWN_EDITOR.is_enabled(course_key)
160160

161161

162-
163-
164-
165162
# .. toggle_name: contentstore.new_studio_mfe.use_new_video_uploads_page
166163
# .. toggle_implementation: CourseWaffleFlag
167164
# .. toggle_default: False
@@ -216,9 +213,6 @@ def use_new_unit_page(course_key):
216213
return not LEGACY_STUDIO_UNIT_EDITOR.is_enabled(course_key)
217214

218215

219-
220-
221-
222216
# .. toggle_name: contentstore.mock_video_uploads
223217
# .. toggle_implementation: WaffleFlag
224218
# .. toggle_default: False

cms/djangoapps/contentstore/utils.py

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -297,39 +297,35 @@ def get_schedule_details_url(course_locator) -> str:
297297
Gets course authoring microfrontend URL for schedule and details pages view.
298298
"""
299299
mfe_base_url = get_course_authoring_url(course_locator)
300-
if mfe_base_url:
301-
return f'{mfe_base_url}/course/{course_locator}/settings/details'
302-
return None
300+
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/settings/details'
301+
return course_mfe_url if mfe_base_url else None
303302

304303

305304
def get_advanced_settings_url(course_locator) -> str | None:
306305
"""
307306
Gets course authoring microfrontend URL for advanced settings page view.
308307
"""
309308
mfe_base_url = get_course_authoring_url(course_locator)
310-
if mfe_base_url:
311-
return f'{mfe_base_url}/course/{course_locator}/settings/advanced'
312-
return None
309+
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/settings/advanced'
310+
return course_mfe_url if mfe_base_url else None
313311

314312

315313
def get_grading_url(course_locator) -> str:
316314
"""
317315
Gets course authoring microfrontend URL for grading page view.
318316
"""
319317
mfe_base_url = get_course_authoring_url(course_locator)
320-
if mfe_base_url:
321-
return f'{mfe_base_url}/course/{course_locator}/settings/grading'
322-
return None
318+
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/settings/grading'
319+
return course_mfe_url if mfe_base_url else None
323320

324321

325322
def get_course_team_url(course_locator) -> str:
326323
"""
327324
Gets course authoring microfrontend URL for course team page view.
328325
"""
329326
mfe_base_url = get_course_authoring_url(course_locator)
330-
if mfe_base_url:
331-
return f'{mfe_base_url}/course/{course_locator}/course_team'
332-
return None
327+
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/course_team'
328+
return course_mfe_url if mfe_base_url else None
333329

334330

335331
def get_updates_url(course_locator) -> str:
@@ -349,19 +345,17 @@ def get_import_url(course_locator) -> str | None:
349345
Gets course authoring microfrontend URL for import page view.
350346
"""
351347
mfe_base_url = get_course_authoring_url(course_locator)
352-
if mfe_base_url:
353-
return f'{mfe_base_url}/course/{course_locator}/import'
354-
return None
348+
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/import'
349+
return course_mfe_url if mfe_base_url else None
355350

356351

357352
def get_export_url(course_locator) -> str | None:
358353
"""
359354
Gets course authoring microfrontend URL for export page view.
360355
"""
361356
mfe_base_url = get_course_authoring_url(course_locator)
362-
if mfe_base_url:
363-
return f'{mfe_base_url}/course/{course_locator}/export'
364-
return None
357+
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/export'
358+
return course_mfe_url if mfe_base_url else None
365359

366360

367361
def get_optimizer_url(course_locator) -> str:
@@ -445,9 +439,8 @@ def get_certificates_url(course_locator) -> str:
445439
Gets course authoring microfrontend URL for certificates page view.
446440
"""
447441
mfe_base_url = get_course_authoring_url(course_locator)
448-
if mfe_base_url:
449-
return f'{mfe_base_url}/course/{course_locator}/certificates'
450-
return None
442+
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/certificates'
443+
return course_mfe_url if mfe_base_url else None
451444

452445

453446
def get_textbooks_url(course_locator) -> str:
@@ -467,7 +460,8 @@ def get_group_configurations_url(course_locator) -> str:
467460
Gets course authoring microfrontend URL for group configurations page view.
468461
"""
469462
mfe_base_url = get_course_authoring_url(course_locator)
470-
return f'{mfe_base_url}/course/{course_locator}/group_configurations' if mfe_base_url else None
463+
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/group_configurations'
464+
return course_mfe_url if mfe_base_url else None
471465

472466

473467
def get_custom_pages_url(course_locator) -> str:

0 commit comments

Comments
 (0)