From f6793c5a6cd2c3a8e1a4156fe42b9a9f25e0375d Mon Sep 17 00:00:00 2001
From: sergeisporyshev <sergei.sporyshev@gmail.com>
Date: Mon, 30 Sep 2019 16:39:12 +0800
Subject: [PATCH] [issue #10] grafana 5.x.x bearer access token checkbox

---
 dist/components/cluster-config/cluster-config.d.ts   |  5 ++++-
 dist/components/cluster-config/cluster-config.html   |  9 +++++++++
 dist/components/cluster-config/cluster-config.js     |  8 +++++++-
 dist/components/cluster-config/cluster-config.js.map |  2 +-
 dist/components/cluster-config/cluster-config.ts     | 10 ++++++++--
 dist/datasource/config.d.ts                          |  5 ++++-
 dist/datasource/config.js                            |  9 ++++++++-
 dist/datasource/config.js.map                        |  2 +-
 dist/datasource/config.ts                            | 10 +++++++++-
 dist/datasource/partials/config.html                 | 10 ++++++++++
 src/components/cluster-config/cluster-config.html    |  9 +++++++++
 src/components/cluster-config/cluster-config.ts      | 10 ++++++++--
 src/datasource/config.ts                             | 10 +++++++++-
 src/datasource/partials/config.html                  | 10 ++++++++++
 14 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/dist/components/cluster-config/cluster-config.d.ts b/dist/components/cluster-config/cluster-config.d.ts
index c351287..58718aa 100644
--- a/dist/components/cluster-config/cluster-config.d.ts
+++ b/dist/components/cluster-config/cluster-config.d.ts
@@ -3,15 +3,18 @@ export declare class ClusterConfig {
     private alertSrv;
     private $q;
     private $location;
+    private $window;
     cluster: any;
     prometheusList: Array<any>;
     busy: boolean;
     $scope: any;
     pageReady: boolean;
+    version: number;
     static templateUrl: string;
-    constructor($scope: any, $injector: any, backendSrv: any, alertSrv: any, $q: any, $location: any);
+    constructor($scope: any, $injector: any, backendSrv: any, alertSrv: any, $q: any, $location: any, $window: any);
     getCluster(): void;
     getPrometheusList(): any;
+    setGrafanaVersion(window: any): void;
     saveCluster(): any;
     check(): any;
     saveDatasource(): any;
diff --git a/dist/components/cluster-config/cluster-config.html b/dist/components/cluster-config/cluster-config.html
index 902168c..acf2e3d 100644
--- a/dist/components/cluster-config/cluster-config.html
+++ b/dist/components/cluster-config/cluster-config.html
@@ -23,12 +23,21 @@ <h3 class="page-heading">Bearer token access</h3>
 
             <div class="gf-form-inline">
                 <gf-form-checkbox
+                        ng-if="ctrl.version >= 6"
                         class="gf-form"
                         label="Access via token"
                         checked="ctrl.cluster.jsonData.access_via_token"
                         label-class="width-10"
                         switch-class="max-width-6">
                 </gf-form-checkbox>
+                <gf-form-switch
+                        ng-if="ctrl.version < 6"
+                        class="gf-form"
+                        label="Access via token"
+                        checked="ctrl.cluster.jsonData.access_via_token"
+                        label-class="width-10"
+                        switch-class="max-width-6">
+                </gf-form-switch>
             </div>
             <div class="gf-form-inline" ng-if="ctrl.cluster.jsonData.access_via_token">
                 <div class="gf-form">
diff --git a/dist/components/cluster-config/cluster-config.js b/dist/components/cluster-config/cluster-config.js
index b3601a9..9f6ee07 100644
--- a/dist/components/cluster-config/cluster-config.js
+++ b/dist/components/cluster-config/cluster-config.js
@@ -8,15 +8,17 @@ System.register(["../../common/constants"], function(exports_1) {
             }],
         execute: function() {
             ClusterConfig = (function () {
-                function ClusterConfig($scope, $injector, backendSrv, alertSrv, $q, $location) {
+                function ClusterConfig($scope, $injector, backendSrv, alertSrv, $q, $location, $window) {
                     this.backendSrv = backendSrv;
                     this.alertSrv = alertSrv;
                     this.$q = $q;
                     this.$location = $location;
+                    this.$window = $window;
                     this.pageReady = false;
                     this.$scope = $scope;
                     this.busy = false;
                     this.getCluster();
+                    this.setGrafanaVersion($window);
                 }
                 ClusterConfig.prototype.getCluster = function () {
                     var _this = this;
@@ -61,6 +63,10 @@ System.register(["../../common/constants"], function(exports_1) {
                         }
                     });
                 };
+                ClusterConfig.prototype.setGrafanaVersion = function (window) {
+                    var _v = window.grafanaBootData.settings.buildInfo.version.split('.')[0];
+                    this.version = _v;
+                };
                 ClusterConfig.prototype.saveCluster = function () {
                     var _this = this;
                     if (this.busy)
diff --git a/dist/components/cluster-config/cluster-config.js.map b/dist/components/cluster-config/cluster-config.js.map
index be6dc47..617a8b8 100644
--- a/dist/components/cluster-config/cluster-config.js.map
+++ b/dist/components/cluster-config/cluster-config.js.map
@@ -1 +1 @@
-{"version":3,"file":"cluster-config.js","sourceRoot":"","sources":["cluster-config.ts"],"names":["ClusterConfig","ClusterConfig.constructor","ClusterConfig.getCluster","ClusterConfig.getPrometheusList","ClusterConfig.saveCluster","ClusterConfig.check","ClusterConfig.saveDatasource","ClusterConfig.createDatasource","ClusterConfig.updateDatasource","ClusterConfig.getDatasource"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"cluster-config.js","sourceRoot":"","sources":["cluster-config.ts"],"names":["ClusterConfig","ClusterConfig.constructor","ClusterConfig.getCluster","ClusterConfig.getPrometheusList","ClusterConfig.setGrafanaVersion","ClusterConfig.saveCluster","ClusterConfig.check","ClusterConfig.saveDatasource","ClusterConfig.createDatasource","ClusterConfig.updateDatasource","ClusterConfig.getDatasource"],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/components/cluster-config/cluster-config.ts b/dist/components/cluster-config/cluster-config.ts
index 789b50b..8805dc8 100644
--- a/dist/components/cluster-config/cluster-config.ts
+++ b/dist/components/cluster-config/cluster-config.ts
@@ -6,15 +6,16 @@ export class ClusterConfig{
     busy: boolean;
     $scope: any;
     pageReady: boolean;
+    version: number;
 
     static templateUrl = 'components/cluster-config/cluster-config.html';
 
-    constructor($scope, $injector, private backendSrv, private alertSrv, private $q, private $location){
+    constructor($scope, $injector, private backendSrv, private alertSrv, private $q, private $location, private $window){
         this.pageReady = false;
-
         this.$scope = $scope;
         this.busy = false;
         this.getCluster();
+        this.setGrafanaVersion($window);
 
     }
 
@@ -66,6 +67,11 @@ export class ClusterConfig{
             })
     }
 
+    setGrafanaVersion(window){
+        let _v = window.grafanaBootData.settings.buildInfo.version.split('.')[0];
+        this.version = _v;
+    }
+
     saveCluster(){
         if(this.busy) return;
         this.busy = true;
diff --git a/dist/datasource/config.d.ts b/dist/datasource/config.d.ts
index 629ec42..ad85e00 100644
--- a/dist/datasource/config.d.ts
+++ b/dist/datasource/config.d.ts
@@ -1,10 +1,13 @@
 export declare class DOPK8SConfig {
     private backendSrv;
+    private $window;
     static templateUrl: string;
     current: any;
     prometheusList: Array<any>;
     pageReady: boolean;
-    constructor($scope: any, $injector: any, backendSrv: any);
+    version: number;
+    constructor($scope: any, $injector: any, backendSrv: any, $window: any);
+    setGrafanaVersion(window: any): void;
     setUrl(): void;
     getPrometheusList(): any;
 }
diff --git a/dist/datasource/config.js b/dist/datasource/config.js
index cd098ae..b5c26fc 100644
--- a/dist/datasource/config.js
+++ b/dist/datasource/config.js
@@ -8,9 +8,10 @@ System.register(["../common/constants"], function(exports_1) {
             }],
         execute: function() {
             DOPK8SConfig = (function () {
-                function DOPK8SConfig($scope, $injector, backendSrv) {
+                function DOPK8SConfig($scope, $injector, backendSrv, $window) {
                     var _this = this;
                     this.backendSrv = backendSrv;
+                    this.$window = $window;
                     this.pageReady = false;
                     if (this.current.id) {
                         if (!(this.current.jsonData.prom_name))
@@ -30,6 +31,7 @@ System.register(["../common/constants"], function(exports_1) {
                             }
                         };
                     }
+                    this.setGrafanaVersion($window);
                     this.getPrometheusList()
                         .then(function () {
                         _this.pageReady = true;
@@ -38,6 +40,11 @@ System.register(["../common/constants"], function(exports_1) {
                         _this.setUrl();
                     });
                 }
+                DOPK8SConfig.prototype.setGrafanaVersion = function (window) {
+                    var _v = window.grafanaBootData.settings.buildInfo.version.split('.')[0];
+                    console.log(_v);
+                    this.version = _v;
+                };
                 DOPK8SConfig.prototype.setUrl = function () {
                     this.current.jsonData.cluster_url = this.current.url;
                 };
diff --git a/dist/datasource/config.js.map b/dist/datasource/config.js.map
index 8c72b80..fd11bad 100644
--- a/dist/datasource/config.js.map
+++ b/dist/datasource/config.js.map
@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["config.ts"],"names":["DOPK8SConfig","DOPK8SConfig.constructor","DOPK8SConfig.setUrl","DOPK8SConfig.getPrometheusList"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"config.js","sourceRoot":"","sources":["config.ts"],"names":["DOPK8SConfig","DOPK8SConfig.constructor","DOPK8SConfig.setGrafanaVersion","DOPK8SConfig.setUrl","DOPK8SConfig.getPrometheusList"],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/datasource/config.ts b/dist/datasource/config.ts
index d28bedc..70677be 100644
--- a/dist/datasource/config.ts
+++ b/dist/datasource/config.ts
@@ -6,8 +6,9 @@ export class DOPK8SConfig{
     current: any;
     prometheusList: Array<any>;
     pageReady: boolean;
+    version: number;
 
-    constructor($scope, $injector, private backendSrv){
+    constructor($scope, $injector, private backendSrv, private $window){
         this.pageReady = false;
         if(this.current.id){
             if(!(this.current.jsonData.prom_name))
@@ -29,6 +30,7 @@ export class DOPK8SConfig{
 
             };
         }
+        this.setGrafanaVersion($window);
         this.getPrometheusList()
             .then(() => {
                 this.pageReady = true;
@@ -39,6 +41,12 @@ export class DOPK8SConfig{
         });
     }
 
+    setGrafanaVersion(window){
+        let _v = window.grafanaBootData.settings.buildInfo.version.split('.')[0];
+        console.log(_v);
+        this.version = _v;
+    }
+
     setUrl(){
         this.current.jsonData.cluster_url = this.current.url;
     }
diff --git a/dist/datasource/partials/config.html b/dist/datasource/partials/config.html
index f0ace80..2505efd 100644
--- a/dist/datasource/partials/config.html
+++ b/dist/datasource/partials/config.html
@@ -9,6 +9,7 @@ <h3 class="page-heading">Bearer token access</h3>
 
         <div class="gf-form-inline">
             <gf-form-checkbox
+                    ng-if="ctrl.version >= 6"
                     class="gf-form"
                     label="Access via token"
                     checked="ctrl.current.jsonData.access_via_token"
@@ -16,6 +17,15 @@ <h3 class="page-heading">Bearer token access</h3>
                     ng-click="ctrl.setUrl()"
                     switch-class="max-width-6">
             </gf-form-checkbox>
+            <gf-form-switch
+                    ng-if="ctrl.version < 6"
+                    class="gf-form"
+                    label="Access via token"
+                    checked="ctrl.current.jsonData.access_via_token"
+                    label-class="width-10"
+                    ng-click="ctrl.setUrl()"
+                    switch-class="max-width-6">
+            </gf-form-switch>
         </div>
         <div class="gf-form-inline" ng-if="ctrl.current.jsonData.access_via_token">
             <div class="gf-form">
diff --git a/src/components/cluster-config/cluster-config.html b/src/components/cluster-config/cluster-config.html
index 902168c..acf2e3d 100644
--- a/src/components/cluster-config/cluster-config.html
+++ b/src/components/cluster-config/cluster-config.html
@@ -23,12 +23,21 @@ <h3 class="page-heading">Bearer token access</h3>
 
             <div class="gf-form-inline">
                 <gf-form-checkbox
+                        ng-if="ctrl.version >= 6"
                         class="gf-form"
                         label="Access via token"
                         checked="ctrl.cluster.jsonData.access_via_token"
                         label-class="width-10"
                         switch-class="max-width-6">
                 </gf-form-checkbox>
+                <gf-form-switch
+                        ng-if="ctrl.version < 6"
+                        class="gf-form"
+                        label="Access via token"
+                        checked="ctrl.cluster.jsonData.access_via_token"
+                        label-class="width-10"
+                        switch-class="max-width-6">
+                </gf-form-switch>
             </div>
             <div class="gf-form-inline" ng-if="ctrl.cluster.jsonData.access_via_token">
                 <div class="gf-form">
diff --git a/src/components/cluster-config/cluster-config.ts b/src/components/cluster-config/cluster-config.ts
index 789b50b..8805dc8 100644
--- a/src/components/cluster-config/cluster-config.ts
+++ b/src/components/cluster-config/cluster-config.ts
@@ -6,15 +6,16 @@ export class ClusterConfig{
     busy: boolean;
     $scope: any;
     pageReady: boolean;
+    version: number;
 
     static templateUrl = 'components/cluster-config/cluster-config.html';
 
-    constructor($scope, $injector, private backendSrv, private alertSrv, private $q, private $location){
+    constructor($scope, $injector, private backendSrv, private alertSrv, private $q, private $location, private $window){
         this.pageReady = false;
-
         this.$scope = $scope;
         this.busy = false;
         this.getCluster();
+        this.setGrafanaVersion($window);
 
     }
 
@@ -66,6 +67,11 @@ export class ClusterConfig{
             })
     }
 
+    setGrafanaVersion(window){
+        let _v = window.grafanaBootData.settings.buildInfo.version.split('.')[0];
+        this.version = _v;
+    }
+
     saveCluster(){
         if(this.busy) return;
         this.busy = true;
diff --git a/src/datasource/config.ts b/src/datasource/config.ts
index d28bedc..70677be 100644
--- a/src/datasource/config.ts
+++ b/src/datasource/config.ts
@@ -6,8 +6,9 @@ export class DOPK8SConfig{
     current: any;
     prometheusList: Array<any>;
     pageReady: boolean;
+    version: number;
 
-    constructor($scope, $injector, private backendSrv){
+    constructor($scope, $injector, private backendSrv, private $window){
         this.pageReady = false;
         if(this.current.id){
             if(!(this.current.jsonData.prom_name))
@@ -29,6 +30,7 @@ export class DOPK8SConfig{
 
             };
         }
+        this.setGrafanaVersion($window);
         this.getPrometheusList()
             .then(() => {
                 this.pageReady = true;
@@ -39,6 +41,12 @@ export class DOPK8SConfig{
         });
     }
 
+    setGrafanaVersion(window){
+        let _v = window.grafanaBootData.settings.buildInfo.version.split('.')[0];
+        console.log(_v);
+        this.version = _v;
+    }
+
     setUrl(){
         this.current.jsonData.cluster_url = this.current.url;
     }
diff --git a/src/datasource/partials/config.html b/src/datasource/partials/config.html
index f0ace80..2505efd 100644
--- a/src/datasource/partials/config.html
+++ b/src/datasource/partials/config.html
@@ -9,6 +9,7 @@ <h3 class="page-heading">Bearer token access</h3>
 
         <div class="gf-form-inline">
             <gf-form-checkbox
+                    ng-if="ctrl.version >= 6"
                     class="gf-form"
                     label="Access via token"
                     checked="ctrl.current.jsonData.access_via_token"
@@ -16,6 +17,15 @@ <h3 class="page-heading">Bearer token access</h3>
                     ng-click="ctrl.setUrl()"
                     switch-class="max-width-6">
             </gf-form-checkbox>
+            <gf-form-switch
+                    ng-if="ctrl.version < 6"
+                    class="gf-form"
+                    label="Access via token"
+                    checked="ctrl.current.jsonData.access_via_token"
+                    label-class="width-10"
+                    ng-click="ctrl.setUrl()"
+                    switch-class="max-width-6">
+            </gf-form-switch>
         </div>
         <div class="gf-form-inline" ng-if="ctrl.current.jsonData.access_via_token">
             <div class="gf-form">