Skip to content

fix: import authoring filter from content_authoring instead #36109

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
merged 4 commits into from
Feb 21, 2025
Merged

fix: import authoring filter from content_authoring instead #36109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4941f03
refactor: import authoring filter from content_authoring instead
mariajgrimaldi Jan 15, 2025
012e8e7
chore!: update library to latest release with breaking change
mariajgrimaldi Feb 17, 2025
293d43c
fix: add missing dependencies in requirement files
mariajgrimaldi Feb 17, 2025
005231d
fix: use correct filter type for testing
mariajgrimaldi Feb 17, 2025
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
4 changes: 2 additions & 2 deletions cms/djangoapps/contentstore/asset_storage_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from common.djangoapps.util.json_request import JsonResponse
from openedx.core.djangoapps.contentserver.caching import del_cached_content
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
from openedx_filters.course_authoring.filters import LMSPageURLRequested
from openedx_filters.content_authoring.filters import LMSPageURLRequested
from xmodule.contentstore.content import StaticContent # lint-amnesty, pylint: disable=wrong-import-order
from xmodule.contentstore.django import contentstore # lint-amnesty, pylint: disable=wrong-import-order
from xmodule.exceptions import NotFoundError # lint-amnesty, pylint: disable=wrong-import-order
Expand Down Expand Up @@ -717,7 +717,7 @@ def get_asset_json(display_name, content_type, date, location, thumbnail_locatio
asset_url = StaticContent.serialize_asset_key_with_slash(location)

## .. filter_implemented_name: LMSPageURLRequested
## .. filter_type: org.openedx.course_authoring.lms.page.url.requested.v1
## .. filter_type: org.openedx.content_authoring.lms.page.url.requested.v1
lms_root, _ = LMSPageURLRequested.run_filter(
url=configuration_helpers.get_value('LMS_ROOT_URL', settings.LMS_ROOT_URL),
org=location.org,
Expand Down
2 changes: 1 addition & 1 deletion cms/djangoapps/contentstore/tests/test_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def setUp(self): # pylint: disable=arguments-differ

@override_settings(
OPEN_EDX_FILTERS_CONFIG={
"org.openedx.course_authoring.lms.page.url.requested.v1": {
"org.openedx.content_authoring.lms.page.url.requested.v1": {
"pipeline": [
"common.djangoapps.util.tests.test_filters.TestPageURLRequestedPipelineStep",
],
Expand Down
3 changes: 2 additions & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ edx-opaque-keys[django]==2.11.0
# edx-when
# lti-consumer-xblock
# openedx-events
# openedx-filters
# ora2
edx-organizations==6.13.0
# via -r requirements/edx/kernel.in
Expand Down Expand Up @@ -820,7 +821,7 @@ openedx-events==9.18.0
# edx-name-affirmation
# event-tracking
# ora2
openedx-filters==1.12.0
openedx-filters==2.0.0
# via
# -r requirements/edx/kernel.in
# lti-consumer-xblock
Expand Down
3 changes: 2 additions & 1 deletion requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,7 @@ edx-opaque-keys[django]==2.11.0
# edx-when
# lti-consumer-xblock
# openedx-events
# openedx-filters
# ora2
edx-organizations==6.13.0
# via
Expand Down Expand Up @@ -1371,7 +1372,7 @@ openedx-events==9.18.0
# edx-name-affirmation
# event-tracking
# ora2
openedx-filters==1.12.0
openedx-filters==2.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down
3 changes: 2 additions & 1 deletion requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ edx-opaque-keys[django]==2.11.0
# edx-when
# lti-consumer-xblock
# openedx-events
# openedx-filters
# ora2
edx-organizations==6.13.0
# via -r requirements/edx/base.txt
Expand Down Expand Up @@ -993,7 +994,7 @@ openedx-events==9.18.0
# edx-name-affirmation
# event-tracking
# ora2
openedx-filters==1.12.0
openedx-filters==2.0.0
# via
# -r requirements/edx/base.txt
# lti-consumer-xblock
Expand Down
3 changes: 2 additions & 1 deletion requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ edx-opaque-keys[django]==2.11.0
# edx-when
# lti-consumer-xblock
# openedx-events
# openedx-filters
# ora2
edx-organizations==6.13.0
# via -r requirements/edx/base.txt
Expand Down Expand Up @@ -1041,7 +1042,7 @@ openedx-events==9.18.0
# edx-name-affirmation
# event-tracking
# ora2
openedx-filters==1.12.0
openedx-filters==2.0.0
# via
# -r requirements/edx/base.txt
# lti-consumer-xblock
Expand Down
Loading