fix group by params update (d62bbd5f) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js

+5 −15

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		var group_by = query_params.by;
		if (group_by == undefined) {
		group_by = defaults.by;
		console.log(group_by);
		updateURLParams("by", group_by);
		}
		var param_columns = query_params.columns;
		@@ -419,30 +420,19 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		group_buttons.map(function(column) {
		column.addEventListener('click', function(e) {
		e.preventDefault();

		var selected_columns =
		getQueryParamOrDefaultValue("by");
		var c = this.innerText;
		var index = selected_columns.indexOf(c);

		if (index == -1) {
		this.className = "active";
		if (selected_columns.length > 0) {
		selected_columns += ",";
		}
		selected_columns += this.innerText;

		selected_columns =
		FnordMetric.util.addToCSV(selected_columns, c);
		} else {
		this.className = "";
		//FIXME
		selected_columns =
		FnordMetric.util.removeFromString(
		c, this.innerText.length+1, selected_columns);
		if (selected_columns[0] == ",") {
		selected_columns.substr(1);
		}
		FnordMetric.util.removeFromCSV(selected_columns, c);
		}

		updateURLParams("by", selected_columns);
		runQuery();
		});

+2 −1

Original line number	Diff line number	Diff line
		@@ -210,8 +210,9 @@ FnordMetric.UnitTests = function() {
		t_window : "5000"},
		"DRAWLINECHARTAXISBOTTOMAXISLEFTLEGENDTOPRIGHTINSIDE;SELECTtimeASx,min(value)ASYFROM`status_codes`GROUPOVERTIMEWINDOW(time,5,5);");


		}();


		if (results.bad == 0) {
		console.log("Yeah, all " + results.total + " tests passed :-) ");
		} else {

+17 −8

Original line number	Diff line number	Diff line
		@@ -523,7 +523,6 @@ FnordMetric.util.generateSQLQueryFromParams = function(params) {
		return query;
		}


		FnordMetric.util.getMonthStr = function(index) {
		var months = [
		"January",
		@@ -627,15 +626,25 @@ FnordMetric.util.reverseLowerCaseUnderscore = function(string) {
		return str;
		}

		FnordMetric.util.removeFromString = function(start, end, str) {
		var length = str.length;
		if (end >= length) {
		return "";
		FnordMetric.util.addToCSV = function(list, value) {
		if (list.length == 0) {
		return value;
		}
		var values = list.split(",");
		values.push(value);
		list = values.join(",");
		return list;
		}

		var res = str.substr(0, length - start);
		res += str.substr(end, length-1);
		return res;
		FnordMetric.util.removeFromCSV = function(list, value) {
		var values = list.split(",");
		for (var i = 0; i < values.length; i ++) {
		if (values[i] == value) {
		values.splice(i, 1);
		return values.join(",");
		}
		}
		return list;
		}

		FnordMetric.util.renderFlyout = function(text, elem, left) {