From 996463b869eeb9422db6fe0757fc297724164edc Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Fri, 26 Aug 2022 07:20:30 +0100
Subject: [PATCH] Fix scripts not running in widgets

---
 core/templates/base.html                   |  2 +-
 core/templates/ui/drilldown/drilldown.html | 20 +++++++-------
 core/templates/widgets/table_results.html  | 31 +++++++++++++---------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/core/templates/base.html b/core/templates/base.html
index 11ec52b..13dd79f 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -22,7 +22,7 @@
     <script defer src="{% static 'js/htmx.min.js' %}" integrity="sha384-cZuAZ+ZbwkNRnrKi05G/fjBX+azI9DNOkNYysZ0I/X5ZFgsmMiBXgDZof30F5ofc" crossorigin="anonymous"></script>
     <script defer src="{% static 'js/remove-me.js' %}" integrity="sha384-6fHcFNoQ8QEI3ZDgw9Z/A6Brk64gF7AnFbLgdrumo8/kBbsKQ/wo7wPegj5WkzuG" crossorigin="anonymous"></script>
     <script defer src="{% static 'js/hyperscript.min.js' %}" integrity="sha384-6GYN8BDHOJkkru6zcpGOUa//1mn+5iZ/MyT6mq34WFIpuOeLF52kSi721q0SsYF9" crossorigin="anonymous"></script>
-    <script src="{% static 'js/bulma-tagsinput.min.js' %}" integrity="sha384-GmnKCsPJIPPZbNVXpkGRmKdxOa0PQLnOM/hQLIHvMRERySuyvFqKGc76iHTGUY+d" crossorigin="anonymous"></script>
+    <script src="{% static 'js/bulma-tagsinput.min.js' %}"></script>
     <script src="{% static 'js/jquery.min.js' %}"></script>
     <script src="{% static 'js/gridstack-all.js' %}"></script>
     <script defer src="{% static 'js/magnet.min.js' %}"></script>
diff --git a/core/templates/ui/drilldown/drilldown.html b/core/templates/ui/drilldown/drilldown.html
index 2b9ca95..5b01700 100644
--- a/core/templates/ui/drilldown/drilldown.html
+++ b/core/templates/ui/drilldown/drilldown.html
@@ -96,16 +96,18 @@
   </script>
   {% if table %}
     <script>
-      //var contents = $("#drilldown-widget").outerHTML;
-      var contents = document.getElementById("drilldown-widget");
-      var grid = document.getElementById("grid-stack-main").gridstack;
-      grid.addWidget(contents.innerHTML);
-      contents.outerHTML = "";
-      //grid.compact();
-      // because we remove the element the JS runs in
-      // so we need to run it again here
-      // initTabs("{{ unique }}");
+    //var contents = $("#drilldown-widget").outerHTML;
+    var contents = document.getElementById("drilldown-widget");
+    var scripts = contents.getElementsByTagName("script");
+    var grid = document.getElementById("grid-stack-main").gridstack;
+    grid.addWidget(contents.innerHTML);
+    contents.outerHTML = "";
+    // restore scripts that aren't going to be run
+    for (var i = 0; i < scripts.length; i++) {
+      eval(scripts[i].innerHTML);
+    }
     
     </script>
+    
   {% endif %}
 {% endblock %}
diff --git a/core/templates/widgets/table_results.html b/core/templates/widgets/table_results.html
index f64f41e..3041ee8 100644
--- a/core/templates/widgets/table_results.html
+++ b/core/templates/widgets/table_results.html
@@ -1,7 +1,10 @@
 {% load static %}
 <script>
-  grid.removeWidget("drilldown-widget-results");
+  if (typeof grid != "undefined") {
+    grid.removeWidget("drilldown-widget-results");
+  }
 </script>
+
 <div id="drilldown-widget" style="display: none;">
   <div id="drilldown-widget-results" class="grid-stack-item" gs-w="10" gs-h="30" gs-y="10" gs-x="1">
     <div class="grid-stack-item-content">
@@ -53,15 +56,17 @@
   </div>
 </div>
 <script>
-  console.log("RUNS");
-  //var contents = $("#drilldown-widget").outerHTML;
-  var contents = document.getElementById("drilldown-widget");
-  var grid = document.getElementById("grid-stack-main").gridstack;
-  grid.addWidget(contents.innerHTML);
-  contents.outerHTML = "";
-  // grid.compact();
-  // because we remove the element the JS runs in
-  // so we need to run it again here
-  // initTabs("{{ unique }}");
-
-</script>
\ No newline at end of file
+  if (typeof grid != "undefined") {
+    //var contents = $("#drilldown-widget").outerHTML;
+    var contents = document.getElementById("drilldown-widget");
+    var scripts = contents.getElementsByTagName("script");
+    var grid = document.getElementById("grid-stack-main").gridstack;
+    grid.addWidget(contents.innerHTML);
+    contents.outerHTML = "";
+    // restore scripts that aren't going to be run
+    for (var i = 0; i < scripts.length; i++) {
+      eval(scripts[i].innerHTML);
+    }
+  }
+  
+</script>