Skip to content

Commit 676016d

Browse files
PDavidPDavid
authored
HBASE-27802 Manage static javascript resources programatically (#7031)
* HBASE-27802 Manage static javascript resources programatically (#6864) Signed-off-by: Nick Dimiduk <[email protected]> Signed-off-by: Nihal Jain <[email protected]> (cherry picked from commit 2f9d9fc) * 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. --------- Signed-off-by: Nick Dimiduk <[email protected]> Signed-off-by: Nihal Jain <[email protected]>
1 parent 61bea8d commit 676016d

File tree

20 files changed

+126
-48
lines changed

20 files changed

+126
-48
lines changed

‎hbase-rest/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
<skipAssembly>true</skipAssembly>
281281
</configuration>
282282
</plugin>
283-
<!-- Copy the static web resources (JS, CSS, images, etc.) from hbase-server sources -->
283+
<!-- Copy the static web resources (JS, CSS, images, etc.) from hbase-server -->
284284
<plugin>
285285
<artifactId>maven-resources-plugin</artifactId>
286286
<executions>
@@ -296,7 +296,7 @@
296296
<overwrite>true</overwrite>
297297
<resources>
298298
<resource>
299-
<directory>../hbase-server/src/main/resources/hbase-webapps/static</directory>
299+
<directory>../hbase-server/target/hbase-webapps/static</directory>
300300
</resource>
301301
</resources>
302302
</configuration>

‎hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
--%>
2020

2121
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
22-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
22+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
2323
<script src="/static/js/tab.js" type="text/javascript"></script>
2424
<script type="text/javascript">
2525
$(document).ready(function() {

‎hbase-server/pom.xml‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,9 @@
888888
<build>
889889
<plugins>
890890
<plugin>
891+
<groupId>org.apache.maven.plugins</groupId>
891892
<artifactId>maven-dependency-plugin</artifactId>
893+
<version>${maven.dependency.version}</version>
892894
<executions>
893895
<execution>
894896
<id>create-mrapp-generated-classpath</id>
@@ -904,6 +906,108 @@
904906
<outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
905907
</configuration>
906908
</execution>
909+
<execution>
910+
<id>unpack-ui-resources-js</id>
911+
<goals>
912+
<goal>unpack</goal>
913+
</goals>
914+
<phase>process-resources</phase>
915+
<configuration>
916+
<artifactItems>
917+
<artifactItem>
918+
<groupId>org.webjars</groupId>
919+
<artifactId>bootstrap</artifactId>
920+
<version>${bootstrap.version}</version>
921+
<type>jar</type>
922+
<overWrite>true</overWrite>
923+
<includes>**/js/bootstrap.bundle.min.js</includes>
924+
<fileMappers>
925+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
926+
</fileMappers>
927+
</artifactItem>
928+
<artifactItem>
929+
<groupId>org.webjars</groupId>
930+
<artifactId>jquery</artifactId>
931+
<version>${jquery.version}</version>
932+
<type>jar</type>
933+
<overWrite>true</overWrite>
934+
<includes>**/jquery.min.js</includes>
935+
<fileMappers>
936+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
937+
</fileMappers>
938+
</artifactItem>
939+
<artifactItem>
940+
<groupId>org.webjars</groupId>
941+
<artifactId>tablesorter</artifactId>
942+
<version>${tablesorter.version}</version>
943+
<type>jar</type>
944+
<overWrite>true</overWrite>
945+
<includes>**/jquery.tablesorter.min.js,
946+
**/parsers/parser-date-iso8601.min.js</includes>
947+
<fileMappers>
948+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
949+
</fileMappers>
950+
</artifactItem>
951+
<artifactItem>
952+
<groupId>org.webjars</groupId>
953+
<artifactId>vega</artifactId>
954+
<version>${vega.version}</version>
955+
<type>jar</type>
956+
<overWrite>true</overWrite>
957+
<includes>**/vega.min.js</includes>
958+
<fileMappers>
959+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
960+
</fileMappers>
961+
</artifactItem>
962+
<artifactItem>
963+
<groupId>org.webjars</groupId>
964+
<artifactId>vega-embed</artifactId>
965+
<version>${vega-embed.version}</version>
966+
<type>jar</type>
967+
<overWrite>true</overWrite>
968+
<includes>**/vega-embed.min.js</includes>
969+
<fileMappers>
970+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
971+
</fileMappers>
972+
</artifactItem>
973+
<artifactItem>
974+
<groupId>org.webjars</groupId>
975+
<artifactId>vega-lite</artifactId>
976+
<version>${vega-lite.version}</version>
977+
<type>jar</type>
978+
<overWrite>true</overWrite>
979+
<includes>**/vega-lite.min.js</includes>
980+
<fileMappers>
981+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
982+
</fileMappers>
983+
</artifactItem>
984+
</artifactItems>
985+
<outputDirectory>${project.build.directory}/hbase-webapps/static/js</outputDirectory>
986+
</configuration>
987+
</execution>
988+
<execution>
989+
<id>unpack-ui-resources-css</id>
990+
<goals>
991+
<goal>unpack</goal>
992+
</goals>
993+
<phase>process-resources</phase>
994+
<configuration>
995+
<artifactItems>
996+
<artifactItem>
997+
<groupId>org.webjars</groupId>
998+
<artifactId>bootstrap</artifactId>
999+
<version>${bootstrap.version}</version>
1000+
<type>jar</type>
1001+
<overWrite>true</overWrite>
1002+
<includes>**/css/bootstrap.min.css</includes>
1003+
<fileMappers>
1004+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
1005+
</fileMappers>
1006+
</artifactItem>
1007+
</artifactItems>
1008+
<outputDirectory>${project.build.directory}/hbase-webapps/static/css</outputDirectory>
1009+
</configuration>
1010+
</execution>
9071011
</executions>
9081012
</plugin>
9091013
</plugins>

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
438438
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
439439
<script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script>
440440
<script src="/static/js/parser-date-iso8601.min.js" type="text/javascript"></script>
441-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
441+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
442442
<script src="/static/js/tab.js" type="text/javascript"></script>
443443
<script src="/static/js/jqSpager.js" type="text/javascript"></script>
444444
<script>

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ See the License for the specific language governing permissions and
1717
limitations under the License.
1818
</%doc>
1919

20-
<script type="text/javascript" src="/static/js/vega@5.32.0.min.js"></script>
21-
<script type="text/javascript" src="/static/js/vega-lite@5.23.0.min.js"></script>
22-
<script type="text/javascript" src="/static/js/vega-embed@6.29.0.min.js"></script>
20+
<script type="text/javascript" src="/static/js/vega.min.js"></script>
21+
<script type="text/javascript" src="/static/js/vega-lite.min.js"></script>
22+
<script type="text/javascript" src="/static/js/vega-embed.min.js"></script>
2323

2424
<div id="vis" style="width:80%;"></div>
2525
<script type="text/javascript">

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
254254
</div>
255255
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
256256
<script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script>
257-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
257+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
258258
<script src="/static/js/tab.js" type="text/javascript"></script>
259259
<script>
260260
$(document).ready(function()

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ org.apache.hadoop.hbase.util.JvmVersion;
136136
</div> <!-- /container -->
137137

138138
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
139-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
139+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
140140
<script src="/static/js/tab.js" type="text/javascript"></script>
141141
</body>
142142
</html>

‎hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
--%>
2020
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
21-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
21+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
2222
<script src="/static/js/tab.js" type="text/javascript"></script>
2323
<script type="text/javascript">
2424
$(document).ready(function() {

‎hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
--%>
2020
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
21-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
21+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
2222
<script src="/static/js/tab.js" type="text/javascript"></script>
2323
<script type="text/javascript">
2424
$(document).ready(function() {

‎hbase-server/src/main/resources/hbase-webapps/static/css/bootstrap.min.css‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)