-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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.
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
feat: add API to return list of downstream blocks for an upstream [FC-0076] #36253
Draft
rpenido
wants to merge
1
commit into
openedx:master
Choose a base branch
from
open-craft:rpenido/fal-4005/list-courses-using-library
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+105
−3
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,9 +47,9 @@ class Fields: | |
context_key = "context_key" | ||
org = "org" | ||
access_id = "access_id" # .models.SearchAccess.id | ||
# breadcrumbs: an array of {"display_name": "..."} entries. First one is the name of the course/library itself. | ||
# breadcrumbs: an array of {"display_name": "...", "usage_key": "...", "url": "..."} entries. | ||
# First one is the name of the course/library itself. | ||
# After that is the name of any parent Section/Subsection/Unit/etc. | ||
# It's a list of dictionaries because for now we just include the name of each but in future we may add their IDs. | ||
breadcrumbs = "breadcrumbs" | ||
# tags (dictionary) | ||
# See https://blog.meilisearch.com/nested-hierarchical-facets-guide/ | ||
|
@@ -199,6 +199,7 @@ def _fields_from_block(block) -> dict: | |
class implementation returns only: | ||
{"content": {"display_name": "..."}, "content_type": "..."} | ||
""" | ||
|
||
block_type = block.scope_ids.block_type | ||
block_data = { | ||
Fields.usage_key: str(block.usage_key), | ||
|
@@ -213,6 +214,9 @@ class implementation returns only: | |
} | ||
# Get the breadcrumbs (course, section, subsection, etc.): | ||
if block.usage_key.context_key.is_course: # Getting parent is not yet implemented in Learning Core (for libraries). | ||
# Import here to avoid circular imports | ||
from cms.djangoapps.contentstore.utils import reverse_course_url, reverse_usage_url | ||
|
||
cur_block = block | ||
while cur_block.parent: | ||
if not cur_block.has_cached_parent: | ||
|
@@ -225,6 +229,15 @@ class implementation returns only: | |
} | ||
if cur_block.scope_ids.block_type != "course": | ||
parent_data["usage_key"] = str(cur_block.usage_key) | ||
# Section and subsections don't have URLs in the CMS | ||
if cur_block.scope_ids.block_type not in ["chapter", "sequential"]: | ||
parent_data["url"] = ( | ||
reverse_course_url("course_handler", cur_block.context_key) + | ||
reverse_usage_url("container_handler", cur_block.usage_key) | ||
) | ||
else: | ||
parent_data["url"] = reverse_course_url("course_handler", cur_block.context_key) | ||
Comment on lines
+233
to
+239
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure if we need to include this data in index as it can be easily derived from the information already present. |
||
|
||
block_data[Fields.breadcrumbs].insert( | ||
0, | ||
parent_data, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: Instead of manually doing this, we can use serializer.