From 5ac2120f4169fd8584cb3979c8b4c441925354e3 Mon Sep 17 00:00:00 2001
From: XnpioChV <xnpiochv@gmail.com>
Date: Thu, 14 Dec 2023 10:49:00 -0500
Subject: [PATCH 1/4] feat: Tag count in components

---
 cms/djangoapps/contentstore/views/block.py     | 12 +++++++++++-
 cms/djangoapps/contentstore/views/preview.py   |  7 ++++++-
 cms/static/js/views/pages/container.js         |  2 +-
 cms/templates/studio_xblock_wrapper.html       | 11 ++++++++++-
 openedx/core/djangoapps/content_tagging/api.py |  1 +
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/block.py b/cms/djangoapps/contentstore/views/block.py
index 91078ccd11c6..dcedcf509a5e 100644
--- a/cms/djangoapps/contentstore/views/block.py
+++ b/cms/djangoapps/contentstore/views/block.py
@@ -25,10 +25,11 @@
     wrap_xblock,
     wrap_xblock_aside,
 )
+from openedx.core.djangoapps.content_tagging.api import get_object_tag_counts
 from xmodule.modulestore.django import (
     modulestore,
 )  # lint-amnesty, pylint: disable=wrong-import-order
-
+from cms.djangoapps.contentstore.toggles import use_tagging_taxonomy_list_page
 
 from xmodule.x_module import (
     AUTHOR_VIEW,
@@ -230,6 +231,14 @@ def xblock_view_handler(request, usage_key_string, view_name):
 
             force_render = request.GET.get("force_render", None)
 
+            # Fetch tags of children components
+            tags_count_map = {}
+            if use_tagging_taxonomy_list_page():
+                children = xblock.get_children()
+                child_usage_keys = [str(child.location) for child in children]
+                tags_count_query = ','.join(child_usage_keys)
+                tags_count_map = get_object_tag_counts(tags_count_query)
+
             # Set up the context to be passed to each XBlock's render method.
             context = request.GET.dict()
             context.update(
@@ -245,6 +254,7 @@ def xblock_view_handler(request, usage_key_string, view_name):
                     "paging": paging,
                     "force_render": force_render,
                     "item_url": "/container/{usage_key}",
+                    "tags_count_map": tags_count_map,
                 }
             )
             fragment = get_preview_fragment(request, xblock, context)
diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py
index acab35471813..a897a38ad21a 100644
--- a/cms/djangoapps/contentstore/views/preview.py
+++ b/cms/djangoapps/contentstore/views/preview.py
@@ -302,6 +302,10 @@ def _studio_wrap_xblock(xblock, view, frag, context, display_name_only=False):
         can_edit = context.get('can_edit', True)
         # Is this a course or a library?
         is_course = xblock.scope_ids.usage_id.context_key.is_course
+        tags_count_map = context.get('tags_count_map')
+        tags_count = 0
+        if tags_count_map:
+            tags_count = tags_count_map.get(str(xblock.location), 0)
         template_context = {
             'xblock_context': context,
             'xblock': xblock,
@@ -318,7 +322,8 @@ def _studio_wrap_xblock(xblock, view, frag, context, display_name_only=False):
             'can_add': context.get('can_add', True),
             'can_move': context.get('can_move', is_course),
             'language': getattr(course, 'language', None),
-            'is_course': is_course
+            'is_course': is_course,
+            'tags_count': tags_count,
         }
 
         add_webpack_js_to_fragment(frag, "js/factories/xblock_validation")
diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js
index cea6eb856bd3..783133af21be 100644
--- a/cms/static/js/views/pages/container.js
+++ b/cms/static/js/views/pages/container.js
@@ -32,7 +32,7 @@ function($, _, Backbone, gettext, BasePage,
             'click .new-component-button': 'scrollToNewComponentButtons',
             'click .save-button': 'saveSelectedLibraryComponents',
             'click .paste-component-button': 'pasteComponent',
-            'click .tags-button': 'openManageTags',
+            'click .manage-tags-button': 'openManageTags',
             'change .header-library-checkbox': 'toggleLibraryComponent',
             'click .collapse-button': 'collapseXBlock',
         },
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html
index 63ff93d41a1b..dc8d578027f6 100644
--- a/cms/templates/studio_xblock_wrapper.html
+++ b/cms/templates/studio_xblock_wrapper.html
@@ -99,6 +99,15 @@
             <ul class="actions-list nav-dd ui-right">
                 % if not is_root:
                     % if can_edit:
