Merge pull request #102 from jenkinsci/dependabot/maven/org.webjars-e…

…charts-5.0.1 Bump echarts from 4.9.0 to 5.0.1
jenkinsci · Mar 3, 2021 · 56eb01a · 56eb01a
2 parents 0a350d7 + d2cda6d
commit 56eb01a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 26 deletions.
diff --git a/go.sh b/go.sh
@@ -13,7 +13,7 @@ cp -fv target/echarts-api.hpi $JENKINS_HOME/plugins/echarts-api.jpi
 
 CURRENT_UID="$(id -u):$(id -g)"
 export CURRENT_UID
-IS_RUNNING=$(docker-compose ps -q jenkins-master)
+IS_RUNNING=$(docker-compose ps -q jenkins-controller)
 if [[ "$IS_RUNNING" != "" ]]; then
     docker-compose restart
     echo "Restarting Jenkins (docker compose with user ID ${CURRENT_UID}) ..."

diff --git a/pom.xml b/pom.xml
@@ -18,9 +18,9 @@
   <url>https://github.com/jenkinsci/echarts-api-plugin</url>
 
   <properties>
-    <revision>4.9.0-5</revision>
+    <revision>5.0.1-1</revision>
     <changelist>-SNAPSHOT</changelist>
-    <echarts.version>4.9.0</echarts.version>
+    <echarts.version>5.0.1</echarts.version>
 
     <module.name>${project.groupId}.echarts</module.name>
 

diff --git a/src/main/resources/io/jenkins/plugins/echarts-common.jelly b/src/main/resources/io/jenkins/plugins/echarts-common.jelly
@@ -7,7 +7,7 @@ Use it like <st:adjunct includes="io.jenkins.plugins.echarts-common"/>
   <j:new var="h" className="hudson.Functions" />
   ${h.initPageVariables(context)}
 
-  <script type="text/javascript" src="${resURL}/plugin/echarts-api/webjars/echarts-en.common.min.js" />
+  <script type="text/javascript" src="${resURL}/plugin/echarts-api/webjars/echarts.common.min.js" />
 
   <st:adjunct includes="io.jenkins.plugins.jquery3"/>
 

diff --git a/src/main/resources/io/jenkins/plugins/echarts-simple.jelly b/src/main/resources/io/jenkins/plugins/echarts-simple.jelly
@@ -7,7 +7,7 @@ Use it like <st:adjunct includes="io.jenkins.plugins.echarts-simple"/>
   <j:new var="h" className="hudson.Functions" />
   ${h.initPageVariables(context)}
 
-  <script type="text/javascript" src="${resURL}/plugin/echarts-api/webjars/echarts-en.simple.min.js" />
+  <script type="text/javascript" src="${resURL}/plugin/echarts-api/webjars/echarts.simple.min.js" />
 
   <st:adjunct includes="io.jenkins.plugins.jquery3"/>
 

diff --git a/src/main/resources/io/jenkins/plugins/echarts.jelly b/src/main/resources/io/jenkins/plugins/echarts.jelly
@@ -7,7 +7,7 @@ Use it like <st:adjunct includes="io.jenkins.plugins.echarts"/>
   <j:new var="h" className="hudson.Functions" />
   ${h.initPageVariables(context)}
 
-  <script type="text/javascript" src="${resURL}/plugin/echarts-api/webjars/echarts-en.min.js" />
+  <script type="text/javascript" src="${resURL}/plugin/echarts-api/webjars/echarts.min.js" />
 
   <st:adjunct includes="io.jenkins.plugins.jquery3"/>
 

diff --git a/src/main/webapp/js/zoomable-trend-chart.js b/src/main/webapp/js/zoomable-trend-chart.js
@@ -47,22 +47,14 @@ EChartsJenkinsApi.prototype.renderZoomableTrendChart = function (chartDivId, mod
                 }
             }
         },
-        dataZoom: [{
-            id: 'dataZoomX',
-            type: 'slider',
-            xAxisIndex: [0],
-            filterMode: 'filter',
-            top: 'bottom',
-            startValue: Math.max(0, chartModel.domainAxisLabels.length - 50),
-            handleIcon: 'M 239.33984 -0.052734375 C 230.53984 -0.052734375 223.33984 7.1472658 223.33984 15.947266 L 223.33984 226 L 134.05859 226 L 134.05859 179.94141 C 134.05859 158.55941 108.20789 147.8517 93.087891 162.9707 L 7.0292969 249.0293 C -2.3437031 258.4023 -2.3437031 273.5977 7.0292969 282.9707 L 93.087891 369.0293 C 108.20689 384.1483 134.05859 373.44059 134.05859 352.05859 L 134.05859 306 L 223.33984 306 L 223.33984 495.94727 C 223.33984 504.74727 230.53984 511.94727 239.33984 511.94727 L 271.33984 511.94727 C 280.13984 511.94727 287.33984 504.74727 287.33984 495.94727 L 287.33984 306 L 377.94141 306 L 377.94141 352.05859 C 377.94141 373.44059 403.79211 384.1483 418.91211 369.0293 L 504.9707 282.9707 C 514.3437 273.5977 514.3437 258.4023 504.9707 249.0293 L 418.91211 162.9707 C 403.79311 147.8507 377.94141 158.55941 377.94141 179.94141 L 377.94141 226 L 287.33984 226 L 287.33984 15.947266 C 287.33984 7.1472658 280.13984 -0.052734375 271.33984 -0.052734375 L 239.33984 -0.052734375 z',
-            handleSize: '70%',
-            handleStyle: {
-                color: '#b4b4b4'
+        dataZoom: [
+            {
+                type: 'inside'
             },
-            textStyle: {
-                color: textColor
-            }
-        }],
+            {
+                type: 'slider',
+                height: 20,
+            }],
         legend: {
             orient: 'horizontal',
             type: 'scroll',
@@ -75,7 +67,7 @@ EChartsJenkinsApi.prototype.renderZoomableTrendChart = function (chartDivId, mod
         grid: {
             left: '20',
             right: '10',
-            bottom: '15%',
+            bottom: '20%',
             top: '15%',
             containLabel: true
         },
@@ -86,15 +78,13 @@ EChartsJenkinsApi.prototype.renderZoomableTrendChart = function (chartDivId, mod
             axisLabel: {
                 color: textColor
             }
-        }
-        ],
+        }],
         yAxis: [{
             type: 'value',
             axisLabel: {
                 color: textColor
             }
-        }
-        ],
+        }],
         series: chartModel.series
     };
     chart.setOption(options);