Merge pull request #2627 from flyinprogrammer/fix_gchart_loader

use Google Charts loader and not jsapi
google · Jul 29, 2020 · 492345a · 492345a
2 parents 33463ad + ddaf1cb
commit 492345a
Show file tree

Hide file tree

Showing 8 changed files with 248 additions and 1,509 deletions.
diff --git a/cmd/internal/pages/assets/html/containers.html b/cmd/internal/pages/assets/html/containers.html
@@ -29,10 +29,8 @@
     <!-- Latest compiled and minified JavaScript -->
     <script src="{{.Root}}static/jquery-3.5.1.min.js"></script>
     <script src="{{.Root}}static/bootstrap-4.0.0-beta.2.min.js"></script>
-    <script type="text/javascript" src="{{.Root}}static/google-jsapi.js"></script>
-
+      <script type="text/javascript" src="{{.Root}}static/loader.js"></script>
     <script type="text/javascript" src="{{.Root}}static/containers.js"></script>
-    <script type="text/javascript" src="{{.Root}}static/gcharts.js"></script>
   </head>
   <body>
     <div class="container theme-showcase" >
@@ -263,7 +261,7 @@ <h4>Top Memory Usage:
       {{end}}
     </div>
     <script type="text/javascript">
-      startPage({{.ContainerName}}, {{.CpuAvailable}}, {{.MemoryAvailable}}, {{.Root}}, {{.IsRoot}});
+      google.charts.setOnLoadCallback(startPage({{.ContainerName}}, {{.CpuAvailable}}, {{.MemoryAvailable}}, {{.Root}}, {{.IsRoot}}));
       drawImages({{.DockerImages}});
     </script>
   </body>

diff --git a/cmd/internal/pages/assets/js/containers.js b/cmd/internal/pages/assets/js/containers.js
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+google.charts.load('current', {packages: ['corechart', 'gauge', 'default', 'format', 'ui', 'table']});
+
 function humanize(num, size, units) {
   var unit;
   for (unit = units.pop(); units.length && num >= size; unit = units.pop()) {

diff --git a/cmd/internal/pages/assets/js/gcharts.js b/cmd/internal/pages/assets/js/gcharts.js
diff --git a/cmd/internal/pages/assets/js/google-jsapi.js b/cmd/internal/pages/assets/js/google-jsapi.js
diff --git a/cmd/internal/pages/assets/js/loader.js b/cmd/internal/pages/assets/js/loader.js
diff --git a/cmd/internal/pages/static/assets.go b/cmd/internal/pages/static/assets.go
diff --git a/cmd/internal/pages/static/static.go b/cmd/internal/pages/static/static.go
@@ -31,8 +31,7 @@ const StaticResource = "/static/"
 var popper, _ = Asset("cmd/internal/pages/assets/js/popper.min.js")
 var bootstrapJs, _ = Asset("cmd/internal/pages/assets/js/bootstrap-4.0.0-beta.2.min.js")
 var containersJs, _ = Asset("cmd/internal/pages/assets/js/containers.js")
-var gchartsJs, _ = Asset("cmd/internal/pages/assets/js/gcharts.js")
-var googleJsapiJs, _ = Asset("cmd/internal/pages/assets/js/google-jsapi.js")
+var loaderJs, _ = Asset("cmd/internal/pages/assets/js/loader.js")
 var jqueryJs, _ = Asset("cmd/internal/pages/assets/js/jquery-3.5.1.min.js")
 
 var bootstrapCss, _ = Asset("cmd/internal/pages/assets/styles/bootstrap-4.0.0-beta.2.min.css")
@@ -46,8 +45,7 @@ var staticFiles = map[string][]byte{
 	"bootstrap-theme-3.1.1.min.css":  bootstrapThemeCss,
 	"containers.css":                 containersCss,
 	"containers.js":                  containersJs,
-	"gcharts.js":                     gchartsJs,
-	"google-jsapi.js":                googleJsapiJs,
+	"loader.js":                      loaderJs,
 	"jquery-3.5.1.min.js":            jqueryJs,
 }
 

diff --git a/cmd/internal/pages/templates.go b/cmd/internal/pages/templates.go