+                        % if use_tagging and tags_count:
+                            <li class="action-item">
+                                <button data-tooltip="${_("Manage Tags")}" class="btn-default action-button manage-tags-button">
+                                    <span class="icon fa fa-tag" aria-hidden="true"></span>
+                                    <span>${tags_count}</span>
+                                    <span class="sr action-button-text">${_("Manage Tags")}</span>
+                                </button>
+                            </li>
+                        % endif
                         % if not show_inline:
                             <li class="action-item action-edit">
                                 <button class="btn-default edit-button action-button" data-usage-id=${xblock.scope_ids.usage_id}>
@@ -128,7 +137,7 @@
                                         % endif
                                         % if use_tagging:
                                             <li class="nav-item">
-                                                <a class="tags-button" href="#" role="button">${_("Manage tags")}</a>
+                                                <a class="manage-tags-button" href="#" role="button">${_("Manage tags")}</a>
                                             </li>
                                         % endif
                                         % if is_course:
diff --git a/openedx/core/djangoapps/content_tagging/api.py b/openedx/core/djangoapps/content_tagging/api.py
index 1f33cc1c84e5..cad6bc94f7db 100644
--- a/openedx/core/djangoapps/content_tagging/api.py
+++ b/openedx/core/djangoapps/content_tagging/api.py
@@ -164,5 +164,6 @@ def tag_content_object(
 get_taxonomy = oel_tagging.get_taxonomy
 get_taxonomies = oel_tagging.get_taxonomies
 get_tags = oel_tagging.get_tags
+get_object_tag_counts = oel_tagging.get_object_tag_counts
 delete_object_tags = oel_tagging.delete_object_tags
 resync_object_tags = oel_tagging.resync_object_tags

From 6964201922ddb05b36b38d46f69c6d5154646c99 Mon Sep 17 00:00:00 2001
From: XnpioChV <xnpiochv@gmail.com>
Date: Thu, 14 Dec 2023 13:09:29 -0500
Subject: [PATCH 2/4] test: Added test for tag count

---
 cms/djangoapps/contentstore/views/block.py    | 11 +++----
 .../contentstore/views/tests/test_block.py    | 33 +++++++++++++++++++
 .../xblock_storage_handlers/xblock_helpers.py | 11 +++++++
 cms/templates/studio_xblock_wrapper.html      |  2 +-
 4 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/block.py b/cms/djangoapps/contentstore/views/block.py
index dcedcf509a5e..8d157c66c45b 100644
--- a/cms/djangoapps/contentstore/views/block.py
+++ b/cms/djangoapps/contentstore/views/block.py
@@ -25,7 +25,6 @@
     wrap_xblock,
     wrap_xblock_aside,
 )
-from openedx.core.djangoapps.content_tagging.api import get_object_tag_counts
 from xmodule.modulestore.django import (
     modulestore,
 )  # lint-amnesty, pylint: disable=wrong-import-order
@@ -52,7 +51,10 @@
     get_xblock,
     delete_orphans,
 )
