From 6d04ee3be03278bc19cb23a572eab677bb7ed7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B4mulo=20Penido?= <romulo@opencraft.com>
Date: Fri, 1 Mar 2024 10:35:58 -0300
Subject: [PATCH] Revert "feat: Serialize tag data in OpenAssessmentBlocks
 (#2171)"

---
 openassessment/__init__.py             |  2 +-
 openassessment/xblock/test/test_xml.py | 34 --------------------------
 openassessment/xblock/utils/xml.py     |  5 ----
 package-lock.json                      |  4 +--
 package.json                           |  2 +-
 5 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/openassessment/__init__.py b/openassessment/__init__.py
index 23ecb7c46a..668f267fc3 100644
--- a/openassessment/__init__.py
+++ b/openassessment/__init__.py
@@ -2,4 +2,4 @@
 Initialization Information for Open Assessment Module
 """
 
-__version__ = '6.1.0'
+__version__ = '6.3.0'
diff --git a/openassessment/xblock/test/test_xml.py b/openassessment/xblock/test/test_xml.py
index 0013b6bbf8..1d258e273f 100644
--- a/openassessment/xblock/test/test_xml.py
+++ b/openassessment/xblock/test/test_xml.py
@@ -216,40 +216,6 @@ def test_serialize_assessments(self, data):
         xml_str = serialize_assessments_to_xml_str(self.oa_block)
         self.assertIn(data['assessments'][0]['name'], xml_str)
 
-    @ddt.file_data('data/serialize.json')
-    def test_serialize_with_tags(self, data):
-        self._configure_xblock(data)
-
-        # Create a mocked serialize tag data method that returns no data
-        def add_tags_to_node_no_tags(node):  # pylint: disable=unused-argument
-            return
-
-        # Manually add the mocked method to the OpenAssessment block instance
-        # This method will be added in the edx-platform repo through applying XBLOCK_MIXINS
-        self.oa_block.add_tags_to_node = add_tags_to_node_no_tags
-
-        xml = serialize_content(self.oa_block)
-
-        # Confirm that no tags appear in the xml
-        self.assertNotIn("tags-v1", xml)
-
-        # Create a mocked serialize tag data method that returns data
-        def add_tags_to_node_with_tags(node):
-            # return "lightcast-skills:Typing,Microsoft Office"
-            node.set('tags-v1', 'lightcast-skills:Typing,Microsoft Office')
-
-        # Manually add the mocked method to the OpenAssessment block instance
-        # This method will be added in the edx-platform repo through applying XBLOCK_MIXINS
-        self.oa_block.add_tags_to_node = add_tags_to_node_with_tags
-
-        xml = serialize_content(self.oa_block)
-
-        # Confirm that tags appear in the xml
-        self.assertIn("tags-v1=\"lightcast-skills:Typing,Microsoft Office\"", xml)
-
-        # Clear the mocked serialize tag data method
-        del self.oa_block.add_tags_to_node
-
     def test_mutated_criteria_dict(self):
         self._configure_xblock({})
 
diff --git a/openassessment/xblock/utils/xml.py b/openassessment/xblock/utils/xml.py
index 7c3dbef788..dea0279b41 100644
--- a/openassessment/xblock/utils/xml.py
+++ b/openassessment/xblock/utils/xml.py
@@ -772,11 +772,6 @@ def serialize_content_to_xml(oa_block, root):
     if oa_block.show_rubric_during_response is not None:
         root.set('show_rubric_during_response', str(oa_block.show_rubric_during_response))
 
-    # Serialize and add tag data if any
-    if hasattr(oa_block, 'add_tags_to_node') and callable(oa_block.add_tags_to_node):  # pylint: disable=no-member
-        # This comes from TaggedBlockMixin
-        oa_block.add_tags_to_node(root)  # pylint: disable=no-member
-
 
 def serialize_content(oa_block):
     """
diff --git a/package-lock.json b/package-lock.json
index 0752ab483c..988c9bb401 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "edx-ora2",
-  "version": "6.0.34",
+  "version": "6.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "edx-ora2",
-      "version": "6.0.33",
+      "version": "6.3.0",
       "dependencies": {
         "@edx/frontend-build": "8.0.6",
         "@openedx/paragon": "^21.5.7",
diff --git a/package.json b/package.json
index 42dff5557b..3af2ec5e15 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edx-ora2",
-  "version": "6.1.0",
+  "version": "6.3.0",
   "repository": "https://github.com/openedx/edx-ora2.git",
   "dependencies": {
     "@edx/frontend-build": "8.0.6",