Merge pull request #266 from edx/ashultz0/more-data

add additional data tags to summary hook html
edx · Apr 13, 2023 · d8c7a9c · d8c7a9c
2 parents 121462d + fbc6630
commit d8c7a9c
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 129 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,6 +15,11 @@ Unreleased
 ~~~~~~~~~~
 *
 
+[1.1.4] - 2023-04-14
+~~~~~~~~~~~~~~~~~~~~
+
+* Add course and block ID to summary hook html
+
 [1.1.3] - 2023-04-05
 ~~~~~~~~~~~~~~~~~~~~
 

diff --git a/edx_arch_experiments/__init__.py b/edx_arch_experiments/__init__.py
@@ -2,4 +2,4 @@
 A plugin to include applications under development by the architecture team at 2U.
 """
 
-__version__ = '1.1.3'
+__version__ = '1.1.4'
diff --git a/edx_arch_experiments/summaryhook_aside/block.py b/edx_arch_experiments/summaryhook_aside/block.py
@@ -8,11 +8,14 @@
 from edx_arch_experiments.summaryhook_aside.waffle import summary_enabled, summary_staff_only
 
 summary_fragment = """
+<div>&nbsp;</div>
 <div class="summary-hook">
   <div summary-launch>
     <div id="launch-summary-button"
       data-url-api="{{data_url_api}}"
       data-text-identifier="{{data_text_identifier}}"
+      data-course-id="{{data_course_id}}"
+      data-content-id="{{data_content_id}}"
     >
     </div>
   </div>
@@ -64,6 +67,8 @@ def student_view_aside(self, block, context=None):  # pylint: disable=unused-arg
                 {
                     'data_url_api': settings.SUMMARY_HOOK_HOST,
                     'data_text_identifier': '.xblock-student_view-html',
+                    'data_course_id': block.scope_ids.usage_id.course_key,
+                    'data_content_id': block.scope_ids.usage_id,
                     'js_url': settings.SUMMARY_HOOK_HOST + settings.SUMMARY_HOOK_JS_PATH,
                 }
             )

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -22,15 +22,15 @@ django-crum==0.7.9
     # via edx-django-utils
 django-waffle==3.0.0
     # via edx-django-utils
-edx-django-utils==5.2.0
+edx-django-utils==5.4.0
     # via -r requirements/base.in
 fs==2.4.16
     # via xblock
 lxml==4.9.2
     # via xblock
 markupsafe==2.1.2
     # via xblock
-newrelic==8.7.0
+newrelic==8.8.0
     # via edx-django-utils
 pbr==5.11.1
     # via stevedore
@@ -42,7 +42,7 @@ pynacl==1.5.0
     # via edx-django-utils
 python-dateutil==2.8.2
     # via xblock
-pytz==2022.7.1
+pytz==2023.3
     # via
     #   django
     #   xblock

diff --git a/requirements/ci.in b/requirements/ci.in
@@ -1,5 +1,4 @@
 # Requirements for running tests on CI
 -c constraints.txt
 
-codecov                   # Code coverage reporting
 tox                       # Virtualenv management for tests
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -4,32 +4,20 @@
 #
 #    make upgrade
 #
-certifi==2022.12.7
-    # via requests
-charset-normalizer==3.0.1
-    # via requests
-codecov==2.1.12
-    # via -r requirements/ci.in
-coverage==7.2.1
-    # via codecov
 distlib==0.3.6
     # via virtualenv
-filelock==3.9.0
+filelock==3.11.0
     # via
     #   tox
     #   virtualenv
-idna==3.4
-    # via requests
-packaging==23.0
+packaging==23.1
     # via tox
-platformdirs==3.0.0
+platformdirs==3.2.0
     # via virtualenv
 pluggy==1.0.0
     # via tox
 py==1.11.0
     # via tox
-requests==2.28.2
-    # via codecov
 six==1.16.0
     # via tox
 tomli==2.0.1
@@ -38,7 +26,5 @@ tox==3.28.0
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/ci.in
-urllib3==1.26.14
-    # via requests
-virtualenv==20.20.0
+virtualenv==20.21.0
     # via tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -12,15 +12,11 @@ asgiref==3.6.0
     # via
     #   -r requirements/quality.txt
     #   django
-astroid==2.14.2
+astroid==2.15.2
     # via
     #   -r requirements/quality.txt
     #   pylint
     #   pylint-celery
-attrs==22.2.0
-    # via
-    #   -r requirements/quality.txt
-    #   pytest
 bleach==6.0.0
     # via
     #   -r requirements/quality.txt
@@ -31,19 +27,16 @@ build==0.10.0
     #   pip-tools
 certifi==2022.12.7
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/quality.txt
     #   requests
 cffi==1.15.1
     # via
     #   -r requirements/quality.txt
-    #   cryptography
     #   pynacl
 chardet==5.1.0
     # via diff-cover
-charset-normalizer==3.0.1
+charset-normalizer==3.1.0
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/quality.txt
     #   requests
 click==8.1.3
@@ -63,18 +56,10 @@ code-annotations==1.3.0
     # via
     #   -r requirements/quality.txt
     #   edx-lint