-from cms.djangoapps.contentstore.xblock_storage_handlers.xblock_helpers import usage_key_with_run
+from cms.djangoapps.contentstore.xblock_storage_handlers.xblock_helpers import (
+    usage_key_with_run,
+    get_children_tags_count,
+)
 
 
 __all__ = [
@@ -234,10 +236,7 @@ def xblock_view_handler(request, usage_key_string, view_name):
             # Fetch tags of children components
             tags_count_map = {}
             if use_tagging_taxonomy_list_page():
-                children = xblock.get_children()
-                child_usage_keys = [str(child.location) for child in children]
-                tags_count_query = ','.join(child_usage_keys)
-                tags_count_map = get_object_tag_counts(tags_count_query)
+                tags_count_map = get_children_tags_count(xblock)
 
             # Set up the context to be passed to each XBlock's render method.
             context = request.GET.dict()
diff --git a/cms/djangoapps/contentstore/views/tests/test_block.py b/cms/djangoapps/contentstore/views/tests/test_block.py
index a90187ef605d..ac86961b2293 100644
--- a/cms/djangoapps/contentstore/views/tests/test_block.py
+++ b/cms/djangoapps/contentstore/views/tests/test_block.py
@@ -17,6 +17,7 @@
 from openedx_events.content_authoring.signals import XBLOCK_DUPLICATED
 from openedx_events.tests.utils import OpenEdxEventsTestMixin
 from edx_proctoring.exceptions import ProctoredExamNotFoundException
+from edx_toggles.toggles.testutils import override_waffle_flag
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.asides import AsideUsageKeyV2
 from opaque_keys.edx.keys import CourseKey, UsageKey
@@ -83,6 +84,7 @@
     add_container_page_publishing_info,
     create_xblock_info,
 )
+from cms.djangoapps.contentstore.toggles import ENABLE_TAGGING_TAXONOMY_LIST_PAGE
 
 
 class AsideTest(XBlockAside):
@@ -269,6 +271,37 @@ def test_get_container_nested_container_fragment(self):
             ),
         )
 
