Business intelligence made simple
Modernized code [skip ci]
Andrew Kane2d950ae5051f
diff --git a/app/helpers/blazer/base_helper.rb b/app/helpers/blazer/base_helper.rbindex e5406122..725e09fd 100644--- a/app/helpers/blazer/base_helper.rb+++ b/app/helpers/blazer/base_helper.rb@@ -29,7 +29,7 @@ module Blazerenddef blazer_js_var(name, value)- "var #{name} = #{json_escape(value.to_json(root: false))};".html_safe+ "const #{name} = #{json_escape(value.to_json(root: false))};".html_safeenddef blazer_series_name(k)diff --git a/app/views/blazer/_variables.html.erb b/app/views/blazer/_variables.html.erbindex 6bd1a3fa..e9b3fa9f 100644--- a/app/views/blazer/_variables.html.erb+++ b/app/views/blazer/_variables.html.erb@@ -2,8 +2,8 @@<% var_params = request.query_parameters %><%= javascript_tag nonce: true do %><%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>- var now = moment.tz(timeZone)- var format = "YYYY-MM-DD"+ const now = moment.tz(timeZone)+ const format = "YYYY-MM-DD"function toDate(time) {return moment.tz(time.format(format), timeZone)@@ -112,12 +112,12 @@})if (document.getElementById("start_time").value.length > 0) {- var picker = $("#reportrange").data("daterangepicker")+ const picker = $("#reportrange").data("daterangepicker")picker.setStartDate(moment.tz($("#start_time").val(), timeZone))picker.setEndDate(moment.tz($("#end_time").val(), timeZone))$("#reportrange").trigger("apply.daterangepicker", picker)} else {- var picker = $("#reportrange").data("daterangepicker")+ const picker = $("#reportrange").data("daterangepicker")$("#reportrange").trigger("apply.daterangepicker", picker)submitIfCompleted($("#start_time").closest("form"))}diff --git a/app/views/blazer/dashboards/_form.html.erb b/app/views/blazer/dashboards/_form.html.erbindex 33322792..a789ec97 100644--- a/app/views/blazer/dashboards/_form.html.erb+++ b/app/views/blazer/dashboards/_form.html.erb@@ -27,7 +27,8 @@<%= javascript_tag nonce: true do %><%= blazer_js_var "queries", Blazer::Query.active.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} } %>- <%= blazer_js_var "dashboardQueries", (@queries || @dashboard.dashboard_queries.order(:position).map(&:query)).as_json(only: [:id, :name]) %>+ <%= blazer_js_+ "dashboardQueries", (@queries || @dashboard.dashboard_queries.order(:position).map(&:query)).as_json(only: [:id, :name]) %>const queriesList = document.getElementById("queries")const queriesGroup = document.getElementById("queries-group")diff --git a/app/views/blazer/dashboards/show.html.erb b/app/views/blazer/dashboards/show.html.erbindex f1516156..a834e205 100644--- a/app/views/blazer/dashboards/show.html.erb+++ b/app/views/blazer/dashboards/show.html.erb@@ -44,7 +44,7 @@(function() {<%= blazer_js_var "chartId", "chart-#{i}" %><%= blazer_js_var "runData", run_data %>- var chart = document.getElementById(chartId)+ const chart = document.getElementById(chartId)runQuery(runData, function (data) {$(chart).html(data)$(chart.querySelector("table")).stupidtable(stupidtableCustomSettings)diff --git a/app/views/blazer/queries/home.html.erb b/app/views/blazer/queries/home.html.erbindex e129598a..cd002022 100644--- a/app/views/blazer/queries/home.html.erb+++ b/app/views/blazer/queries/home.html.erb@@ -54,10 +54,8 @@<%= blazer_js_var "showUser", !!Blazer.user_class %>function prepareSearch(list) {- var i, q, searchStr- for (i = 0; i < list.length; i++) {- q = list[i]- searchStr = q.name + q.creator+ for (const q of list) {+ let searchStr = q.name + q.creatorif (q.creator === "You") {searchStr += "mine me"}@@ -77,16 +75,16 @@}}- var search = document.getElementById("search")- var items = document.getElementById("items")- var loading = document.getElementById("loading")+ const search = document.getElementById("search")+ const items = document.getElementById("items")+ const loading = document.getElementById("loading")function addItem(item) {- var tr = document.createElement("tr")+ const tr = document.createElement("tr")- var td = document.createElement("td")+ const td = document.createElement("td")- var a = document.createElement("a")+ const a = document.createElement("a")a.setAttribute("href", itemPath(item))if (item.dashboard) {a.classList.add("dashboard")@@ -95,7 +93,7 @@td.append(a)if (item.vars) {- var span = document.createElement("span")+ const span = document.createElement("span")span.classList.add("vars")span.textContent = item.varstd.append(" ", span)@@ -103,7 +101,7 @@tr.append(td)if (showUser) {- var td2 = document.createElement("td")+ const td2 = document.createElement("td")td2.classList.add("creator")td2.textContent = item.creatortr.append(td2)@@ -112,15 +110,14 @@}function visibleItems(searchTerm) {- var pageSize = 200+ const pageSize = 200if (searchTerm.length > 0) {- var term = prepareQuery(searchTerm)- var items = []- var fuzzyItems = []- for (var i = 0; i < listItems.length; i++) {- var q = listItems[i]- if (q.searchStr.indexOf(term) !== -1) {+ const term = prepareQuery(searchTerm)+ const items = []+ const fuzzyItems = []+ for (const q of listItems) {+ if (q.searchStr.includes(term)) {items.push(q)if (items.length == pageSize) {break@@ -135,13 +132,13 @@}}- var listItems = dashboards.concat(queries)+ let listItems = dashboards.concat(queries)prepareSearch(listItems)- var queryIds = {}- for (i = 0; i < queries.length; i++) {- queryIds[queries[i].id] = true+ const queryIds = {}+ for (const query of queries) {+ queryIds[query.id] = true}if (more) {@@ -150,9 +147,8 @@$.getJSON(Routes.queries_path(), function (data) {loading.classList.add("hide")- var newValues = []- for (var j = 0; j < data.length; j++) {- var val = data[j]+ const newValues = []+ for (const val of data) {if (val && !queryIds[val.id]) {newValues.push(val)}