Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions cms/djangoapps/contentstore/views/tests/test_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -2675,10 +2675,7 @@ def setUp(self):
XBlockStudioConfiguration.objects.create(
name="openassessment", enabled=True, support_level="us"
)
# Library Sourced Block and Library Content block has it's own category.
XBlockStudioConfiguration.objects.create(
name="library_sourced", enabled=True, support_level="fs"
)
# Library Content block has its own category.
XBlockStudioConfiguration.objects.create(
name="library_content", enabled=True, support_level="fs"
)
Expand Down
8 changes: 7 additions & 1 deletion docs/decisions/0013-library-reference-content-block.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ Referencing Content Blocks in Library V2

Status
=======
Pending

**Deferred** as of September 2023.

The goals described in the ADR are still relevant to future development,
but for the intial launch of Blockstore-backed content libraries,
the existing ``library_content`` block will be used instead,
and it will continue to copy blocks from Blockstore into Modulestore as necessary.

Context
=======
Expand Down
2 changes: 1 addition & 1 deletion openedx/core/lib/xblock_utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ def xblock_resource_pkg(block):
ProblemBlock, and most other built-in blocks currently. Handling for these
assets does not interact with this function.
2. The (preferred) standard XBlock runtime resource loading system, used by
LibrarySourcedBlock. Handling for these assets *does* interact with this
LibraryContentBlock. Handling for these assets *does* interact with this
function.
We hope to migrate to (2) eventually, tracked by:
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"image = xmodule.template_block:TranslateCustomTagBlock",
"library = xmodule.library_root_xblock:LibraryRoot",
"library_content = xmodule.library_content_block:LibraryContentBlock",
"library_sourced = xmodule.library_sourced_block:LibrarySourcedBlock",
"lti = xmodule.lti_block:LTIBlock",
"poll_question = xmodule.poll_block:PollBlock",
"problem = xmodule.capa_block:ProblemBlock",
Expand Down
1 change: 0 additions & 1 deletion webpack.common.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ module.exports = Merge.smart({
// Studio
Import: './cms/static/js/features/import/factories/import.js',
CourseOrLibraryListing: './cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx',
LibrarySourcedBlockPicker: './xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx', // eslint-disable-line max-len
'js/factories/textbooks': './cms/static/js/factories/textbooks.js',
'js/factories/container': './cms/static/js/factories/container.js',
'js/factories/context_course': './cms/static/js/factories/context_course.js',
Expand Down
9 changes: 2 additions & 7 deletions xmodule/assets/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ It is collected into the static root, and then linked to from XBlock fragments b
.. _annotatable/_display.scss: https://github.com/openedx/edx-platform/tree/master/xmodule/assets/annotatable/_display.scss
.. _simplify things: https://github.com/openedx/edx-platform/issues/32621

Static CSS (.css)
*****************

Non-themable, ready-to-seve CSS may also be added to the any block type's
subdirectory. For example, see `library_source_block/style.css`_.

JavaScript (.js)
****************
Expand All @@ -72,7 +67,7 @@ Currently, edx-platform XBlock JS is defined both here in `xmodule/assets`_ and
* For other "purer" blocks, the JS is used as a standard XBlock fragment. Example blocks:

* `VerticalBlock`_
* `LibrarySourcedBlock`_
* `LibraryContentBlock`_

As part of an `active build refactoring`_, we will soon consolidate all edx-platform XBlock JS here in `xmodule/assets`_.

Expand All @@ -82,7 +77,7 @@ As part of an `active build refactoring`_, we will soon consolidate all edx-plat
.. _HtmlBlock: https://github.com/openedx/edx-platform/blob/master/xmodule/html_block.py
.. _AnnotatableBlock: https://github.com/openedx/edx-platform/blob/master/xmodule/annotatable_block.py
.. _VerticalBlock: https://github.com/openedx/edx-platform/blob/master/xmodule/vertical_block.py
.. _LibrarySourcedBlock: https://github.com/openedx/edx-platform/blob/master/xmodule/library_sourced_block.py
.. _LibraryContentBlock: https://github.com/openedx/edx-platform/blob/master/xmodule/library_content_block.py
.. _active build refactoring: https://github.com/openedx/edx-platform/issues/31624
.. _builtin_assets.py: https://github.com/openedx/edx-platform/tree/master/xmodule/util/builtin_assets.py
.. _static_content.py: https://github.com/openedx/edx-platform/blob/master/xmodule/static_content.py
Expand Down
236 changes: 0 additions & 236 deletions xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx

This file was deleted.

This file was deleted.

Loading