fix(ds_edit): dont show warning when data source does not support testing, fixes grafana#4811

torkelo · torkelo · commit 0762c38d3552 · 2016-04-26T10:59:57.000+02:00
diff --git 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/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
@@ -53,7 +53,7 @@ <h1 ng-hide="ctrl.isNew">Edit data source</h1>
 			</plugin-component>
 			</rebuild-on-change>
 
-			<div ng-if="ctrl.testing" style="margin-top: 25px">
+			<div ng-if="ctrl.testing" class="gf-form-group">
 				<h5 ng-show="!ctrl.testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5>
 				<div class="alert-{{ctrl.testing.status}} alert">
 					<div class="alert-title">{{ctrl.testing.title}}</div>

Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,7 @@ export class DataSourceEditCtrl {`
`98`	`98`
`99`	`99`	`this.datasourceSrv.get(this.current.name).then(datasource => {`
`100`	`100`	`if (!datasource.testDatasource) {`
`101`		`- this.testing.message = 'Data source does not support test connection feature.';`
`102`		`- this.testing.status = 'warning';`
`103`		`- this.testing.title = 'Unknown';`
	`101`	`+ delete this.testing;`
`104`	`102`	`return;`
`105`	`103`	`}`
`106`	`104`
`@@ -118,7 +116,9 @@ export class DataSourceEditCtrl {`
`118`	`116`	`}`
`119`	`117`	`});`
`120`	`118`	`}).finally(() => {`
`121`		`- this.testing.done = true;`
	`119`	`+ if (this.testing) {`
	`120`	`+ this.testing.done = true;`
	`121`	`+ }`
`122`	`122`	`});`
`123`	`123`	`}`
`124`	`124`