From 59419c71f7064b0270ea249280122f97d47fe33d Mon Sep 17 00:00:00 2001 From: Chris Akritidis <43294513+cakrit@users.noreply.github.com> Date: Wed, 6 Feb 2019 15:52:49 +0100 Subject: [PATCH] Codacy js fixes (#5337) * Ignore main.js which will be deprecated and fix some warnings in dashboard * Minor fixes to resolve codacy issues in dashboard.js. --- .codacy.yml | 1 + web/gui/dashboard.js | 106 +++++++++--------- .../dashboard.js/charting/google-charts.js | 3 + web/gui/src/dashboard.js/main.js | 101 ++++++++--------- web/gui/src/dashboard.js/registry.js | 2 +- 5 files changed, 111 insertions(+), 102 deletions(-) diff --git a/.codacy.yml b/.codacy.yml index 0e552d718c..fb16c24122 100644 --- a/.codacy.yml +++ b/.codacy.yml @@ -11,4 +11,5 @@ exclude_paths: - web/gui/lib/** - web/gui/old/** - web/gui/src/** + - web/gui/main.js - tests/** diff --git a/web/gui/dashboard.js b/web/gui/dashboard.js index 8fea62541b..7ba8c522e2 100644 --- a/web/gui/dashboard.js +++ b/web/gui/dashboard.js @@ -2930,6 +2930,9 @@ NETDATA.sparklineChartCreate = function (state, data) { }; // google charts +// Codacy declarations +/* global google */ + NETDATA.googleInitialize = function (callback) { if (typeof netdataNoGoogleCharts === 'undefined' || !netdataNoGoogleCharts) { $.ajax({ @@ -4988,6 +4991,7 @@ NETDATA.commonColors = { // Codacy declarations /* global clipboard */ +/* global Ps */ if (NETDATA.options.debug.main_loop) { console.log('welcome to NETDATA'); @@ -6256,6 +6260,55 @@ let chartState = function (element) { this.tm.last_dom_created = 0; }; + const maxMessageFontSize = () => { + let screenHeight = screen.height; + let el = this.element; + + // normally we want a font size, as tall as the element + let h = el.clientHeight; + + // but give it some air, 20% let's say, or 5 pixels min + let lost = Math.max(h * 0.2, 5); + h -= lost; + + // center the text, vertically + let paddingTop = (lost - 5) / 2; + + // but check the width too + // it should fit 10 characters in it + let w = el.clientWidth / 10; + if (h > w) { + paddingTop += (h - w) / 2; + h = w; + } + + // and don't make it too huge + // 5% of the screen size is good + if (h > screenHeight / 20) { + paddingTop += (h - (screenHeight / 20)) / 2; + h = screenHeight / 20; + } + + // set it + this.element_message.style.fontSize = h.toString() + 'px'; + this.element_message.style.paddingTop = paddingTop.toString() + 'px'; + }; + + const showMessageIcon = (icon) => { + this.element_message.innerHTML = icon; + maxMessageFontSize(); + $(this.element_message).removeClass('hidden'); + this.tmp.___messageHidden___ = undefined; + }; + + const showLoading = () => { + if (!this.chart_created) { + showMessageIcon(NETDATA.icons.loading + ' netdata'); + return true; + } + return false; + }; + let createDOM = () => { if (!this.enabled) { return; @@ -6329,47 +6382,6 @@ let chartState = function (element) { } }; - const maxMessageFontSize = () => { - let screenHeight = screen.height; - let el = this.element; - - // normally we want a font size, as tall as the element - let h = el.clientHeight; - - // but give it some air, 20% let's say, or 5 pixels min - let lost = Math.max(h * 0.2, 5); - h -= lost; - - // center the text, vertically - let paddingTop = (lost - 5) / 2; - - // but check the width too - // it should fit 10 characters in it - let w = el.clientWidth / 10; - if (h > w) { - paddingTop += (h - w) / 2; - h = w; - } - - // and don't make it too huge - // 5% of the screen size is good - if (h > screenHeight / 20) { - paddingTop += (h - (screenHeight / 20)) / 2; - h = screenHeight / 20; - } - - // set it - this.element_message.style.fontSize = h.toString() + 'px'; - this.element_message.style.paddingTop = paddingTop.toString() + 'px'; - }; - - const showMessageIcon = (icon) => { - this.element_message.innerHTML = icon; - maxMessageFontSize(); - $(this.element_message).removeClass('hidden'); - this.tmp.___messageHidden___ = undefined; - }; - const hideMessage = () => { if (typeof this.tmp.___messageHidden___ === 'undefined') { this.tmp.___messageHidden___ = true; @@ -6393,14 +6405,6 @@ let chartState = function (element) { showMessageIcon(icon + ' netdata' + invisibleSearchableText()); }; - const showLoading = () => { - if (!this.chart_created) { - showMessageIcon(NETDATA.icons.loading + ' netdata'); - return true; - } - return false; - }; - const isHidden = () => { return (typeof this.tmp.___chartIsHidden___ !== 'undefined'); }; @@ -8828,7 +8832,7 @@ NETDATA.resetAllCharts = function (state) { // if (NETDATA.globalPanAndZoom.isMaster(state) === false) { // master = false; // } - const master = NETDATA.globalPanAndZoom.isMaster(state) + const master = NETDATA.globalPanAndZoom.isMaster(state); // clear the global Pan and Zoom // this will also refresh the master @@ -9758,7 +9762,7 @@ NETDATA.registry = { NETDATA.registry.hello(NETDATA.serverDefault, function (data) { if (data) { NETDATA.registry.server = data.registry; - if (data.cloud_base_url != "") { + if (data.cloud_base_url !== "") { NETDATA.registry.isCloudEnabled = true; NETDATA.registry.cloudBaseURL = data.cloud_base_url; } else { diff --git a/web/gui/src/dashboard.js/charting/google-charts.js b/web/gui/src/dashboard.js/charting/google-charts.js index 432c84a1d6..7497dafd8e 100644 --- a/web/gui/src/dashboard.js/charting/google-charts.js +++ b/web/gui/src/dashboard.js/charting/google-charts.js @@ -1,5 +1,8 @@ // google charts +// Codacy declarations +/* global google */ + NETDATA.googleInitialize = function (callback) { if (typeof netdataNoGoogleCharts === 'undefined' || !netdataNoGoogleCharts) { $.ajax({ diff --git a/web/gui/src/dashboard.js/main.js b/web/gui/src/dashboard.js/main.js index 1d050d6136..13f3b4c7d4 100644 --- a/web/gui/src/dashboard.js/main.js +++ b/web/gui/src/dashboard.js/main.js @@ -3,6 +3,7 @@ // Codacy declarations /* global clipboard */ +/* global Ps */ if (NETDATA.options.debug.main_loop) { console.log('welcome to NETDATA'); @@ -1271,6 +1272,55 @@ let chartState = function (element) { this.tm.last_dom_created = 0; }; + const maxMessageFontSize = () => { + let screenHeight = screen.height; + let el = this.element; + + // normally we want a font size, as tall as the element + let h = el.clientHeight; + + // but give it some air, 20% let's say, or 5 pixels min + let lost = Math.max(h * 0.2, 5); + h -= lost; + + // center the text, vertically + let paddingTop = (lost - 5) / 2; + + // but check the width too + // it should fit 10 characters in it + let w = el.clientWidth / 10; + if (h > w) { + paddingTop += (h - w) / 2; + h = w; + } + + // and don't make it too huge + // 5% of the screen size is good + if (h > screenHeight / 20) { + paddingTop += (h - (screenHeight / 20)) / 2; + h = screenHeight / 20; + } + + // set it + this.element_message.style.fontSize = h.toString() + 'px'; + this.element_message.style.paddingTop = paddingTop.toString() + 'px'; + }; + + const showMessageIcon = (icon) => { + this.element_message.innerHTML = icon; + maxMessageFontSize(); + $(this.element_message).removeClass('hidden'); + this.tmp.___messageHidden___ = undefined; + }; + + const showLoading = () => { + if (!this.chart_created) { + showMessageIcon(NETDATA.icons.loading + ' netdata'); + return true; + } + return false; + }; + let createDOM = () => { if (!this.enabled) { return; @@ -1344,47 +1394,6 @@ let chartState = function (element) { } }; - const maxMessageFontSize = () => { - let screenHeight = screen.height; - let el = this.element; - - // normally we want a font size, as tall as the element - let h = el.clientHeight; - - // but give it some air, 20% let's say, or 5 pixels min - let lost = Math.max(h * 0.2, 5); - h -= lost; - - // center the text, vertically - let paddingTop = (lost - 5) / 2; - - // but check the width too - // it should fit 10 characters in it - let w = el.clientWidth / 10; - if (h > w) { - paddingTop += (h - w) / 2; - h = w; - } - - // and don't make it too huge - // 5% of the screen size is good - if (h > screenHeight / 20) { - paddingTop += (h - (screenHeight / 20)) / 2; - h = screenHeight / 20; - } - - // set it - this.element_message.style.fontSize = h.toString() + 'px'; - this.element_message.style.paddingTop = paddingTop.toString() + 'px'; - }; - - const showMessageIcon = (icon) => { - this.element_message.innerHTML = icon; - maxMessageFontSize(); - $(this.element_message).removeClass('hidden'); - this.tmp.___messageHidden___ = undefined; - }; - const hideMessage = () => { if (typeof this.tmp.___messageHidden___ === 'undefined') { this.tmp.___messageHidden___ = true; @@ -1408,14 +1417,6 @@ let chartState = function (element) { showMessageIcon(icon + ' netdata' + invisibleSearchableText()); }; - const showLoading = () => { - if (!this.chart_created) { - showMessageIcon(NETDATA.icons.loading + ' netdata'); - return true; - } - return false; - }; - const isHidden = () => { return (typeof this.tmp.___chartIsHidden___ !== 'undefined'); }; @@ -3843,7 +3844,7 @@ NETDATA.resetAllCharts = function (state) { // if (NETDATA.globalPanAndZoom.isMaster(state) === false) { // master = false; // } - const master = NETDATA.globalPanAndZoom.isMaster(state) + const master = NETDATA.globalPanAndZoom.isMaster(state); // clear the global Pan and Zoom // this will also refresh the master diff --git a/web/gui/src/dashboard.js/registry.js b/web/gui/src/dashboard.js/registry.js index 77a822b7b2..7894eaa21c 100644 --- a/web/gui/src/dashboard.js/registry.js +++ b/web/gui/src/dashboard.js/registry.js @@ -75,7 +75,7 @@ NETDATA.registry = { NETDATA.registry.hello(NETDATA.serverDefault, function (data) { if (data) { NETDATA.registry.server = data.registry; - if (data.cloud_base_url != "") { + if (data.cloud_base_url !== "") { NETDATA.registry.isCloudEnabled = true; NETDATA.registry.cloudBaseURL = data.cloud_base_url; } else {