From 8604e66b45c79cb2b9337080e2d580abfd04b6b1 Mon Sep 17 00:00:00 2001
From: sanke1 <22073083+sankerust@users.noreply.github.com>
Date: Fri, 21 Dec 2018 18:22:16 +0300
Subject: [PATCH] Get analytic unit types from server #112 (#116)

---
 src/module.ts                    | 21 +++++++++++++--------
 src/partials/tab_analytics.html  |  4 ++--
 src/services/analytic_service.ts |  4 ++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/module.ts b/src/module.ts
index feacdcc..86559fb 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -54,6 +54,8 @@ class GraphCtrl extends MetricsPanelCtrl {
 
   _panelInfo: PanelInfo;
 
+  private _analyticUnitTypes: any;
+
   panelDefaults = {
     // datasource name, null = default datasource
     datasource: null,
@@ -137,14 +139,6 @@ class GraphCtrl extends MetricsPanelCtrl {
     seriesOverrides: [],
     thresholds: [],
     anomalyType: '',
-    analyticUnitTypes: [
-      { name: 'General', value: 'GENERAL' },
-      { name: 'Peaks', value: 'PEAK' },
-      { name: 'Troughs', value: 'TROUGH' },
-      { name: 'Jumps', value: 'JUMP' },
-      { name: 'Drops', value: 'DROP' },
-      { name: 'Custom', value: 'CUSTOM' }
-    ]
   };
 
   /** @ngInject */
@@ -168,6 +162,8 @@ class GraphCtrl extends MetricsPanelCtrl {
 
     this.analyticService = new AnalyticService(this.backendURL, $http, this.backendSrv, this.alertSrv);
 
+    this.updateAnalyticUnitTypes();
+
     this.runBackendConnectivityCheck();
 
     this.analyticsController = new AnalyticController(this.panel, this.analyticService, this.events);
@@ -219,6 +215,15 @@ class GraphCtrl extends MetricsPanelCtrl {
     return val;
   }
 
+  async updateAnalyticUnitTypes(){
+    const analyticUnitTypes = await this.analyticService.getAnalyticUnitTypes();
+    this._analyticUnitTypes = analyticUnitTypes;
+  }
+
+  get analyticUnitTypes() {
+    return this._analyticUnitTypes;
+  }
+
   async runBackendConnectivityCheck() {
     if(this.backendURL === '' || this.backendURL === undefined) {
       this.alertSrv.set(
diff --git a/src/partials/tab_analytics.html b/src/partials/tab_analytics.html
index a811154..3158143 100644
--- a/src/partials/tab_analytics.html
+++ b/src/partials/tab_analytics.html
@@ -22,7 +22,7 @@
       <div class="gf-form-select-wrapper">
         <select class="gf-form-input width-12"
           ng-model="analyticUnit.type"
-          ng-options="type.value as type.name for type in ctrl.panel.analyticUnitTypes"
+          ng-options="type.value as type.name for type in ctrl.analyticUnitTypes.pattern"
           ng-disabled="true"
         />
       </div>
@@ -118,7 +118,7 @@
       <div class="gf-form-select-wrapper">
         <select class="gf-form-input width-12"
           ng-model="ctrl.analyticsController.newAnalyticUnit.type"
-          ng-options="type.value as type.name for type in ctrl.panel.analyticUnitTypes"
+          ng-options="type.value as type.name for type in ctrl.analyticUnitTypes.pattern"
         />
       </div>
 
diff --git a/src/services/analytic_service.ts b/src/services/analytic_service.ts
index 79228ce..3cfd9b7 100644
--- a/src/services/analytic_service.ts
+++ b/src/services/analytic_service.ts
@@ -20,6 +20,10 @@ export class AnalyticService {
     this.isBackendOk();
   }
 
+  async getAnalyticUnitTypes() {
+    return await this.get('/analyticUnits/types');
+  }
+
   async postNewItem(
     metric: MetricExpanded, datasourceRequest: DatasourceRequest,
     newItem: AnalyticUnit, panelId: number