From 51ddcd731e19c9424c0b41023c887d9a277142b4 Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Fri, 2 Dec 2022 14:41:34 +0530 Subject: [PATCH 01/11] feat: adds VerticalBlockChildrenLoaded filter call This introduces the VerticalBlockChildrenLoaded filter that is run after all the child blocks are fetched before rendering a student or the public view. This will allow modifying the contents of the VerticalBlock before presenting it to the students. Internal-ref: https://tasks.opencraft.com/browse/BB-6932 --- docs/guides/hooks/filters.rst | 10 +++++++--- xmodule/vertical_block.py | 8 +++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/guides/hooks/filters.rst b/docs/guides/hooks/filters.rst index 9e8496aead70..961a78811211 100644 --- a/docs/guides/hooks/filters.rst +++ b/docs/guides/hooks/filters.rst @@ -182,6 +182,10 @@ well as the trigger location in this same repository. - org.openedx.learning.dashboard.render.started.v1 - `2022-06-14 `_ - * - `VerticalChildRenderStarted `_ - - org.openedx.learning.veritical_child_block.render.started.v1 - - `2022-08-18 `_ + * - `VerticalBlockChildRenderStarted `_ + - org.openedx.learning.veritical_block_child.render.started.v1 + - TODO: Update link `2022-08-18 `_ + + * - `VerticalBlockChildrenLoaded `_ + - org.openedx.learning.veritical_block.children.loaded.v1 + - TODO: Update date and link `2022-08-18 `_ diff --git a/xmodule/vertical_block.py b/xmodule/vertical_block.py index 6d6f8aef8a54..14d80b276eb2 100644 --- a/xmodule/vertical_block.py +++ b/xmodule/vertical_block.py @@ -13,7 +13,7 @@ from web_fragments.fragment import Fragment from xblock.core import XBlock # lint-amnesty, pylint: disable=wrong-import-order from xblock.fields import Boolean, Scope -from openedx_filters.learning.filters import VerticalBlockChildRenderStarted +from openedx_filters.learning.filters import VerticalBlockChildRenderStarted, VerticalBlockChildrenLoaded from xmodule.mako_block import MakoTemplateBlockBase from xmodule.progress import Progress from xmodule.seq_block import SequenceFields @@ -97,6 +97,12 @@ def _student_or_public_view(self, context, view): child_blocks = self.get_children() # lint-amnesty, pylint: disable=no-member + # .. filter_implemented_name: VerticalBlockChildrenLoaded + # .. filter_type: org.openedx.learning.vertical_block.children.loaded.v1 + child_blocks, context, view = VerticalBlockChildrenLoaded.run_filter( + children=child_blocks, context=context, view=view + ) + child_blocks_to_complete_on_view = set() completion_service = self.runtime.service(self, 'completion') if completion_service and completion_service.completion_tracking_enabled(): From fb2fec3d62c307340489e5de0af43793b87435cd Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Tue, 6 Dec 2022 16:39:35 +0530 Subject: [PATCH 02/11] refactor: replaces VerticalBlock ChildrenLoaded with RenderCompleted filter --- xmodule/vertical_block.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xmodule/vertical_block.py b/xmodule/vertical_block.py index 14d80b276eb2..bdceeb9f8eb4 100644 --- a/xmodule/vertical_block.py +++ b/xmodule/vertical_block.py @@ -13,7 +13,7 @@ from web_fragments.fragment import Fragment from xblock.core import XBlock # lint-amnesty, pylint: disable=wrong-import-order from xblock.fields import Boolean, Scope -from openedx_filters.learning.filters import VerticalBlockChildRenderStarted, VerticalBlockChildrenLoaded +from openedx_filters.learning.filters import VerticalBlockChildRenderStarted, VerticalBlockRenderCompleted from xmodule.mako_block import MakoTemplateBlockBase from xmodule.progress import Progress from xmodule.seq_block import SequenceFields @@ -97,12 +97,6 @@ def _student_or_public_view(self, context, view): child_blocks = self.get_children() # lint-amnesty, pylint: disable=no-member - # .. filter_implemented_name: VerticalBlockChildrenLoaded - # .. filter_type: org.openedx.learning.vertical_block.children.loaded.v1 - child_blocks, context, view = VerticalBlockChildrenLoaded.run_filter( - children=child_blocks, context=context, view=view - ) - child_blocks_to_complete_on_view = set() completion_service = self.runtime.service(self, 'completion') if completion_service and completion_service.completion_tracking_enabled(): @@ -168,6 +162,12 @@ def _student_or_public_view(self, context, view): add_webpack_to_fragment(fragment, 'VerticalStudentView') fragment.initialize_js('VerticalStudentView') + # .. filter_implemented_name: VerticalBlockRenderCompleted + # .. filter_type: org.openedx.learning.vertical_block.render.completed.v1 + fragment, context, view = VerticalBlockRenderCompleted.run_filter( + fragment=fragment, context=context, view=view + ) + return fragment def block_has_access_error(self, block): From a8ce80a26a155bc8bae385868fbbfddece8fa03c Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Tue, 6 Dec 2022 16:44:31 +0530 Subject: [PATCH 03/11] temp: pin openedx-filters version to the dev branch --- requirements/edx/development.txt | 3 ++- requirements/edx/testing.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index aad1b6425360..4f34212bf161 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1009,7 +1009,8 @@ openedx-events==5.0.0 # via # -r requirements/edx/testing.txt # edx-event-bus-kafka -openedx-filters==1.0.0 +# openedx-filters==0.8.0 +openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@984f734f82bffff08e14757ed770a8b1663265be # via # -r requirements/edx/testing.txt # lti-consumer-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index e0c58f84d899..4aabd0caad4d 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -959,7 +959,8 @@ openedx-events==5.0.0 # via # -r requirements/edx/base.txt # edx-event-bus-kafka -openedx-filters==1.0.0 +# openedx-filters==0.8.0 +openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@984f734f82bffff08e14757ed770a8b1663265be # via # -r requirements/edx/base.txt # lti-consumer-xblock From ffbe3fa9442dfbaee217aa85ae0d14eabb4166b0 Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Tue, 6 Dec 2022 20:46:19 +0530 Subject: [PATCH 04/11] fix: rename the filter in the docs --- docs/guides/hooks/filters.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/hooks/filters.rst b/docs/guides/hooks/filters.rst index 961a78811211..2cd64125030a 100644 --- a/docs/guides/hooks/filters.rst +++ b/docs/guides/hooks/filters.rst @@ -186,6 +186,6 @@ well as the trigger location in this same repository. - org.openedx.learning.veritical_block_child.render.started.v1 - TODO: Update link `2022-08-18 `_ - * - `VerticalBlockChildrenLoaded `_ - - org.openedx.learning.veritical_block.children.loaded.v1 + * - `VerticalBlockRenderCompleted `_ + - org.openedx.learning.veritical_block.render.completed.v1 - TODO: Update date and link `2022-08-18 `_ From 5b659930f4a5b039c2e7d43c9f54099bac7de6ba Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Tue, 20 Dec 2022 18:28:23 +0530 Subject: [PATCH 05/11] refactor: pass the block as the first argument to the filter --- xmodule/vertical_block.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmodule/vertical_block.py b/xmodule/vertical_block.py index bdceeb9f8eb4..7b5fd215668e 100644 --- a/xmodule/vertical_block.py +++ b/xmodule/vertical_block.py @@ -164,8 +164,8 @@ def _student_or_public_view(self, context, view): # .. filter_implemented_name: VerticalBlockRenderCompleted # .. filter_type: org.openedx.learning.vertical_block.render.completed.v1 - fragment, context, view = VerticalBlockRenderCompleted.run_filter( - fragment=fragment, context=context, view=view + _, fragment, context, view = VerticalBlockRenderCompleted.run_filter( + block=self, fragment=fragment, context=context, view=view ) return fragment From 368a7fb443dc6bb15e7361d45667124c0c19ab86 Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Tue, 20 Dec 2022 19:00:36 +0530 Subject: [PATCH 06/11] chore: update the hash of openedx-filters in requirements --- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 4f34212bf161..d8b5fe17a188 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1010,7 +1010,7 @@ openedx-events==5.0.0 # -r requirements/edx/testing.txt # edx-event-bus-kafka # openedx-filters==0.8.0 -openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@984f734f82bffff08e14757ed770a8b1663265be +openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@d0206cf84f2e5e22b1a99d06566d88839d40b9fe # via # -r requirements/edx/testing.txt # lti-consumer-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4aabd0caad4d..e92f4377ffe1 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -960,7 +960,7 @@ openedx-events==5.0.0 # -r requirements/edx/base.txt # edx-event-bus-kafka # openedx-filters==0.8.0 -openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@984f734f82bffff08e14757ed770a8b1663265be +openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@d0206cf84f2e5e22b1a99d06566d88839d40b9fe # via # -r requirements/edx/base.txt # lti-consumer-xblock From 81cef0046fa179268a16cf2eb2a5608e085eb847 Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Mon, 13 Feb 2023 13:08:40 +0530 Subject: [PATCH 07/11] temp: checking if the xmodule tests are passing --- xmodule/tests/test_vertical.py | 73 ++++++++++++++++++++++++++++++++++ xmodule/vertical_block.py | 28 ++++++++----- 2 files changed, 91 insertions(+), 10 deletions(-) diff --git a/xmodule/tests/test_vertical.py b/xmodule/tests/test_vertical.py index a7f993808fad..a3c93d7b7e3a 100644 --- a/xmodule/tests/test_vertical.py +++ b/xmodule/tests/test_vertical.py @@ -14,6 +14,9 @@ import ddt from fs.memoryfs import MemoryFS from django.contrib.auth.models import AnonymousUser +from django.test import override_settings +from openedx_filters import PipelineStep +from openedx_filters.learning.filters import VerticalBlockChildRenderStarted, VerticalBlockRenderCompleted from . import get_test_system from .helpers import StubUserService @@ -78,6 +81,58 @@ def vertical_is_complete(self, item): return self._completion_value == 1 if self._enabled else None +class TestVerticalBlockChildRenderStep(PipelineStep): + """ + Utility class for testing filters on vertical block children + """ + filter_content = "Altered Content" + + def run_filter(self, block, context): + """Pipeline step that changes child content""" + block.html = TestVerticalBlockChildRenderStep.filter_content + return {"block": block, "context": context} + + +class TestPreventVerticalBlockChildRender(PipelineStep): + """ + Utility class to test vertical block children are skipped in rendering. + """ + + def run_filter(self, *args): + """Pipeline step that raises exceptions during child block rendering""" + raise VerticalBlockChildRenderStarted.PreventChildBlockRender( + "Skip block test exception" + ) + + +class TestVerticalBlockRenderCompletedStep(PipelineStep): + """ + Utility class for testing filters on vertical block render completion + """ + + def run_filter(self, block, fragment, content, view): + """Pipeline step that alters the output of the fragment""" + fragment.content += "Extra content added" + return { + "block": block, + "fragment": fragment, + "content": content, + "view": view + } + + +class TestPreventVerticalBlockRenderStep(PipelineStep): + """ + Utility class for testing VerticalBlock render can be stopped. + """ + + def run_filter(self, block, fragment, context, view): + """Pipeline step that raises an exception""" + raise VerticalBlockRenderCompleted.PreventVerticalBlockRender( + "Assignments are not available for Audit students." + ) + + class BaseVerticalBlockTest(XModuleXmlImportTest): """ Tests for the BaseVerticalBlock. @@ -289,3 +344,21 @@ def test_render_studio_view(self): html = self.module_system.render(self.vertical, AUTHOR_VIEW, context).content assert self.test_html in html assert self.test_problem in html + + @override_settings( + OPEN_EDX_FILTERS_CONFIG={ + "org.openedx.learning.vertical_block_child.render.started.v1": { + "pipeline": [ + "x_module.tests.test_vertical.TestVerticalBlockChildRenderStep" + ], + "fail_silently": False, + }, + }, + ) + def test_vertical_block_child_render_started_filter_execution(self): + """ + Test the VerticalBlockChildRenderStarted filter's effects on student view. + """ + html = self.module_system.render(self.vertical, STUDENT_VIEW, {}).content + + assert TestVerticalBlockChildRenderStep.filter_content in html diff --git a/xmodule/vertical_block.py b/xmodule/vertical_block.py index 7b5fd215668e..b1cd48c3e2ef 100644 --- a/xmodule/vertical_block.py +++ b/xmodule/vertical_block.py @@ -117,11 +117,15 @@ def _student_or_public_view(self, context, view): 'mark-completed-on-view-after-delay': complete_on_view_delay } - # .. filter_implemented_name: VerticalBlockChildRenderStarted - # .. filter_type: org.openedx.learning.vertical_block_child.render.started.v1 - child, child_block_context = VerticalBlockChildRenderStarted.run_filter( - block=child, context=child_block_context - ) + try: + # .. filter_implemented_name: VerticalBlockChildRenderStarted + # .. filter_type: org.openedx.learning.vertical_block_child.render.started.v1 + child, child_block_context = VerticalBlockChildRenderStarted.run_filter( + block=child, context=child_block_context + ) + except VerticalBlockChildRenderStarted.PreventChildBlockRender as exc: + log.info("Skipping %s from vertical block. Reason: %s", child, exc.message) + continue rendered_child = child.render(view, child_block_context) fragment.add_fragment_resources(rendered_child) @@ -162,11 +166,15 @@ def _student_or_public_view(self, context, view): add_webpack_to_fragment(fragment, 'VerticalStudentView') fragment.initialize_js('VerticalStudentView') - # .. filter_implemented_name: VerticalBlockRenderCompleted - # .. filter_type: org.openedx.learning.vertical_block.render.completed.v1 - _, fragment, context, view = VerticalBlockRenderCompleted.run_filter( - block=self, fragment=fragment, context=context, view=view - ) + try: + # .. filter_implemented_name: VerticalBlockRenderCompleted + # .. filter_type: org.openedx.learning.vertical_block.render.completed.v1 + _, fragment, context, view = VerticalBlockRenderCompleted.run_filter( + block=self, fragment=fragment, context=context, view=view + ) + except VerticalBlockRenderCompleted.PreventVerticalBlockRender as exc: + log.info("VerticalBlock rendering stopped. Reason: %s", exc.message) + fragment.content = exc.message return fragment From d3d7d20c4c37dfb4d256e7494198cfe61825956a Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Mon, 13 Feb 2023 19:50:51 +0530 Subject: [PATCH 08/11] test: adds tests for the filters introduced in vertical-block --- xmodule/tests/test_vertical.py | 101 ++++++++++++++++++++++++++++----- xmodule/vertical_block.py | 2 +- 2 files changed, 89 insertions(+), 14 deletions(-) diff --git a/xmodule/tests/test_vertical.py b/xmodule/tests/test_vertical.py index a3c93d7b7e3a..1717354b4798 100644 --- a/xmodule/tests/test_vertical.py +++ b/xmodule/tests/test_vertical.py @@ -87,9 +87,10 @@ class TestVerticalBlockChildRenderStep(PipelineStep): """ filter_content = "Altered Content" - def run_filter(self, block, context): + def run_filter(self, block, context): # lint-amnesty, pylint: disable=arguments-differ """Pipeline step that changes child content""" - block.html = TestVerticalBlockChildRenderStep.filter_content + if type(block).__name__ == "HtmlBlockWithMixins": + block.get_html = lambda: TestVerticalBlockChildRenderStep.filter_content return {"block": block, "context": context} @@ -98,25 +99,27 @@ class TestPreventVerticalBlockChildRender(PipelineStep): Utility class to test vertical block children are skipped in rendering. """ - def run_filter(self, *args): + def run_filter(self, block, context): # lint-amnesty, pylint: disable=arguments-differ """Pipeline step that raises exceptions during child block rendering""" - raise VerticalBlockChildRenderStarted.PreventChildBlockRender( - "Skip block test exception" - ) + if type(block).__name__ == "HtmlBlockWithMixins": + raise VerticalBlockChildRenderStarted.PreventChildBlockRender( + "Skip block test exception" + ) class TestVerticalBlockRenderCompletedStep(PipelineStep): """ Utility class for testing filters on vertical block render completion """ + filter_content = "Extra content added" - def run_filter(self, block, fragment, content, view): + def run_filter(self, block, fragment, context, view): # lint-amnesty, pylint: disable=arguments-differ """Pipeline step that alters the output of the fragment""" - fragment.content += "Extra content added" + fragment.content += TestVerticalBlockRenderCompletedStep.filter_content return { "block": block, "fragment": fragment, - "content": content, + "context": context, "view": view } @@ -125,11 +128,12 @@ class TestPreventVerticalBlockRenderStep(PipelineStep): """ Utility class for testing VerticalBlock render can be stopped. """ + filter_content = "
Assignments are not available for Audit students.
" - def run_filter(self, block, fragment, context, view): + def run_filter(self, block, fragment, context, view): # lint-amnesty, pylint: disable=arguments-differ """Pipeline step that raises an exception""" raise VerticalBlockRenderCompleted.PreventVerticalBlockRender( - "Assignments are not available for Audit students." + TestPreventVerticalBlockRenderStep.filter_content ) @@ -349,7 +353,7 @@ def test_render_studio_view(self): OPEN_EDX_FILTERS_CONFIG={ "org.openedx.learning.vertical_block_child.render.started.v1": { "pipeline": [ - "x_module.tests.test_vertical.TestVerticalBlockChildRenderStep" + "xmodule.tests.test_vertical.TestVerticalBlockChildRenderStep" ], "fail_silently": False, }, @@ -359,6 +363,77 @@ def test_vertical_block_child_render_started_filter_execution(self): """ Test the VerticalBlockChildRenderStarted filter's effects on student view. """ - html = self.module_system.render(self.vertical, STUDENT_VIEW, {}).content + self.module_system._services['bookmarks'] = Mock() + self.module_system._services['user'] = StubUserService(user=Mock()) + self.module_system._services['completion'] = StubCompletionService(enabled=True, completion_value=0) + + html = self.module_system.render(self.vertical, STUDENT_VIEW, self.default_context).content assert TestVerticalBlockChildRenderStep.filter_content in html + + @override_settings( + OPEN_EDX_FILTERS_CONFIG={ + "org.openedx.learning.vertical_block_child.render.started.v1": { + "pipeline": [ + "xmodule.tests.test_vertical.TestPreventVerticalBlockChildRender" + ], + "fail_silently": False, + }, + }, + ) + def test_vertical_block_child_render_is_skipped_on_filter_exception(self): + """ + Test VerticalBlockChildRenderStarted filter can be used to skip child blocks. + """ + self.module_system._services['bookmarks'] = Mock() + self.module_system._services['user'] = StubUserService(user=Mock()) + self.module_system._services['completion'] = StubCompletionService(enabled=True, completion_value=0) + + html = self.module_system.render(self.vertical, STUDENT_VIEW, self.default_context).content + + assert self.test_html not in html + assert self.test_html_nested not in html + + @override_settings( + OPEN_EDX_FILTERS_CONFIG={ + "org.openedx.learning.vertical_block.render.completed.v1": { + "pipeline": [ + "xmodule.tests.test_vertical.TestVerticalBlockRenderCompletedStep" + ], + "fail_silently": False, + }, + }, + ) + def test_vertical_block_render_completed_filter_execution(self): + """ + Test the VerticalBlockRenderCompleted filter's execution. + """ + self.module_system._services['bookmarks'] = Mock() + self.module_system._services['user'] = StubUserService(user=Mock()) + self.module_system._services['completion'] = StubCompletionService(enabled=True, completion_value=0) + + html = self.module_system.render(self.vertical, STUDENT_VIEW, self.default_context).content + + assert TestVerticalBlockRenderCompletedStep.filter_content in html + + @override_settings( + OPEN_EDX_FILTERS_CONFIG={ + "org.openedx.learning.vertical_block.render.completed.v1": { + "pipeline": [ + "xmodule.tests.test_vertical.TestPreventVerticalBlockRenderStep" + ], + "fail_silently": False, + }, + }, + ) + def test_vertical_block_render_output_is_changed_on_filter_exception(self): + """ + Test VerticalBlockRenderCompleted filter can be used to prevent vertical block from rendering. + """ + self.module_system._services['bookmarks'] = Mock() + self.module_system._services['user'] = StubUserService(user=Mock()) + self.module_system._services['completion'] = StubCompletionService(enabled=True, completion_value=0) + + html = self.module_system.render(self.vertical, STUDENT_VIEW, self.default_context).content + + assert TestPreventVerticalBlockRenderStep.filter_content == html diff --git a/xmodule/vertical_block.py b/xmodule/vertical_block.py index b1cd48c3e2ef..f66e90203679 100644 --- a/xmodule/vertical_block.py +++ b/xmodule/vertical_block.py @@ -72,7 +72,7 @@ class VerticalBlock( show_in_read_only_mode = True - def _student_or_public_view(self, context, view): + def _student_or_public_view(self, context, view): # lint-amnesty, pylint: disable=too-many-statements """ Renders the requested view type of the block in the LMS. """ From be42ce1c3c83488bb4f07d6f8dc124d7c5d22d8f Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Mon, 13 Feb 2023 20:06:06 +0530 Subject: [PATCH 09/11] chore: pin openedx-filters version to PR commit --- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index d8b5fe17a188..78a95ba8963b 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1010,7 +1010,7 @@ openedx-events==5.0.0 # -r requirements/edx/testing.txt # edx-event-bus-kafka # openedx-filters==0.8.0 -openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@d0206cf84f2e5e22b1a99d06566d88839d40b9fe +openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@ae45fdf1a5d96b766ed5c2dba3680fc691ac118a # via # -r requirements/edx/testing.txt # lti-consumer-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index e92f4377ffe1..24763958798d 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -960,7 +960,7 @@ openedx-events==5.0.0 # -r requirements/edx/base.txt # edx-event-bus-kafka # openedx-filters==0.8.0 -openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@d0206cf84f2e5e22b1a99d06566d88839d40b9fe +openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@ae45fdf1a5d96b766ed5c2dba3680fc691ac118a # via # -r requirements/edx/base.txt # lti-consumer-xblock From d3ec459d1bbd90914755eb8b01449a6a29ec2759 Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Tue, 14 Feb 2023 11:57:39 +0530 Subject: [PATCH 10/11] chore: pin openedx-filters in base.txt for ci --- requirements/edx/base.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 6379b3cfed14..df8ef80fca9c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -762,7 +762,8 @@ openedx-events==5.0.0 # via # -r requirements/edx/base.in # edx-event-bus-kafka -openedx-filters==1.0.0 +# openedx-filters==1.0.0 +openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@ae45fdf1a5d96b766ed5c2dba3680fc691ac118a # via # -r requirements/edx/base.in # lti-consumer-xblock From fb200e4066171a02d0f62bd6bb557fc3a0c862a9 Mon Sep 17 00:00:00 2001 From: Arunmozhi Date: Sat, 18 Feb 2023 21:42:15 +0530 Subject: [PATCH 11/11] chore: update openedx-filters version and links --- docs/guides/hooks/filters.rst | 6 +++--- requirements/edx/base.txt | 3 +-- requirements/edx/development.txt | 3 +-- requirements/edx/testing.txt | 3 +-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/guides/hooks/filters.rst b/docs/guides/hooks/filters.rst index 2cd64125030a..0eb1527503dd 100644 --- a/docs/guides/hooks/filters.rst +++ b/docs/guides/hooks/filters.rst @@ -184,8 +184,8 @@ well as the trigger location in this same repository. * - `VerticalBlockChildRenderStarted `_ - org.openedx.learning.veritical_block_child.render.started.v1 - - TODO: Update link `2022-08-18 `_ + - `2022-08-18 `_ - * - `VerticalBlockRenderCompleted `_ + * - `VerticalBlockRenderCompleted `_ - org.openedx.learning.veritical_block.render.completed.v1 - - TODO: Update date and link `2022-08-18 `_ + - `2022-02-18 `_ diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index df8ef80fca9c..e0dd600cc820 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -762,8 +762,7 @@ openedx-events==5.0.0 # via # -r requirements/edx/base.in # edx-event-bus-kafka -# openedx-filters==1.0.0 -openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@ae45fdf1a5d96b766ed5c2dba3680fc691ac118a +openedx-filters==1.1.0 # via # -r requirements/edx/base.in # lti-consumer-xblock diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 78a95ba8963b..80c11ae785c6 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1009,8 +1009,7 @@ openedx-events==5.0.0 # via # -r requirements/edx/testing.txt # edx-event-bus-kafka -# openedx-filters==0.8.0 -openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@ae45fdf1a5d96b766ed5c2dba3680fc691ac118a +openedx-filters==1.1.0 # via # -r requirements/edx/testing.txt # lti-consumer-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 24763958798d..a70830c5cd8b 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -959,8 +959,7 @@ openedx-events==5.0.0 # via # -r requirements/edx/base.txt # edx-event-bus-kafka -# openedx-filters==0.8.0 -openedx-filters @ git+https://github.com/open-craft/openedx-filters.git@ae45fdf1a5d96b766ed5c2dba3680fc691ac118a +openedx-filters==1.1.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock