@@ -60,16 +61,11 @@ export class OrgSwitchCtrl {
setUsingOrg(org) {
return this.backendSrv.post('/api/user/using/' + org.orgId).then(() => {
- const re = /orgId=\d+/gi;
- this.setWindowLocationHref(this.getWindowLocationHref().replace(re, 'orgId=' + org.orgId));
+ this.setWindowLocation(config.appSubUrl + (config.appSubUrl.endsWith('/') ? '' : '/') + '?orgId=' + org.orgId);
});
}
- getWindowLocationHref() {
- return window.location.href;
- }
-
- setWindowLocationHref(href: string) {
+ setWindowLocation(href: string) {
window.location.href = href;
}
}
diff --git a/public/app/core/components/query_part/query_part_editor.ts b/public/app/core/components/query_part/query_part_editor.ts
index 138da186238..5fd6e16c466 100644
--- a/public/app/core/components/query_part/query_part_editor.ts
+++ b/public/app/core/components/query_part/query_part_editor.ts
@@ -23,11 +23,13 @@ export function queryPartEditorDirective($compile, templateSrv) {
scope: {
part: '=',
handleEvent: '&',
+ debounce: '@',
},
link: function postLink($scope, elem) {
var part = $scope.part;
var partDef = part.def;
var $paramsContainer = elem.find('.query-part-parameters');
+ var debounceLookup = $scope.debounce;
$scope.partActions = [];
@@ -128,6 +130,10 @@ export function queryPartEditorDirective($compile, templateSrv) {
var items = this.source(this.query, $.proxy(this.process, this));
return items ? this.process(items) : items;
};
+
+ if (debounceLookup) {
+ typeahead.lookup = _.debounce(typeahead.lookup, 500, { leading: true });
+ }
}
$scope.showActionsMenu = function() {
diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts
index 99245ed3331..720334d8973 100644
--- a/public/app/core/components/scroll/scroll.ts
+++ b/public/app/core/components/scroll/scroll.ts
@@ -6,7 +6,9 @@ export function geminiScrollbar() {
return {
restrict: 'A',
link: function(scope, elem, attrs) {
- let scrollbar = new PerfectScrollbar(elem[0]);
+ let scrollbar = new PerfectScrollbar(elem[0], {
+ wheelPropagation: true,
+ });
let lastPos = 0;
appEvents.on(
diff --git a/public/app/core/directives/metric_segment.js b/public/app/core/directives/metric_segment.js
index 2754f8d8c6e..7ba4a5a5259 100644
--- a/public/app/core/directives/metric_segment.js
+++ b/public/app/core/directives/metric_segment.js
@@ -22,6 +22,7 @@ function (_, $, coreModule) {
segment: "=",
getOptions: "&",
onChange: "&",
+ debounce: "@",
},
link: function($scope, elem) {
var $input = $(inputTemplate);
@@ -30,6 +31,7 @@ function (_, $, coreModule) {
var options = null;
var cancelBlur = null;
var linkMode = true;
+ var debounceLookup = $scope.debounce;
$input.appendTo(elem);
$button.appendTo(elem);
@@ -135,6 +137,10 @@ function (_, $, coreModule) {
return items ? this.process(items) : items;
};
+ if (debounceLookup) {
+ typeahead.lookup = _.debounce(typeahead.lookup, 500, {leading: true});
+ }
+
$button.keydown(function(evt) {
// trigger typeahead on down arrow or enter key
if (evt.keyCode === 40 || evt.keyCode === 13) {
diff --git a/public/app/core/specs/file_export.jest.ts b/public/app/core/specs/file_export.jest.ts
new file mode 100644
index 00000000000..bbb894094ff
--- /dev/null
+++ b/public/app/core/specs/file_export.jest.ts
@@ -0,0 +1,64 @@
+import * as fileExport from '../utils/file_export';
+import { beforeEach, expect } from 'test/lib/common';
+
+describe('file_export', () => {
+ let ctx: any = {};
+
+ beforeEach(() => {
+ ctx.seriesList = [
+ {
+ alias: 'series_1',
+ datapoints: [
+ [1, 1500026100000],
+ [2, 1500026200000],
+ [null, 1500026300000],
+ [null, 1500026400000],
+ [null, 1500026500000],
+ [6, 1500026600000],
+ ],
+ },
+ {
+ alias: 'series_2',
+ datapoints: [[11, 1500026100000], [12, 1500026200000], [13, 1500026300000], [15, 1500026500000]],
+ },
+ ];
+
+ ctx.timeFormat = 'X'; // Unix timestamp (seconds)
+ });
+
+ describe('when exporting series as rows', () => {
+ it('should export points in proper order', () => {
+ let text = fileExport.convertSeriesListToCsv(ctx.seriesList, ctx.timeFormat);
+ const expectedText =
+ 'Series;Time;Value\n' +
+ 'series_1;1500026100;1\n' +
+ 'series_1;1500026200;2\n' +
+ 'series_1;1500026300;null\n' +
+ 'series_1;1500026400;null\n' +
+ 'series_1;1500026500;null\n' +
+ 'series_1;1500026600;6\n' +
+ 'series_2;1500026100;11\n' +
+ 'series_2;1500026200;12\n' +
+ 'series_2;1500026300;13\n' +
+ 'series_2;1500026500;15\n';
+
+ expect(text).toBe(expectedText);
+ });
+ });
+
+ describe('when exporting series as columns', () => {
+ it('should export points in proper order', () => {
+ let text = fileExport.convertSeriesListToCsvColumns(ctx.seriesList, ctx.timeFormat);
+ const expectedText =
+ 'Time;series_1;series_2\n' +
+ '1500026100;1;11\n' +
+ '1500026200;2;12\n' +
+ '1500026300;null;13\n' +
+ '1500026400;null;null\n' +
+ '1500026500;null;15\n' +
+ '1500026600;6;null\n';
+
+ expect(text).toBe(expectedText);
+ });
+ });
+});
diff --git a/public/app/core/specs/org_switcher.jest.ts b/public/app/core/specs/org_switcher.jest.ts
index 06172604069..230da81f191 100644
--- a/public/app/core/specs/org_switcher.jest.ts
+++ b/public/app/core/specs/org_switcher.jest.ts
@@ -7,6 +7,12 @@ jest.mock('app/core/services/context_srv', () => ({
},
}));
+jest.mock('app/core/config', () => {
+ return {
+ appSubUrl: '/subUrl',
+ };
+});
+
describe('OrgSwitcher', () => {
describe('when switching org', () => {
let expectedHref;
@@ -25,8 +31,7 @@ describe('OrgSwitcher', () => {
const orgSwitcherCtrl = new OrgSwitchCtrl(backendSrvStub);
- orgSwitcherCtrl.getWindowLocationHref = () => 'http://localhost:3000?orgId=1&from=now-3h&to=now';
- orgSwitcherCtrl.setWindowLocationHref = href => (expectedHref = href);
+ orgSwitcherCtrl.setWindowLocation = href => (expectedHref = href);
return orgSwitcherCtrl.setUsingOrg({ orgId: 2 });
});
@@ -35,8 +40,8 @@ describe('OrgSwitcher', () => {
expect(expectedUsingUrl).toBe('/api/user/using/2');
});
- it('should switch orgId in url', () => {
- expect(expectedHref).toBe('http://localhost:3000?orgId=2&from=now-3h&to=now');
+ it('should switch orgId in url and redirect to home page', () => {
+ expect(expectedHref).toBe('/subUrl/?orgId=2');
});
});
});
diff --git a/public/app/core/utils/file_export.ts b/public/app/core/utils/file_export.ts
index 1ebd5b90a86..670326fc068 100644
--- a/public/app/core/utils/file_export.ts
+++ b/public/app/core/utils/file_export.ts
@@ -3,19 +3,27 @@ import moment from 'moment';
import { saveAs } from 'file-saver';
const DEFAULT_DATETIME_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
+const POINT_TIME_INDEX = 1;
+const POINT_VALUE_INDEX = 0;
-export function exportSeriesListToCsv(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
+export function convertSeriesListToCsv(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
var text = (excel ? 'sep=;\n' : '') + 'Series;Time;Value\n';
_.each(seriesList, function(series) {
_.each(series.datapoints, function(dp) {
- text += series.alias + ';' + moment(dp[1]).format(dateTimeFormat) + ';' + dp[0] + '\n';
+ text +=
+ series.alias + ';' + moment(dp[POINT_TIME_INDEX]).format(dateTimeFormat) + ';' + dp[POINT_VALUE_INDEX] + '\n';
});
});
+ return text;
+}
+
+export function exportSeriesListToCsv(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
+ var text = convertSeriesListToCsv(seriesList, dateTimeFormat, excel);
saveSaveBlob(text, 'grafana_data_export.csv');
}
-export function exportSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
- var text = (excel ? 'sep=;\n' : '') + 'Time;';
+export function convertSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
+ let text = (excel ? 'sep=;\n' : '') + 'Time;';
// add header
_.each(seriesList, function(series) {
text += series.alias + ';';
@@ -24,14 +32,15 @@ export function exportSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAUL
text += '\n';
// process data
+ seriesList = mergeSeriesByTime(seriesList);
var dataArr = [[]];
var sIndex = 1;
_.each(seriesList, function(series) {
var cIndex = 0;
dataArr.push([]);
_.each(series.datapoints, function(dp) {
- dataArr[0][cIndex] = moment(dp[1]).format(dateTimeFormat);
- dataArr[sIndex][cIndex] = dp[0];
+ dataArr[0][cIndex] = moment(dp[POINT_TIME_INDEX]).format(dateTimeFormat);
+ dataArr[sIndex][cIndex] = dp[POINT_VALUE_INDEX];
cIndex++;
});
sIndex++;
@@ -46,6 +55,44 @@ export function exportSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAUL
text = text.substring(0, text.length - 1);
text += '\n';
}
+
+ return text;
+}
+
+/**
+ * Collect all unique timestamps from series list and use it to fill
+ * missing points by null.
+ */
+function mergeSeriesByTime(seriesList) {
+ let timestamps = [];
+ for (let i = 0; i < seriesList.length; i++) {
+ let seriesPoints = seriesList[i].datapoints;
+ for (let j = 0; j < seriesPoints.length; j++) {
+ timestamps.push(seriesPoints[j][POINT_TIME_INDEX]);
+ }
+ }
+ timestamps = _.sortedUniq(timestamps.sort());
+
+ for (let i = 0; i < seriesList.length; i++) {
+ let seriesPoints = seriesList[i].datapoints;
+ let seriesTimestamps = _.map(seriesPoints, p => p[POINT_TIME_INDEX]);
+ let extendedSeries = [];
+ let pointIndex;
+ for (let j = 0; j < timestamps.length; j++) {
+ pointIndex = _.sortedIndexOf(seriesTimestamps, timestamps[j]);
+ if (pointIndex !== -1) {
+ extendedSeries.push(seriesPoints[pointIndex]);
+ } else {
+ extendedSeries.push([null, timestamps[j]]);
+ }
+ }
+ seriesList[i].datapoints = extendedSeries;
+ }
+ return seriesList;
+}
+
+export function exportSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAULT_DATETIME_FORMAT, excel = false) {
+ let text = convertSeriesListToCsvColumns(seriesList, dateTimeFormat, excel);
saveSaveBlob(text, 'grafana_data_export.csv');
}
diff --git a/public/app/features/dashboard/create_folder_ctrl.ts b/public/app/features/dashboard/create_folder_ctrl.ts
index 0c582164e2b..4b74d290e34 100644
--- a/public/app/features/dashboard/create_folder_ctrl.ts
+++ b/public/app/features/dashboard/create_folder_ctrl.ts
@@ -1,4 +1,5 @@
import appEvents from 'app/core/app_events';
+import locationUtil from 'app/core/utils/location_util';
export class CreateFolderCtrl {
title = '';
@@ -19,7 +20,7 @@ export class CreateFolderCtrl {
return this.backendSrv.createDashboardFolder(this.title).then(result => {
appEvents.emit('alert-success', ['Folder Created', 'OK']);
- this.$location.url(result.meta.url);
+ this.$location.url(locationUtil.stripBaseFromUrl(result.meta.url));
});
}
diff --git a/public/app/features/dashboard/dashboard_import_ctrl.ts b/public/app/features/dashboard/dashboard_import_ctrl.ts
index c3af0a51a19..d127e628a77 100644
--- a/public/app/features/dashboard/dashboard_import_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_import_ctrl.ts
@@ -18,7 +18,7 @@ export class DashboardImportCtrl {
nameValidationError: any;
/** @ngInject */
- constructor(private backendSrv, private validationSrv, navModelSrv, private $location, private $scope, $routeParams) {
+ constructor(private backendSrv, private validationSrv, navModelSrv, private $location, $routeParams) {
this.navModel = navModelSrv.getNav('create', 'import');
this.step = 1;
@@ -124,8 +124,7 @@ export class DashboardImportCtrl {
inputs: inputs,
})
.then(res => {
- this.$location.url('dashboard/' + res.importedUri);
- this.$scope.dismiss();
+ this.$location.url(res.importedUrl);
});
}
diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts
index 08ab70053f6..a1ff99007e3 100644
--- a/public/app/features/dashboard/dashboard_srv.ts
+++ b/public/app/features/dashboard/dashboard_srv.ts
@@ -1,5 +1,6 @@
import coreModule from 'app/core/core_module';
import { DashboardModel } from './dashboard_model';
+import locationUtil from 'app/core/utils/location_util';
export class DashboardSrv {
dash: any;
@@ -19,7 +20,10 @@ export class DashboardSrv {
return this.dash;
}
- handleSaveDashboardError(clone, err) {
+ handleSaveDashboardError(clone, options, err) {
+ options = options || {};
+ options.overwrite = true;
+
if (err.data && err.data.status === 'version-mismatch') {
err.isHandled = true;
@@ -30,7 +34,7 @@ export class DashboardSrv {
yesText: 'Save & Overwrite',
icon: 'fa-warning',
onConfirm: () => {
- this.save(clone, { overwrite: true });
+ this.save(clone, options);
},
});
}
@@ -40,12 +44,12 @@ export class DashboardSrv {
this.$rootScope.appEvent('confirm-modal', {
title: 'Conflict',
- text: 'Dashboard with the same name exists.',
+ text: 'A dashboard with the same name in selected folder already exists.',
text2: 'Would you still like to save this dashboard?',
yesText: 'Save & Overwrite',
icon: 'fa-warning',
onConfirm: () => {
- this.save(clone, { overwrite: true });
+ this.save(clone, options);
},
});
}
@@ -74,7 +78,7 @@ export class DashboardSrv {
this.dash.version = data.version;
if (data.url !== this.$location.path()) {
- this.$location.url(data.url);
+ this.$location.url(locationUtil.stripBaseFromUrl(data.url)).replace();
}
this.$rootScope.appEvent('dashboard-saved', this.dash);
@@ -90,7 +94,7 @@ export class DashboardSrv {
return this.backendSrv
.saveDashboard(clone, options)
.then(this.postSave.bind(this, clone))
- .catch(this.handleSaveDashboardError.bind(this, clone));
+ .catch(this.handleSaveDashboardError.bind(this, clone, options));
}
saveDashboard(options, clone) {
diff --git a/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx b/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
index 01d16436a45..aeb840c317a 100644
--- a/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
@@ -93,7 +93,6 @@ export class AddPanelPanel extends React.Component
this.onAddPanel(panel)} title={panel.name}>
diff --git a/public/app/features/dashboard/history/history.ts b/public/app/features/dashboard/history/history.ts
index 2a3fd0b3984..d9f0c087438 100644
--- a/public/app/features/dashboard/history/history.ts
+++ b/public/app/features/dashboard/history/history.ts
@@ -4,6 +4,7 @@ import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
+import locationUtil from 'app/core/utils/location_util';
import { DashboardModel } from '../dashboard_model';
import { HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv } from './history_srv';
@@ -185,7 +186,7 @@ export class HistoryListCtrl {
return this.historySrv
.restoreDashboard(this.dashboard, version)
.then(response => {
- this.$location.path('dashboard/db/' + response.slug);
+ this.$location.url(locationUtil.stripBaseFromUrl(response.url)).replace();
this.$route.reload();
this.$rootScope.appEvent('alert-success', ['Dashboard restored', 'Restored from version ' + version]);
})
diff --git a/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts b/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts
index 3d311b8b4f8..1cb59ef5bac 100644
--- a/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts
+++ b/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts
@@ -22,7 +22,7 @@ describe('DashboardImportCtrl', function() {
validateNewDashboardName: jest.fn().mockReturnValue(Promise.resolve()),
};
- ctx.ctrl = new DashboardImportCtrl(backendSrv, validationSrv, navModelSrv, {}, {}, {});
+ ctx.ctrl = new DashboardImportCtrl(backendSrv, validationSrv, navModelSrv, {}, {});
});
describe('when uploading json', function() {
diff --git a/public/app/features/org/partials/team_details.html b/public/app/features/org/partials/team_details.html
index 9f06ebdb017..3fce8b3c720 100644
--- a/public/app/features/org/partials/team_details.html
+++ b/public/app/features/org/partials/team_details.html
@@ -33,7 +33,7 @@
Old picker
-->
-
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+