+    @override_waffle_flag(ENABLE_TAGGING_TAXONOMY_LIST_PAGE, True)
+    @patch("cms.djangoapps.contentstore.xblock_storage_handlers.xblock_helpers.get_object_tag_counts")
+    def test_tag_count_in_container_fragment(self, mock_get_object_tag_counts):
+        root_usage_key = self._create_vertical()
+
+        # Add a problem beneath a child vertical
+        child_vertical_usage_key = self._create_vertical(
+            parent_usage_key=root_usage_key
+        )
+        resp = self.create_xblock(
+            parent_usage_key=child_vertical_usage_key,
+            category="problem",
+            boilerplate="multiplechoice.yaml",
+        )
+        self.assertEqual(resp.status_code, 200)
+        usage_key = self.response_usage_key(resp)
+
+        # Get the preview HTML without tags
+        mock_get_object_tag_counts.return_value = {}
+        html, __ = self._get_container_preview(root_usage_key)
+        self.assertIn("wrapper-xblock", html)
+        self.assertNotIn('data-testid="tag-count-button"', html)
+
+        # Get the preview HTML with tags
+        mock_get_object_tag_counts.return_value = {
+            str(usage_key): 13
+        }
+        html, __ = self._get_container_preview(root_usage_key)
+        self.assertIn("wrapper-xblock", html)
+        self.assertIn('data-testid="tag-count-button"', html)
+
     def test_split_test(self):
         """
         Test that a split_test block renders all of its children in Studio.
diff --git a/cms/djangoapps/contentstore/xblock_storage_handlers/xblock_helpers.py b/cms/djangoapps/contentstore/xblock_storage_handlers/xblock_helpers.py
index 3205b79a8887..c0a01e45ea3c 100644
--- a/cms/djangoapps/contentstore/xblock_storage_handlers/xblock_helpers.py
+++ b/cms/djangoapps/contentstore/xblock_storage_handlers/xblock_helpers.py
@@ -4,6 +4,7 @@
 
 from opaque_keys.edx.keys import UsageKey
 from xmodule.modulestore.django import modulestore
+from openedx.core.djangoapps.content_tagging.api import get_object_tag_counts
 
 
 def usage_key_with_run(usage_key_string):
@@ -13,3 +14,13 @@ def usage_key_with_run(usage_key_string):
     usage_key = UsageKey.from_string(usage_key_string)
     usage_key = usage_key.replace(course_key=modulestore().fill_in_run(usage_key.course_key))
     return usage_key
+
+
+def get_children_tags_count(xblock):
+    """
+    Returns a map with tag count of each child
+    """
+    children = xblock.get_children()
+    child_usage_keys = [str(child.location) for child in children]
+    tags_count_query = ','.join(child_usage_keys)
+    return get_object_tag_counts(tags_count_query)
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html
index dc8d578027f6..328a0a37e90d 100644
--- a/cms/templates/studio_xblock_wrapper.html
+++ b/cms/templates/studio_xblock_wrapper.html
@@ -101,7 +101,7 @@
                     % if can_edit:
                         % if use_tagging and tags_count:
                             <li class="action-item">
-                                <button data-tooltip="${_("Manage Tags")}" class="btn-default action-button manage-tags-button">
+                                <button data-tooltip="${_("Manage Tags")}" class="btn-default action-button manage-tags-button" data-testid="tag-count-button">
                                     <span class="icon fa fa-tag" aria-hidden="true"></span>
                                     <span>${tags_count}</span>
                                     <span class="sr action-button-text">${_("Manage Tags")}</span>

From 2f99115e6edd7eb9ea1e1d20c1625d32de1c975a Mon Sep 17 00:00:00 2001
From: XnpioChV <xnpiochv@gmail.com>
Date: Fri, 15 Dec 2023 10:35:00 -0500
Subject: [PATCH 3/4] fix: Use count_implicit to the counts to be consistent

---
 .../contentstore/xblock_storage_handlers/view_handlers.py     | 4 ++--
 .../contentstore/xblock_storage_handlers/xblock_helpers.py    | 2 +-
 requirements/constraints.txt                                  | 2 +-
 requirements/edx/base.txt                                     | 2 +-
 requirements/edx/development.txt                              | 2 +-
 requirements/edx/doc.txt                                      | 2 +-
 requirements/edx/kernel.in                                    | 2 +-
 requirements/edx/testing.txt                                  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
index f94b43d3e758..eb79181c4659 100644
--- a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
+++ b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
@@ -19,7 +19,7 @@
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.utils.translation import gettext as _
 from edx_django_utils.plugins import pluggable_override
-from openedx_tagging.core.tagging import api as tagging_api
+from openedx.core.djangoapps.content_tagging.api import get_object_tag_counts
 from edx_proctoring.api import (
     does_backend_support_onboarding,
     get_exam_by_content_id,
@@ -1249,7 +1249,7 @@ def _get_course_unit_tags(course_key) -> dict:
     # Create a pattern to match the IDs of the units, e.g. "block-v1:org+course+run+type@vertical+block@*"
     vertical_key = course_key.make_usage_key('vertical', 'x')
     unit_key_pattern = str(vertical_key).rsplit("@", 1)[0] + "@*"
-    return tagging_api.get_object_tag_counts(unit_key_pattern)
+    return get_object_tag_counts(unit_key_pattern, count_implicit=True)
 
 
 def _was_xblock_ever_exam_linked_with_external(course, xblock):
diff --git a/cms/djangoapps/contentstore/xblock_storage_handlers/xblock_helpers.py b/cms/djangoapps/contentstore/xblock_storage_handlers/xblock_helpers.py
index c0a01e45ea3c..7e589405a1c2 100644
--- a/cms/djangoapps/contentstore/xblock_storage_handlers/xblock_helpers.py
+++ b/cms/djangoapps/contentstore/xblock_storage_handlers/xblock_helpers.py
@@ -23,4 +23,4 @@ def get_children_tags_count(xblock):
     children = xblock.get_children()
     child_usage_keys = [str(child.location) for child in children]
     tags_count_query = ','.join(child_usage_keys)
-    return get_object_tag_counts(tags_count_query)
+    return get_object_tag_counts(tags_count_query, count_implicit=True)
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 77409d165b42..3942c5838970 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -103,7 +103,7 @@ libsass==0.10.0
 click==8.1.6
 
 # pinning this version to avoid updates while the library is being developed
-openedx-learning==0.3.6
+openedx-learning==0.4.0
 
 # Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
 openai<=0.28.1
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 3f1394707707..ae6877c49cf1 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -779,7 +779,7 @@ openedx-filters==1.6.0
     # via
     #   -r requirements/edx/kernel.in
     #   lti-consumer-xblock
-openedx-learning==0.3.6
+openedx-learning @ git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 584a406988b9..14bb3ee3a6da 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1311,7 +1311,7 @@ openedx-filters==1.6.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   lti-consumer-xblock
-openedx-learning==0.3.6
+openedx-learning @ git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 0dbbf15b2a5f..4ede1c961083 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -921,7 +921,7 @@ openedx-filters==1.6.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
-openedx-learning==0.3.6
+openedx-learning @ git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in
index 744f1bd632ce..5b2c44e2f42c 100644
--- a/requirements/edx/kernel.in
+++ b/requirements/edx/kernel.in
@@ -117,7 +117,7 @@ openedx-calc                        # Library supporting mathematical calculatio
 openedx-django-require
 openedx-events                      # Open edX Events from Hooks Extension Framework (OEP-50)
 openedx-filters                     # Open edX Filters from Hooks Extension Framework (OEP-50)
-openedx-learning                    # Open edX Learning core (experimental)
+git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit#egg=openedx-learning                    # Open edX Learning core (experimental)
 openedx-mongodbproxy
 openedx-django-wiki
 openedx-blockstore
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 2c9ec56b6894..9781f65b6bdf 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -981,7 +981,7 @@ openedx-filters==1.6.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
-openedx-learning==0.3.6
+openedx-learning @ git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt

From 3f2f389314df56ba9e07f4821d4c20880319d812 Mon Sep 17 00:00:00 2001
From: XnpioChV <xnpiochv@gmail.com>
Date: Thu, 11 Jan 2024 10:09:40 -0500
Subject: [PATCH 4/4] chore: Update openedx-learning version

---
 requirements/constraints.txt     | 2 +-
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/doc.txt         | 2 +-
 requirements/edx/kernel.in       | 2 +-
 requirements/edx/testing.txt     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 3942c5838970..de06805492e9 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -103,7 +103,7 @@ libsass==0.10.0
 click==8.1.6
 
 # pinning this version to avoid updates while the library is being developed
-openedx-learning==0.4.0
+openedx-learning==0.4.2
 
 # Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
 openai<=0.28.1
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index ae6877c49cf1..1aa1924eeabe 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -779,7 +779,7 @@ openedx-filters==1.6.0
     # via
     #   -r requirements/edx/kernel.in
     #   lti-consumer-xblock
-openedx-learning @ git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit
+openedx-learning==0.4.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 14bb3ee3a6da..f778b54bbfad 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1311,7 +1311,7 @@ openedx-filters==1.6.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   lti-consumer-xblock
-openedx-learning @ git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit
+openedx-learning==0.4.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 4ede1c961083..53019ca744bc 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -921,7 +921,7 @@ openedx-filters==1.6.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
-openedx-learning @ git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit
+openedx-learning==0.4.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in
index 5b2c44e2f42c..744f1bd632ce 100644
--- a/requirements/edx/kernel.in
+++ b/requirements/edx/kernel.in
@@ -117,7 +117,7 @@ openedx-calc                        # Library supporting mathematical calculatio
 openedx-django-require
 openedx-events                      # Open edX Events from Hooks Extension Framework (OEP-50)
 openedx-filters                     # Open edX Filters from Hooks Extension Framework (OEP-50)
-git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit#egg=openedx-learning                    # Open edX Learning core (experimental)
+openedx-learning                    # Open edX Learning core (experimental)
 openedx-mongodbproxy
 openedx-django-wiki
 openedx-blockstore
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 9781f65b6bdf..0ae9b662b1ae 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -981,7 +981,7 @@ openedx-filters==1.6.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
-openedx-learning @ git+https://github.com/open-craft/openedx-learning.git@braden/count-implicit
+openedx-learning==0.4.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt