From afdb24c48309b992c571a98787c679ea3cc1ef9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Paksy?= <paksydavid@gmail.com>
Date: Thu, 22 May 2025 16:36:10 +0200
Subject: [PATCH] HBASE-27802 Manage static javascript resources
 programatically (addendum: Fix not working popovers on UI)

Popovers were not working on the UI and the following JS error was logged to browser console:

```
Uncaught TypeError: i.createPopper is not a function
```

This is because popper.js was not available on the page for Bootstrap.

Solution: We use bootstrap.bundle.min.js instead which includes both popper.js and Bootstrap.
---
 hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp     | 2 +-
 hbase-server/pom.xml                                            | 2 +-
 .../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon  | 2 +-
 .../apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon    | 2 +-
 .../org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon    | 2 +-
 .../src/main/resources/hbase-webapps/master/scripts.jsp         | 2 +-
 .../src/main/resources/hbase-webapps/regionserver/footer.jsp    | 2 +-
 hbase-thrift/src/main/resources/hbase-webapps/thrift/footer.jsp | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp
index 1f17eecf3f39..6938694a492f 100644
--- a/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp
+++ b/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp
@@ -19,7 +19,7 @@
 --%>
 
     <script src="/static/js/jquery.min.js" type="text/javascript"></script>
-    <script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
     <script src="/static/js/tab.js" type="text/javascript"></script>
     <script type="text/javascript">
       $(document).ready(function() {
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index dc51db0f8f5f..0f2a14d4dc3d 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -784,7 +784,7 @@
                       <version>${bootstrap.version}</version>
                       <type>jar</type>
                       <overWrite>true</overWrite>
-                      <includes>**/js/bootstrap.min.js</includes>
+                      <includes>**/js/bootstrap.bundle.min.js</includes>
                       <fileMappers>
                         <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
                       </fileMappers>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index 2a5b9e5a5fb8..c80707d8c83b 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -441,7 +441,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
     <script src="/static/js/jquery.min.js" type="text/javascript"></script>
     <script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script>
     <script src="/static/js/parser-date-iso8601.min.js" type="text/javascript"></script>
-    <script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
     <script src="/static/js/tab.js" type="text/javascript"></script>
     <script src="/static/js/jqSpager.js" type="text/javascript"></script>
     <script>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
index 5e05355d1d3b..4b8047b9e446 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
@@ -256,7 +256,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
 </div>
 <script src="/static/js/jquery.min.js" type="text/javascript"></script>
 <script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script>
-<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
+<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
 <script src="/static/js/tab.js" type="text/javascript"></script>
 <script>
 $(document).ready(function()
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon
index 8d1c5746467d..031f3445518d 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon
@@ -136,7 +136,7 @@ org.apache.hadoop.hbase.util.JvmVersion;
     </div> <!-- /container -->
 
     <script src="/static/js/jquery.min.js" type="text/javascript"></script>
-    <script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
     <script src="/static/js/tab.js" type="text/javascript"></script>
   </body>
 </html>
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp b/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp
index 1e9031f77eba..d987621a119d 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp
@@ -18,7 +18,7 @@
 */
 --%>
     <script src="/static/js/jquery.min.js" type="text/javascript"></script>
-    <script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
     <script src="/static/js/tab.js" type="text/javascript"></script>
     <script type="text/javascript">
       $(document).ready(function() {
diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp
index 6a0ac444e3b1..02a36e9c23fa 100644
--- a/hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp
@@ -18,7 +18,7 @@
 */
 --%>
     <script src="/static/js/jquery.min.js" type="text/javascript"></script>
-    <script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
     <script src="/static/js/tab.js" type="text/javascript"></script>
     <script type="text/javascript">
       $(document).ready(function() {
diff --git a/hbase-thrift/src/main/resources/hbase-webapps/thrift/footer.jsp b/hbase-thrift/src/main/resources/hbase-webapps/thrift/footer.jsp
index 6a0ac444e3b1..02a36e9c23fa 100644
--- a/hbase-thrift/src/main/resources/hbase-webapps/thrift/footer.jsp
+++ b/hbase-thrift/src/main/resources/hbase-webapps/thrift/footer.jsp
@@ -18,7 +18,7 @@
 */
 --%>
     <script src="/static/js/jquery.min.js" type="text/javascript"></script>
-    <script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
     <script src="/static/js/tab.js" type="text/javascript"></script>
     <script type="text/javascript">
       $(document).ready(function() {