Merge pull request #8389 from sbwhitt/fix/readinglog-inlinejs

Remove inline JS from readinglog_stats.html
internetarchive · Oct 19, 2023 · a6ebcf2 · a6ebcf2
2 parents d72b54b + 120675d
commit a6ebcf2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/openlibrary/plugins/openlibrary/js/index.js b/openlibrary/plugins/openlibrary/js/index.js
@@ -251,9 +251,11 @@ jQuery(function () {
             .then((module) => module.init());
     }
 
-    if (window.READINGLOG_STATS_CONFIG) {
+    const readingLogCharts = document.querySelector('.readinglog-charts')
+    if (readingLogCharts) {
+        const readingLogConfig = JSON.parse(readingLogCharts.dataset.config)
         import(/* webpackChunkName: "readinglog-stats" */ './readinglog_stats')
-            .then(module => module.init(window.READINGLOG_STATS_CONFIG));
+            .then(module => module.init(readingLogConfig));
     }
 
     const pageEl = $('#page-barcodescanner');

diff --git a/openlibrary/plugins/upstream/mybooks.py b/openlibrary/plugins/upstream/mybooks.py
@@ -155,8 +155,8 @@ def GET(self, username, key='want-to-read'):
             for a in web.ctx.site.get_many(list(author_keys))
         ]
         return render['account/readinglog_stats'](
-            json.dumps(works_json),
-            json.dumps(authors_json),
+            works_json,
+            authors_json,
             len(works_json),
             user.key,
             user.displayname,

diff --git a/openlibrary/templates/account/readinglog_stats.html b/openlibrary/templates/account/readinglog_stats.html
@@ -1,5 +1,12 @@
 $def with (works_json, authors_json, works_count, owner_key, owner_name, shelf_path, shelf_key, lang='en')
 
+$ reading_log_stats_config = {
+$    'works': works_json,
+$    'authors': authors_json,
+$    'lang': lang,
+$    'charts_selector': '.readinglog-stats-chart'
+$ }
+
 $ shelf_name = unicode(render_template('account/readinglog_shelf_name', shelf_key)).strip();
 $var title: $_('My %(shelf_name)s Stats', shelf_name=shelf_name)
 
@@ -96,7 +103,7 @@ <h1>$_('My %(shelf_name)s Stats', shelf_name=shelf_name)</h1>
     <p>$:_('Displaying stats about <strong>%d</strong> books. Note all charts show only the top 20 bars. Note reading log stats are private.', works_count)</p>
 </div>
 
-<div class="readinglog-charts" style="padding: 12px;">
+<div class="readinglog-charts" data-config="$dumps(reading_log_stats_config)" style="padding: 12px;">
 
     <h2>$_('Author Stats')</h2>
 
@@ -147,12 +154,3 @@ <h3>$chart['title']</h3>
         </div>
     </main>
 </details>
-
-<script>
-    window.READINGLOG_STATS_CONFIG = {
-        works: $:works_json,
-        authors: $:authors_json,
-        lang: $:dumps(lang),
-        charts_selector: '.readinglog-stats-chart',
-    };
-</script>