diff --git a/public/app/features/panel/query_ctrl.ts b/public/app/features/panel/query_ctrl.ts
index 66370595252..67f4f93d16c 100644
--- a/public/app/features/panel/query_ctrl.ts
+++ b/public/app/features/panel/query_ctrl.ts
@@ -13,45 +13,11 @@ export class QueryCtrl {
constructor(public $scope, private $injector) {
this.panel = this.panelCtrl.panel;
-
- if (!this.target.refId) {
- this.target.refId = this.getNextQueryLetter();
- }
- }
-
- getNextQueryLetter() {
- var letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
- return _.find(letters, refId => {
- return _.every(this.panel.targets, function(other) {
- return other.refId !== refId;
- });
- });
- }
-
- removeQuery() {
- this.panel.targets = _.without(this.panel.targets, this.target);
- this.panelCtrl.refresh();
- };
-
- duplicateQuery() {
- var clone = angular.copy(this.target);
- clone.refId = this.getNextQueryLetter();
- this.panel.targets.push(clone);
- }
-
- moveQuery(direction) {
- var index = _.indexOf(this.panel.targets, this.target);
- _.move(this.panel.targets, index, index + direction);
}
refresh() {
this.panelCtrl.refresh();
}
- toggleHideQuery() {
- this.target.hide = !this.target.hide;
- this.panelCtrl.refresh();
- }
}
diff --git a/public/app/features/panel/query_editor_row.ts b/public/app/features/panel/query_editor_row.ts
index a4cb6155139..84cc597e388 100644
--- a/public/app/features/panel/query_editor_row.ts
+++ b/public/app/features/panel/query_editor_row.ts
@@ -1,17 +1,115 @@
///
import angular from 'angular';
-import $ from 'jquery';
+import _ from 'lodash';
var module = angular.module('grafana.directives');
+export class QueryRowCtrl {
+ collapsedText: string;
+ canCollapse: boolean;
+ getCollapsedText: any;
+ target: any;
+ queryCtrl: any;
+ panelCtrl: any;
+ panel: any;
+ collapsed: any;
+
+ constructor() {
+ this.panelCtrl = this.queryCtrl.panelCtrl;
+ this.target = this.queryCtrl.target;
+ this.panel = this.panelCtrl.panel;
+
+ if (!this.target.refId) {
+ this.target.refId = this.getNextQueryLetter();
+ }
+
+ this.toggleCollapse(true);
+ if (this.target.isNew) {
+ delete this.target.isNew;
+ this.toggleCollapse(false);
+ }
+ }
+
+ toggleHideQuery() {
+ this.target.hide = !this.target.hide;
+ this.panelCtrl.refresh();
+ }
+
+ getNextQueryLetter() {
+ var letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+ return _.find(letters, refId => {
+ return _.every(this.panel.targets, function(other) {
+ return other.refId !== refId;
+ });
+ });
+ }
+
+ toggleCollapse(init) {
+ if (!this.canCollapse) {
+ return;
+ }
+
+ if (!this.panelCtrl.__collapsedQueryCache) {
+ this.panelCtrl.__collapsedQueryCache = {};
+ }
+
+ if (init) {
+ this.collapsed = this.panelCtrl.__collapsedQueryCache[this.target.refId] !== false;
+ } else {
+ this.collapsed = !this.collapsed;
+ this.panelCtrl.__collapsedQueryCache[this.target.refId] = this.collapsed;
+ }
+
+ try {
+ this.collapsedText = this.queryCtrl.getCollapsedText();
+ } catch (e) {
+ var err = e.message || e.toString();
+ this.collapsedText = 'Error: ' + err;
+ }
+ }
+
+ toggleEditorMode() {
+ if (this.canCollapse && this.collapsed) {
+ this.collapsed = false;
+ }
+
+ this.queryCtrl.toggleEditorMode();
+ }
+
+ removeQuery() {
+ delete this.panelCtrl.__collapsedQueryCache[this.target.refId];
+ this.panel.targets = _.without(this.panel.targets, this.target);
+ this.panelCtrl.refresh();
+ }
+
+ duplicateQuery() {
+ var clone = angular.copy(this.target);
+ clone.refId = this.getNextQueryLetter();
+ this.panel.targets.push(clone);
+ }
+
+ moveQuery(direction) {
+ var index = _.indexOf(this.panel.targets, this.target);
+ _.move(this.panel.targets, index, index + direction);
+ }
+}
+
/** @ngInject **/
function queryEditorRowDirective() {
return {
restrict: 'E',
+ controller: QueryRowCtrl,
+ bindToController: true,
+ controllerAs: "ctrl",
templateUrl: 'public/app/features/panel/partials/query_editor_row.html',
transclude: true,
- scope: {ctrl: "="},
+ scope: {
+ queryCtrl: "=",
+ canCollapse: "=",
+ hasTextEditMode: "=",
+ },
};
}
diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts
index e7e8014ed10..a3e78c33a15 100644
--- a/public/app/features/plugins/ds_edit_ctrl.ts
+++ b/public/app/features/plugins/ds_edit_ctrl.ts
@@ -98,9 +98,7 @@ export class DataSourceEditCtrl {
this.datasourceSrv.get(this.current.name).then(datasource => {
if (!datasource.testDatasource) {
- this.testing.message = 'Data source does not support test connection feature.';
- this.testing.status = 'warning';
- this.testing.title = 'Unknown';
+ delete this.testing;
return;
}
@@ -118,7 +116,9 @@ export class DataSourceEditCtrl {
}
});
}).finally(() => {
- this.testing.done = true;
+ if (this.testing) {
+ this.testing.done = true;
+ }
});
}
diff --git a/public/app/features/plugins/import_list/import_list.html b/public/app/features/plugins/import_list/import_list.html
index acb6654d520..86534f1adc7 100644
--- a/public/app/features/plugins/import_list/import_list.html
+++ b/public/app/features/plugins/import_list/import_list.html
@@ -15,16 +15,16 @@
|
v{{dash.revision}}
- |
-
- Imported v{{dash.installedRevision}}
+
+ (Imported v{{dash.installedRevision}})
+
|
|