Merge branch 'master' into feature/tls-renegotiation

frontend/src/components/Service/ServiceHeatmap.vue

@@ -96,19 +96,15 @@
                   start = new Date(start.getUTCFullYear(), start.getUTCMonth()+1, 1);
                   monthNum += 1
               }
-
-              window.console.log(monthData)
               this.series = monthData.reverse()
               this.ready = true
           },
           async heatmapData(start, end) {
-
-              window.console.log("start: ", start)
-              window.console.log("end: ", end)
-
               const data = await Api.service_failures_data(this.service.id, this.toUnix(start), this.toUnix(end), "24h", true)
-
               let dataArr = []
+                if (!data) {
+                  return {name: start.toLocaleString('en-us', { month: 'long'}), data: []}
+                }
               data.forEach((d) => {
                 dataArr.push({x: this.parseISO(d.timeframe), y: d.amount});
               });

frontend/src/components/Service/StatsGen.vue

@@ -44,6 +44,7 @@
       async mounted() {
         await this.latencyYesterday();
       },
+      methods: {
         async latencyYesterday() {
           const todayTime = await Api.service_hits(this.service.id, this.toUnix(this.nowSubtract(86400)), this.toUnix(new Date()), this.group, false)
           const fetched = await Api.service_hits(this.service.id, this.start, this.end, this.group, false)
@@ -63,6 +64,7 @@
           return total
         }
       }
+    }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->