-codecov==2.1.12
-    # via -r requirements/ci.txt
-coverage[toml]==7.2.1
+coverage[toml]==7.2.3
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/quality.txt
-    #   codecov
     #   pytest-cov
-cryptography==40.0.1
-    # via
-    #   -r requirements/quality.txt
-    #   secretstorage
 diff-cover==7.5.0
     # via -r requirements/dev.in
 dill==0.3.6
@@ -104,17 +89,17 @@ docutils==0.19
     # via
     #   -r requirements/quality.txt
     #   readme-renderer
-edx-django-utils==5.2.0
+edx-django-utils==5.4.0
     # via -r requirements/quality.txt
 edx-i18n-tools==0.9.2
     # via -r requirements/dev.in
 edx-lint==5.3.4
     # via -r requirements/quality.txt
-exceptiongroup==1.1.0
+exceptiongroup==1.1.1
     # via
     #   -r requirements/quality.txt
     #   pytest
-filelock==3.9.0
+filelock==3.11.0
     # via
     #   -r requirements/ci.txt
     #   tox
@@ -125,10 +110,9 @@ fs==2.4.16
     #   xblock
 idna==3.4
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/quality.txt
     #   requests
-importlib-metadata==6.0.0
+importlib-metadata==6.3.0
     # via
     #   -r requirements/quality.txt
     #   keyring
@@ -149,11 +133,6 @@ jaraco-classes==3.2.3
     # via
     #   -r requirements/quality.txt
     #   keyring
-jeepney==0.8.0
-    # via
-    #   -r requirements/quality.txt
-    #   keyring
-    #   secretstorage
 jinja2==3.1.2
     # via
     #   -r requirements/quality.txt
@@ -192,11 +171,11 @@ more-itertools==9.1.0
     # via
     #   -r requirements/quality.txt
     #   jaraco-classes
-newrelic==8.7.0
+newrelic==8.8.0
     # via
     #   -r requirements/quality.txt
     #   edx-django-utils
-packaging==23.0
+packaging==23.1
     # via
     #   -r requirements/ci.txt
     #   -r requirements/pip-tools.txt
@@ -210,13 +189,13 @@ pbr==5.11.1
     # via
     #   -r requirements/quality.txt
     #   stevedore
-pip-tools==6.12.3
+pip-tools==6.13.0
     # via -r requirements/pip-tools.txt
 pkginfo==1.9.6
     # via
     #   -r requirements/quality.txt
     #   twine
-platformdirs==3.0.0
+platformdirs==3.2.0
     # via
     #   -r requirements/ci.txt
     #   -r requirements/quality.txt
@@ -247,13 +226,13 @@ pycparser==2.21
     #   cffi
 pydocstyle==6.3.0
     # via -r requirements/quality.txt
-pygments==2.14.0
+pygments==2.15.0
     # via
     #   -r requirements/quality.txt
     #   diff-cover
     #   readme-renderer
     #   rich
-pylint==2.16.2
+pylint==2.17.2
     # via
     #   -r requirements/quality.txt
     #   edx-lint
@@ -281,7 +260,7 @@ pyproject-hooks==1.0.0
     # via
     #   -r requirements/pip-tools.txt
     #   build
-pytest==7.2.1
+pytest==7.3.0
     # via
     #   -r requirements/quality.txt
     #   pytest-cov
@@ -298,7 +277,7 @@ python-slugify==8.0.1
     # via
     #   -r requirements/quality.txt
     #   code-annotations
-pytz==2022.7.1
+pytz==2023.3
     # via
     #   -r requirements/quality.txt
     #   django
@@ -315,9 +294,7 @@ readme-renderer==37.3
     #   twine
 requests==2.28.2
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/quality.txt
-    #   codecov
     #   requests-toolbelt
     #   twine
 requests-toolbelt==0.10.1
@@ -328,14 +305,10 @@ rfc3986==2.0.0
     # via
     #   -r requirements/quality.txt
     #   twine
-rich==13.3.1
+rich==13.3.4
     # via
     #   -r requirements/quality.txt
     #   twine
-secretstorage==3.3.3
-    # via
-    #   -r requirements/quality.txt
-    #   keyring
 six==1.16.0
     # via
     #   -r requirements/ci.txt
@@ -373,7 +346,7 @@ tomli==2.0.1
     #   pyproject-hooks
     #   pytest
     #   tox
-tomlkit==0.11.6
+tomlkit==0.11.7
     # via
     #   -r requirements/quality.txt
     #   pylint
@@ -392,13 +365,12 @@ typing-extensions==4.5.0
     #   astroid
     #   pylint
     #   rich
-urllib3==1.26.14
+urllib3==1.26.15
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/quality.txt
     #   requests
     #   twine
-virtualenv==20.20.0
+virtualenv==20.21.0
     # via
     #   -r requirements/ci.txt
     #   tox
@@ -414,7 +386,7 @@ webob==1.8.7
     # via
     #   -r requirements/quality.txt
     #   xblock
-wheel==0.38.4
+wheel==0.40.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools