update url params (2425d934) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-datepicker.js

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ FnordMetric.util.DatePicker = function(elem, dp_input, viewport, callback) {
		//var selected_day = selected_ts.getDate();
		var selected_hours =
		FnordMetric.util.appendLeadingZero(selected_ts.getHours());
		console.log("hours " + selected_ts.getHours());
		var selected_minutes =
		FnordMetric.util.appendLeadingZero(selected_ts.getMinutes());

fnordmetric-webui/fnordmetric-webui-metriclist.js

+0 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ FnordMetric.views.MetricList = function() {

		function render(viewport, url, query_params) {
		if (query_params.innerView != undefined) {
		console.log(query_params.innerView);
		actions[query_params.innerView].render(viewport, query_params);
		return;
		}
		@@ -110,7 +109,6 @@ FnordMetric.views.MetricList = function() {
		var json = JSON.parse(r.response);
		var search_item;
		if (query_params.innerView != undefined) {
		console.log(query_params.innerView);
		json.metrics =
		actions[query_params.innerView].data(json.metrics, query_params.innerViewValue);
		search_item = query_params.innerviewValue;

fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js

+46 −44

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		var table_container = document.createElement("div");
		var chart_container = document.createElement("div");
		var now = Date.now();
		console.log(now);
		var columns = [];
		var elems = {};
		var mseconds_to_end;
		@@ -53,8 +52,8 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		return value;
		}

		function updateURLParameters(key, value) {
		query_params.key = value;
		function updateURLParams(key, value) {
		query_params[key] = value;
		//update url fragment
		}

		@@ -80,14 +79,12 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {

		}

		function runQuery(querystr) {
		console.log("run qyery run");
		console.log(querystr);
		function runQuery() {
		var querystr =
		FnordMetric.util.generateSQLQueryFromParams(query_params);
		FnordMetric.httpPost("/query", querystr, function(r) {
		console.log(r);
		if (r.status == 200) {
		var json = JSON.parse(r.response);
		console.log(json);
		if (json.charts != undefined) {
		renderChart(json.charts[0]);
		}
		@@ -128,8 +125,11 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {

		}

		function updateDateTimeElems(start, end, title, input) {
		var end_string = FnordMetric.util.getDateTimeString(end);
		function updateDateTimeElems(title, input) {
		var start = FnordMetric.util.getdateTimeString(
		getQueryParamOrDefault("start_time"));
		var end = getQueryParameOrDefault("end_time");
		var end_str = FnordMetric.util.getDateTimeString(end);

		if (input != null) {
		input.value = end_string;
		@@ -143,39 +143,42 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		}

		function onDateSubmit(ts) {
		inputs.time.end = ts;
		runQuery(FnordMetric.util.createQuery(inputs, metric));
		var start = ts - inputs.time.mseconds_to_end;
		updateDateTimeElems(start, ts, elems.timespan.title, null);
		var start =
		ts - getQueryParamOrDefault(time_to_end);
		updateURLParams("end_time", ts);
		updateURLParams("start_time", start);
		runQuery();
		updateDateTimeElems(elems.timespan_title, null);
		}


		function updateEventHandler() {
		elems.rollup.addEventListener('change', function() {
		inputs.show = this.value;
		updateURLParams("show", this.value);
		handleAggrAvailability(
		this.value, elems.aggregation.timewindow, elems.aggregation.step, elems.group_by);
		runQuery(FnordMetric.util.createQuery(inputs, metric));
		this.value, elems_timewindow, elems.t_step, elems.by);
		runQuery();
		}, false);

		elems.t_window.addEventListener('change', function() {
		inputs.aggregation.time = FnordMetric.util.toMilliSeconds(this.value);
		runQuery(FnordMetric.util.createQuery(inputs, metric));
		updateURLParams(
		"t_window", FnordMetric.util.toMilliSeconds(this.value));
		runQuery();
		}, false);

		elems.t_step.addEventListener('change', function() {
		inputs.aggregation.step = FnordMetric.util.toMilliSeconds(this.value);
		runQuery(FnordMetric.util.createQuery(inputs, metric));
		updateURLParams(
		"t_step", FnordMetric.util.toMilliSeconds(this.value));
		runQuery();
		}, false);

		elems.time_to_end.addEventListener('change', function() {
		var mseconds_to_end =
		mseconds_to_end =
		FnordMetric.util.toMilliSeconds(this.value);
		var start = inputs.time.end - mseconds_to_end;
		updateDateTimeElems(
		start, inputs.time.end, elems.timespan_title, null);
		inputs.time.mseconds_to_end = mseconds_to_end;
		runQuery(FnordMetric.util.createQuery(inputs, metric));
		var start = getQueryParamOrDefault("end_time") - mseconds_to_end;
		updateURLParams("start_time", start);
		updateDateTimeElems(elems.timespan_title, null);
		runQuery();
		}, false);

		if (elems.by) {
		@@ -186,12 +189,12 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		var index = inputs.group_by.indexOf(c);
		if (index == -1) {
		this.className = "selected";
		inputs.group_by.push(this.innerText);
		updateURLParams(this.innerText);
		} else {
		this.className = "";
		inputs.group_by.splice(index, 1);
		}
		runQuery(FnordMetric.util.createQuery(inputs, metric));
		runQuery();
		});
		}, false);
		}
		@@ -199,25 +202,24 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		elems.timespan_next.addEventListener('click', function(e) {
		e.preventDefault();
		var end_time =
		parseInt(inputs.time.end, 10) + parseInt(inputs.time.mseconds_to_end, 10);
		updateDateTimeElems(
		inputs.time.end, end_time, elems.timespan_title, elems.date);
		inputs.time.end = end_time;
		runQuery(FnordMetric.util.createQuery(inputs, metric));

		//update elems.timespan.title
		parseInt(getQueryParamOrDefault("end_time", 10) +
		parseInt(mseconds_to_end, 10));

		updateURLParams("end_time", end_time);
		//upfdate start_time
		updateDateTimeElems(elems.timespan_title, elems.date);
		runQuery();
		}, false);

		elems.timespan_prev.addEventListener('click', function(e) {
		e.preventDefault();
		var end_time =
		inputs.time.end - inputs.time.mseconds_to_end;
		updateDateTimeElems(
		end_time, inputs.time.end, elems.timespan_title, elems.date);
		inputs.time.end = end_time;
		runQuery(FnordMetric.util.createQuery(inputs, metric));
		//update elems.timespan.title
		parseInt(getQueryParamOrDefault("end_time", 10) -
		parseInt(mseconds_to_end, 10));
		updateURLParams("ent_time", end_time);
		//update start time
		updateDateTimeElems(elems.timespan_title, elems.date);
		runQuery();
		}, false);

		}

fnordmetric-webui/fnordmetric-webui-queryeditor.js

+0 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,6 @@ FnordMetric.views.QueryPlayground = function() {
		}

		function renderEditorView(view, editor_pane, result_pane, query) {
		console.log(view);
		editorViews[view].render(editor_pane, query);
		editor_pane.insertBefore(button_bar, editor_pane.firstChild);
		if (query != undefined) {

fnordmetric-webui/fnordmetric-webui-util.js

+0 −4

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@ FnordMetric.util.setFragmentURL = function(hash, name, value, encode, push_state
		var hash =
		path + "#" + hash + "?" + name + "=" + value;
		window.location = hash;
		console.log("push state: " + push_state);
		if (push_state == true) {
		window.history.pushState({url: hash}, "#", hash);
		}
		@@ -491,8 +490,6 @@ FnordMetric.util.createQuery = function(inputs, metric) {

		/* in singleMetricView */
		FnordMetric.util.generateSQLQueryFromParams = function(params) {
		console.log("generate sql query");
		console.log(params);
		//FIX html escape
		var query;
		var draw_stm = "DRAW LINECHART AXIS BOTTOM AXIS LEFT; ";
		@@ -562,7 +559,6 @@ FnordMetric.util.generateSQLQueryFromParams = function(params) {
		draw_stm + select_expr +// where_expr +
		from_expr + group_expr + ";";

		console.log(query);

		return query;
		}

Admin message